From 35bd43775cc49ec64f6d276991f549c516082697 Mon Sep 17 00:00:00 2001 From: sarathibalamurugan Date: Mon, 20 Apr 2026 16:17:38 +0530 Subject: [PATCH 1/2] fix: clear conditions table when calculate_based_on is set to Fixed (cherry picked from commit d73920be12727c83c60dd79c5e3b8be6935702a7) --- erpnext/accounts/doctype/shipping_rule/shipping_rule.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js index 1ece3e6c3dd..5c02fd2f127 100644 --- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js +++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js @@ -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"); From 9e10ecc4cb0530ee3ab19e7999c404a1d3c6a01f Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Mon, 20 Apr 2026 18:58:06 +0530 Subject: [PATCH 2/2] fix: clear shipping rule conditions for fixed shipping rule (cherry picked from commit d6bb0ae093a15b4c5430d43d3eed9e6000c920d5) --- erpnext/accounts/doctype/shipping_rule/shipping_rule.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py index abbb6a58119..a2db95d03c9 100644 --- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py @@ -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"):