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

fix update user properties patch

Browse Source
This commit is contained in:
Pratik Vyas 2014-05-10 22:16:39 +05:30
parent 34e36a233c
commit 95f558e7bc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,8 @@ class Employee(Document):
throw(_("Please enter relieving date.")) throw(_("Please enter relieving date."))
def validate_for_enabled_user_id(self): def validate_for_enabled_user_id(self):
if not self.status == 'Active':
return
enabled = frappe.db.sql("""select name from `tabUser` where enabled = frappe.db.sql("""select name from `tabUser` where
name=%s and enabled=1""", self.user_id) name=%s and enabled=1""", self.user_id)
if not enabled: if not enabled:

9
erpnext/patches/4_0/update_user_properties.py
View File

@ -8,6 +8,7 @@ import frappe.defaults
def execute(): def execute():
frappe.reload_doc("core", "doctype", "docperm") frappe.reload_doc("core", "doctype", "docperm")
frappe.reload_doc("hr", "doctype", "employee")
update_user_properties() update_user_properties()
update_user_match() update_user_match()
add_employee_restrictions_to_leave_approver() add_employee_restrictions_to_leave_approver()
@ -82,13 +83,11 @@ def add_employee_restrictions_to_leave_approver():
# add Employee restrictions (in on_update method) # add Employee restrictions (in on_update method)
for employee in frappe.db.sql_list("""select name from `tabEmployee` for employee in frappe.db.sql_list("""select name from `tabEmployee`
where exists(select leave_approver from `tabEmployee Leave Approver` where (exists(select leave_approver from `tabEmployee Leave Approver`
where `tabEmployee Leave Approver`.parent=`tabEmployee`.name) where `tabEmployee Leave Approver`.parent=`tabEmployee`.name)
or ifnull(`reports_to`, '')!=''"""): or ifnull(`reports_to`, '')!='') and docstatus<2 and status='Active'"""):
emp = frappe.get_doc("Employee", employee) frappe.get_doc("Employee", employee).save()
emp.ignore_links = True
emp.save()
def update_permissions(): def update_permissions():
# clear match conditions other than owner # clear match conditions other than owner