nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 03:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: attribute error in payment entry

Browse Source 
(cherry picked from commit dc841fe661)
This commit is contained in:
ljain112
2025-07-26 12:56:10 +05:30
committed by Mergify
parent ec9747cc99
commit 3739e2ca5a
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1487,13 +1487,14 @@ class PaymentEntry(AccountsController):
"voucher_no": self.name, "voucher_no": self.name,
"voucher_detail_no": invoice.name, "voucher_detail_no": invoice.name,
} }
if invoice.reconcile_effect_on: if invoice.reconcile_effect_on:
posting_date = invoice.reconcile_effect_on posting_date = invoice.reconcile_effect_on
else: else:
# For backwards compatibility # For backwards compatibility
# Supporting reposting on payment entries reconciled before select field introduction # Supporting reposting on payment entries reconciled before select field introduction
posting_date = get_reconciliation_effect_date(invoice, self.company, self.posting_date) posting_date = get_reconciliation_effect_date(
invoice.reference_doctype, invoice.reference_name, self.company, self.posting_date
)
frappe.db.set_value("Payment Entry Reference", invoice.name, "reconcile_effect_on", posting_date) frappe.db.set_value("Payment Entry Reference", invoice.name, "reconcile_effect_on", posting_date)
dr_or_cr, account = self.get_dr_and_account_for_advances(invoice) dr_or_cr, account = self.get_dr_and_account_for_advances(invoice)

15
erpnext/accounts/utils.py
View File

@@ -717,7 +717,9 @@ def update_reference_in_payment_entry(
# Update Reconciliation effect date in reference # Update Reconciliation effect date in reference
if payment_entry.book_advance_payments_in_separate_party_account: if payment_entry.book_advance_payments_in_separate_party_account:
reconcile_on = get_reconciliation_effect_date(d, payment_entry.company, payment_entry.posting_date) reconcile_on = get_reconciliation_effect_date(
d.against_voucher_type, d.against_voucher, payment_entry.company, payment_entry.posting_date
)
reference_details.update({"reconcile_effect_on": reconcile_on}) reference_details.update({"reconcile_effect_on": reconcile_on})
if d.voucher_detail_no: if d.voucher_detail_no:
@@ -771,20 +773,21 @@ def update_reference_in_payment_entry(
return row, update_advance_paid return row, update_advance_paid
def get_reconciliation_effect_date(reference, company, posting_date): def get_reconciliation_effect_date(against_voucher_type, against_voucher, company, posting_date):
reconciliation_takes_effect_on = frappe.get_cached_value( reconciliation_takes_effect_on = frappe.get_cached_value(
"Company", company, "reconciliation_takes_effect_on" "Company", company, "reconciliation_takes_effect_on"
) )
# default
reconcile_on = posting_date
if reconciliation_takes_effect_on == "Advance Payment Date": if reconciliation_takes_effect_on == "Advance Payment Date":
reconcile_on = posting_date reconcile_on = posting_date
elif reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance": elif reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance":
date_field = "posting_date" date_field = "posting_date"
if reference.against_voucher_type in ["Sales Order", "Purchase Order"]: if against_voucher_type in ["Sales Order", "Purchase Order"]:
date_field = "transaction_date" date_field = "transaction_date"
reconcile_on = frappe.db.get_value( reconcile_on = frappe.db.get_value(against_voucher_type, against_voucher, date_field)
reference.against_voucher_type, reference.against_voucher, date_field
)
if getdate(reconcile_on) < getdate(posting_date): if getdate(reconcile_on) < getdate(posting_date):
reconcile_on = posting_date reconcile_on = posting_date
elif reconciliation_takes_effect_on == "Reconciliation Date": elif reconciliation_takes_effect_on == "Reconciliation Date":