diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 779b056..64b9f5c 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:39", 
   "docstatus": 0, 
-  "modified": "2013-07-08 18:03:17", 
+  "modified": "2013-07-09 12:51:06", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -172,7 +172,7 @@
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
   "in_filter": 1, 
-  "label": "Bill No", 
+  "label": "Supplier Invoice No", 
   "oldfieldname": "bill_no", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -185,7 +185,7 @@
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
   "in_filter": 1, 
-  "label": "Bill Date", 
+  "label": "Supplier Invoice Date", 
   "oldfieldname": "bill_date", 
   "oldfieldtype": "Date", 
   "print_hide": 1, 
@@ -195,37 +195,34 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "items", 
-  "fieldtype": "Section Break", 
-  "label": "Items", 
-  "oldfieldtype": "Section Break", 
-  "options": "icon-shopping-cart", 
-  "read_only": 0
- }, 
- {
-  "allow_on_submit": 1, 
-  "doctype": "DocField", 
-  "fieldname": "entries", 
-  "fieldtype": "Table", 
-  "label": "Entries", 
-  "oldfieldname": "entries", 
-  "oldfieldtype": "Table", 
-  "options": "Purchase Invoice Item", 
-  "read_only": 0
+  "fieldname": "amended_from", 
+  "fieldtype": "Link", 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Invoice", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "recalculate", 
-  "fieldtype": "Button", 
-  "label": "Recalculate", 
-  "oldfieldtype": "Button", 
-  "read_only": 0
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "currency_price_list", 
   "fieldtype": "Section Break", 
-  "label": "Currency & Price List", 
+  "label": "Currency and Price List", 
   "options": "icon-tag", 
   "read_only": 0
  }, 
