Skip to content

Commit

Permalink
fix(gd): Scan FY only if current_fiscal_year set
Browse files Browse the repository at this point in the history
  • Loading branch information
gavindsouza committed Jul 25, 2022
1 parent 24af872 commit 6c20fc3
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions erpnext/setup/doctype/global_defaults/global_defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,20 @@ def on_update(self):
frappe.db.set_default(key, self.get(keydict[key], ""))

# update year start date and year end date from fiscal_year
year_start_end_date = frappe.db.sql(
"""select year_start_date, year_end_date
from `tabFiscal Year` where name=%s""",
self.current_fiscal_year,
)
if year_start_end_date:
ysd = year_start_end_date[0][0] or ""
yed = year_start_end_date[0][1] or ""

if ysd and yed:
frappe.db.set_default("year_start_date", ysd.strftime("%Y-%m-%d"))
frappe.db.set_default("year_end_date", yed.strftime("%Y-%m-%d"))
if self.current_fiscal_year:
if fiscal_year := frappe.get_all(
"Fiscal Year",
filters={"name": self.current_fiscal_year},
fields=["year_start_date", "year_end_date"],
limit=1,
order_by=None,
):
ysd = fiscal_year[0].year_start_date or ""
yed = fiscal_year[0].year_end_date or ""

if ysd and yed:
frappe.db.set_default("year_start_date", ysd.strftime("%Y-%m-%d"))
frappe.db.set_default("year_end_date", yed.strftime("%Y-%m-%d"))

# enable default currency
if self.default_currency:
Expand All @@ -50,7 +52,6 @@ def on_update(self):
self.toggle_rounded_total()
self.toggle_in_words()

# clear cache
frappe.clear_cache()

@frappe.whitelist()
Expand Down

0 comments on commit 6c20fc3

Please sign in to comment.