diff --git a/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 53a56aa507b..c03e025c07d 100644
--- a/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/erpnext/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:27:39", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:18", 
+  "modified": "2014-02-03 12:44:31", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -58,23 +58,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "debit", 
-  "fieldtype": "Currency", 
-  "in_list_view": 1, 
-  "label": "Debit", 
-  "oldfieldname": "debit", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "credit", 
-  "fieldtype": "Currency", 
-  "in_list_view": 1, 
-  "label": "Credit", 
-  "oldfieldname": "credit", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency"
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -88,12 +73,55 @@
   "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break1", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "debit", 
+  "fieldtype": "Currency", 
+  "in_list_view": 1, 
+  "label": "Debit", 
+  "oldfieldname": "debit", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "credit", 
+  "fieldtype": "Currency", 
+  "in_list_view": 1, 
+  "label": "Credit", 
+  "oldfieldname": "credit", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "reference", 
   "fieldtype": "Section Break", 
   "label": "Reference"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "against_invoice", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Against Sales Invoice", 
+  "no_copy": 1, 
+  "oldfieldname": "against_invoice", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Invoice", 
+  "print_hide": 0, 
+  "search_index": 1
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "against_voucher", 
@@ -110,16 +138,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "against_invoice", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Against Sales Invoice", 
-  "no_copy": 1, 
-  "oldfieldname": "against_invoice", 
-  "oldfieldtype": "Link", 
-  "options": "Sales Invoice", 
-  "print_hide": 0, 
-  "search_index": 1
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
index f10d30e88b8..98c85877550 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-08 15:36:46", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:29", 
+  "modified": "2014-02-03 12:38:24", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -15,7 +15,6 @@
  {
   "doctype": "DocField", 
   "name": "__common__", 
-  "no_copy": 1, 
   "parent": "Purchase Invoice Advance", 
   "parentfield": "fields", 
   "parenttype": "DocType", 
@@ -31,6 +30,7 @@
   "fieldtype": "Link", 
   "in_list_view": 1, 
   "label": "Journal Voucher", 
+  "no_copy": 1, 
   "oldfieldname": "journal_voucher", 
   "oldfieldtype": "Link", 
   "options": "Journal Voucher", 
@@ -45,6 +45,7 @@
   "hidden": 1, 
   "in_list_view": 0, 
   "label": "Journal Voucher Detail No", 
+  "no_copy": 1, 
   "oldfieldname": "jv_detail_no", 
   "oldfieldtype": "Date", 
   "print_hide": 1, 
@@ -52,12 +53,31 @@
   "read_only": 1, 
   "width": "80px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "remarks", 
+  "fieldtype": "Small Text", 
+  "in_list_view": 1, 
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Small Text", 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "advance_amount", 
   "fieldtype": "Currency", 
   "in_list_view": 1, 
   "label": "Advance Amount", 
+  "no_copy": 1, 
   "oldfieldname": "advance_amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -71,22 +91,11 @@
   "fieldtype": "Currency", 
   "in_list_view": 1, 
   "label": "Allocated Amount", 
+  "no_copy": 1, 
   "oldfieldname": "allocated_amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "print_width": "100px", 
   "width": "100px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "remarks", 
-  "fieldtype": "Small Text", 
-  "in_list_view": 1, 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
-  "oldfieldtype": "Small Text", 
-  "print_width": "150px", 
-  "read_only": 1, 
-  "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 3f1ae05bd48..7c249d728c4 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-22 12:43:10", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:29", 
+  "modified": "2014-02-03 12:30:39", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -53,6 +53,11 @@
   "reqd": 1, 
   "search_index": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "description", 
@@ -84,6 +89,11 @@
   "read_only": 0, 
   "reqd": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "uom", 
@@ -94,6 +104,20 @@
   "print_hide": 1, 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "in_list_view": 0, 
+  "label": "Conversion Factor", 
+  "print_hide": 1, 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break1", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_ref_rate", 
@@ -113,6 +137,26 @@
   "print_hide": 0, 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "purchase_ref_rate", 
+  "fieldtype": "Currency", 
+  "in_list_view": 0, 
+  "label": "Price List Rate (Company Currency)", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break2", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_rate", 
@@ -140,13 +184,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "purchase_ref_rate", 
-  "fieldtype": "Currency", 
-  "in_list_view": 0, 
-  "label": "Price List Rate (Company Currency)", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 0
+  "fieldname": "col_break4", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -158,7 +197,7 @@
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
-  "read_only": 0, 
+  "read_only": 1, 
   "reqd": 1
  }, 
  {
@@ -196,6 +235,11 @@
   "reqd": 0, 
   "width": "120px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break5", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "default": ":Company", 
   "doctype": "DocField", 
@@ -257,6 +301,52 @@
   "read_only": 1, 
   "search_index": 1
  }, 
