From 461ee2ebaef34083079c2ca253d9eb68aa2b9330 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 12 Feb 2015 11:47:45 +0530 Subject: [PATCH] Renamed total fields --- .../purchase_invoice/purchase_invoice.json | 52 +- .../doctype/sales_invoice/sales_invoice.json | 22 +- .../purchase_order/purchase_order.json | 36 +- .../supplier_quotation.json | 36 +- .../doctype/opportunity/opportunity.json | 2 +- .../selling/doctype/quotation/quotation.json | 1552 ++++++++--------- .../doctype/sales_order/sales_order.json | 26 +- .../doctype/delivery_note/delivery_note.json | 28 +- .../purchase_receipt/purchase_receipt.json | 36 +- 9 files changed, 911 insertions(+), 879 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 4054dd5384..98a1a69bde 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -265,7 +265,7 @@ }, { "description": "Will be calculated automatically when you enter the details", - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "oldfieldname": "net_total", @@ -281,7 +281,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_import", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "oldfieldname": "net_total_import", @@ -340,7 +340,7 @@ "read_only": 0 }, { - "fieldname": "other_charges_added", + "fieldname": "base_taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added (Company Currency)", "oldfieldname": "other_charges_added", @@ -351,7 +351,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_deducted", + "fieldname": "base_taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted (Company Currency)", "oldfieldname": "other_charges_deducted", @@ -362,7 +362,18 @@ "read_only": 1 }, { - "fieldname": "grand_total", + "fieldname": "base_total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges (Company Currency)", + "oldfieldname": "total_tax", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1 + }, + { + "fieldname": "base_grand_total", "fieldtype": "Currency", "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", @@ -374,7 +385,7 @@ }, { "description": "In Words will be visible once you save the Purchase Invoice.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "oldfieldname": "in_words", @@ -393,7 +404,7 @@ "width": "50%" }, { - "fieldname": "other_charges_added_import", + "fieldname": "taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added", "oldfieldname": "other_charges_added_import", @@ -404,7 +415,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_deducted_import", + "fieldname": "taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted", "oldfieldname": "other_charges_deducted_import", @@ -415,7 +426,15 @@ "read_only": 1 }, { - "fieldname": "grand_total_import", + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -427,7 +446,7 @@ "read_only": 1 }, { - "fieldname": "in_words_import", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "oldfieldname": "in_words_import", @@ -461,17 +480,6 @@ "print_hide": 1, "read_only": 1 }, - { - "fieldname": "total_tax", - "fieldtype": "Currency", - "label": "Total Tax (Company Currency)", - "oldfieldname": "total_tax", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1 - }, { "fieldname": "outstanding_amount", "fieldtype": "Currency", @@ -880,7 +888,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-02-05 05:11:43.312905", + "modified": "2015-02-11 16:56:27.871736", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 7ceab70678..1fbc77208d 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -332,7 +332,7 @@ "permlevel": 0 }, { - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "oldfieldname": "net_total", @@ -349,7 +349,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_export", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "options": "currency", @@ -423,7 +423,7 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total_export", + "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", "label": "Total Taxes and Charges", "options": "currency", @@ -432,7 +432,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_total", + "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", "label": "Total Taxes and Charges (Company Currency)", "oldfieldname": "other_charges_total", @@ -476,7 +476,7 @@ "read_only": 0 }, { - "fieldname": "grand_total", + "fieldname": "base_grand_total", "fieldtype": "Currency", "in_filter": 1, "label": "Grand Total (Company Currency)", @@ -490,7 +490,7 @@ "search_index": 0 }, { - "fieldname": "rounded_total", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", @@ -502,7 +502,7 @@ }, { "description": "In Words will be visible once you save the Sales Invoice.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "oldfieldname": "in_words", @@ -545,7 +545,7 @@ "width": "50%" }, { - "fieldname": "grand_total_export", + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -558,7 +558,7 @@ "reqd": 1 }, { - "fieldname": "rounded_total_export", + "fieldname": "rounded_total", "fieldtype": "Currency", "label": "Rounded Total", "oldfieldname": "rounded_total_export", @@ -569,7 +569,7 @@ "read_only": 1 }, { - "fieldname": "in_words_export", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "oldfieldname": "in_words_export", @@ -1202,7 +1202,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-02-05 05:11:45.330358", + "modified": "2015-02-11 15:57:57.399512", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 4fb74ad8be..28c8693799 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -230,7 +230,7 @@ "permlevel": 0 }, { - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "no_copy": 1, @@ -248,7 +248,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_import", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "no_copy": 0, @@ -316,7 +316,7 @@ "permlevel": 0 }, { - "fieldname": "other_charges_added", + "fieldname": "base_taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added (Company Currency)", "no_copy": 0, @@ -328,7 +328,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_deducted", + "fieldname": "base_taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted (Company Currency)", "no_copy": 0, @@ -340,9 +340,9 @@ "read_only": 1 }, { - "fieldname": "total_tax", + "fieldname": "base_taxes_and_charges", "fieldtype": "Currency", - "label": "Total Tax (Company Currency)", + "label": "Total Taxes and Charges (Company Currency)", "no_copy": 1, "oldfieldname": "total_tax", "oldfieldtype": "Currency", @@ -352,7 +352,7 @@ "read_only": 1 }, { - "fieldname": "grand_total", + "fieldname": "base_grand_total", "fieldtype": "Currency", "label": "Grand Total (Company Currency)", "no_copy": 1, @@ -365,7 +365,7 @@ }, { "description": "In Words will be visible once you save the Purchase Order.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "oldfieldname": "in_words", @@ -375,7 +375,7 @@ "read_only": 1 }, { - "fieldname": "rounded_total", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", @@ -401,7 +401,7 @@ "print_hide": 0 }, { - "fieldname": "other_charges_added_import", + "fieldname": "taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added", "no_copy": 0, @@ -414,7 +414,7 @@ "report_hide": 0 }, { - "fieldname": "other_charges_deducted_import", + "fieldname": "taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted", "no_copy": 0, @@ -427,7 +427,15 @@ "report_hide": 0 }, { - "fieldname": "grand_total_import", + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -441,7 +449,7 @@ "report_hide": 0 }, { - "fieldname": "in_words_import", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "oldfieldname": "in_words_import", @@ -775,7 +783,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-02-05 05:11:43.673323", + "modified": "2015-02-11 16:13:52.294735", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index ff365cc05e..b1f0749109 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -229,7 +229,7 @@ "permlevel": 0 }, { - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "no_copy": 1, @@ -247,7 +247,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_import", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "no_copy": 0, @@ -306,7 +306,7 @@ "permlevel": 0 }, { - "fieldname": "other_charges_added", + "fieldname": "base_taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added (Company Currency)", "no_copy": 0, @@ -318,7 +318,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_deducted", + "fieldname": "base_taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted (Company Currency)", "no_copy": 0, @@ -330,9 +330,9 @@ "read_only": 1 }, { - "fieldname": "total_tax", + "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", - "label": "Total Tax (Company Currency)", + "label": "Total Taxes and Charges (Company Currency)", "no_copy": 1, "oldfieldname": "total_tax", "oldfieldtype": "Currency", @@ -342,7 +342,7 @@ "read_only": 1 }, { - "fieldname": "grand_total", + "fieldname": "base_grand_total", "fieldtype": "Currency", "label": "Grand Total (Company Currency)", "no_copy": 1, @@ -354,7 +354,7 @@ "read_only": 1 }, { - "fieldname": "rounded_total", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", @@ -366,7 +366,7 @@ }, { "description": "In Words will be visible once you save the Purchase Order.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "oldfieldname": "in_words", @@ -383,7 +383,7 @@ "print_hide": 0 }, { - "fieldname": "other_charges_added_import", + "fieldname": "taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added", "no_copy": 0, @@ -396,7 +396,7 @@ "report_hide": 0 }, { - "fieldname": "other_charges_deducted_import", + "fieldname": "taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted", "no_copy": 0, @@ -409,7 +409,15 @@ "report_hide": 0 }, { - "fieldname": "grand_total_import", + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -423,7 +431,7 @@ "report_hide": 0 }, { - "fieldname": "in_words_import", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "oldfieldname": "in_words_import", @@ -575,7 +583,7 @@ "icon": "icon-shopping-cart", "idx": 1, "is_submittable": 1, - "modified": "2015-02-05 05:11:47.602292", + "modified": "2015-02-11 16:08:30.374140", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json index 980de56db7..0ff4060316 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.json +++ b/erpnext/selling/doctype/opportunity/opportunity.json @@ -391,7 +391,7 @@ "icon": "icon-info-sign", "idx": 1, "is_submittable": 1, - "modified": "2015-02-05 05:11:41.732687", + "modified": "2015-02-11 14:45:30.174431", "modified_by": "Administrator", "module": "Selling", "name": "Opportunity", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index deb578d11e..9c8ddaacbc 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -1,946 +1,946 @@ { - "allow_import": 1, - "autoname": "naming_series:", - "creation": "2013-05-24 19:29:08", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Transaction", + "allow_import": 1, + "autoname": "naming_series:", + "creation": "2013-05-24 19:29:08", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Transaction", "fields": [ { - "fieldname": "customer_section", - "fieldtype": "Section Break", - "label": "Customer", - "options": "icon-user", + "fieldname": "customer_section", + "fieldtype": "Section Break", + "label": "Customer", + "options": "icon-user", "permlevel": 0 - }, + }, { - "fieldname": "column_break0", - "fieldtype": "Column Break", - "permlevel": 0, - "read_only": 0, + "fieldname": "column_break0", + "fieldtype": "Column Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "naming_series", - "fieldtype": "Select", - "label": "Series", - "no_copy": 1, - "oldfieldname": "naming_series", - "oldfieldtype": "Select", - "options": "QTN-", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "naming_series", + "fieldtype": "Select", + "label": "Series", + "no_copy": 1, + "oldfieldname": "naming_series", + "oldfieldtype": "Select", + "options": "QTN-", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "reqd": 1 - }, + }, { - "default": "Customer", - "fieldname": "quotation_to", - "fieldtype": "Select", - "in_filter": 1, - "label": "Quotation To", - "oldfieldname": "quotation_to", - "oldfieldtype": "Select", - "options": "\nLead\nCustomer", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "report_hide": 0, + "default": "Customer", + "fieldname": "quotation_to", + "fieldtype": "Select", + "in_filter": 1, + "label": "Quotation To", + "oldfieldname": "quotation_to", + "oldfieldtype": "Select", + "options": "\nLead\nCustomer", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "report_hide": 0, "reqd": 1 - }, + }, { - "depends_on": "eval:doc.quotation_to == \"Customer\"", - "fieldname": "customer", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Customer", - "oldfieldname": "customer", - "oldfieldtype": "Link", - "options": "Customer", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "depends_on": "eval:doc.quotation_to == \"Customer\"", + "fieldname": "customer", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Customer", + "oldfieldname": "customer", + "oldfieldtype": "Link", + "options": "Customer", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "search_index": 1 - }, + }, { - "depends_on": "eval:doc.quotation_to == \"Lead\"", - "fieldname": "lead", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Lead", - "oldfieldname": "lead", - "oldfieldtype": "Link", - "options": "Lead", - "permlevel": 0, - "print_hide": 1, + "depends_on": "eval:doc.quotation_to == \"Lead\"", + "fieldname": "lead", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Lead", + "oldfieldname": "lead", + "oldfieldtype": "Link", + "options": "Lead", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "customer_name", - "fieldtype": "Data", - "hidden": 1, - "in_list_view": 0, - "label": "Customer / Lead Name", - "permlevel": 0, + "fieldname": "customer_name", + "fieldtype": "Data", + "hidden": 1, + "in_list_view": 0, + "label": "Customer / Lead Name", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "address_display", - "fieldtype": "Small Text", - "hidden": 1, - "in_filter": 0, - "label": "Address", - "oldfieldname": "customer_address", - "oldfieldtype": "Small Text", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, - "reqd": 0, + "fieldname": "address_display", + "fieldtype": "Small Text", + "hidden": 1, + "in_filter": 0, + "label": "Address", + "oldfieldname": "customer_address", + "oldfieldtype": "Small Text", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "contact_display", - "fieldtype": "Small Text", - "hidden": 1, - "in_filter": 0, - "label": "Contact", - "permlevel": 0, - "print_hide": 0, + "fieldname": "contact_display", + "fieldtype": "Small Text", + "hidden": 1, + "in_filter": 0, + "label": "Contact", + "permlevel": 0, + "print_hide": 0, "read_only": 1 - }, + }, { - "fieldname": "contact_mobile", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Mobile No", - "permlevel": 0, - "print_hide": 0, + "fieldname": "contact_mobile", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Mobile No", + "permlevel": 0, + "print_hide": 0, "read_only": 1 - }, + }, { - "fieldname": "contact_email", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Contact Email", - "permlevel": 0, - "print_hide": 1, + "fieldname": "contact_email", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Contact Email", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "column_break1", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "read_only": 0, + "fieldname": "column_break1", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "amended_from", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Data", - "options": "Quotation", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "amended_from", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Data", + "options": "Quotation", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "width": "150px" - }, + }, { - "description": "", - "fieldname": "company", - "fieldtype": "Link", - "in_filter": 1, - "label": "Company", - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, - "search_index": 0, + "description": "", + "fieldname": "company", + "fieldtype": "Link", + "in_filter": 1, + "label": "Company", + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, + "search_index": 0, "width": "150px" - }, + }, { - "default": "Today", - "fieldname": "transaction_date", - "fieldtype": "Date", - "in_filter": 1, - "label": "Date", - "no_copy": 1, - "oldfieldname": "transaction_date", - "oldfieldtype": "Date", - "permlevel": 0, - "read_only": 0, - "reqd": 1, - "search_index": 1, + "default": "Today", + "fieldname": "transaction_date", + "fieldtype": "Date", + "in_filter": 1, + "label": "Date", + "no_copy": 1, + "oldfieldname": "transaction_date", + "oldfieldtype": "Date", + "permlevel": 0, + "read_only": 0, + "reqd": 1, + "search_index": 1, "width": "100px" - }, + }, { - "default": "Sales", - "fieldname": "order_type", - "fieldtype": "Select", - "in_filter": 1, - "label": "Order Type", - "oldfieldname": "order_type", - "oldfieldtype": "Select", - "options": "\nSales\nMaintenance\nShopping Cart", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, + "default": "Sales", + "fieldname": "order_type", + "fieldtype": "Select", + "in_filter": 1, + "label": "Order Type", + "oldfieldname": "order_type", + "oldfieldtype": "Select", + "options": "\nSales\nMaintenance\nShopping Cart", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "fieldname": "currency_and_price_list", - "fieldtype": "Section Break", - "label": "Currency and Price List", - "options": "icon-tag", - "permlevel": 0, + "fieldname": "currency_and_price_list", + "fieldtype": "Section Break", + "label": "Currency and Price List", + "options": "icon-tag", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "currency", - "fieldtype": "Link", - "in_filter": 1, - "label": "Currency", - "oldfieldname": "currency", - "oldfieldtype": "Select", - "options": "Currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, - "search_index": 0, + "fieldname": "currency", + "fieldtype": "Link", + "in_filter": 1, + "label": "Currency", + "oldfieldname": "currency", + "oldfieldtype": "Select", + "options": "Currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, + "search_index": 0, "width": "100px" - }, + }, { - "description": "Rate at which customer's currency is converted to company's base currency", - "fieldname": "conversion_rate", - "fieldtype": "Float", - "label": "Exchange Rate", - "oldfieldname": "conversion_rate", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, + "description": "Rate at which customer's currency is converted to company's base currency", + "fieldname": "conversion_rate", + "fieldtype": "Float", + "label": "Exchange Rate", + "oldfieldname": "conversion_rate", + "oldfieldtype": "Currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, "width": "100px" - }, + }, { - "fieldname": "column_break2", - "fieldtype": "Column Break", - "permlevel": 0, - "read_only": 0, + "fieldname": "column_break2", + "fieldtype": "Column Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "selling_price_list", - "fieldtype": "Link", - "in_filter": 1, - "label": "Price List", - "oldfieldname": "price_list_name", - "oldfieldtype": "Select", - "options": "Price List", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, - "search_index": 0, + "fieldname": "selling_price_list", + "fieldtype": "Link", + "in_filter": 1, + "label": "Price List", + "oldfieldname": "price_list_name", + "oldfieldtype": "Select", + "options": "Price List", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, + "search_index": 0, "width": "100px" - }, + }, { - "fieldname": "price_list_currency", - "fieldtype": "Link", - "label": "Price List Currency", - "options": "Currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "price_list_currency", + "fieldtype": "Link", + "label": "Price List Currency", + "options": "Currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "reqd": 1 - }, + }, { - "description": "Rate at which Price list currency is converted to company's base currency", - "fieldname": "plc_conversion_rate", - "fieldtype": "Float", - "label": "Price List Exchange Rate", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "description": "Rate at which Price list currency is converted to company's base currency", + "fieldname": "plc_conversion_rate", + "fieldtype": "Float", + "label": "Price List Exchange Rate", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "reqd": 1 - }, + }, { - "fieldname": "ignore_pricing_rule", - "fieldtype": "Check", - "label": "Ignore Pricing Rule", - "no_copy": 1, - "permlevel": 1, + "fieldname": "ignore_pricing_rule", + "fieldtype": "Check", + "label": "Ignore Pricing Rule", + "no_copy": 1, + "permlevel": 1, "print_hide": 1 - }, + }, { - "fieldname": "items_section", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "options": "icon-shopping-cart", - "permlevel": 0, - "print_hide": 0, - "read_only": 0, + "fieldname": "items_section", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", + "permlevel": 0, + "print_hide": 0, + "read_only": 0, "search_index": 0 - }, + }, { - "allow_on_submit": 1, - "fieldname": "items", - "fieldtype": "Table", - "label": "Items", - "oldfieldname": "quotation_details", - "oldfieldtype": "Table", - "options": "Quotation Item", - "permlevel": 0, - "read_only": 0, - "reqd": 0, + "allow_on_submit": 1, + "fieldname": "items", + "fieldtype": "Table", + "label": "Items", + "oldfieldname": "quotation_details", + "oldfieldtype": "Table", + "options": "Quotation Item", + "permlevel": 0, + "read_only": 0, + "reqd": 0, "width": "40px" - }, + }, { - "fieldname": "sec_break23", - "fieldtype": "Section Break", - "permlevel": 0, + "fieldname": "sec_break23", + "fieldtype": "Section Break", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "net_total", - "fieldtype": "Currency", - "label": "Net Total (Company Currency)", - "no_copy": 0, - "oldfieldname": "net_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, - "reqd": 0, + "fieldname": "base_net_total", + "fieldtype": "Currency", + "label": "Net Total (Company Currency)", + "no_copy": 0, + "oldfieldname": "net_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, + "reqd": 0, "width": "100px" - }, + }, { - "fieldname": "column_break_28", - "fieldtype": "Column Break", + "fieldname": "column_break_28", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "net_total_export", - "fieldtype": "Currency", - "label": "Net Total", - "options": "currency", - "permlevel": 0, + "fieldname": "net_total", + "fieldtype": "Currency", + "label": "Net Total", + "options": "currency", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "taxes_section", - "fieldtype": "Section Break", - "label": "Taxes and Charges", - "oldfieldtype": "Section Break", - "options": "icon-money", - "permlevel": 0, + "fieldname": "taxes_section", + "fieldtype": "Section Break", + "label": "Taxes and Charges", + "oldfieldtype": "Section Break", + "options": "icon-money", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "taxes_and_charges", - "fieldtype": "Link", - "hidden": 0, - "label": "Taxes and Charges", - "oldfieldname": "charge", - "oldfieldtype": "Link", - "options": "Sales Taxes and Charges Master", - "permlevel": 0, - "print_hide": 1, + "fieldname": "taxes_and_charges", + "fieldtype": "Link", + "hidden": 0, + "label": "Taxes and Charges", + "oldfieldname": "charge", + "oldfieldtype": "Link", + "options": "Sales Taxes and Charges Master", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "column_break_34", - "fieldtype": "Column Break", + "fieldname": "column_break_34", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "shipping_rule", - "fieldtype": "Link", - "hidden": 0, - "label": "Shipping Rule", - "oldfieldtype": "Button", - "options": "Shipping Rule", - "permlevel": 0, - "print_hide": 1, + "fieldname": "shipping_rule", + "fieldtype": "Link", + "hidden": 0, + "label": "Shipping Rule", + "oldfieldtype": "Button", + "options": "Shipping Rule", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "section_break_36", - "fieldtype": "Section Break", + "fieldname": "section_break_36", + "fieldtype": "Section Break", "permlevel": 0 - }, + }, { - "fieldname": "taxes", - "fieldtype": "Table", - "label": "Sales Taxes and Charges", - "oldfieldname": "other_charges", - "oldfieldtype": "Table", - "options": "Sales Taxes and Charges", - "permlevel": 0, + "fieldname": "taxes", + "fieldtype": "Table", + "label": "Sales Taxes and Charges", + "oldfieldname": "other_charges", + "oldfieldtype": "Table", + "options": "Sales Taxes and Charges", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "other_charges_calculation", - "fieldtype": "HTML", - "label": "Taxes and Charges Calculation", - "oldfieldtype": "HTML", - "permlevel": 0, - "print_hide": 1, + "fieldname": "other_charges_calculation", + "fieldtype": "HTML", + "label": "Taxes and Charges Calculation", + "oldfieldtype": "HTML", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "section_break_39", - "fieldtype": "Section Break", + "fieldname": "section_break_39", + "fieldtype": "Section Break", "permlevel": 0 - }, + }, { - "fieldname": "other_charges_total_export", - "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "options": "currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "other_charges_total", - "fieldtype": "Currency", - "label": "Taxes and Charges Total (Company Currency)", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "base_total_taxes_and_charges", + "fieldtype": "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 - }, + }, { - "fieldname": "column_break_42", - "fieldtype": "Column Break", + "fieldname": "column_break_42", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "discount_amount", - "fieldtype": "Currency", - "label": "Discount Amount", - "options": "currency", + "fieldname": "discount_amount", + "fieldtype": "Currency", + "label": "Discount Amount", + "options": "currency", "permlevel": 0 - }, + }, { - "fieldname": "base_discount_amount", - "fieldtype": "Currency", - "label": "Discount Amount (Company Currency)", - "options": "Company:company:default_currency", - "permlevel": 0, - "precision": "", - "print_hide": 1, + "fieldname": "base_discount_amount", + "fieldtype": "Currency", + "label": "Discount Amount (Company Currency)", + "options": "Company:company:default_currency", + "permlevel": 0, + "precision": "", + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "totals", - "fieldtype": "Section Break", - "label": "Totals", - "oldfieldtype": "Section Break", - "options": "icon-money", - "permlevel": 0, - "print_hide": 1, + "fieldname": "totals", + "fieldtype": "Section Break", + "label": "Totals", + "oldfieldtype": "Section Break", + "options": "icon-money", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "grand_total", - "fieldtype": "Currency", - "label": "Grand Total (Company Currency)", - "no_copy": 0, - "oldfieldname": "grand_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, - "reqd": 0, + "fieldname": "base_grand_total", + "fieldtype": "Currency", + "label": "Grand Total (Company Currency)", + "no_copy": 0, + "oldfieldname": "grand_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, + "reqd": 0, "width": "200px" - }, + }, { - "fieldname": "rounded_total", - "fieldtype": "Currency", - "label": "Rounded Total (Company Currency)", - "no_copy": 0, - "oldfieldname": "rounded_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "base_rounded_total", + "fieldtype": "Currency", + "label": "Rounded Total (Company Currency)", + "no_copy": 0, + "oldfieldname": "rounded_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "width": "200px" - }, + }, { - "description": "In Words will be visible once you save the Quotation.", - "fieldname": "in_words", - "fieldtype": "Data", - "label": "In Words (Company Currency)", - "no_copy": 0, - "oldfieldname": "in_words", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "description": "In Words will be visible once you save the Quotation.", + "fieldname": "base_in_words", + "fieldtype": "Data", + "label": "In Words (Company Currency)", + "no_copy": 0, + "oldfieldname": "in_words", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "width": "200px" - }, + }, { - "fieldname": "column_break3", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "column_break3", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "grand_total_export", - "fieldtype": "Currency", - "in_list_view": 1, - "label": "Grand Total", - "no_copy": 0, - "oldfieldname": "grand_total_export", - "oldfieldtype": "Currency", - "options": "currency", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, - "reqd": 0, + "fieldname": "grand_total", + "fieldtype": "Currency", + "in_list_view": 1, + "label": "Grand Total", + "no_copy": 0, + "oldfieldname": "grand_total_export", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, + "reqd": 0, "width": "200px" - }, + }, { - "fieldname": "rounded_total_export", - "fieldtype": "Currency", - "label": "Rounded Total", - "no_copy": 0, - "oldfieldname": "rounded_total_export", - "oldfieldtype": "Currency", - "options": "currency", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, - "reqd": 0, + "fieldname": "rounded_total", + "fieldtype": "Currency", + "label": "Rounded Total", + "no_copy": 0, + "oldfieldname": "rounded_total_export", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, + "reqd": 0, "width": "200px" - }, + }, { - "fieldname": "in_words_export", - "fieldtype": "Data", - "label": "In Words", - "no_copy": 0, - "oldfieldname": "in_words_export", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, + "fieldname": "in_words", + "fieldtype": "Data", + "label": "In Words", + "no_copy": 0, + "oldfieldname": "in_words_export", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, "width": "200px" - }, + }, { - "fieldname": "fold", - "fieldtype": "Fold", - "label": "Fold", + "fieldname": "fold", + "fieldtype": "Fold", + "label": "Fold", "permlevel": 0 - }, + }, { - "fieldname": "terms_section_break", - "fieldtype": "Section Break", - "label": "Terms and Conditions", - "oldfieldtype": "Section Break", - "options": "icon-legal", - "permlevel": 0, - "print_hide": 0, + "fieldname": "terms_section_break", + "fieldtype": "Section Break", + "label": "Terms and Conditions", + "oldfieldtype": "Section Break", + "options": "icon-legal", + "permlevel": 0, + "print_hide": 0, "read_only": 0 - }, + }, { - "fieldname": "tc_name", - "fieldtype": "Link", - "label": "Terms", - "oldfieldname": "tc_name", - "oldfieldtype": "Link", - "options": "Terms and Conditions", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "tc_name", + "fieldtype": "Link", + "label": "Terms", + "oldfieldname": "tc_name", + "oldfieldtype": "Link", + "options": "Terms and Conditions", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "report_hide": 1 - }, + }, { - "fieldname": "terms", - "fieldtype": "Text Editor", - "label": "Term Details", - "oldfieldname": "terms", - "oldfieldtype": "Text Editor", - "permlevel": 0, + "fieldname": "terms", + "fieldtype": "Text Editor", + "label": "Term Details", + "oldfieldname": "terms", + "oldfieldtype": "Text Editor", + "permlevel": 0, "read_only": 0 - }, + }, { - "fieldname": "contact_section", - "fieldtype": "Section Break", - "label": "Contact Info", - "options": "icon-bullhorn", - "permlevel": 0, + "fieldname": "contact_section", + "fieldtype": "Section Break", + "label": "Contact Info", + "options": "icon-bullhorn", + "permlevel": 0, "read_only": 0 - }, + }, { - "description": "", - "fieldname": "territory", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Territory", - "options": "Territory", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, + "description": "", + "fieldname": "territory", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Territory", + "options": "Territory", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "depends_on": "customer", - "description": "", - "fieldname": "customer_group", - "fieldtype": "Link", - "in_filter": 1, - "label": "Customer Group", - "oldfieldname": "customer_group", - "oldfieldtype": "Link", - "options": "Customer Group", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 0, + "depends_on": "customer", + "description": "", + "fieldname": "customer_group", + "fieldtype": "Link", + "in_filter": 1, + "label": "Customer Group", + "oldfieldname": "customer_group", + "oldfieldtype": "Link", + "options": "Customer Group", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 0, "search_index": 0 - }, + }, { - "fieldname": "shipping_address_name", - "fieldtype": "Link", - "hidden": 0, - "label": "Shipping Address", - "options": "Address", - "permlevel": 0, + "fieldname": "shipping_address_name", + "fieldtype": "Link", + "hidden": 0, + "label": "Shipping Address", + "options": "Address", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "shipping_address", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Shipping Address", - "permlevel": 0, - "print_hide": 1, + "fieldname": "shipping_address", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Shipping Address", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "depends_on": "customer", - "fieldname": "col_break98", - "fieldtype": "Column Break", - "permlevel": 0, - "read_only": 0, + "depends_on": "customer", + "fieldname": "col_break98", + "fieldtype": "Column Break", + "permlevel": 0, + "read_only": 0, "width": "50%" - }, + }, { - "fieldname": "customer_address", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Customer Address", - "options": "Address", - "permlevel": 0, - "print_hide": 1, + "fieldname": "customer_address", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Customer Address", + "options": "Address", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "depends_on": "eval:doc.customer", - "fieldname": "contact_person", - "fieldtype": "Link", - "hidden": 0, - "in_filter": 1, - "label": "Contact Person", - "oldfieldname": "contact_person", - "oldfieldtype": "Link", - "options": "Contact", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "depends_on": "eval:doc.customer", + "fieldname": "contact_person", + "fieldtype": "Link", + "hidden": 0, + "in_filter": 1, + "label": "Contact Person", + "oldfieldname": "contact_person", + "oldfieldtype": "Link", + "options": "Contact", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "reqd": 0 - }, + }, { - "fieldname": "more_info", - "fieldtype": "Section Break", - "label": "More Info", - "oldfieldtype": "Section Break", - "options": "icon-file-text", - "permlevel": 0, - "print_hide": 1, + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info", + "oldfieldtype": "Section Break", + "options": "icon-file-text", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "campaign", - "fieldtype": "Link", - "hidden": 0, - "label": "Campaign", - "no_copy": 0, - "oldfieldname": "campaign", - "oldfieldtype": "Link", - "options": "Campaign", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "campaign", + "fieldtype": "Link", + "hidden": 0, + "label": "Campaign", + "no_copy": 0, + "oldfieldname": "campaign", + "oldfieldtype": "Link", + "options": "Campaign", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "report_hide": 0 - }, + }, { - "fieldname": "source", - "fieldtype": "Select", - "hidden": 0, - "label": "Source", - "no_copy": 0, - "oldfieldname": "source", - "oldfieldtype": "Select", - "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "source", + "fieldtype": "Select", + "hidden": 0, + "label": "Source", + "no_copy": 0, + "oldfieldname": "source", + "oldfieldtype": "Select", + "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "report_hide": 0 - }, + }, { - "allow_on_submit": 0, - "default": "Draft", - "fieldname": "status", - "fieldtype": "Select", - "in_filter": 1, - "in_list_view": 1, - "label": "Status", - "no_copy": 1, - "oldfieldname": "status", - "oldfieldtype": "Select", - "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, - "reqd": 1, + "allow_on_submit": 0, + "default": "Draft", + "fieldname": "status", + "fieldtype": "Select", + "in_filter": 1, + "in_list_view": 1, + "label": "Status", + "no_copy": 1, + "oldfieldname": "status", + "oldfieldtype": "Select", + "options": "Draft\nSubmitted\nOrdered\nLost\nCancelled\nOpen\nReplied", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, + "reqd": 1, "search_index": 0 - }, + }, { - "allow_on_submit": 1, - "fieldname": "order_lost_reason", - "fieldtype": "Small Text", - "label": "Quotation Lost Reason", - "no_copy": 1, - "oldfieldname": "order_lost_reason", - "oldfieldtype": "Small Text", - "permlevel": 0, - "print_hide": 1, + "allow_on_submit": 1, + "fieldname": "order_lost_reason", + "fieldtype": "Small Text", + "label": "Quotation Lost Reason", + "no_copy": 1, + "oldfieldname": "order_lost_reason", + "oldfieldtype": "Small Text", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "fieldname": "column_break4", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "fieldname": "column_break4", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "width": "50%" - }, + }, { - "allow_on_submit": 1, - "fieldname": "letter_head", - "fieldtype": "Link", - "label": "Letter Head", - "oldfieldname": "letter_head", - "oldfieldtype": "Select", - "options": "Letter Head", - "permlevel": 0, - "print_hide": 1, + "allow_on_submit": 1, + "fieldname": "letter_head", + "fieldtype": "Link", + "label": "Letter Head", + "oldfieldname": "letter_head", + "oldfieldtype": "Select", + "options": "Letter Head", + "permlevel": 0, + "print_hide": 1, "read_only": 0 - }, + }, { - "allow_on_submit": 1, - "fieldname": "select_print_heading", - "fieldtype": "Link", - "label": "Print Heading", - "no_copy": 1, - "oldfieldname": "select_print_heading", - "oldfieldtype": "Link", - "options": "Print Heading", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, + "allow_on_submit": 1, + "fieldname": "select_print_heading", + "fieldtype": "Link", + "label": "Print Heading", + "no_copy": 1, + "oldfieldname": "select_print_heading", + "oldfieldtype": "Link", + "options": "Print Heading", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, "report_hide": 1 - }, + }, { - "fieldname": "fiscal_year", - "fieldtype": "Link", - "in_filter": 1, - "label": "Fiscal Year", - "oldfieldname": "fiscal_year", - "oldfieldtype": "Select", - "options": "Fiscal Year", - "permlevel": 0, - "print_hide": 1, - "read_only": 0, - "reqd": 1, + "fieldname": "fiscal_year", + "fieldtype": "Link", + "in_filter": 1, + "label": "Fiscal Year", + "oldfieldname": "fiscal_year", + "oldfieldtype": "Select", + "options": "Fiscal Year", + "permlevel": 0, + "print_hide": 1, + "read_only": 0, + "reqd": 1, "search_index": 0 - }, + }, { - "fieldname": "enq_det", - "fieldtype": "Text", - "hidden": 1, - "label": "Opportunity Item", - "no_copy": 0, - "oldfieldname": "enq_det", - "oldfieldtype": "Text", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "enq_det", + "fieldtype": "Text", + "hidden": 1, + "label": "Opportunity Item", + "no_copy": 0, + "oldfieldname": "enq_det", + "oldfieldtype": "Text", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "report_hide": 0 } - ], - "hide_toolbar": 0, - "icon": "icon-shopping-cart", - "idx": 1, - "is_submittable": 1, - "max_attachments": 1, - "modified": "2015-02-05 05:11:44.426544", - "modified_by": "Administrator", - "module": "Selling", - "name": "Quotation", - "owner": "Administrator", + ], + "hide_toolbar": 0, + "icon": "icon-shopping-cart", + "idx": 1, + "is_submittable": 1, + "max_attachments": 1, + "modified": "2015-02-11 15:15:29.475837", + "modified_by": "Administrator", + "module": "Selling", + "name": "Quotation", + "owner": "Administrator", "permissions": [ { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Sales User", - "share": 1, - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Sales User", + "share": 1, + "submit": 1, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "match": "", - "permlevel": 1, - "read": 1, - "report": 1, - "role": "Sales User", - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "match": "", + "permlevel": 1, + "read": 1, + "report": 1, + "role": "Sales User", + "submit": 0, "write": 0 - }, + }, { - "cancel": 0, - "delete": 0, - "email": 1, - "match": "", - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, + "cancel": 0, + "delete": 0, + "email": 1, + "match": "", + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, "role": "Customer" - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "match": "", - "permlevel": 1, - "read": 1, - "report": 1, - "role": "Sales Manager", - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "match": "", + "permlevel": 1, + "read": 1, + "report": 1, + "role": "Sales Manager", + "submit": 0, "write": 0 - }, + }, { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Sales Manager", - "share": 1, - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Sales Manager", + "share": 1, + "submit": 1, "write": 1 - }, + }, { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Maintenance Manager", - "share": 1, - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Maintenance Manager", + "share": 1, + "submit": 1, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "match": "", - "permlevel": 1, - "read": 1, - "report": 1, - "role": "Maintenance Manager", + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "match": "", + "permlevel": 1, + "read": 1, + "report": 1, + "role": "Maintenance Manager", "submit": 0 - }, + }, { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Maintenance User", - "share": 1, - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Maintenance User", + "share": 1, + "submit": 1, "write": 1 - }, + }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 0, - "match": "", - "permlevel": 1, - "read": 1, - "report": 1, - "role": "Maintenance User", + "amend": 0, + "cancel": 0, + "create": 0, + "delete": 0, + "match": "", + "permlevel": 1, + "read": 1, + "report": 1, + "role": "Maintenance User", "submit": 0 } - ], - "read_only_onload": 1, - "search_fields": "status,transaction_date,customer,lead,order_type", - "sort_field": "modified", - "sort_order": "DESC", + ], + "read_only_onload": 1, + "search_fields": "status,transaction_date,customer,lead,order_type", + "sort_field": "modified", + "sort_order": "DESC", "title_field": "customer_name" -} +} \ No newline at end of file diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 16a9bb7366..c94004c7d1 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -326,7 +326,7 @@ "permlevel": 0 }, { - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "oldfieldname": "net_total", @@ -344,7 +344,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_export", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "options": "currency", @@ -412,18 +412,18 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total_export", + "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", - "label": "Taxes and Charges Total", + "label": "Total Taxes and Charges", "options": "currency", "permlevel": 0, "print_hide": 1, "read_only": 1 }, { - "fieldname": "other_charges_total", + "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", - "label": "Taxes and Charges Total (Company Currency)", + "label": "Total Taxes and Charges (Company Currency)", "oldfieldname": "other_charges_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -465,7 +465,7 @@ "print_hide": 1 }, { - "fieldname": "grand_total", + "fieldname": "base_grand_total", "fieldtype": "Currency", "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", @@ -478,7 +478,7 @@ "width": "150px" }, { - "fieldname": "rounded_total", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", @@ -491,7 +491,7 @@ }, { "description": "In Words will be visible once you save the Sales Order.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "oldfieldname": "in_words", @@ -510,7 +510,7 @@ "width": "50%" }, { - "fieldname": "grand_total_export", + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -524,7 +524,7 @@ "width": "150px" }, { - "fieldname": "rounded_total_export", + "fieldname": "rounded_total", "fieldtype": "Currency", "label": "Rounded Total", "oldfieldname": "rounded_total_export", @@ -536,7 +536,7 @@ "width": "150px" }, { - "fieldname": "in_words_export", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "oldfieldname": "in_words_export", @@ -1034,7 +1034,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2015-02-05 05:11:45.731715", + "modified": "2015-02-11 15:42:09.174504", "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 4eb9357327..cbbc400bc6 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -341,7 +341,7 @@ "permlevel": 0 }, { - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "no_copy": 0, @@ -361,7 +361,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_export", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "options": "currency", @@ -435,18 +435,18 @@ "permlevel": 0 }, { - "fieldname": "other_charges_total_export", + "fieldname": "total_taxes_and_charges", "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "options": "Company:company:default_currency", + "label": "Total Taxes and Charges", + "options": "currency", "permlevel": 0, "print_hide": 1, "read_only": 1 }, { - "fieldname": "other_charges_total", + "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", - "label": "Taxes and Charges Total (Company Currency)", + "label": "Total Taxes and Charges (Company Currency)", "oldfieldname": "other_charges_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -489,7 +489,7 @@ "read_only": 0 }, { - "fieldname": "grand_total", + "fieldname": "base_grand_total", "fieldtype": "Currency", "label": "Grand Total (Company Currency)", "no_copy": 0, @@ -504,7 +504,7 @@ "width": "150px" }, { - "fieldname": "rounded_total", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "label": "Rounded Total (Company Currency)", "no_copy": 0, @@ -519,7 +519,7 @@ }, { "description": "In Words will be visible once you save the Delivery Note.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "no_copy": 0, @@ -539,7 +539,7 @@ "read_only": 0 }, { - "fieldname": "grand_total_export", + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -555,7 +555,7 @@ "width": "150px" }, { - "fieldname": "rounded_total_export", + "fieldname": "rounded_total", "fieldtype": "Currency", "label": "Rounded Total", "no_copy": 0, @@ -570,7 +570,7 @@ }, { "description": "In Words (Export) will be visible once you save the Delivery Note.", - "fieldname": "in_words_export", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "no_copy": 0, @@ -1024,7 +1024,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2015-02-05 05:11:37.151596", + "modified": "2015-02-11 15:45:06.803707", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index dc35407553..4d4ad70568 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -229,7 +229,7 @@ "permlevel": 0 }, { - "fieldname": "net_total", + "fieldname": "base_net_total", "fieldtype": "Currency", "label": "Net Total (Company Currency)", "oldfieldname": "net_total", @@ -257,7 +257,7 @@ "permlevel": 0 }, { - "fieldname": "net_total_import", + "fieldname": "net_total", "fieldtype": "Currency", "label": "Net Total", "oldfieldname": "net_total_import", @@ -314,7 +314,7 @@ "permlevel": 0 }, { - "fieldname": "other_charges_added", + "fieldname": "base_taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added (Company Currency)", "oldfieldname": "other_charges_added", @@ -325,7 +325,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_deducted", + "fieldname": "base_taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted (Company Currency)", "oldfieldname": "other_charges_deducted", @@ -336,9 +336,9 @@ "read_only": 1 }, { - "fieldname": "total_tax", + "fieldname": "base_total_taxes_and_charges", "fieldtype": "Currency", - "label": "Total Tax (Company Currency)", + "label": "Total Taxes and Charges (Company Currency)", "oldfieldname": "total_tax", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -347,7 +347,7 @@ "read_only": 1 }, { - "fieldname": "grand_total", + "fieldname": "base_grand_total", "fieldtype": "Currency", "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", @@ -358,7 +358,7 @@ "read_only": 1 }, { - "fieldname": "rounded_total", + "fieldname": "base_rounded_total", "fieldtype": "Currency", "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", @@ -370,7 +370,7 @@ }, { "description": "In Words will be visible once you save the Purchase Receipt.", - "fieldname": "in_words", + "fieldname": "base_in_words", "fieldtype": "Data", "label": "In Words (Company Currency)", "oldfieldname": "in_words", @@ -387,7 +387,7 @@ "width": "50%" }, { - "fieldname": "other_charges_added_import", + "fieldname": "taxes_and_charges_added", "fieldtype": "Currency", "label": "Taxes and Charges Added", "oldfieldname": "other_charges_added_import", @@ -398,7 +398,7 @@ "read_only": 1 }, { - "fieldname": "other_charges_deducted_import", + "fieldname": "taxes_and_charges_deducted", "fieldtype": "Currency", "label": "Taxes and Charges Deducted", "oldfieldname": "other_charges_deducted_import", @@ -409,7 +409,15 @@ "read_only": 1 }, { - "fieldname": "grand_total_import", + "fieldname": "total_taxes_and_charges", + "fieldtype": "Currency", + "label": "Total Taxes and Charges", + "options": "currency", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "grand_total", "fieldtype": "Currency", "in_list_view": 1, "label": "Grand Total", @@ -421,7 +429,7 @@ "read_only": 1 }, { - "fieldname": "in_words_import", + "fieldname": "in_words", "fieldtype": "Data", "label": "In Words", "oldfieldname": "in_words_import", @@ -767,7 +775,7 @@ "icon": "icon-truck", "idx": 1, "is_submittable": 1, - "modified": "2015-02-05 05:11:43.969108", + "modified": "2015-02-11 16:13:02.294088", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",