From 2cb2bdeb002a5cf24a68c7ed5b42a11d6f818d8c Mon Sep 17 00:00:00 2001 From: CoiledCoder Date: Mon, 25 Aug 2025 03:35:55 +0000 Subject: [PATCH] refactor: centralize exchange rate revaluation scheduling logic - Introduced a private helper `_auto_create_exchange_rate_revaluation_for(frequency)` - Removed duplicate logic across daily, weekly, and monthly ERR functions - Prevents future copy-paste bugs - Keeps existing behavior unchanged (cherry picked from commit 15040a362d244c6eb5aac4ae0c330ee836399ef0) --- erpnext/accounts/utils.py | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 11df188832f..32d4657ea7c 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -1743,40 +1743,38 @@ def create_err_and_its_journals(companies: list | None = None) -> None: jv and frappe.get_doc("Journal Entry", jv).submit() +def _auto_create_exchange_rate_revaluation_for(frequency: str) -> None: + """ + Internal helper to avoid code duplication and typos. + Fetches companies by frequency and triggers ERR. + """ + companies = frappe.db.get_all( + "Company", + filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": frequency}, + fields=["name", "submit_err_jv"], + ) + create_err_and_its_journals(companies) + + def auto_create_exchange_rate_revaluation_daily() -> None: """ Executed by background job """ - companies = frappe.db.get_all( - "Company", - filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": "Daily"}, - fields=["name", "submit_err_jv"], - ) - create_err_and_its_journals(companies) + _auto_create_exchange_rate_revaluation_for("Daily") def auto_create_exchange_rate_revaluation_weekly() -> None: """ Executed by background job """ - companies = frappe.db.get_all( - "Company", - filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": "Weekly"}, - fields=["name", "submit_err_jv"], - ) - create_err_and_its_journals(companies) + _auto_create_exchange_rate_revaluation_for("Weekly") def auto_create_exchange_rate_revaluation_monthly() -> None: """ Executed by background job """ - companies = frappe.db.get_all( - "Company", - filters={"auto_exchange_rate_revaluation": 1, "auto_err_frequency": "Monthly"}, - fields=["name", "submit_err_jv"], - ) - create_err_and_its_journals(companies) + _auto_create_exchange_rate_revaluation_for("Monthly") def get_payment_ledger_entries(gl_entries, cancel=0):