+ {
+  "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
+  "doctype": "DocField", 
+  "fieldname": "item_tax_rate", 
+  "fieldtype": "Small Text", 
+  "hidden": 1, 
+  "in_list_view": 0, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "item_tax_amount", 
+  "fieldtype": "Currency", 
+  "hidden": 1, 
+  "in_list_view": 0, 
+  "label": "Item Tax Amount", 
+  "no_copy": 1, 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "search_index": 0, 
+  "width": "150px"
+ }, 
+ {
+  "allow_on_submit": 1, 
+  "doctype": "DocField", 
+  "fieldname": "page_break", 
+  "fieldtype": "Check", 
+  "in_list_view": 0, 
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "report_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break6", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "purchase_order", 
@@ -317,35 +407,6 @@
   "read_only": 1, 
   "search_index": 1
  }, 
- {
-  "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
-  "doctype": "DocField", 
-  "fieldname": "item_tax_rate", 
-  "fieldtype": "Small Text", 
-  "hidden": 1, 
-  "in_list_view": 0, 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
-  "oldfieldtype": "Small Text", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "report_hide": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "item_tax_amount", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "in_list_view": 0, 
-  "label": "Item Tax Amount", 
-  "no_copy": 1, 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "read_only": 1, 
-  "search_index": 0, 
-  "width": "150px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "valuation_rate", 
@@ -358,15 +419,6 @@
   "print_hide": 1, 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Float", 
-  "in_list_view": 0, 
-  "label": "Conversion Factor", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "rm_supp_cost", 
@@ -378,17 +430,5 @@
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
- }, 
- {
-  "allow_on_submit": 1, 
-  "doctype": "DocField", 
-  "fieldname": "page_break", 
-  "fieldtype": "Check", 
-  "in_list_view": 0, 
-  "label": "Page Break", 
-  "no_copy": 1, 
-  "print_hide": 1, 
-  "read_only": 0, 
-  "report_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
index 9a2a75d4d72..c5768c66514 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:04", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:38", 
+  "modified": "2014-02-03 12:36:04", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -31,7 +31,7 @@
   "doctype": "DocField", 
   "fieldname": "category", 
   "fieldtype": "Select", 
-  "in_list_view": 1, 
+  "in_list_view": 0, 
   "label": "Consider Tax or Charge for", 
   "oldfieldname": "category", 
   "oldfieldtype": "Select", 
@@ -39,6 +39,18 @@
   "read_only": 0, 
   "reqd": 1
  }, 
