Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: reconcile invoice against credit note

Browse Source
This commit is contained in:
Devin Slauenwhite 2023-06-07 15:55:37 -04:00
parent 7973951c37
commit 54935438e1
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@ -316,6 +316,7 @@ class PaymentReconciliation(Document):
entry_list = [] entry_list = []
dr_or_cr_notes = [] dr_or_cr_notes = []
difference_entries = []
for row in self.get("allocation"): for row in self.get("allocation"):
reconciled_entry = [] reconciled_entry = []
if row.invoice_number and row.allocated_amount: if row.invoice_number and row.allocated_amount:
@ -328,13 +329,15 @@ class PaymentReconciliation(Document):
reconciled_entry.append(payment_details) reconciled_entry.append(payment_details)
if payment_details.difference_amount: if payment_details.difference_amount:
self.make_difference_entry(payment_details) difference_entries.append(
self.make_difference_entry(payment_details, do_not_save_and_submit=bool(dr_or_cr_notes))
)
if entry_list: if entry_list:
reconcile_against_document(entry_list, skip_ref_details_update_for_pe) reconcile_against_document(entry_list, skip_ref_details_update_for_pe)
if dr_or_cr_notes: if dr_or_cr_notes:
reconcile_dr_cr_note(dr_or_cr_notes, self.company) reconcile_dr_cr_note(dr_or_cr_notes, difference_entries, self.company)
@frappe.whitelist() @frappe.whitelist()
def reconcile(self): def reconcile(self):
@ -362,7 +365,7 @@ class PaymentReconciliation(Document):
self.get_unreconciled_entries() self.get_unreconciled_entries()
def make_difference_entry(self, row): def make_difference_entry(self, row, do_not_save_and_submit=False):
journal_entry = frappe.new_doc("Journal Entry") journal_entry = frappe.new_doc("Journal Entry")
journal_entry.voucher_type = "Exchange Gain Or Loss" journal_entry.voucher_type = "Exchange Gain Or Loss"
journal_entry.company = self.company journal_entry.company = self.company
@ -410,9 +413,12 @@ class PaymentReconciliation(Document):
journal_entry.append("accounts", journal_account) journal_entry.append("accounts", journal_account)
if not do_not_save_and_submit:
journal_entry.save() journal_entry.save()
journal_entry.submit() journal_entry.submit()
return journal_entry
def get_payment_details(self, row, dr_or_cr): def get_payment_details(self, row, dr_or_cr):
return frappe._dict( return frappe._dict(
{ {
@ -577,7 +583,14 @@ class PaymentReconciliation(Document):
return condition return condition
def reconcile_dr_cr_note(dr_cr_notes, company): def reconcile_dr_cr_note(dr_cr_notes, difference_entries, company):
def find_difference_entry(voucher_type, voucher_no):
for jv in difference_entries:
accounts = iter(jv.accounts)
for account in accounts:
if account.reference_type == voucher_type and account.reference_name == voucher_no:
return next(accounts)
for inv in dr_cr_notes: for inv in dr_cr_notes:
voucher_type = "Credit Note" if inv.voucher_type == "Sales Invoice" else "Debit Note" voucher_type = "Credit Note" if inv.voucher_type == "Sales Invoice" else "Debit Note"
@ -622,5 +635,9 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
], ],
} }
) )
if difference_entry := find_difference_entry(inv.against_voucher_type, inv.against_voucher):
jv.append("accounts", difference_entry)
jv.flags.ignore_mandatory = True jv.flags.ignore_mandatory = True
jv.submit() jv.submit()