From 985fb5dfdc2cae524b77694fc73859667907449b Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sat, 8 Mar 2025 22:22:12 +0530 Subject: [PATCH] chore: resolve conflicts --- .../recalculate_amount_difference_field.py | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/erpnext/patches/v15_0/recalculate_amount_difference_field.py b/erpnext/patches/v15_0/recalculate_amount_difference_field.py index 0f8083d8b14..2891ac16c44 100644 --- a/erpnext/patches/v15_0/recalculate_amount_difference_field.py +++ b/erpnext/patches/v15_0/recalculate_amount_difference_field.py @@ -62,15 +62,6 @@ def execute(): ): posting_date = period_closing_voucher[0].period_end_date -<<<<<<< HEAD - try: - fiscal_year = get_fiscal_year(frappe.utils.datetime.date.today()) - except Exception: - return - else: - if fiscal_year and getdate(fiscal_year[1]) > getdate(posting_date): - posting_date = fiscal_year[1] -======= acc_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto") if acc_frozen_upto and getdate(acc_frozen_upto) > getdate(posting_date): posting_date = acc_frozen_upto @@ -79,10 +70,14 @@ def execute(): if stock_frozen_upto and getdate(stock_frozen_upto) > getdate(posting_date): posting_date = stock_frozen_upto - fiscal_year = get_fiscal_year(frappe.utils.datetime.date.today(), raise_on_missing=False) - if fiscal_year and getdate(fiscal_year[1]) > getdate(posting_date): - posting_date = fiscal_year[1] ->>>>>>> 696f931678 (fix: consider account freeze date in recalculate_amount_difference_field patch) + try: + fiscal_year = get_fiscal_year(frappe.utils.datetime.date.today()) + except Exception: + return + else: + if fiscal_year and getdate(fiscal_year[1]) > getdate(posting_date): + posting_date = fiscal_year[1] + query = query.where(parent.posting_date > posting_date) if result := query.run(as_dict=True):