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

fix: Multi invoice reconciliation

Browse Source
This commit is contained in:
Deepesh Garg
2023-06-27 18:11:47 +05:30
parent 62c3ca8286
commit f2edc91dc6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@@ -1019,14 +1019,11 @@ class PaymentEntry(AccountsController):
gl_entries.append(gle) gl_entries.append(gle)
def make_advance_gl_entries(self, against_voucher_type=None, against_voucher=None, cancel=0): def make_advance_gl_entries(self, cancel=0):
if self.book_advance_payments_in_separate_party_account: if self.book_advance_payments_in_separate_party_account:
gl_entries = [] gl_entries = []
for d in self.get("references"): for d in self.get("references"):
if d.reference_doctype in ("Sales Invoice", "Purchase Invoice"): if d.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
if not (against_voucher_type and against_voucher) or (
d.reference_doctype == against_voucher_type and d.reference_name == against_voucher
):
self.make_invoice_liability_entry(gl_entries, d) self.make_invoice_liability_entry(gl_entries, d)
if cancel: if cancel:

2
erpnext/accounts/utils.py
View File

@@ -476,7 +476,7 @@ def reconcile_against_document(args, skip_ref_details_update_for_pe=False): # n
create_payment_ledger_entry(gl_map, update_outstanding="No", cancel=0, adv_adj=1) create_payment_ledger_entry(gl_map, update_outstanding="No", cancel=0, adv_adj=1)
if voucher_type == "Payment Entry": if voucher_type == "Payment Entry":
doc.make_advance_gl_entries(entry.against_voucher_type, entry.against_voucher) doc.make_advance_gl_entries()
# Only update outstanding for newly linked vouchers # Only update outstanding for newly linked vouchers
for entry in entries: for entry in entries: