CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 03:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: hide is_cumulative for apply_on is set to Transaction (backport #49243) (#49257)

Browse Source 
* fix: hide is_cumulative for apply_on is set to Transaction

(cherry picked from commit 699d42b26c)

# Conflicts:
#	erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json

* chore: update modified date for promotional_scheme.json

---------

Co-authored-by: Navin-S-R <navin@aerele.in>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2025-08-27 16:51:19 +00:00
committed by GitHub
parent 700f96af61
commit 064ce4bf6d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,6 +174,7 @@
}, },
{ {
"default": "0", "default": "0",
"depends_on": "eval:doc.apply_on != 'Transaction'",
"fieldname": "is_cumulative", "fieldname": "is_cumulative",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Is Cumulative" "label": "Is Cumulative"
@@ -656,7 +657,7 @@
"icon": "fa fa-gift", "icon": "fa fa-gift",
"idx": 1, "idx": 1,
"links": [], "links": [],
"modified": "2025-02-17 18:15:39.824639", "modified": "2025-08-20 11:40:07.096854",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",

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

@@ -93,12 +93,14 @@
}, },
{ {
"default": "0", "default": "0",
"depends_on": "eval:doc.apply_on != 'Transaction'",
"fieldname": "mixed_conditions", "fieldname": "mixed_conditions",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Mixed Conditions" "label": "Mixed Conditions"
}, },
{ {
"default": "0", "default": "0",
"depends_on": "eval:doc.apply_on != 'Transaction'",
"fieldname": "is_cumulative", "fieldname": "is_cumulative",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Is Cumulative" "label": "Is Cumulative"
@@ -278,7 +280,7 @@
} }
], ],
"links": [], "links": [],
"modified": "2021-05-06 16:20:22.039078", "modified": "2025-08-20 11:48:23.231081",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Promotional Scheme", "name": "Promotional Scheme",
@@ -336,4 +338,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }