From c1e10264867f04b98b9bd696cc6e50b7afa54b56 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 4 Jan 2016 12:20:25 +0530 Subject: [PATCH] [fix] validate 'cannot change fiscal year dates' only if not new --- .../accounts/doctype/fiscal_year/fiscal_year.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py index 4a2166ce4b..9456924a87 100644 --- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py @@ -20,14 +20,15 @@ class FiscalYear(Document): msgprint(_("{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.").format(self.name)) def validate(self): - year_start_end_dates = frappe.db.sql("""select year_start_date, year_end_date - from `tabFiscal Year` where name=%s""", (self.name)) - self.validate_dates() - if year_start_end_dates: - if getdate(self.year_start_date) != year_start_end_dates[0][0] or getdate(self.year_end_date) != year_start_end_dates[0][1]: - frappe.throw(_("Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.")) + if not self.is_new(): + year_start_end_dates = frappe.db.sql("""select year_start_date, year_end_date + from `tabFiscal Year` where name=%s""", (self.name)) + + if year_start_end_dates: + if getdate(self.year_start_date) != year_start_end_dates[0][0] or getdate(self.year_end_date) != year_start_end_dates[0][1]: + frappe.throw(_("Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.")) def validate_dates(self): if getdate(self.year_start_date) > getdate(self.year_end_date): @@ -62,7 +63,7 @@ def auto_create_fiscal_year(): start_year = cstr(new_fy.year_start_date.year) end_year = cstr(new_fy.year_end_date.year) new_fy.year = start_year if start_year==end_year else (start_year + "-" + end_year) - + new_fy.insert(ignore_permissions=True) except frappe.NameError: pass