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

Fix(selling): enable selling_settings creation through fixtures (#54177)

Browse Source 
(cherry picked from commit 3e5d18c5c4)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.py
This commit is contained in:
mgicking-bmi
2026-04-11 00:12:00 -05:00
committed by Mergify
parent 17ce550417
commit b1224c68b8
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/selling/doctype/selling_settings/selling_settings.py
View File

@@ -74,6 +74,15 @@ class SellingSettings(Document):
self.validate_fallback_to_default_price_list() 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): def validate_fallback_to_default_price_list(self):
if ( if (
self.fallback_to_default_price_list self.fallback_to_default_price_list