nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 09:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup

Browse Source
This commit is contained in:
Deepesh Garg
2021-06-02 13:26:27 +05:30
parent b3ed807b70 865663857c
commit ca34eec2d6
73 changed files with 2030 additions and 2931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,7 +249,7 @@ class EmailDigest(Document):
card = cache.get(cache_key)
if card:
card = eval(card)
card = frappe.safe_eval(card)
else:
card = frappe._dict(getattr(self, "get_" + key)())
@@ -808,7 +808,6 @@ def get_incomes_expenses_for_period(account, from_date, to_date):
val = balance_on_to_date - balance_before_from_date
else:
last_year_closing_balance = get_balance_on(account, date=fy_start_date - timedelta(days=1))
print(fy_start_date - timedelta(days=1), last_year_closing_balance)
val = balance_on_to_date + (last_year_closing_balance - balance_before_from_date)
return val
@@ -837,4 +836,4 @@ def get_future_date_for_calendaer_event(frequency):
elif frequency == "Monthly":
to_date = add_to_date(from_date, months=1)
return from_date, to_date
return from_date, to_date