@@ -288,6 +285,59 @@
   "read_only": 0
  }, 
  {
+  "doctype": "DocField", 
+  "fieldname": "items", 
+  "fieldtype": "Section Break", 
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "options": "icon-shopping-cart", 
+  "read_only": 0
+ }, 
+ {
+  "allow_on_submit": 1, 
+  "doctype": "DocField", 
+  "fieldname": "entries", 
+  "fieldtype": "Table", 
+  "label": "Entries", 
+  "oldfieldname": "entries", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Invoice Item", 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "section_break_26", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total_import", 
+  "fieldtype": "Currency", 
+  "label": "Net Total", 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "options": "currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_28", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "description": "Will be calculated automatically when you enter the details", 
+  "doctype": "DocField", 
+  "fieldname": "net_total", 
+  "fieldtype": "Currency", 
+  "label": "Net Total (Company Currency)", 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
   "description": "Add / Edit Taxes and Charges", 
   "doctype": "DocField", 
   "fieldname": "taxes", 
@@ -310,16 +360,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "get_tax_detail", 
-  "fieldtype": "Button", 
-  "label": "Get Tax Detail", 
-  "oldfieldtype": "Button", 
-  "options": "get_purchase_tax_details", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
   "label": "Purchase Taxes and Charges", 
@@ -330,15 +370,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_tax", 
-  "fieldtype": "Button", 
-  "label": "Calculate Tax", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
   "label": "Tax Calculation", 
@@ -348,50 +379,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "total_tax", 
-  "fieldtype": "Currency", 
-  "label": "Total Tax", 
-  "oldfieldname": "total_tax", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "depends_on": "supplier", 
-  "doctype": "DocField", 
-  "fieldname": "contact_section", 
-  "fieldtype": "Section Break", 
-  "label": "Contact Info", 
-  "options": "icon-bullhorn", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "supplier_address", 
-  "fieldtype": "Link", 
-  "label": "Supplier Address", 
-  "options": "Address", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "col_break23", 
-  "fieldtype": "Column Break", 
-  "read_only": 0, 
-  "width": "50%"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "contact_person", 
-  "fieldtype": "Link", 
-  "label": "Contact Person", 
-  "options": "Contact", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
   "label": "Totals", 
@@ -401,20 +388,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total_import", 
-  "fieldtype": "Currency", 
-  "label": "Net Total (Import)", 
-  "oldfieldname": "net_total_import", 
-  "oldfieldtype": "Currency", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added (Import)", 
+  "label": "Taxes and Charges Added", 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -425,7 +401,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted (Import)", 
+  "label": "Taxes and Charges Deducted", 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -437,7 +413,7 @@
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
   "in_list_view": 1, 
-  "label": "Grand Total (Import)", 
+  "label": "Grand Total", 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -448,7 +424,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "label": "In Words (Import)", 
+  "label": "In Words", 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -504,12 +480,11 @@
   "width": "50%"
  }, 
  {
-  "description": "Will be calculated automatically when you enter the details", 
   "doctype": "DocField", 
-  "fieldname": "net_total", 
+  "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "label": "Net Total", 
-  "oldfieldname": "net_total", 
+  "label": "Total Tax (Company Currency)", 
+  "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
@@ -519,7 +494,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added", 
+  "label": "Taxes and Charges Added (Company Currency)", 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -530,7 +505,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted", 
+  "label": "Taxes and Charges Deducted (Company Currency)", 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -541,7 +516,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total", 
+  "label": "Grand Total (Company Currency)", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -553,7 +528,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -658,6 +633,39 @@
   "label": "Terms and Conditions1"
  }, 
  {
+  "depends_on": "supplier", 
+  "doctype": "DocField", 
+  "fieldname": "contact_section", 
+  "fieldtype": "Section Break", 
+  "label": "Contact Info", 
+  "options": "icon-bullhorn", 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "supplier_address", 
+  "fieldtype": "Link", 
+  "label": "Supplier Address", 
+  "options": "Address", 
+  "read_only": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "col_break23", 
+  "fieldtype": "Column Break", 
+  "read_only": 0, 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "contact_person", 
+  "fieldtype": "Link", 
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1, 
+  "read_only": 0
+ }, 
+ {
   "doctype": "DocField", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
@@ -695,18 +703,6 @@
   "search_index": 0
  }, 
  {
-  "doctype": "DocField", 
-  "fieldname": "amended_from", 
-  "fieldtype": "Link", 
-  "label": "Amended From", 
-  "no_copy": 1, 
-  "oldfieldname": "amended_from", 
-  "oldfieldtype": "Link", 
-  "options": "Purchase Invoice", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
   "allow_on_submit": 1, 
   "doctype": "DocField", 
   "fieldname": "select_print_heading", 
@@ -751,19 +747,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "company", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "oldfieldtype": "Link", 
-  "options": "Company", 
-  "print_hide": 1, 
-  "read_only": 0, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
   "in_filter": 1, 
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 8df4306..867cd7a 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-04-19 11:00:07", 
+  "creation": "2013-05-22 12:43:10", 
   "docstatus": 0, 
-  "modified": "2013-05-22 12:01:56", 
+  "modified": "2013-07-09 12:21:47", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -86,7 +86,7 @@
   "doctype": "DocField", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Ref Rate ", 
+  "label": "Price List Rate", 
   "options": "currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -126,7 +126,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Ref Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -135,7 +135,7 @@
   "doctype": "DocField", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "label": "Rate*", 
+  "label": "Rate (Company Currency)", 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -147,7 +147,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -223,7 +223,7 @@
   "fieldname": "purchase_order", 
   "fieldtype": "Link", 
   "in_filter": 1, 
-  "label": "Pur Order", 
+  "label": "Purchase Order", 
   "no_copy": 1, 
   "oldfieldname": "purchase_order", 
   "oldfieldtype": "Link", 
@@ -251,7 +251,7 @@
   "fieldname": "purchase_receipt", 
   "fieldtype": "Link", 
   "in_filter": 1, 
-  "label": "Pur Receipt", 
+  "label": "Purchase Receipt", 
   "no_copy": 1, 
   "oldfieldname": "purchase_receipt", 
   "oldfieldtype": "Link", 
diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py
index c5c510c..23fe75e 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/accounts/doctype/sales_invoice/sales_invoice.py
@@ -149,7 +149,7 @@
 		self.make_cancel_gl_entries()
 		
 	def update_status_updater_args(self):
-		if cint(self.doc.is_pos) and cint(self.doc.update_stock):
+		if cint(self.doc.update_stock):
 			self.status_updater.append({
 				'source_dt':'Sales Invoice Item',
 				'target_dt':'Sales Order Item',
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index c935789..e3c60a0 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:05", 
   "docstatus": 0, 
-  "modified": "2013-07-09 11:18:43", 
+  "modified": "2013-07-09 12:48:05", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -223,7 +223,7 @@
   "doctype": "DocField", 
   "fieldname": "currency_section", 
   "fieldtype": "Section Break", 
-  "label": "Price List and Currency", 
+  "label": "Currency and Price List", 
   "options": "icon-tag", 
   "read_only": 0
  }, 
@@ -352,18 +352,28 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "section_break_30", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total_export", 
   "fieldtype": "Currency", 
-  "label": "Net Total (Export)", 
+  "label": "Net Total", 
   "options": "currency", 
   "print_hide": 0, 
   "read_only": 1
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "column_break_32", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "label": "Net Total*", 
+  "label": "Net Total (Company Currency)", 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -373,15 +383,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
   "label": "Taxes and Charges", 
@@ -449,19 +450,8 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_total_export", 
   "fieldtype": "Currency", 
-  "label": "Total Taxes and Charges (Export)", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "other_charges_total", 
-  "fieldtype": "Currency", 
   "label": "Total Taxes and Charges", 
-  "oldfieldname": "other_charges_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
+  "options": "currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -472,12 +462,14 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_charges", 
-  "fieldtype": "Button", 
-  "label": "Calculate Taxes and Charges", 
-  "oldfieldtype": "Button", 
+  "fieldname": "other_charges_total", 
+  "fieldtype": "Currency", 
+  "label": "Total Taxes and Charges (Company Currency)", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
-  "read_only": 0
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -494,7 +486,7 @@
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
   "in_list_view": 1, 
-  "label": "Grand Total (Export)", 
+  "label": "Grand Total", 
   "oldfieldname": "grand_total_export", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -506,7 +498,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total (Export)", 
+  "label": "Rounded Total", 
   "oldfieldname": "rounded_total_export", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -517,7 +509,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "label": "In Words (Export)", 
+  "label": "In Words", 
   "oldfieldname": "in_words_export", 
   "oldfieldtype": "Data", 
   "print_hide": 0, 
@@ -558,7 +550,7 @@
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "in_filter": 1, 
-  "label": "Grand Total", 
+  "label": "Grand Total (Company Currency)", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -571,7 +563,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -583,7 +575,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 1a9cd48..b0fd7c7 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-06-04 11:02:19", 
   "docstatus": 0, 
-  "modified": "2013-06-26 14:34:00", 
+  "modified": "2013-07-09 12:46:12", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -85,7 +85,7 @@
   "doctype": "DocField", 
   "fieldname": "qty", 
   "fieldtype": "Float", 
-  "label": "Qty", 
+  "label": "Quantity", 
   "oldfieldname": "qty", 
   "oldfieldtype": "Currency", 
   "read_only": 0, 
@@ -146,7 +146,7 @@
   "doctype": "DocField", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -158,7 +158,7 @@
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
   "in_filter": 0, 
-  "label": "Basic Rate*", 
+  "label": "Basic Rate (Company Currency)", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -171,7 +171,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -320,7 +320,7 @@
   "fieldtype": "Data", 
   "hidden": 1, 
   "in_filter": 1, 
-  "label": "SO Detail ", 
+  "label": "Sales Order Item", 
   "no_copy": 1, 
   "oldfieldname": "so_detail", 
   "oldfieldtype": "Data", 
@@ -348,7 +348,7 @@
   "fieldtype": "Data", 
   "hidden": 1, 
   "in_filter": 1, 
-  "label": "DN Detail", 
+  "label": "Delivery Note Item", 
   "no_copy": 1, 
   "oldfieldname": "dn_detail", 
   "oldfieldtype": "Data", 
@@ -377,18 +377,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "clear_pending", 
-  "fieldtype": "Check", 
-  "hidden": 1, 
-  "label": "Clear Pending", 
-  "no_copy": 1, 
-  "oldfieldname": "clear_pending", 
-  "oldfieldtype": "Check", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "buying_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js
index 0d4a615..b6070ba 100644
--- a/buying/doctype/purchase_common/purchase_common.js
+++ b/buying/doctype/purchase_common/purchase_common.js
@@ -220,6 +220,21 @@
 		}
 	},
 	