+ {
+  "default": "Add", 
+  "doctype": "DocField", 
+  "fieldname": "add_deduct_tax", 
+  "fieldtype": "Select", 
+  "label": "Add or Deduct", 
+  "oldfieldname": "add_deduct_tax", 
+  "oldfieldtype": "Select", 
+  "options": "Add\nDeduct", 
+  "read_only": 0, 
+  "reqd": 1
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "charge_type", 
@@ -53,26 +65,12 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "account_head", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Account Head", 
-  "oldfieldname": "account_head", 
-  "oldfieldtype": "Link", 
-  "options": "Account", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
- {
-  "default": ":Company", 
-  "doctype": "DocField", 
-  "fieldname": "cost_center", 
-  "fieldtype": "Link", 
-  "in_list_view": 1, 
-  "label": "Cost Center", 
-  "oldfieldname": "cost_center", 
-  "oldfieldtype": "Link", 
-  "options": "Cost Center", 
+  "fieldname": "row_id", 
+  "fieldtype": "Data", 
+  "hidden": 0, 
+  "label": "Enter Row", 
+  "oldfieldname": "row_id", 
+  "oldfieldtype": "Data", 
   "read_only": 0
  }, 
  {
@@ -88,6 +86,35 @@
   "reqd": 1, 
   "width": "300px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "account_head", 
+  "fieldtype": "Link", 
+  "in_list_view": 0, 
+  "label": "Account Head", 
+  "oldfieldname": "account_head", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "read_only": 0, 
+  "reqd": 1
+ }, 
+ {
+  "default": ":Company", 
+  "doctype": "DocField", 
+  "fieldname": "cost_center", 
+  "fieldtype": "Link", 
+  "in_list_view": 0, 
+  "label": "Cost Center", 
+  "oldfieldname": "cost_center", 
+  "oldfieldtype": "Link", 
+  "options": "Cost Center", 
+  "read_only": 0
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "rate", 
@@ -103,6 +130,7 @@
   "doctype": "DocField", 
   "fieldname": "tax_amount", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Amount", 
   "oldfieldname": "tax_amount", 
   "oldfieldtype": "Currency", 
@@ -120,28 +148,6 @@
   "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "row_id", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Enter Row", 
-  "oldfieldname": "row_id", 
-  "oldfieldtype": "Data", 
-  "read_only": 0
- }, 
- {
-  "default": "Add", 
-  "doctype": "DocField", 
-  "fieldname": "add_deduct_tax", 
-  "fieldtype": "Select", 
-  "label": "Add or Deduct", 
-  "oldfieldname": "add_deduct_tax", 
-  "oldfieldtype": "Select", 
-  "options": "Add\nDeduct", 
-  "read_only": 0, 
-  "reqd": 1
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "item_wise_tax_detail", 
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index 9ae37cfab39..f0f361d098f 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:27:41", 
   "docstatus": 0, 
-  "modified": "2013-12-31 18:29:19", 
+  "modified": "2014-02-03 12:38:53", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -38,38 +38,6 @@
   "read_only": 1, 
   "width": "250px"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "advance_amount", 
-  "fieldtype": "Currency", 
-  "in_list_view": 1, 
-  "label": "Advance amount", 
-  "no_copy": 1, 
-  "oldfieldname": "advance_amount", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_width": "120px", 
-  "read_only": 1, 
-  "width": "120px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "allocated_amount", 
-  "fieldtype": "Currency", 
-  "in_list_view": 1, 
-  "label": "Allocated amount", 
-  "no_copy": 1, 
-  "oldfieldname": "allocated_amount", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_width": "120px", 
-  "width": "120px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "col_break1", 
-  "fieldtype": "Column Break"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "remarks", 
@@ -97,5 +65,37 @@
   "print_width": "120px", 
   "read_only": 1, 
   "width": "120px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "advance_amount", 
+  "fieldtype": "Currency", 
+  "in_list_view": 1, 
+  "label": "Advance amount", 
+  "no_copy": 1, 
+  "oldfieldname": "advance_amount", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_width": "120px", 
+  "read_only": 1, 
+  "width": "120px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "allocated_amount", 
+  "fieldtype": "Currency", 
+  "in_list_view": 1, 
+  "label": "Allocated amount", 
+  "no_copy": 1, 
+  "oldfieldname": "allocated_amount", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_width": "120px", 
+  "width": "120px"
  }
 ]
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
index a78c485f896..84009735b57 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:06", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:32", 
+  "modified": "2014-02-03 12:08:21", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -40,22 +40,6 @@
   "reqd": 1, 
   "search_index": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "schedule_date", 
-  "fieldtype": "Date", 
-  "hidden": 0, 
-  "in_filter": 1, 
-  "in_list_view": 0, 
-  "label": "Reqd By Date", 
-  "no_copy": 0, 
-  "oldfieldname": "schedule_date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 1, 
-  "read_only": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
  {
   "description": "If Supplier Part Number exists for given Item, it gets stored here", 
   "doctype": "DocField", 
@@ -84,10 +68,24 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "quantity_and_rate", 
-  "fieldtype": "Section Break", 
+  "fieldname": "schedule_date", 
+  "fieldtype": "Date", 
+  "hidden": 0, 
+  "in_filter": 1, 
   "in_list_view": 0, 
-  "label": "Quantity and Rate"
+  "label": "Reqd By Date", 
+  "no_copy": 0, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -102,6 +100,13 @@
   "reqd": 1, 
   "width": "300px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "quantity_and_rate", 
+  "fieldtype": "Section Break", 
+  "in_list_view": 0, 
+  "label": "Quantity and Rate"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "qty", 
@@ -130,6 +135,47 @@
   "reqd": 1, 
   "width": "100px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Link", 
+  "hidden": 0, 
+  "in_list_view": 0, 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "options": "UOM", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "hidden": 0, 
+  "in_list_view": 0, 
+  "label": "UOM Conversion Factor", 
+  "oldfieldname": "conversion_factor", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 0, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break1", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_ref_rate", 
@@ -149,6 +195,26 @@
   "print_hide": 0, 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "purchase_ref_rate", 
+  "fieldtype": "Currency", 
+  "in_list_view": 0, 
+  "label": "Price List Rate (Company Currency)", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break2", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_rate", 
@@ -175,13 +241,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "purchase_ref_rate", 
-  "fieldtype": "Currency", 
-  "in_list_view": 0, 
-  "label": "Price List Rate (Company Currency)", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 0
+  "fieldname": "col_break4", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -194,7 +255,7 @@
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "read_only": 0, 
+  "read_only": 1, 
   "reqd": 1, 
   "width": "100px"
  }, 
