CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-26 14:41:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: consider account freeze date in recalculate_amount_difference_field patch

Browse Source 
(cherry picked from commit 696f931678)

# Conflicts:
#	erpnext/patches/v15_0/recalculate_amount_difference_field.py
This commit is contained in:
Mihir Kandoi
2025-03-08 11:31:33 +05:30
committed by Mergify
parent 2bf910a786
commit 8b67527900
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/patches/v15_0/recalculate_amount_difference_field.py
View File

@@ -62,6 +62,7 @@ def execute():
): ):
posting_date = period_closing_voucher[0].period_end_date posting_date = period_closing_voucher[0].period_end_date
<<<<<<< HEAD
try: try:
fiscal_year = get_fiscal_year(frappe.utils.datetime.date.today()) fiscal_year = get_fiscal_year(frappe.utils.datetime.date.today())
except Exception: except Exception:
@@ -69,6 +70,15 @@ def execute():
else: else:
if fiscal_year and getdate(fiscal_year[1]) > getdate(posting_date): if fiscal_year and getdate(fiscal_year[1]) > getdate(posting_date):
posting_date = fiscal_year[1] 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
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)
query = query.where(parent.posting_date > posting_date) query = query.where(parent.posting_date > posting_date)
if result := query.run(as_dict=True): if result := query.run(as_dict=True):