+	purchase_other_charges: function() {
+		var me = this;
+		if(this.frm.doc.purchase_other_charges) {
+			this.frm.call({
+				doc: this.frm.doc,
+				method: "get_purchase_tax_details",
+				callback: function(r) {
+					if(!r.exc) {
+						me.calculate_taxes_and_totals();
+					}
+				}
+			});
+		}
+	},
+	
 	calculate_taxes_and_totals: function() {
 		this._super();
 		this.calculate_total_advance("Purchase Invoice", "advance_allocation_details");
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index f9e8375..1699c56 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:39", 
   "docstatus": 0, 
-  "modified": "2013-07-08 17:49:29", 
+  "modified": "2013-07-09 12:50:00", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -139,55 +139,37 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "items", 
-  "fieldtype": "Section Break", 
-  "label": "Items", 
-  "oldfieldtype": "Section Break", 
-  "options": "icon-shopping-cart"
+  "fieldname": "amended_from", 
+  "fieldtype": "Data", 
+  "hidden": 0, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 0
  }, 
  {
-  "allow_on_submit": 1, 
+  "description": "Select the relevant company name if you have multiple companies", 
   "doctype": "DocField", 
-  "fieldname": "po_details", 
-  "fieldtype": "Table", 
-  "label": "Purchase Order Items", 
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Company", 
   "no_copy": 0, 
-  "oldfieldname": "po_details", 
-  "oldfieldtype": "Table", 
-  "options": "Purchase Order Item"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "sb_last_purchase", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "get_last_purchase_rate", 
-  "fieldtype": "Button", 
-  "label": "Get Last Purchase Rate", 
-  "oldfieldtype": "Button", 
-  "print_hide": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break2", 
-  "fieldtype": "Column Break", 
-  "print_width": "50%", 
-  "width": "50%"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button"
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "price_list_and_currency", 
   "fieldtype": "Section Break", 
-  "label": "Currency & Price List", 
+  "label": "Currency and Price List", 
   "options": "icon-tag"
  }, 
  {
@@ -255,6 +237,68 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "items", 
+  "fieldtype": "Section Break", 
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "options": "icon-shopping-cart"
+ }, 
+ {
+  "allow_on_submit": 1, 
+  "doctype": "DocField", 
+  "fieldname": "po_details", 
+  "fieldtype": "Table", 
+  "label": "Purchase Order Items", 
+  "no_copy": 0, 
+  "oldfieldname": "po_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Order Item"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sb_last_purchase", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total_import", 
+  "fieldtype": "Currency", 
+  "label": "Net Total", 
+  "no_copy": 0, 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "options": "currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "get_last_purchase_rate", 
+  "fieldtype": "Button", 
+  "label": "Get Last Purchase Rate", 
+  "oldfieldtype": "Button", 
+  "print_hide": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_26", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total", 
+  "fieldtype": "Currency", 
+  "label": "Net Total (Company Currency)", 
+  "no_copy": 1, 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
   "label": "Taxes", 
@@ -276,15 +320,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "get_tax_detail", 
-  "fieldtype": "Button", 
-  "label": "Get Tax Detail", 
-  "oldfieldtype": "Button", 
-  "options": "get_purchase_tax_details", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
   "label": "Purchase Taxes and Charges", 
@@ -295,14 +330,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_tax", 
-  "fieldtype": "Button", 
-  "label": "Calculate Tax", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
   "label": "Tax Calculation", 
@@ -320,21 +347,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total_import", 
-  "fieldtype": "Currency", 
-  "label": "Net Total (Import)", 
-  "no_copy": 0, 
-  "oldfieldname": "net_total_import", 
-  "oldfieldtype": "Currency", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added (Import)", 
+  "label": "Taxes and Charges Added", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
@@ -347,7 +362,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted (Import)", 
+  "label": "Taxes and Charges Deducted", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
@@ -361,7 +376,7 @@
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
   "in_list_view": 1, 
-  "label": "Grand Total (Import)", 
+  "label": "Grand Total", 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
@@ -374,7 +389,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "label": "In Words(Import)", 
+  "label": "In Words", 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -389,22 +404,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total", 
-  "fieldtype": "Currency", 
-  "label": "Net Total*", 
-  "no_copy": 1, 
-  "oldfieldname": "net_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added", 
+  "label": "Taxes and Charges Added (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
@@ -416,7 +418,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted", 
+  "label": "Taxes and Charges Deducted (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
@@ -428,7 +430,7 @@
   "doctype": "DocField", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "label": "Total Tax*", 
+  "label": "Total Tax (Company Currency)", 
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
@@ -440,7 +442,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total", 
+  "label": "Grand Total (Company Currency)", 
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -452,7 +454,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -464,7 +466,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -583,34 +585,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "amended_from", 
-  "fieldtype": "Data", 
-  "hidden": 0, 
-  "label": "Amended From", 
-  "no_copy": 1, 
-  "oldfieldname": "amended_from", 
-  "oldfieldtype": "Data", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "report_hide": 0
- }, 
- {
-  "description": "Select the relevant company name if you have multiple companies", 
-  "doctype": "DocField", 
-  "fieldname": "company", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Company", 
-  "no_copy": 0, 
-  "oldfieldname": "company", 
-  "oldfieldtype": "Link", 
-  "options": "Company", 
-  "print_hide": 1, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
   "in_filter": 1, 
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index 1ee2700..927f6e1 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:06", 
   "docstatus": 0, 
-  "modified": "2013-07-08 13:51:42", 
+  "modified": "2013-07-09 12:16:19", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -160,7 +160,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Ref Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -170,7 +170,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
-  "label": "Rate*", 
+  "label": "Rate (Company Currency)", 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -185,7 +185,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index 0984ac7..3cb5046 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:45", 
   "docstatus": 0, 
-  "modified": "2013-07-08 15:14:48", 
+  "modified": "2013-07-09 12:49:31", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -139,40 +139,37 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "items", 
-  "fieldtype": "Section Break", 
-  "label": "Items", 
-  "oldfieldtype": "Section Break", 
-  "options": "icon-shopping-cart"
+  "fieldname": "amended_from", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 0
  }, 
  {
-  "allow_on_submit": 1, 
+  "description": "Select the relevant company name if you have multiple companies", 
   "doctype": "DocField", 
-  "fieldname": "quotation_items", 
-  "fieldtype": "Table", 
-  "label": "Quotation Items", 
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Company", 
   "no_copy": 0, 
-  "oldfieldname": "po_details", 
-  "oldfieldtype": "Table", 
-  "options": "Supplier Quotation Item"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break0", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button"
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "currency_price_list", 
   "fieldtype": "Section Break", 
-  "label": "Currency & Price List", 
+  "label": "Currency and Price List", 
   "options": "icon-tag"
  }, 
  {
@@ -237,6 +234,60 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "items", 
+  "fieldtype": "Section Break", 
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "options": "icon-shopping-cart"
+ }, 
+ {
+  "allow_on_submit": 1, 
+  "doctype": "DocField", 
+  "fieldname": "quotation_items", 
+  "fieldtype": "Table", 
+  "label": "Quotation Items", 
+  "no_copy": 0, 
+  "oldfieldname": "po_details", 
+  "oldfieldtype": "Table", 
+  "options": "Supplier Quotation Item"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "section_break_22", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total_import", 
+  "fieldtype": "Currency", 
+  "label": "Net Total", 
+  "no_copy": 0, 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "options": "currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_24", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total", 
+  "fieldtype": "Currency", 
+  "label": "Net Total (Company Currency)", 
+  "no_copy": 1, 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
   "label": "Taxes", 
@@ -257,15 +308,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "get_tax_detail", 
-  "fieldtype": "Button", 
-  "label": "Get Tax Detail", 
-  "oldfieldtype": "Button", 
-  "options": "get_purchase_tax_details", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
   "label": "Purchase Taxes and Charges", 
@@ -276,14 +318,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_tax", 
-  "fieldtype": "Button", 
-  "label": "Calculate Tax", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
   "label": "Tax Calculation", 
@@ -301,21 +335,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total_import", 
-  "fieldtype": "Currency", 
-  "label": "Net Total (Import)", 
-  "no_copy": 0, 
-  "oldfieldname": "net_total_import", 
-  "oldfieldtype": "Currency", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added (Import)", 
+  "label": "Taxes and Charges Added", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
@@ -328,7 +350,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted (Import)", 
+  "label": "Taxes and Charges Deducted", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
@@ -342,7 +364,7 @@
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
   "in_list_view": 1, 
-  "label": "Grand Total (Import)", 
+  "label": "Grand Total", 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
@@ -355,7 +377,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "label": "In Words(Import)", 
+  "label": "In Words", 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -370,22 +392,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total", 
-  "fieldtype": "Currency", 
-  "label": "Net Total*", 
-  "no_copy": 1, 
-  "oldfieldname": "net_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added", 
+  "label": "Taxes and Charges Added (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
@@ -397,7 +406,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted", 
+  "label": "Taxes and Charges Deducted (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
@@ -409,7 +418,7 @@
   "doctype": "DocField", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "label": "Total Tax*", 
+  "label": "Total Tax (Company Currency)", 
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
@@ -421,7 +430,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total", 
+  "label": "Grand Total (Company Currency)", 
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -433,7 +442,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -445,7 +454,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -555,38 +564,10 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "amended_from", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Amended From", 
-  "no_copy": 1, 
-  "oldfieldname": "amended_from", 
-  "oldfieldtype": "Data", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "report_hide": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "column_break_57", 
   "fieldtype": "Column Break"
  }, 
  {
-  "description": "Select the relevant company name if you have multiple companies", 
-  "doctype": "DocField", 
-  "fieldname": "company", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Company", 
-  "no_copy": 0, 
-  "oldfieldname": "company", 
-  "oldfieldtype": "Link", 
-  "options": "Company", 
-  "print_hide": 1, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
   "doctype": "DocField", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 6b24d2f..d4df404 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-03-07 11:42:56", 
+  "creation": "2013-05-22 12:43:10", 
   "docstatus": 0, 
-  "modified": "2013-05-22 12:02:28", 
+  "modified": "2013-07-09 12:15:15", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -106,7 +106,7 @@
   "doctype": "DocField", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Ref Rate ", 
+  "label": "Price List Rate", 
   "options": "currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -145,7 +145,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Ref Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -155,7 +155,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
-  "label": "Rate*", 
+  "label": "Rate (Company Currency)", 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -170,7 +170,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
diff --git a/public/js/queries.js b/public/js/queries.js
index 24ddc13..a7e137e 100644
--- a/public/js/queries.js
+++ b/public/js/queries.js
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // searches for enabled profiles
+wn.provide("erpnext.utils");
 erpnext.utils.profile_query = function() {
 	return "select name, concat_ws(' ', first_name, middle_name, last_name) \
 		from `tabProfile` where ifnull(enabled, 0)=1 and docstatus < 2 and \
diff --git a/public/js/startup.js b/public/js/startup.js
index 26e5219..33059e3 100644
--- a/public/js/startup.js
+++ b/public/js/startup.js
@@ -71,12 +71,6 @@
 	}
 }
 
