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

Fixed validation message for disabled employee

Browse Source
This commit is contained in:
Neil Trini Lasrado 2016-03-31 16:52:32 +05:30 committed by Anand Doshi
parent 1dd6329e5b
commit cb6430575b
2 changed files with 965 additions and 965 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/doctype/lead/lead.json
View File

@ -233,7 +233,7 @@
"in_list_view": 0, "in_list_view": 0,
"label": "From Customer", "label": "From Customer",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 1,
"oldfieldname": "customer", "oldfieldname": "customer",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Customer", "options": "Customer",
@ -909,7 +909,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-04-04 07:23:47.804914", "modified": "2016-04-04 07:23:47.804915",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Lead", "name": "Lead",

10
erpnext/hr/doctype/employee/employee.py
View File

@ -133,11 +133,11 @@ class Employee(Document):
def validate_for_enabled_user_id(self): def validate_for_enabled_user_id(self):
if not self.status == 'Active': if not self.status == 'Active':
return return
enabled = frappe.db.sql("""select name from `tabUser` where enabled = frappe.db.get_value("User", self.user_id, "enabled")
name=%s and enabled=1""", self.user_id) if enabled is None:
if not enabled: frappe.throw(_("User {0} does not exist").format(self.user_id))
throw(_("User {0} is disabled").format( if enabled == 0:
self.user_id), EmployeeUserDisabledError) frappe.throw(_("User {0} is disabled").format(self.user_id), EmployeeUserDisabledError)
def validate_duplicate_user_id(self): def validate_duplicate_user_id(self):
employee = frappe.db.sql_list("""select name from `tabEmployee` where employee = frappe.db.sql_list("""select name from `tabEmployee` where