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

[print] Moved Total Taxes and Charges to the right column

Browse Source
This commit is contained in:
Anand Doshi 2014-07-31 16:05:19 +05:30
parent fbe37c9158
commit 29817d6d8b
4 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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