-erpnext.hide_naming_series = function() {
-	if(cur_frm.fields_dict.naming_series) {
-		cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
-	}
-}
-
 erpnext.setup_mousetrap = function() {
 	$(document).keydown("meta+g ctrl+g", function(e) {
 		wn.ui.toolbar.search.show();
diff --git a/public/js/transaction.js b/public/js/transaction.js
index 79e7a56..50de3d5 100644
--- a/public/js/transaction.js
+++ b/public/js/transaction.js
@@ -45,6 +45,7 @@
 	refresh: function() {
 		this.frm.clear_custom_buttons();
 		erpnext.hide_naming_series();
+		erpnext.hide_company();
 		this.show_item_wise_taxes();
 		this.frm.fields_dict.currency ? this.currency() : this.set_dynamic_labels();
 	},
diff --git a/public/js/utils.js b/public/js/utils.js
index 0284670..b44a875 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -13,13 +13,31 @@
 // 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-wn.provide("erpnext.utils");
+wn.provide("erpnext");
 
-erpnext.get_currency = function(company) {
-	if(!company && cur_frm)
-		company = cur_frm.doc.company;
-	if(company)
-		return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency;
-	else
-		return wn.boot.sysdefaults.currency;
-}
+$.extend(erpnext, {
+	get_currency: function(company) {
+		if(!company && cur_frm)
+			company = cur_frm.doc.company;
+		if(company)
+			return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency;
+		else
+			return wn.boot.sysdefaults.currency;
+	},
+	
+	hide_naming_series: function() {
+		if(cur_frm.fields_dict.naming_series) {
+			cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false);
+		}
+	},
+	
+	hide_company: function() {
+		if(cur_frm.fields_dict.company) {
+			var companies = Object.keys(locals[":Company"]);
+			if(companies.length === 1) {
+				if(!cur_frm.doc.company) cur_frm.set_value("company", companies[0]);
+				cur_frm.toggle_display("company", false);
+			}
+		}
+	}
+});
\ No newline at end of file
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index 243963c..19eefa3 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:08", 
   "docstatus": 0, 
-  "modified": "2013-07-08 15:51:41", 
+  "modified": "2013-07-09 12:48:56", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -236,7 +236,7 @@
   "doctype": "DocField", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "label": "Price List and Currency", 
+  "label": "Currency and Price List", 
   "options": "icon-tag", 
   "read_only": 0
  }, 
@@ -348,15 +348,20 @@
   "doctype": "DocField", 
   "fieldname": "net_total_export", 
   "fieldtype": "Currency", 
-  "label": "Net Total (Export)", 
+  "label": "Net Total", 
   "options": "currency", 
   "read_only": 1
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "column_break_28", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "label": "Net Total*", 
+  "label": "Net Total (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
@@ -368,15 +373,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
   "label": "Taxes", 
@@ -445,19 +441,8 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_total_export", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total (Export)", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "other_charges_total", 
-  "fieldtype": "Currency", 
   "label": "Taxes and Charges Total", 
-  "oldfieldname": "other_charges_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
+  "options": "currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -468,12 +453,14 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_charges", 
-  "fieldtype": "Button", 
-  "label": "Calculate Taxes and Charges", 
-  "oldfieldtype": "Button", 
+  "fieldname": "other_charges_total", 
+  "fieldtype": "Currency", 
+  "label": "Taxes and Charges Total (Company Currency)", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
-  "read_only": 0
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -539,7 +526,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total*", 
+  "label": "Grand Total (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -553,7 +540,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
@@ -567,7 +554,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index 11ac1ba..a15166a 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-07 11:42:57", 
   "docstatus": 0, 
-  "modified": "2013-05-22 12:10:32", 
+  "modified": "2013-07-09 12:24:21", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -174,7 +174,7 @@
   "doctype": "DocField", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -189,7 +189,7 @@
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
   "in_filter": 0, 
-  "label": "Basic Rate*", 
+  "label": "Basic Rate (Company Currency)", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -206,7 +206,7 @@
   "fieldname": "amount", 
   "fieldtype": "Currency", 
   "in_filter": 0, 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 572164a..37c9e21 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-06-18 12:39:59", 
   "docstatus": 0, 
-  "modified": "2013-07-08 15:54:25", 
+  "modified": "2013-07-09 12:47:46", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -210,7 +210,7 @@
   "fieldname": "po_no", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "label": "P.O. No", 
+  "label": "Customer's Purchase Order No", 
   "oldfieldname": "po_no", 
   "oldfieldtype": "Data", 
   "print_hide": 0, 
@@ -223,7 +223,7 @@
   "fieldname": "po_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
-  "label": "P.O. Date", 
+  "label": "Customer's Purchase Order Date", 
   "oldfieldname": "po_date", 
   "oldfieldtype": "Date", 
   "print_hide": 0, 
@@ -255,7 +255,7 @@
   "doctype": "DocField", 
   "fieldname": "sec_break45", 
   "fieldtype": "Section Break", 
-  "label": "Price List and Currency", 
+  "label": "Currency and Price List", 
   "options": "icon-tag"
  }, 
  {
@@ -366,17 +366,27 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "section_break_31", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total_export", 
   "fieldtype": "Currency", 
-  "label": "Net Total (Export)", 
+  "label": "Net Total", 
   "options": "currency", 
   "read_only": 1
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "column_break_33", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "label": "Net Total*", 
+  "label": "Net Total (Company Currency)", 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -387,15 +397,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1, 
-  "search_index": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
   "label": "Taxes", 
@@ -458,35 +459,27 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_total_export", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total (Export)", 
+  "label": "Taxes and Charges Total", 
   "options": "currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "other_charges_total", 
-  "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total", 
-  "oldfieldname": "other_charges_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "read_only": 1, 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "column_break_46", 
   "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_charges", 
-  "fieldtype": "Button", 
-  "label": "Calculate Taxes and Charges", 
-  "oldfieldtype": "Button", 
-  "print_hide": 0
+  "fieldname": "other_charges_total", 
+  "fieldtype": "Currency", 
+  "label": "Taxes and Charges Total (Company Currency)", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
   "doctype": "DocField", 
@@ -501,7 +494,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
-  "label": "Grand Total (Export)", 
+  "label": "Grand Total", 
   "oldfieldname": "grand_total_export", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -514,7 +507,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total (Export)", 
+  "label": "Rounded Total", 
   "oldfieldname": "rounded_total_export", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -526,7 +519,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "label": "In Words (Export)", 
+  "label": "In Words", 
   "oldfieldname": "in_words_export", 
   "oldfieldtype": "Data", 
   "print_hide": 0, 
@@ -545,7 +538,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total*", 
+  "label": "Grand Total (Company Currency)", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -558,7 +551,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -571,7 +564,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index 7276fc3..0d1ca5b 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-07 11:42:58", 
   "docstatus": 0, 
-  "modified": "2013-05-22 12:10:03", 
+  "modified": "2013-07-09 12:28:31", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -163,7 +163,7 @@
   "doctype": "DocField", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -177,7 +177,7 @@
   "doctype": "DocField", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
-  "label": "Basic Rate*", 
+  "label": "Basic Rate (Company Currency)", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -192,7 +192,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
@@ -337,7 +337,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "in_filter": 1, 
-  "label": "Quotation No.", 
+  "label": "Quotation", 
   "no_copy": 1, 
   "oldfieldname": "prevdoc_docname", 
   "oldfieldtype": "Link", 
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 5cdae86..cfdd8cd 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:09", 
   "docstatus": 0, 
-  "modified": "2013-07-08 17:46:45", 
+  "modified": "2013-07-09 12:48:27", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -214,32 +214,10 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "challan_no", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Challan No", 
-  "oldfieldname": "challan_no", 
-  "oldfieldtype": "Data", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "challan_date", 
-  "fieldtype": "Date", 
-  "hidden": 1, 
-  "label": "Challan Date", 
-  "oldfieldname": "challan_date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 1, 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "po_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "label": "P.O. No", 
+  "label": "Customer's Purchase Order No", 
   "no_copy": 0, 
   "oldfieldname": "po_no", 
   "oldfieldtype": "Data", 
@@ -254,7 +232,7 @@
   "fieldname": "po_date", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "label": "P.O. Date", 
+  "label": "Customer's Purchase Order Date", 
   "no_copy": 0, 
   "oldfieldname": "po_date", 
   "oldfieldtype": "Data", 
@@ -267,7 +245,7 @@
   "doctype": "DocField", 
   "fieldname": "sec_break25", 
   "fieldtype": "Section Break", 
-  "label": "Price List and Currency", 
+  "label": "Currency and Price List", 
   "options": "icon-tag", 
   "read_only": 0
  }, 
