nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-26 01:58:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54423 from frappe/mergify/bp/version-15-hotfix/pr-54415

Browse Source 
fix: clear conditions table when calculate_based_on is set to Fixed (backport #54415)
This commit is contained in:
Ravibharathi
2026-04-20 19:44:36 +05:30
committed by GitHub
parent 813f4644a0 9e10ecc4cb
commit bd4eb71205
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/shipping_rule/shipping_rule.js
View File

@@ -25,6 +25,10 @@ frappe.ui.form.on("Shipping Rule", {
},
calculate_based_on: function (frm) {
frm.trigger("toggle_reqd");
if (frm.doc.calculate_based_on === "Fixed") {
frm.clear_table("conditions");
frm.refresh_field("conditions");
}
},
toggle_reqd: function (frm) {
frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === "Fixed");

5
erpnext/accounts/doctype/shipping_rule/shipping_rule.py
View File

@@ -58,6 +58,11 @@ class ShippingRule(Document):
self.validate_overlapping_shipping_rule_conditions()
def validate_from_to_values(self):
if self.calculate_based_on == "Fixed":
if self.conditions:
self.set("conditions", [])
return
zero_to_values = []
for d in self.get("conditions"):