@@ -244,37 +305,6 @@
   "read_only": 0, 
   "report_hide": 0
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Float", 
-  "hidden": 0, 
-  "in_list_view": 0, 
-  "label": "UOM Conversion Factor", 
-  "oldfieldname": "conversion_factor", 
-  "oldfieldtype": "Currency", 
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "read_only": 0, 
-  "reqd": 1, 
-  "width": "100px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "stock_uom", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "in_list_view": 0, 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
-  "oldfieldtype": "Data", 
-  "options": "UOM", 
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "read_only": 1, 
-  "reqd": 1, 
-  "width": "100px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "prevdoc_doctype", 
@@ -325,9 +355,9 @@
   "doctype": "DocField", 
   "fieldname": "supplier_quotation", 
   "fieldtype": "Link", 
-  "hidden": 1, 
+  "hidden": 0, 
   "in_filter": 0, 
-  "in_list_view": 1, 
+  "in_list_view": 0, 
   "label": "Supplier Quotation", 
   "no_copy": 1, 
   "options": "Supplier Quotation", 
@@ -347,16 +377,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "brand", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "in_list_view": 1, 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "oldfieldtype": "Link", 
-  "options": "Brand", 
-  "print_hide": 1, 
-  "read_only": 1
+  "fieldname": "col_break5", 
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
@@ -374,13 +396,26 @@
   "read_only": 1, 
   "search_index": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "brand", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "in_list_view": 1, 
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "stock_qty", 
   "fieldtype": "Float", 
   "hidden": 0, 
   "in_list_view": 1, 
-  "label": "Stock Qty", 
+  "label": "Qty as per Stock UOM", 
   "no_copy": 1, 
   "oldfieldname": "stock_qty", 
   "oldfieldtype": "Currency", 
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index f0810ff449e..cffe811cd17 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-22 12:43:10", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:21:50", 
+  "modified": "2014-02-03 11:47:21", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -66,6 +66,11 @@
   "reqd": 1, 
   "search_index": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "description", 
@@ -99,21 +104,6 @@
   "reqd": 1, 
   "width": "60px"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "uom", 
-  "fieldtype": "Link", 
-  "in_list_view": 0, 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "oldfieldtype": "Link", 
-  "options": "UOM", 
-  "print_hide": 0, 
-  "print_width": "100px", 
-  "read_only": 0, 
-  "reqd": 1, 
-  "width": "100px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_ref_rate", 
@@ -133,6 +123,41 @@
   "print_hide": 0, 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "uom", 
+  "fieldtype": "Link", 
+  "in_list_view": 0, 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "read_only": 0, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "purchase_ref_rate", 
+  "fieldtype": "Currency", 
+  "in_list_view": 0, 
+  "label": "Price List Rate (Company Currency)", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break1", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_rate", 
@@ -159,13 +184,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "purchase_ref_rate", 
-  "fieldtype": "Currency", 
-  "in_list_view": 0, 
-  "label": "Price List Rate (Company Currency)", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 0
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -178,7 +198,7 @@
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "read_only": 0, 
+  "read_only": 1, 
   "reqd": 1, 
   "width": "100px"
  }, 
@@ -259,6 +279,11 @@
   "search_index": 1, 
   "width": "120px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break4", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "prevdoc_detail_docname", 
@@ -278,7 +303,7 @@
   "doctype": "DocField", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "hidden": 1, 
