nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues 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
parent 1dd6329e5b cb6430575b
commit 47d8c52281
2 changed files with 965 additions and 965 deletions
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): 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