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

Merge pull request #46891 from frappe/mergify/bp/version-15-hotfix/pr-46637

Browse Source 
fix(payment term): allocate payment amount when payment term is fetched from order (backport #46637)
This commit is contained in:
ruthra kumar
2025-04-07 11:25:45 +05:30
committed by GitHub
parent 3181dc8ed1 ea289a40fb
commit 4e9a3b687f
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@@ -2094,7 +2094,7 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
1, 1,
) )
pi = make_pi_from_pr(pr.name) pi = make_pi_from_pr(pr.name)
self.assertEqual(pi.payment_schedule[0].payment_amount, 2500) self.assertEqual(pi.payment_schedule[0].payment_amount, 1000)
automatically_fetch_payment_terms(enable=0) automatically_fetch_payment_terms(enable=0)
frappe.db.set_value( frappe.db.set_value(

31
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) 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) 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): 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.
""" """
@@ -2426,12 +2432,25 @@ class AccountsController(TransactionBase):
"invoice_portion": schedule.invoice_portion, "invoice_portion": schedule.invoice_portion,
"mode_of_payment": schedule.mode_of_payment, "mode_of_payment": schedule.mode_of_payment,
"description": schedule.description, "description": schedule.description,
"payment_amount": schedule.payment_amount,
"base_payment_amount": schedule.base_payment_amount,
"outstanding": schedule.outstanding,
"paid_amount": schedule.paid_amount, "paid_amount": schedule.paid_amount,
} }
if automatically_fetch_payment_terms:
payment_schedule["payment_amount"] = flt(
grand_total * flt(payment_schedule["invoice_portion"]) / 100,
schedule.precision("payment_amount"),
)
payment_schedule["base_payment_amount"] = flt(
base_grand_total * flt(payment_schedule["invoice_portion"]) / 100,
schedule.precision("base_payment_amount"),
)
payment_schedule["outstanding"] = payment_schedule["payment_amount"]
else:
payment_schedule["base_payment_amount"] = flt(
schedule.base_payment_amount * self.get("conversion_rate"),
schedule.precision("base_payment_amount"),
)
if schedule.discount_type == "Percentage": if schedule.discount_type == "Percentage":
payment_schedule["discount_type"] = schedule.discount_type payment_schedule["discount_type"] = schedule.discount_type
payment_schedule["discount"] = schedule.discount payment_schedule["discount"] = schedule.discount