@@ -392,17 +370,27 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "section_break_31", 
+  "fieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total_export", 
   "fieldtype": "Currency", 
-  "label": "Net Total (Export)", 
+  "label": "Net Total", 
   "options": "currency", 
   "read_only": 1
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "column_break_33", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "label": "Net Total*", 
+  "label": "Net Total (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
@@ -415,14 +403,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button", 
-  "read_only": 0
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
   "label": "Taxes", 
@@ -490,37 +470,28 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_total_export", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total (Export)", 
+  "label": "Taxes and Charges Total", 
   "options": "company", 
   "print_hide": 1, 
   "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "other_charges_total", 
-  "fieldtype": "Currency", 
-  "label": "Taxes and Charges Total", 
-  "oldfieldname": "other_charges_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "read_only": 1, 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "column_break_47", 
   "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_charges", 
-  "fieldtype": "Button", 
-  "label": "Calculate Charges", 
-  "oldfieldtype": "Button", 
+  "fieldname": "other_charges_total", 
+  "fieldtype": "Currency", 
+  "label": "Taxes and Charges Total (Company Currency)", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
-  "read_only": 0
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
   "doctype": "DocField", 
@@ -536,7 +507,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
-  "label": "Grand Total (Export)", 
+  "label": "Grand Total", 
   "no_copy": 0, 
   "oldfieldname": "grand_total_export", 
   "oldfieldtype": "Currency", 
