nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-28 02:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51014 from mihir-kandoi/gh42653-3

Browse Source
This commit is contained in:
Mihir Kandoi
2025-12-11 11:35:33 +05:30
committed by GitHub
parent f3ba59480b 074bdd119b
commit 8d9b83e410
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/controllers/buying_controller.py
View File

@@ -81,6 +81,19 @@ 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")
and not self.get("terms")
):
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):
po_list = {x.purchase_order for x in self.items if x.purchase_order}

13
erpnext/controllers/selling_controller.py
View File

@@ -43,6 +43,19 @@ 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")
and not self.get("terms")
):
self.tc_name = default_selling_terms
self.terms = frappe.get_value("Terms and Conditions", self.get("tc_name"), "terms")
def validate(self):
super().validate()
self.validate_items()