nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 12:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52722 from frappe/mergify/bp/version-15-hotfix/pr-52720

Browse Source 
fix: wrong display_depends_on condition for item group and brand chil… (backport #52720)
This commit is contained in:
mergify[bot]
2026-02-23 15:04:41 +00:00
committed by GitHub
parent 07eb5c714a
commit eda4462e5f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Apply On", "label": "Apply On",
"options": "\nItem Code\nItem Group\nBrand\nTransaction", "options": "Item Code\nItem Group\nBrand\nTransaction",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -657,7 +657,7 @@
"icon": "fa fa-gift", "icon": "fa fa-gift",
"idx": 1, "idx": 1,
"links": [], "links": [],
"modified": "2025-08-20 11:40:07.096854", "modified": "2026-02-17 12:24:07.553505",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",
@@ -719,4 +719,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "title" "title_field": "title"
} }

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@@ -45,7 +45,7 @@ class PricingRule(Document):
apply_discount_on: DF.Literal["Grand Total", "Net Total"] apply_discount_on: DF.Literal["Grand Total", "Net Total"]
apply_discount_on_rate: DF.Check apply_discount_on_rate: DF.Check
apply_multiple_pricing_rules: DF.Check apply_multiple_pricing_rules: DF.Check
apply_on: DF.Literal["", "Item Code", "Item Group", "Brand", "Transaction"] apply_on: DF.Literal["Item Code", "Item Group", "Brand", "Transaction"]
apply_recursion_over: DF.Float apply_recursion_over: DF.Float
apply_rule_on_other: DF.Literal["", "Item Code", "Item Group", "Brand"] apply_rule_on_other: DF.Literal["", "Item Code", "Item Group", "Brand"]
brands: DF.Table[PricingRuleBrand] brands: DF.Table[PricingRuleBrand]

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

@@ -20,7 +20,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:parent.apply_on == 'Item Code'", "depends_on": "eval:parent.apply_on == 'Brand'",
"fieldname": "brand", "fieldname": "brand",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
@@ -91,7 +91,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2019-03-24 14:48:59.649168", "modified": "2026-02-17 12:17:13.073587",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule Brand", "name": "Pricing Rule Brand",
@@ -107,4 +107,4 @@
"track_changes": 1, "track_changes": 1,
"track_seen": 0, "track_seen": 0,
"track_views": 0 "track_views": 0
} }

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

@@ -20,7 +20,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:parent.apply_on == 'Item Code'", "depends_on": "eval:parent.apply_on == 'Item Group'",
"fieldname": "item_group", "fieldname": "item_group",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
@@ -91,7 +91,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2019-03-24 14:48:59.649168", "modified": "2026-02-17 12:16:57.778471",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule Item Group", "name": "Pricing Rule Item Group",
@@ -107,4 +107,4 @@
"track_changes": 1, "track_changes": 1,
"track_seen": 0, "track_seen": 0,
"track_views": 0 "track_views": 0
} }