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

Merge pull request #54415 from aerele/fix/clear-condions-table

Browse Source 
fix: clear conditions table when calculate_based_on is set to Fixed
This commit is contained in:
Ravibharathi
2026-04-20 19:22:25 +05:30
committed by GitHub
parent bc8f63b6dd d6bb0ae093
commit f9232b209c
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) { calculate_based_on: function (frm) {
frm.trigger("toggle_reqd"); frm.trigger("toggle_reqd");
if (frm.doc.calculate_based_on === "Fixed") {
frm.clear_table("conditions");
frm.refresh_field("conditions");
}
}, },
toggle_reqd: function (frm) { toggle_reqd: function (frm) {
frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === "Fixed"); 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() self.validate_overlapping_shipping_rule_conditions()
def validate_from_to_values(self): def validate_from_to_values(self):
if self.calculate_based_on == "Fixed":
if self.conditions:
self.set("conditions", [])
return
zero_to_values = [] zero_to_values = []
for d in self.get("conditions"): for d in self.get("conditions"):