From 620252cadbe03e373355468a9a9e673d77bcba3f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 15 Feb 2016 12:03:04 +0530 Subject: [PATCH] [fix] validate Fiscal Year in Trial Balance --- .../accounts/report/trial_balance/trial_balance.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index f0524c0302..822702b2e5 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -17,11 +17,14 @@ def execute(filters=None): def validate_filters(filters): if not filters.fiscal_year: - frappe.throw(_("Fiscal Year {0} is required")) - filters.year_start_date, filters.year_end_date = frappe.db.get_value("Fiscal Year", filters.fiscal_year, - ["year_start_date", "year_end_date"]) - filters.year_start_date = getdate(filters.year_start_date) - filters.year_end_date = getdate(filters.year_end_date) + frappe.throw(_("Fiscal Year {0} is required").format(filters.fiscal_year)) + + fiscal_year = frappe.db.get_value("Fiscal Year", filters.fiscal_year, ["year_start_date", "year_end_date"], as_dict=True) + if not fiscal_year: + frappe.throw(_("Fiscal Year {0} does not exist").format(filters.fiscal_year)) + else: + filters.year_start_date = getdate(fiscal_year.year_start_date) + filters.year_end_date = getdate(fiscal_year.year_end_date) if not filters.from_date: filters.from_date = filters.year_start_date