+  "hidden": 0, 
   "in_list_view": 0, 
   "label": "Brand", 
   "oldfieldname": "brand", 
@@ -292,7 +317,7 @@
   "doctype": "DocField", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "hidden": 1, 
+  "hidden": 0, 
   "in_filter": 1, 
   "in_list_view": 0, 
   "label": "Item Group", 
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.txt b/erpnext/manufacturing/doctype/bom_item/bom_item.txt
index b7017f487c0..6949b75e4fc 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.txt
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:27:49", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:22:58", 
+  "modified": "2014-02-03 12:47:39", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -62,6 +62,28 @@
   "search_index": 1, 
   "width": "150px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Text", 
+  "label": "Item Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "print_width": "250px", 
+  "reqd": 0, 
+  "width": "250px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "quantity_and_rate", 
+  "fieldtype": "Section Break", 
+  "label": "Quantity and Rate"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "qty", 
@@ -72,6 +94,19 @@
   "oldfieldtype": "Currency", 
   "reqd": 1
  }, 
+ {
+  "description": "See \"Rate Of Materials Based On\" in Costing Section", 
+  "doctype": "DocField", 
+  "fieldname": "rate", 
+  "fieldtype": "Float", 
+  "in_list_view": 1, 
+  "label": "Rate"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "stock_uom", 
@@ -84,14 +119,6 @@
   "read_only": 1, 
   "reqd": 1
  }, 
