schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into unit-price-contract-2

Browse Source
This commit is contained in:
Marica
2025-04-28 16:15:41 +05:30
committed by GitHub
parent bbe641fd77 9a7bcfe395
commit 72113dc485
116 changed files with 76874 additions and 92108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/accounts_controller.py
View File

@@ -2415,13 +2415,12 @@ class AccountsController(TransactionBase):
base_grand_total * flt(d.invoice_portion) / 100, d.precision("base_payment_amount")
)
d.outstanding = d.payment_amount
d.base_outstanding = flt(
d.payment_amount * self.get("conversion_rate"), d.precision("base_outstanding")
)
d.base_outstanding = d.base_payment_amount
elif not d.invoice_portion:
d.base_payment_amount = flt(
d.payment_amount * self.get("conversion_rate"), d.precision("base_payment_amount")
)
d.base_outstanding = d.base_payment_amount
else:
self.fetch_payment_terms_from_order(
po_or_so, doctype, grand_total, base_grand_total, automatically_fetch_payment_terms