From 0718292bfaddf490564d0fd3d9b723bbf8a5797e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 May 2015 10:28:08 +0530 Subject: [PATCH] [minor] naming series not set message --- erpnext/setup/doctype/naming_series/naming_series.py | 4 +++- erpnext/support/doctype/issue/issue.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index d97ce7441b..9af629500c 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -173,4 +173,6 @@ def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True def get_default_naming_series(doctype): naming_series = frappe.get_meta(doctype).get_field("naming_series").options or "" naming_series = naming_series.split("\n") - return naming_series[0] or naming_series[1] + out = naming_series[0] or (naming_series[1] if len(naming_series) > 1 else None) + if out: + frappe.throw(_("Please set Naming Series for {0} via Setup > Settings > Naming Series").format(doctype)) diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py index 51322e6a0f..2555bfaffd 100644 --- a/erpnext/support/doctype/issue/issue.py +++ b/erpnext/support/doctype/issue/issue.py @@ -37,7 +37,6 @@ class Issue(Document): if values: self.contact, self.customer = values - if not self.company: self.company = frappe.db.get_value("Lead", self.lead, "company") or \ frappe.db.get_default("company")