schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Add condition for discount section collapse

Browse Source 
(cherry picked from commit 4cd65027c4)
This commit is contained in:
Deepesh Garg
2022-10-26 16:48:24 +05:30
committed by Mergify
parent 753b2edebf
commit 953f78d6a9
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,7 @@
"reqd": 1 "reqd": 1
}, },
{ {
"default": "1",
"depends_on": "eval:doc.uom != doc.stock_uom", "depends_on": "eval:doc.uom != doc.stock_uom",
"fieldname": "conversion_factor", "fieldname": "conversion_factor",
"fieldtype": "Float", "fieldtype": "Float",
@@ -820,6 +821,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval: doc.margin_type || doc.discount_amount",
"fieldname": "section_break_26", "fieldname": "section_break_26",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Discount and Margin" "label": "Discount and Margin"
@@ -871,7 +873,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-10-12 03:37:29.032732", "modified": "2022-10-26 16:05:37.304788",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

3
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@@ -247,6 +247,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval: doc.margin_type || doc.discount_amount",
"fieldname": "discount_and_margin", "fieldname": "discount_and_margin",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Discount and Margin" "label": "Discount and Margin"
@@ -876,7 +877,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-10-10 20:57:38.340026", "modified": "2022-10-26 11:38:36.119339",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",

3
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@@ -777,6 +777,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval: doc.margin_type || doc.discount_amount",
"fieldname": "discount_and_margin_section", "fieldname": "discount_and_margin_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Discount and Margin" "label": "Discount and Margin"
@@ -894,7 +895,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-09-07 11:12:38.634976", "modified": "2022-10-26 16:47:41.364387",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order Item", "name": "Purchase Order Item",

3
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@@ -272,6 +272,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval: doc.margin_type || doc.discount_amount",
"fieldname": "discount_and_margin", "fieldname": "discount_and_margin",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Discount and Margin" "label": "Discount and Margin"
@@ -842,7 +843,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-09-06 13:24:18.065312", "modified": "2022-10-26 16:05:02.712705",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",

3
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@@ -261,6 +261,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval: doc.margin_type || doc.discount_amount",
"fieldname": "discount_and_margin", "fieldname": "discount_and_margin",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Discount and Margin" "label": "Discount and Margin"
@@ -814,7 +815,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-10-12 03:36:05.344847", "modified": "2022-10-26 16:05:17.720768",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",

3
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@@ -919,6 +919,7 @@
}, },
{ {
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "eval: doc.margin_type || doc.discount_amount",
"fieldname": "discount_and_margin_section", "fieldname": "discount_and_margin_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Discount and Margin" "label": "Discount and Margin"
@@ -1000,7 +1001,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2022-10-12 03:37:59.516609", "modified": "2022-10-26 16:06:02.524435",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",