- {
-  "description": "See \"Rate Of Materials Based On\" in Costing Section", 
-  "doctype": "DocField", 
-  "fieldname": "rate", 
-  "fieldtype": "Float", 
-  "in_list_view": 1, 
-  "label": "Rate"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "amount", 
@@ -113,17 +140,6 @@
   "oldfieldtype": "Currency", 
   "print_hide": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "label": "Item Description", 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_width": "250px", 
-  "reqd": 0, 
-  "width": "250px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "qty_consumed_per_unit", 
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.txt b/erpnext/manufacturing/doctype/bom_operation/bom_operation.txt
index 6ace745c14c..b2628c14158 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.txt
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:27:49", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:22:58", 
+  "modified": "2014-02-03 12:53:03", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -14,7 +14,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "in_list_view": 1, 
   "name": "__common__", 
   "parent": "BOM Operation", 
   "parentfield": "fields", 
@@ -29,6 +28,7 @@
   "doctype": "DocField", 
   "fieldname": "operation_no", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Operation No", 
   "oldfieldname": "operation_no", 
   "oldfieldtype": "Data", 
@@ -38,15 +38,22 @@
   "doctype": "DocField", 
   "fieldname": "opn_description", 
   "fieldtype": "Text", 
+  "in_list_view": 1, 
   "label": "Operation Description", 
   "oldfieldname": "opn_description", 
   "oldfieldtype": "Text", 
   "reqd": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "workstation", 
   "fieldtype": "Link", 
+  "in_list_view": 1, 
   "label": "Workstation", 
   "oldfieldname": "workstation", 
   "oldfieldtype": "Link", 
@@ -57,6 +64,7 @@
   "doctype": "DocField", 
   "fieldname": "hour_rate", 
   "fieldtype": "Float", 
+  "in_list_view": 0, 
   "label": "Hour Rate", 
   "oldfieldname": "hour_rate", 
   "oldfieldtype": "Currency", 
@@ -66,6 +74,7 @@
   "doctype": "DocField", 
   "fieldname": "time_in_mins", 
   "fieldtype": "Float", 
+  "in_list_view": 0, 
   "label": "Operation Time (mins)", 
   "oldfieldname": "time_in_mins", 
   "oldfieldtype": "Currency", 
@@ -76,6 +85,7 @@
   "doctype": "DocField", 
   "fieldname": "operating_cost", 
   "fieldtype": "Float", 
+  "in_list_view": 1, 
   "label": "Operating Cost", 
   "oldfieldname": "operating_cost", 
   "oldfieldtype": "Currency", 
diff --git a/erpnext/selling/doctype/opportunity_item/opportunity_item.txt b/erpnext/selling/doctype/opportunity_item/opportunity_item.txt
index 94c6dd25b68..22023ed65c9 100644
--- a/erpnext/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/erpnext/selling/doctype/opportunity_item/opportunity_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:27:51", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:22", 
+  "modified": "2014-02-03 12:40:44", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -45,18 +45,6 @@
   "oldfieldtype": "Data", 
   "reqd": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "in_list_view": 1, 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "oldfieldtype": "Text", 
-  "print_width": "300px", 
-  "reqd": 1, 
-  "width": "300px"
- }, 
  {
   "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
   "doctype": "DocField", 
@@ -84,6 +72,23 @@
   "print_hide": 1, 
   "search_index": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Text", 
+  "in_list_view": 1, 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "print_width": "300px", 
+  "reqd": 1, 
+  "width": "300px"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "quantity_and_rate", 
@@ -112,6 +117,11 @@
   "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "uom", 
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.txt b/erpnext/stock/doctype/material_request_item/material_request_item.txt
index 6e8a0d6f98e..56a4976bcac 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.txt
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:28:02", 
   "docstatus": 0, 
-  "modified": "2013-12-20 19:23:21", 
+  "modified": "2014-02-03 11:35:26", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -41,20 +41,24 @@
   "width": "100px"
  }, 
  {
-  "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "fieldname": "schedule_date", 
-  "fieldtype": "Date", 
-  "in_list_view": 1, 
-  "label": "Required Date", 
-  "no_copy": 0, 
-  "oldfieldname": "schedule_date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 0, 
+  "fieldname": "item_name", 
+  "fieldtype": "Data", 
+  "in_filter": 1, 
+  "in_list_view": 0, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
   "print_width": "100px", 
-  "reqd": 1, 
+  "reqd": 0, 
+  "search_index": 1, 
   "width": "100px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "description", 
@@ -87,21 +91,6 @@
   "reqd": 1, 
   "width": "80px"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "uom", 
-  "fieldtype": "Link", 
-  "in_list_view": 0, 
-  "label": "Stock UOM", 
-  "no_copy": 0, 
-  "oldfieldname": "uom", 
-  "oldfieldtype": "Link", 
-  "options": "UOM", 
-  "print_width": "70px", 
-  "read_only": 1, 
-  "reqd": 1, 
-  "width": "70px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "warehouse", 
@@ -116,38 +105,47 @@
   "reqd": 0, 
   "width": "100px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "uom", 
+  "fieldtype": "Link", 
+  "in_list_view": 1, 
+  "label": "Stock UOM", 
+  "no_copy": 0, 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "print_width": "70px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "70px"
+ }, 
+ {
+  "allow_on_submit": 0, 
+  "doctype": "DocField", 
+  "fieldname": "schedule_date", 
+  "fieldtype": "Date", 
+  "in_list_view": 1, 
+  "label": "Required Date", 
+  "no_copy": 0, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "label": "More Info"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "lead_time_date", 
-  "fieldtype": "Date", 
-  "in_list_view": 0, 
-  "label": "Lead Time Date", 
-  "no_copy": 1, 
-  "oldfieldname": "lead_time_date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "item_name", 
-  "fieldtype": "Data", 
-  "in_filter": 1, 
-  "in_list_view": 1, 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
-  "oldfieldtype": "Data", 
-  "print_width": "100px", 
-  "reqd": 0, 
-  "search_index": 1, 
-  "width": "100px"
- }, 
  {
   "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
   "doctype": "DocField", 
@@ -177,6 +175,33 @@
   "read_only": 1, 
   "width": "100px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "lead_time_date", 
+  "fieldtype": "Date", 
+  "in_list_view": 0, 
+  "label": "Lead Time Date", 
+  "no_copy": 1, 
+  "oldfieldname": "lead_time_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sales_order_no", 
+  "fieldtype": "Link", 
+  "label": "Sales Order No", 
+  "no_copy": 0, 
+  "options": "Sales Order", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "min_order_qty", 
@@ -214,16 +239,6 @@
   "oldfieldtype": "Currency", 
   "read_only": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sales_order_no", 
-  "fieldtype": "Link", 
-  "label": "Sales Order No", 
-  "no_copy": 0, 
-  "options": "Sales Order", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
  {
   "allow_on_submit": 1, 
   "doctype": "DocField", 
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 9bc66a42da8..393e1ed9e5b 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:10", 
   "docstatus": 0, 
-  "modified": "2014-01-15 16:00:44", 
+  "modified": "2014-02-03 12:18:24", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -55,6 +55,11 @@
   "reqd": 1, 
   "search_index": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "description", 
@@ -116,6 +121,11 @@
   "search_index": 0, 
   "width": "100px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "uom", 
@@ -131,6 +141,35 @@
   "reqd": 1, 
   "width": "100px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Link", 
+  "in_list_view": 0, 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "options": "UOM", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "in_list_view": 0, 
+  "label": "Conversion Factor", 
+  "oldfieldname": "conversion_factor", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 0, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "rate_and_amount", 
@@ -157,6 +196,26 @@
   "print_hide": 1, 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "purchase_ref_rate", 
+  "fieldtype": "Currency", 
+  "in_list_view": 0, 
+  "label": "Price List Rate (Company Currency)", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break1", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "import_rate", 
@@ -184,13 +243,8 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "purchase_ref_rate", 
-  "fieldtype": "Currency", 
-  "in_list_view": 0, 
-  "label": "Price List Rate (Company Currency)", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 0
+  "fieldname": "col_break4", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -203,7 +257,7 @@
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "read_only": 0, 
+  "read_only": 1, 
   "reqd": 1, 
   "width": "100px"
  }, 
@@ -218,7 +272,7 @@
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "read_only": 0, 
+  "read_only": 1, 
   "reqd": 0, 
   "width": "100px"
  }, 
