From 29817d6d8be31c08d6f28e4372aa911eb26a4b10 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 31 Jul 2014 16:05:19 +0530 Subject: [PATCH] [print] Moved Total Taxes and Charges to the right column --- .../doctype/sales_invoice/sales_invoice.json | 18 +++++------ .../selling/doctype/quotation/quotation.json | 18 +++++------ .../doctype/sales_order/sales_order.json | 30 +++++++++---------- .../doctype/delivery_note/delivery_note.json | 30 +++++++++---------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 726aa439bd..a7827bc73f 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -427,10 +427,12 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total_export", + "fieldname": "other_charges_total", "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 @@ -441,12 +443,10 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total", + "fieldname": "other_charges_total_export", "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 @@ -1188,7 +1188,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-07-31 04:59:22.564878", + "modified": "2014-07-31 06:34:41.295337", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index f1cc5dc9aa..de02584152 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -407,10 +407,12 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total_export", + "fieldname": "other_charges_total", "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "options": "currency", + "label": "Taxes and Charges Total (Company Currency)", + "oldfieldname": "other_charges_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", "permlevel": 0, "print_hide": 1, "read_only": 1 @@ -421,12 +423,10 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total", + "fieldname": "other_charges_total_export", "fieldtype": "Currency", - "label": "Taxes and Charges Total (Company Currency)", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", + "label": "Taxes and Charges Total", + "options": "currency", "permlevel": 0, "print_hide": 1, "read_only": 1 @@ -827,7 +827,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 1, - "modified": "2014-07-31 04:59:20.653769", + "modified": "2014-07-31 06:34:26.339765", "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 4abb8f6275..7b07e7d6e4 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -433,20 +433,6 @@ "fieldtype": "Section Break", "permlevel": 0 }, - { - "fieldname": "other_charges_total_export", - "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "options": "currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "column_break_46", - "fieldtype": "Column Break", - "permlevel": 0 - }, { "fieldname": "other_charges_total", "fieldtype": "Currency", @@ -459,6 +445,20 @@ "read_only": 1, "width": "150px" }, + { + "fieldname": "column_break_46", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "fieldname": "other_charges_total_export", + "fieldtype": "Currency", + "label": "Taxes and Charges Total", + "options": "currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "fieldname": "discount_amount", "fieldtype": "Currency", @@ -889,7 +889,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2014-07-31 04:59:21.856833", + "modified": "2014-07-31 06:34:14.727868", "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 c1ddb8af5e..262ef48545 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -435,20 +435,6 @@ "fieldtype": "Section Break", "permlevel": 0 }, - { - "fieldname": "other_charges_total_export", - "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "column_break_47", - "fieldtype": "Column Break", - "permlevel": 0 - }, { "fieldname": "other_charges_total", "fieldtype": "Currency", @@ -462,6 +448,20 @@ "read_only": 1, "width": "150px" }, + { + "fieldname": "column_break_47", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "fieldname": "other_charges_total_export", + "fieldtype": "Currency", + "label": "Taxes and Charges Total", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, { "fieldname": "discount_amount", "fieldtype": "Currency", @@ -1009,7 +1009,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2014-07-31 04:59:23.236970", + "modified": "2014-07-31 06:34:59.028308", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note",