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

Merge branch 'neilLasrado-develop' into develop

Browse Source
This commit is contained in:
Anand Doshi 2016-04-08 16:36:35 +05:30
commit 47d8c52281
2 changed files with 965 additions and 965 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

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