Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed total fields

Browse Source
This commit is contained in:
Nabin Hait 2015-02-12 11:47:45 +05:30
parent 7945712171
commit 461ee2ebae
9 changed files with 911 additions and 879 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -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",

22
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -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",

36
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -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",

36
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -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",

2
erpnext/selling/doctype/opportunity/opportunity.json
View File

@ -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",

1552
erpnext/selling/doctype/quotation/quotation.json
View File

File diff suppressed because it is too large Load Diff

26
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -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",

28
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -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",

36
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@ -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",