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

fix: Total amount field ordering in transactions (#21313)

Browse Source
This commit is contained in:
Deepesh Garg 2020-04-18 22:13:48 +05:30 committed by GitHub
parent 6298bbb1eb
commit 3cec5cbb0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,9 @@
"base_total",
"base_net_total",
"column_break_28",
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"taxes_section",
"tax_category",
"column_break_49",
@ -1298,7 +1298,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
"modified": "2019-12-30 19:13:49.610538",
"modified": "2020-04-17 13:05:25.199832",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",

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

@ -1,4 +1,5 @@
{
"actions": [],
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-24 19:29:05",
@ -74,9 +75,9 @@
"base_total",
"base_net_total",
"column_break_32",
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"taxes_section",
"taxes_and_charges",
"column_break_38",
@ -1577,7 +1578,8 @@
"icon": "fa fa-file-text",
"idx": 181,
"is_submittable": 1,
"modified": "2020-02-10 04:57:11.221180",
"links": [],
"modified": "2020-04-17 12:38:41.435728",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",

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

@ -1,4 +1,5 @@
{
"actions": [],
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-05-21 16:16:39",
@ -63,9 +64,9 @@
"base_total",
"base_net_total",
"column_break_26",
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"taxes_section",
"tax_category",
"column_break_50",
@ -170,8 +171,8 @@
"search_index": 1
},
{
"description": "Fetch items based on Default Supplier.",
"depends_on": "eval:doc.supplier && doc.docstatus===0 && (!(doc.items && doc.items.length) || (doc.items.length==1 && !doc.items[0].item_code))",
"description": "Fetch items based on Default Supplier.",
"fieldname": "get_items_from_open_material_requests",
"fieldtype": "Button",
"label": "Get Items from Open Material Requests"
@ -1054,7 +1055,8 @@
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"modified": "2020-01-14 18:54:39.694448",
"links": [],
"modified": "2020-04-17 13:04:28.185197",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

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

@ -60,9 +60,9 @@
"base_total",
"base_net_total",
"column_break_33",
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"taxes_section",
"tax_category",
"column_break_38",
@ -1196,7 +1196,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2019-12-30 19:15:28.605085",
"modified": "2020-04-17 12:50:39.640534",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",

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

@ -66,9 +66,9 @@
"base_total",
"base_net_total",
"column_break_33",
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"taxes_section",
"tax_category",
"column_break_39",
@ -1256,7 +1256,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
"modified": "2019-12-31 19:17:13.122644",
"modified": "2020-04-17 12:51:41.288600",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

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

@ -59,9 +59,9 @@
"base_total",
"base_net_total",
"column_break_27",
"total_net_weight",
"total",
"net_total",
"total_net_weight",
"taxes_charges_section",
"tax_category",
"shipping_col",
@ -1082,7 +1082,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
"modified": "2020-04-06 16:31:37.444891",
"modified": "2020-04-17 13:06:26.970288",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",