diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json index 057383a9cdd..ea1e59a6778 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json @@ -103,6 +103,12 @@ "reqd": 1, "width": "300px" }, + { + "fieldname": "section_break_10", + "fieldtype": "Section Break", + "permlevel": 0, + "precision": "" + }, { "fieldname": "rate", "fieldtype": "Float", @@ -216,7 +222,7 @@ "hide_heading": 1, "idx": 1, "istable": 1, - "modified": "2015-02-23 15:01:31.895131", + "modified": "2015-03-04 16:05:08.553606", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Taxes and Charges", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 10aac98b5f3..45afb0b324e 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -443,10 +443,12 @@ "permlevel": 0 }, { - "fieldname": "total_taxes_and_charges", + "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", - "label": "Total Taxes and Charges", - "options": "currency", + "label": "Total Taxes and Charges (Company Currency)", + "oldfieldname": "other_charges_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, "read_only": 1 @@ -458,12 +460,10 @@ "precision": "" }, { - "fieldname": "base_total_taxes_and_charges", + "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", - "label": "Total Taxes and Charges (Company Currency)", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", + "label": "Total Taxes and Charges", + "options": "currency", "permlevel": 0, "print_hide": 1, "read_only": 1 @@ -553,30 +553,6 @@ "print_hide": 1, "read_only": 1 }, - { - "fieldname": "total_advance", - "fieldtype": "Currency", - "label": "Total Advance", - "oldfieldname": "total_advance", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "outstanding_amount", - "fieldtype": "Currency", - "in_list_view": 0, - "label": "Outstanding Amount", - "no_copy": 1, - "oldfieldname": "outstanding_amount", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, { "fieldname": "column_break5", "fieldtype": "Column Break", @@ -620,6 +596,30 @@ "print_hide": 0, "read_only": 1 }, + { + "fieldname": "total_advance", + "fieldtype": "Currency", + "label": "Total Advance", + "oldfieldname": "total_advance", + "oldfieldtype": "Currency", + "options": "", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, + { + "fieldname": "outstanding_amount", + "fieldtype": "Currency", + "in_list_view": 0, + "label": "Outstanding Amount", + "no_copy": 1, + "oldfieldname": "outstanding_amount", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "fieldname": "advances_section", "fieldtype": "Section Break", @@ -676,7 +676,7 @@ "no_copy": 1, "oldfieldname": "paid_amount", "oldfieldtype": "Currency", - "options": "Company:company:default_currency", + "options": "currency", "permlevel": 0, "print_hide": 1, "read_only": 0 @@ -716,7 +716,7 @@ "fieldtype": "Currency", "label": "Write Off Amount", "no_copy": 1, - "options": "Company:company:default_currency", + "options": "currency", "permlevel": 0, "print_hide": 1, "read_only": 0 @@ -749,7 +749,7 @@ { "fieldname": "terms_section_break", "fieldtype": "Section Break", - "label": "", + "label": "Terms and Conditions", "oldfieldtype": "Section Break", "options": "icon-legal", "permlevel": 0, @@ -780,7 +780,7 @@ "fieldname": "contact_section", "fieldtype": "Section Break", "hidden": 0, - "label": "", + "label": "Contact Info", "options": "icon-bullhorn", "permlevel": 0, "read_only": 0 @@ -1244,7 +1244,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-03-03 02:47:05.467179", + "modified": "2015-03-04 16:08:58.641155", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index 58af0767cf7..f117472a02f 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -126,26 +126,6 @@ "reqd": 1, "width": "60px" }, - { - "fieldname": "uom", - "fieldtype": "Link", - "in_list_view": 1, - "label": "UOM", - "oldfieldname": "uom", - "oldfieldtype": "Link", - "options": "UOM", - "permlevel": 0, - "print_hide": 0, - "print_width": "100px", - "read_only": 0, - "reqd": 1, - "width": "100px" - }, - { - "fieldname": "col_break2", - "fieldtype": "Column Break", - "permlevel": 0 - }, { "fieldname": "stock_uom", "fieldtype": "Link", @@ -162,6 +142,26 @@ "reqd": 1, "width": "100px" }, + { + "fieldname": "col_break2", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "fieldname": "uom", + "fieldtype": "Link", + "in_list_view": 1, + "label": "UOM", + "oldfieldname": "uom", + "oldfieldtype": "Link", + "options": "UOM", + "permlevel": 0, + "print_hide": 0, + "print_width": "100px", + "read_only": 0, + "reqd": 1, + "width": "100px" + }, { "fieldname": "conversion_factor", "fieldtype": "Float", @@ -536,7 +536,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-02-23 12:21:53.399279", + "modified": "2015-03-04 16:12:29.821493", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 1f5a6642ecf..a3e66787154 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -856,7 +856,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 1, - "modified": "2015-02-24 14:52:49.998224", + "modified": "2015-03-04 16:07:44.213726", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 0e988a54833..4450c190123 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -432,21 +432,6 @@ "fieldtype": "Section Break", "permlevel": 0 }, - { - "fieldname": "total_taxes_and_charges", - "fieldtype": "Currency", - "label": "Total Taxes and Charges", - "options": "currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "column_break_46", - "fieldtype": "Column Break", - "permlevel": 0, - "precision": "" - }, { "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", @@ -459,6 +444,21 @@ "read_only": 1, "width": "150px" }, + { + "fieldname": "column_break_46", + "fieldtype": "Column Break", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "fieldname": "section_break_48", "fieldtype": "Section Break", @@ -1077,7 +1077,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2015-02-24 15:22:27.195416", + "modified": "2015-03-04 16:08:22.203274", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 8fd57021003..2413a9393e0 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -455,21 +455,6 @@ "fieldtype": "Section Break", "permlevel": 0 }, - { - "fieldname": "total_taxes_and_charges", - "fieldtype": "Currency", - "label": "Total Taxes and Charges", - "options": "currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "column_break_47", - "fieldtype": "Column Break", - "permlevel": 0, - "precision": "" - }, { "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", @@ -483,6 +468,21 @@ "read_only": 1, "width": "150px" }, + { + "fieldname": "column_break_47", + "fieldtype": "Column Break", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "fieldname": "section_break_49", "fieldtype": "Section Break", @@ -1067,7 +1067,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2015-02-24 15:23:10.431286", + "modified": "2015-03-04 16:08:45.464202", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note",