nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: simplify repeated condition checks

Browse Source 
(cherry picked from commit 7bc62cedc6)
This commit is contained in:
Bhavan23
2025-05-08 16:32:30 +05:30
committed by ruthra kumar
parent 25fabda40a
commit bafd9ed15e
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1492,15 +1492,12 @@ class PaymentEntry(AccountsController):
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
if ( reconciliation_takes_effect_on = frappe.get_cached_value(
frappe.get_cached_value("Company", self.company, "reconciliation_takes_effect_on") "Company", self.company, "reconciliation_takes_effect_on"
== "Advance Payment Date" )
): if reconciliation_takes_effect_on == "Advance Payment Date":
posting_date = self.posting_date posting_date = self.posting_date
elif ( elif reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance":
frappe.get_cached_value("Company", self.company, "reconciliation_takes_effect_on")
== "Oldest Of Invoice Or Advance"
):
date_field = "posting_date" date_field = "posting_date"
if invoice.reference_doctype in ["Sales Order", "Purchase Order"]: if invoice.reference_doctype in ["Sales Order", "Purchase Order"]:
date_field = "transaction_date" date_field = "transaction_date"
@@ -1510,10 +1507,7 @@ class PaymentEntry(AccountsController):
if getdate(posting_date) < getdate(self.posting_date): if getdate(posting_date) < getdate(self.posting_date):
posting_date = self.posting_date posting_date = self.posting_date
elif ( elif reconciliation_takes_effect_on == "Reconciliation Date":
frappe.get_cached_value("Company", self.company, "reconciliation_takes_effect_on")
== "Reconciliation Date"
):
posting_date = nowdate() posting_date = nowdate()
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)

18
erpnext/accounts/utils.py
View File

@@ -713,16 +713,13 @@ def update_reference_in_payment_entry(
update_advance_paid = [] update_advance_paid = []
# Update Reconciliation effect date in reference # Update Reconciliation effect date in reference
reconciliation_takes_effect_on = frappe.get_cached_value(
"Company", payment_entry.company, "reconciliation_takes_effect_on"
)
if payment_entry.book_advance_payments_in_separate_party_account: if payment_entry.book_advance_payments_in_separate_party_account:
if ( if reconciliation_takes_effect_on == "Advance Payment Date":
frappe.get_cached_value("Company", payment_entry.company, "reconciliation_takes_effect_on")
== "Advance Payment Date"
):
reconcile_on = payment_entry.posting_date reconcile_on = payment_entry.posting_date
elif ( elif reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance":
frappe.get_cached_value("Company", payment_entry.company, "reconciliation_takes_effect_on")
== "Oldest Of Invoice Or Advance"
):
date_field = "posting_date" date_field = "posting_date"
if d.against_voucher_type in ["Sales Order", "Purchase Order"]: if d.against_voucher_type in ["Sales Order", "Purchase Order"]:
date_field = "transaction_date" date_field = "transaction_date"
@@ -730,10 +727,7 @@ def update_reference_in_payment_entry(
if getdate(reconcile_on) < getdate(payment_entry.posting_date): if getdate(reconcile_on) < getdate(payment_entry.posting_date):
reconcile_on = payment_entry.posting_date reconcile_on = payment_entry.posting_date
elif ( elif reconciliation_takes_effect_on == "Reconciliation Date":
frappe.get_cached_value("Company", payment_entry.company, "reconciliation_takes_effect_on")
== "Reconciliation Date"
):
reconcile_on = nowdate() reconcile_on = nowdate()
reference_details.update({"reconcile_effect_on": reconcile_on}) reference_details.update({"reconcile_effect_on": reconcile_on})