Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(gd): Scan FY only if current_fiscal_year set

Browse Source
This commit is contained in:
Gavin D'souza 2022-06-28 15:10:59 +05:30
parent cb73528c9c
commit 3c26415b6f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/setup/doctype/global_defaults/global_defaults.py
View File

@ -30,18 +30,20 @@ class GlobalDefaults(Document):
frappe.db.set_default(key, self.get(keydict[key], "")) frappe.db.set_default(key, self.get(keydict[key], ""))
# update year start date and year end date from fiscal_year # update year start date and year end date from fiscal_year
year_start_end_date = frappe.db.sql( if self.current_fiscal_year:
"""select year_start_date, year_end_date if fiscal_year := frappe.get_all(
from `tabFiscal Year` where name=%s""", "Fiscal Year",
self.current_fiscal_year, filters={"name": self.current_fiscal_year},
) fields=["year_start_date", "year_end_date"],
if year_start_end_date: limit=1,
ysd = year_start_end_date[0][0] or "" order_by=None,
yed = year_start_end_date[0][1] or "" ):
ysd = fiscal_year[0].year_start_date or ""
yed = fiscal_year[0].year_end_date or ""
if ysd and yed: if ysd and yed:
frappe.db.set_default("year_start_date", ysd.strftime("%Y-%m-%d")) frappe.db.set_default("year_start_date", ysd.strftime("%Y-%m-%d"))
frappe.db.set_default("year_end_date", yed.strftime("%Y-%m-%d")) frappe.db.set_default("year_end_date", yed.strftime("%Y-%m-%d"))
# enable default currency # enable default currency
if self.default_currency: if self.default_currency:
@ -50,7 +52,6 @@ class GlobalDefaults(Document):
self.toggle_rounded_total() self.toggle_rounded_total()
self.toggle_in_words() self.toggle_in_words()
# clear cache
frappe.clear_cache() frappe.clear_cache()
@frappe.whitelist() @frappe.whitelist()