Skip to content

Commit 4e05277

Browse files
Merge pull request #54424 from frappe/mergify/bp/version-16-hotfix/pr-54415
fix: clear conditions table when calculate_based_on is set to Fixed (backport #54415)
2 parents d5ea039 + 319d769 commit 4e05277

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

erpnext/accounts/doctype/shipping_rule/shipping_rule.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ frappe.ui.form.on("Shipping Rule", {
2525
},
2626
calculate_based_on: function (frm) {
2727
frm.trigger("toggle_reqd");
28+
if (frm.doc.calculate_based_on === "Fixed") {
29+
frm.clear_table("conditions");
30+
frm.refresh_field("conditions");
31+
}
2832
},
2933
toggle_reqd: function (frm) {
3034
frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === "Fixed");

erpnext/accounts/doctype/shipping_rule/shipping_rule.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ def validate(self):
5858
self.validate_overlapping_shipping_rule_conditions()
5959

6060
def validate_from_to_values(self):
61+
if self.calculate_based_on == "Fixed":
62+
if self.conditions:
63+
self.set("conditions", [])
64+
return
65+
6166
zero_to_values = []
6267

6368
for d in self.get("conditions"):

0 commit comments

Comments
 (0)