schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: annual income and expenses in digest

Browse Source 
(cherry picked from commit 52305e3000)

# Conflicts:
#	erpnext/accounts/utils.py
This commit is contained in:
Gursheen Anand
2023-11-22 18:38:33 +05:30
committed by Mergify
parent 7601861f21
commit 7dce68bdcc
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/utils.py
View File

@@ -179,6 +179,11 @@ def get_balance_on(
in_account_currency=True,
cost_center=None,
ignore_account_permission=False,
<<<<<<< HEAD
=======
account_type=None,
start_date=None,
>>>>>>> 52305e3000 (fix: annual income and expenses in digest)
):
if not account and frappe.form_dict.get("account"):
account = frappe.form_dict.get("account")
@@ -192,6 +197,8 @@ def get_balance_on(
cost_center = frappe.form_dict.get("cost_center")
cond = ["is_cancelled=0"]
if start_date:
cond.append("posting_date >= %s" % frappe.db.escape(cstr(start_date)))
if date:
cond.append("posting_date <= %s" % frappe.db.escape(cstr(date)))
else:

3
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -382,9 +382,10 @@ class EmailDigest(Document):
"""Get income to date"""
balance = 0.0
count = 0
fy_start_date = get_fiscal_year().get("year_start_date")
for account in self.get_root_type_accounts(root_type):
balance += get_balance_on(account, date=self.future_to_date)
balance += get_balance_on(account, date=self.future_to_date, start_date=fy_start_date)
count += get_count_on(account, fieldname, date=self.future_to_date)
if fieldname == "income":