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

fix: make sure buying/selling default terms from company master is default

Browse Source
This commit is contained in:
Mihir Kandoi
2025-12-10 13:49:46 +05:30
parent 85114eda7c
commit 8cb0632081
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/buying_controller.py
View File

@@ -81,6 +81,18 @@ class BuyingController(SubcontractingController):
), ),
) )
if (
self.get("company")
and (
default_buying_terms := frappe.get_value(
"Company", self.get("company"), "default_buying_terms"
)
)
and not self.get("tc_name")
):
self.tc_name = default_buying_terms
self.terms = frappe.get_value("Terms and Conditions", self.get("tc_name"), "terms")
def validate_posting_date_with_po(self): def validate_posting_date_with_po(self):
po_list = {x.purchase_order for x in self.items if x.purchase_order} po_list = {x.purchase_order for x in self.items if x.purchase_order}

12
erpnext/controllers/selling_controller.py
View File

@@ -43,6 +43,18 @@ class SellingController(StockController):
), ),
) )
if (
self.get("company")
and (
default_selling_terms := frappe.get_value(
"Company", self.get("company"), "default_selling_terms"
)
)
and not self.get("tc_name")
):
self.tc_name = default_selling_terms
self.terms = frappe.get_value("Terms and Conditions", self.get("tc_name"), "terms")
def validate(self): def validate(self):
super().validate() super().validate()
self.validate_items() self.validate_items()