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

Merge branch 'develop' into hr-separation

Browse Source
This commit is contained in:
Rucha Mahabal
2022-07-07 13:46:54 +05:30
parent 694d35e1c4 0b5101d9c7
commit ef02e58859
192 changed files with 517 additions and 73374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/utils.py
View File

@@ -856,8 +856,8 @@ def get_outstanding_invoices(
)
for d in invoice_list:
payment_amount = d.invoice_amount - d.outstanding
outstanding_amount = d.outstanding
payment_amount = d.invoice_amount_in_account_currency - d.outstanding_in_account_currency
outstanding_amount = d.outstanding_in_account_currency
if outstanding_amount > 0.5 / (10**precision):
if (
min_outstanding
@@ -873,7 +873,7 @@ def get_outstanding_invoices(
"voucher_no": d.voucher_no,
"voucher_type": d.voucher_type,
"posting_date": d.posting_date,
"invoice_amount": flt(d.invoice_amount),
"invoice_amount": flt(d.invoice_amount_in_account_currency),
"payment_amount": payment_amount,
"outstanding_amount": outstanding_amount,
"due_date": d.due_date,
@@ -1413,7 +1413,7 @@ def create_payment_ledger_entry(
if gle.against_voucher_type
else gle.voucher_type,
"against_voucher_no": gle.against_voucher if gle.against_voucher else gle.voucher_no,
"currency": gle.currency,
"account_currency": gle.account_currency,
"amount": dr_or_cr,
"amount_in_account_currency": dr_or_cr_account_currency,
"delinked": True if cancel else False,