@@ -244,68 +298,6 @@
   "read_only": 0, 
   "width": "100px"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Float", 
-  "in_list_view": 0, 
-  "label": "Conversion Factor", 
-  "oldfieldname": "conversion_factor", 
-  "oldfieldtype": "Currency", 
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "read_only": 0, 
-  "reqd": 1, 
-  "width": "100px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "stock_uom", 
-  "fieldtype": "Link", 
-  "in_list_view": 0, 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
-  "oldfieldtype": "Data", 
-  "options": "UOM", 
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "read_only": 1, 
-  "reqd": 1, 
-  "width": "100px"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "serial_no", 
-  "fieldtype": "Text", 
-  "in_filter": 1, 
-  "in_list_view": 1, 
-  "label": "Serial No", 
-  "no_copy": 1, 
-  "oldfieldname": "serial_no", 
-  "oldfieldtype": "Text", 
-  "print_hide": 0, 
-  "read_only": 0, 
-  "report_hide": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "rejected_serial_no", 
-  "fieldtype": "Text", 
-  "label": "Rejected Serial No", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "batch_no", 
-  "fieldtype": "Link", 
-  "label": "Batch No", 
-  "oldfieldname": "batch_no", 
-  "oldfieldtype": "Link", 
-  "options": "Batch", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "rejected_warehouse", 
@@ -321,19 +313,6 @@
   "read_only": 0, 
   "width": "100px"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "schedule_date", 