@@ -551,7 +522,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total (Export)", 
+  "label": "Rounded Total", 
   "no_copy": 0, 
   "oldfieldname": "rounded_total_export", 
   "oldfieldtype": "Currency", 
@@ -566,7 +537,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "label": "In Words (Export)", 
+  "label": "In Words", 
   "no_copy": 0, 
   "oldfieldname": "in_words_export", 
   "oldfieldtype": "Data", 
@@ -586,7 +557,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total", 
+  "label": "Grand Total (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
@@ -601,7 +572,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
@@ -616,7 +587,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "no_copy": 0, 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
@@ -690,7 +661,7 @@
   "doctype": "DocField", 
   "fieldname": "lr_no", 
   "fieldtype": "Data", 
-  "label": "LR No", 
+  "label": "Vehicle No", 
   "no_copy": 0, 
   "oldfieldname": "lr_no", 
   "oldfieldtype": "Data", 
@@ -706,7 +677,7 @@
   "doctype": "DocField", 
   "fieldname": "lr_date", 
   "fieldtype": "Date", 
-  "label": "LR Date", 
+  "label": "Vehicle Dispatch Date", 
   "no_copy": 0, 
   "oldfieldname": "lr_date", 
   "oldfieldtype": "Date", 
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index 69b5bc4..ef5a984 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-04-22 13:15:44", 
   "docstatus": 0, 
