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

fix: update payment amount if automatically_fetch_payment_terms is enabled

Browse Source 
(cherry picked from commit 7bf1a39861)
This commit is contained in:
venkat102
2025-03-27 22:28:20 +05:30
committed by Mergify
parent 3b66c48479
commit ea289a40fb
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/controllers/accounts_controller.py
View File

@@ -2328,7 +2328,9 @@ class AccountsController(TransactionBase):
and automatically_fetch_payment_terms and automatically_fetch_payment_terms
and self.linked_order_has_payment_terms(po_or_so, fieldname, doctype) and self.linked_order_has_payment_terms(po_or_so, fieldname, doctype)
): ):
self.fetch_payment_terms_from_order(po_or_so, doctype, grand_total, base_grand_total) self.fetch_payment_terms_from_order(
po_or_so, doctype, grand_total, base_grand_total, automatically_fetch_payment_terms
)
if self.get("payment_terms_template"): if self.get("payment_terms_template"):
self.ignore_default_payment_terms_template = 1 self.ignore_default_payment_terms_template = 1
elif self.get("payment_terms_template"): elif self.get("payment_terms_template"):
@@ -2372,7 +2374,9 @@ class AccountsController(TransactionBase):
d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount") d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
) )
else: else:
self.fetch_payment_terms_from_order(po_or_so, doctype, grand_total, base_grand_total) self.fetch_payment_terms_from_order(
po_or_so, doctype, grand_total, base_grand_total, automatically_fetch_payment_terms
)
self.ignore_default_payment_terms_template = 1 self.ignore_default_payment_terms_template = 1
def get_order_details(self): def get_order_details(self):
@@ -2410,7 +2414,9 @@ class AccountsController(TransactionBase):
def linked_order_has_payment_schedule(self, po_or_so): def linked_order_has_payment_schedule(self, po_or_so):
return frappe.get_all("Payment Schedule", filters={"parent": po_or_so}) return frappe.get_all("Payment Schedule", filters={"parent": po_or_so})
def fetch_payment_terms_from_order(self, po_or_so, po_or_so_doctype, grand_total, base_grand_total): def fetch_payment_terms_from_order(
self, po_or_so, po_or_so_doctype, grand_total, base_grand_total, automatically_fetch_payment_terms
):
""" """
Fetch Payment Terms from Purchase/Sales Order on creating a new Purchase/Sales Invoice. Fetch Payment Terms from Purchase/Sales Order on creating a new Purchase/Sales Invoice.
""" """
@@ -2429,7 +2435,7 @@ class AccountsController(TransactionBase):
"paid_amount": schedule.paid_amount, "paid_amount": schedule.paid_amount,
} }
if payment_schedule["invoice_portion"]: if automatically_fetch_payment_terms:
payment_schedule["payment_amount"] = flt( payment_schedule["payment_amount"] = flt(
grand_total * flt(payment_schedule["invoice_portion"]) / 100, grand_total * flt(payment_schedule["invoice_portion"]) / 100,
schedule.precision("payment_amount"), schedule.precision("payment_amount"),