nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 09:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: only update reconcile_effect_on advance in separate acc

Browse Source
This commit is contained in:
ruthra kumar
2025-01-14 13:52:21 +05:30
parent 9fa1865cb7
commit 9ee5fcc602
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/accounts/utils.py
View File

@@ -731,20 +731,21 @@ def update_reference_in_payment_entry(
update_advance_paid = [] update_advance_paid = []
# Update Reconciliation effect date in reference # Update Reconciliation effect date in reference
if payment_entry.advance_reconciliation_takes_effect_on == "Advance Payment Date": if payment_entry.book_advance_payments_in_separate_party_account:
reconcile_on = payment_entry.posting_date if payment_entry.advance_reconciliation_takes_effect_on == "Advance Payment Date":
elif payment_entry.advance_reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance":
date_field = "posting_date"
if d.against_voucher_type in ["Sales Order", "Purchase Order"]:
date_field = "transaction_date"
reconcile_on = frappe.db.get_value(d.against_voucher_type, d.against_voucher, date_field)
if getdate(reconcile_on) < getdate(payment_entry.posting_date):
reconcile_on = payment_entry.posting_date reconcile_on = payment_entry.posting_date
elif payment_entry.advance_reconciliation_takes_effect_on == "Reconciliation Date": elif payment_entry.advance_reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance":
reconcile_on = nowdate() date_field = "posting_date"
if d.against_voucher_type in ["Sales Order", "Purchase Order"]:
date_field = "transaction_date"
reconcile_on = frappe.db.get_value(d.against_voucher_type, d.against_voucher, date_field)
reference_details.update({"reconcile_effect_on": reconcile_on}) if getdate(reconcile_on) < getdate(payment_entry.posting_date):
reconcile_on = payment_entry.posting_date
elif payment_entry.advance_reconciliation_takes_effect_on == "Reconciliation Date":
reconcile_on = nowdate()
reference_details.update({"reconcile_effect_on": reconcile_on})
if d.voucher_detail_no: if d.voucher_detail_no:
existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0] existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]