-  "fieldtype": "Date", 
-  "label": "Required By", 
-  "no_copy": 0, 
-  "oldfieldname": "schedule_date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 1, 
-  "read_only": 0, 
-  "report_hide": 0, 
-  "reqd": 0
- }, 
  {
   "default": ":Company", 
   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
@@ -368,36 +347,22 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "brand", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "oldfieldtype": "Link", 
-  "options": "Brand", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
-  "doctype": "DocField", 
-  "fieldname": "item_group", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "in_filter": 1, 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "oldfieldtype": "Link", 
-  "options": "Item Group", 
+  "fieldname": "schedule_date", 
+  "fieldtype": "Date", 
+  "label": "Required By", 
+  "no_copy": 0, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
   "print_hide": 1, 
   "read_only": 1, 
-  "search_index": 1
+  "report_hide": 0, 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "stock_qty", 
   "fieldtype": "Float", 
-  "label": "Stock Qty", 
+  "label": "Qty as per Stock UOM", 
   "oldfieldname": "stock_qty", 
   "oldfieldtype": "Currency", 
   "print_hide": 1, 
@@ -435,6 +400,87 @@
   "search_index": 1, 
   "width": "150px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "prevdoc_detail_docname", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Purchase Order Item No", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break5", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "serial_no", 
+  "fieldtype": "Text", 
+  "in_filter": 1, 
+  "in_list_view": 1, 
+  "label": "Serial No", 
+  "no_copy": 1, 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Text", 
+  "print_hide": 0, 
+  "read_only": 0, 
+  "report_hide": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "rejected_serial_no", 
+  "fieldtype": "Text", 
+  "label": "Rejected Serial No", 
+  "print_hide": 1, 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "batch_no", 
+  "fieldtype": "Link", 
+  "label": "Batch No", 
+  "oldfieldname": "batch_no", 
+  "oldfieldtype": "Link", 
+  "options": "Batch", 
+  "print_hide": 1, 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "brand", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
+  "doctype": "DocField", 
+  "fieldname": "item_group", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "rm_supp_cost", 
@@ -468,22 +514,6 @@
   "search_index": 0, 
   "width": "150px"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "prevdoc_detail_docname", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "in_filter": 1, 
-  "label": "Purchase Order Item No", 
-  "no_copy": 1, 
-  "oldfieldname": "prevdoc_detail_docname", 
-  "oldfieldtype": "Data", 
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "read_only": 1, 
-  "search_index": 1, 
-  "width": "150px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "valuation_rate", 
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index 25835e0bf3d..3bc16955bcf 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-29 18:22:12", 
   "docstatus": 0, 
-  "modified": "2014-01-15 16:08:45", 
+  "modified": "2014-02-03 12:59:27", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -38,6 +38,11 @@
   "options": "Warehouse", 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break1", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "t_warehouse", 
@@ -51,6 +56,11 @@
   "options": "Warehouse", 
   "read_only": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sec_break1", 
+  "fieldtype": "Section Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "item_code", 
@@ -73,6 +83,11 @@
   "print_hide": 1, 
   "read_only": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break2", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "description", 
@@ -85,6 +100,12 @@
   "read_only": 0, 
   "width": "300px"
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "quantity_and_rate", 
+  "fieldtype": "Section Break", 
+  "label": "Quantity and Rate"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "qty", 
@@ -108,6 +129,58 @@
   "read_only": 0, 
   "reqd": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "incoming_rate", 
+  "fieldtype": "Currency", 
+  "in_list_view": 1, 
+  "label": "Valuation Rate", 
+  "oldfieldname": "incoming_rate", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "read_only": 0, 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break3", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Link", 
+  "in_filter": 0, 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "label": "Conversion Factor", 
+  "oldfieldname": "conversion_factor", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "amount", 
+  "fieldtype": "Currency", 
+  "label": "Amount", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "read_only": 1
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "serial_no_batch", 
@@ -125,6 +198,11 @@
   "read_only": 0, 
   "reqd": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break4", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "batch_no", 
@@ -142,28 +220,6 @@
   "fieldtype": "Section Break", 
   "label": "Accounting"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "incoming_rate", 
-  "fieldtype": "Currency", 
-  "in_list_view": 1, 
-  "label": "Valuation Rate", 
-  "oldfieldname": "incoming_rate", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "read_only": 0, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "amount", 
-  "fieldtype": "Currency", 
-  "label": "Amount", 
-  "oldfieldname": "amount", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "read_only": 1
- }, 
  {
   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
   "doctype": "DocField", 
@@ -173,6 +229,11 @@
   "options": "Account", 
   "print_hide": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break5", 
+  "fieldtype": "Column Break"
+ }, 
  {
   "default": ":Company", 
   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)", 
@@ -207,15 +268,21 @@
   "search_index": 1
  }, 
  {
+  "description": "BOM No. for a Finished Good Item", 
   "doctype": "DocField", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Float", 
-  "label": "Conversion Factor", 
-  "oldfieldname": "conversion_factor", 
-  "oldfieldtype": "Currency", 
+  "fieldname": "bom_no", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "label": "BOM No", 
+  "no_copy": 0, 
+  "options": "BOM", 
   "print_hide": 1, 
-  "read_only": 1, 
-  "reqd": 1
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break6", 
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
@@ -228,32 +295,6 @@
   "read_only": 1, 
   "reqd": 1
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "stock_uom", 
-  "fieldtype": "Link", 
-  "in_filter": 0, 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
-  "oldfieldtype": "Link", 
-  "options": "UOM", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "reqd": 1, 
-  "search_index": 0
- }, 
- {
-  "description": "BOM No. for a Finished Good Item", 
-  "doctype": "DocField", 
-  "fieldname": "bom_no", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "label": "BOM No", 
-  "no_copy": 0, 
-  "options": "BOM", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
  {
   "description": "Material Request used to make this Stock Entry", 
   "doctype": "DocField",