From b1224c68b8fb6c57d6e63841f614651eca15d2d4 Mon Sep 17 00:00:00 2001 From: mgicking-bmi Date: Sat, 11 Apr 2026 00:12:00 -0500 Subject: [PATCH] Fix(selling): enable selling_settings creation through fixtures (#54177) (cherry picked from commit 3e5d18c5c432a3acdeb208e3dc950c8583e818da) # Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.py --- .../selling/doctype/selling_settings/selling_settings.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.py b/erpnext/selling/doctype/selling_settings/selling_settings.py index cad8385ab73..331f6360d1b 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.py +++ b/erpnext/selling/doctype/selling_settings/selling_settings.py @@ -74,6 +74,15 @@ class SellingSettings(Document): self.validate_fallback_to_default_price_list() +<<<<<<< HEAD +======= + if old_doc and old_doc.enable_tracking_sales_commissions != self.enable_tracking_sales_commissions: + toggle_tracking_sales_commissions_section(not self.enable_tracking_sales_commissions) + + if old_doc and old_doc.enable_utm != self.enable_utm: + toggle_utm_analytics_section(not self.enable_utm) + +>>>>>>> 3e5d18c5c4 (Fix(selling): enable selling_settings creation through fixtures (#54177)) def validate_fallback_to_default_price_list(self): if ( self.fallback_to_default_price_list