nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 01:43:10 +00:00
Code Issues 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
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",