-  "modified": "2013-07-08 17:46:21", 
+  "modified": "2013-07-09 12:42:09", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -169,7 +169,7 @@
   "doctype": "DocField", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -183,7 +183,7 @@
   "doctype": "DocField", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
-  "label": "Rate*", 
+  "label": "Rate (Company Currency)", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -197,7 +197,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt
index 649210e..92bca0a 100644
--- a/stock/doctype/material_request/material_request.txt
+++ b/stock/doctype/material_request/material_request.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-07 14:48:38", 
   "docstatus": 0, 
-  "modified": "2013-07-08 16:18:00", 
+  "modified": "2013-07-09 11:39:32", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -81,6 +81,35 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "amended_from", 
+  "fieldtype": "Data", 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
+ }, 
+ {
+  "description": "Select the relevant company name if you have multiple companies", 
+  "doctype": "DocField", 
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
   "label": "Items", 
@@ -131,22 +160,6 @@
   "width": "100px"
  }, 
  {
-  "description": "Select the relevant company name if you have multiple companies", 
-  "doctype": "DocField", 
-  "fieldname": "company", 
-  "fieldtype": "Link", 
-  "in_filter": 1, 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "oldfieldtype": "Link", 
-  "options": "Company", 
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "reqd": 1, 
-  "search_index": 1, 
-  "width": "150px"
- }, 
- {
   "doctype": "DocField", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
@@ -226,19 +239,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "amended_from", 
-  "fieldtype": "Data", 
-  "label": "Amended From", 
-  "no_copy": 1, 
-  "oldfieldname": "amended_from", 
-  "oldfieldtype": "Data", 
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "read_only": 1, 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
   "in_list_view": 0, 
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 3b6d876..94136ae 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-21 16:16:39", 
   "docstatus": 0, 
-  "modified": "2013-07-08 17:46:13", 
+  "modified": "2013-07-09 12:50:25", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -172,7 +172,7 @@
   "fieldname": "challan_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "label": "Challan No", 
+  "label": "Supplier Shipment No", 
   "no_copy": 1, 
   "oldfieldname": "challan_no", 
   "oldfieldtype": "Data", 
@@ -186,7 +186,7 @@
   "fieldname": "challan_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "label": "Challan Date", 
+  "label": "Supplier Shipment Date", 
   "no_copy": 1, 
   "oldfieldname": "challan_date", 
   "oldfieldtype": "Date", 
@@ -197,56 +197,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "items", 
-  "fieldtype": "Section Break", 
-  "label": "Items", 
-  "oldfieldtype": "Section Break", 
-  "options": "icon-shopping-cart"
- }, 
- {
-  "allow_on_submit": 1, 
-  "doctype": "DocField", 
-  "fieldname": "purchase_receipt_details", 
-  "fieldtype": "Table", 
-  "label": "Purchase Receipt Items", 
-  "oldfieldname": "purchase_receipt_details", 
-  "oldfieldtype": "Table", 
-  "options": "Purchase Receipt Item", 
-  "print_hide": 0, 
-  "reqd": 0
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "oldfieldtype": "Section Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "get_current_stock", 
-  "fieldtype": "Button", 
-  "label": "Get Current Stock", 
-  "oldfieldtype": "Button", 
-  "options": "get_current_stock", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "column_break_18", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "recalculate_values", 
-  "fieldtype": "Button", 
-  "label": "Re-Calculate Values", 
-  "oldfieldtype": "Button"
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "currency_price_list", 
   "fieldtype": "Section Break", 
-  "label": "Currency & Price List", 
+  "label": "Currency and Price List", 
   "options": "icon-tag"
  }, 
  {
@@ -309,6 +262,71 @@
   "print_hide": 1
  }, 
  {
+  "doctype": "DocField", 
+  "fieldname": "items", 
+  "fieldtype": "Section Break", 
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "options": "icon-shopping-cart"
+ }, 
+ {
+  "allow_on_submit": 1, 
+  "doctype": "DocField", 
+  "fieldname": "purchase_receipt_details", 
+  "fieldtype": "Table", 
+  "label": "Purchase Receipt Items", 
+  "oldfieldname": "purchase_receipt_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Receipt Item", 
+  "print_hide": 0, 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "section_break0", 
+  "fieldtype": "Section Break", 
+  "oldfieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total_import", 
+  "fieldtype": "Currency", 
+  "label": "Net Total", 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "options": "currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "get_current_stock", 
+  "fieldtype": "Button", 
+  "label": "Get Current Stock", 
+  "oldfieldtype": "Button", 
+  "options": "get_current_stock", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_27", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "net_total", 
+  "fieldtype": "Currency", 
+  "label": "Net Total (Company Currency)", 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "options": "Company:company:default_currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "150px"
+ }, 
+ {
   "description": "Add / Edit Taxes and Charges", 
   "doctype": "DocField", 
   "fieldname": "taxes", 
@@ -330,15 +348,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "get_tax_detail", 
-  "fieldtype": "Button", 
-  "label": "Get Tax Detail", 
-  "oldfieldtype": "Button", 
-  "options": "get_purchase_tax_details", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
   "label": "Purchase Taxes and Charges", 
@@ -348,14 +357,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "calculate_tax", 
-  "fieldtype": "Button", 
-  "label": "Calculate Tax", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
   "label": "Tax Calculation", 
@@ -373,20 +374,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total_import", 
-  "fieldtype": "Currency", 
-  "label": "Net Total (Import)", 
-  "oldfieldname": "net_total_import", 
-  "oldfieldtype": "Currency", 
-  "options": "currency", 
-  "print_hide": 1, 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added (Import)", 
+  "label": "Taxes and Charges Added", 
   "oldfieldname": "other_charges_added_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -397,7 +387,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted (Import)", 
+  "label": "Taxes and Charges Deducted", 
   "oldfieldname": "other_charges_deducted_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -408,7 +398,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
-  "label": "Grand Total (Import)", 
+  "label": "Grand Total", 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
   "options": "currency", 
@@ -419,7 +409,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "label": "In Words (Import)", 
+  "label": "In Words", 
   "oldfieldname": "in_words_import", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
@@ -434,23 +424,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "net_total", 
-  "fieldtype": "Currency", 
-  "label": "Net Total", 
-  "oldfieldname": "net_total", 
-  "oldfieldtype": "Currency", 
-  "options": "Company:company:default_currency", 
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "read_only": 1, 
-  "reqd": 1, 
-  "width": "150px"
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Added", 
+  "label": "Taxes and Charges Added (Company Currency)", 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -461,7 +437,7 @@
   "doctype": "DocField", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "label": "Taxes and Charges Deducted", 
+  "label": "Taxes and Charges Deducted (Company Currency)", 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -472,7 +448,7 @@
   "doctype": "DocField", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "label": "Total Tax", 
+  "label": "Total Tax (Company Currency)", 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -483,7 +459,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "label": "Grand Total", 
+  "label": "Grand Total (Company Currency)", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -494,7 +470,7 @@
   "doctype": "DocField", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "label": "Rounded Total", 
+  "label": "Rounded Total (Company Currency)", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -506,7 +482,7 @@
   "doctype": "DocField", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "label": "In Words", 
+  "label": "In Words (Company Currency)", 
   "oldfieldname": "in_words", 
   "oldfieldtype": "Data", 
   "print_hide": 1, 
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 0f6e9b5..186ab3d 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-05-24 19:29:10", 
   "docstatus": 0, 
-  "modified": "2013-07-08 17:46:17", 
+  "modified": "2013-07-09 12:20:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -124,7 +124,7 @@
   "doctype": "DocField", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Ref Rate ", 
+  "label": "Price List Rate", 
   "options": "currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -165,7 +165,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "label": "Price List Rate*", 
+  "label": "Price List Rate (Company Currency)", 
   "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 0
@@ -175,7 +175,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
-  "label": "Rate*", 
+  "label": "Rate (Company Currency)", 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -190,7 +190,7 @@
   "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "label": "Amount*", 
+  "label": "Amount (Company Currency)", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
   "options": "Company:company:default_currency", 
@@ -314,7 +314,7 @@
   "doctype": "DocField", 
   "fieldname": "qa_no", 
   "fieldtype": "Link", 
-  "label": "QA No", 
+  "label": "Quality Inspection", 
   "no_copy": 1, 
   "oldfieldname": "qa_no", 
   "oldfieldtype": "Link", 
@@ -378,7 +378,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "in_filter": 1, 
-  "label": "PO No", 
+  "label": "Purchase Order", 
   "no_copy": 1, 
   "oldfieldname": "prevdoc_docname", 
   "oldfieldtype": "Link", 
@@ -396,7 +396,7 @@
   "fieldtype": "Date", 
   "hidden": 1, 
   "in_filter": 1, 
-  "label": "PO Date", 
+  "label": "Purchase Order Date", 
   "no_copy": 1, 
   "oldfieldname": "prevdoc_date", 
   "oldfieldtype": "Date",