From add6bf35a323b978ccfa45cf980e937117f75734 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Fri, 4 Jan 2019 11:36:30 +0530 Subject: [PATCH 1/4] Fix: Employee Onboarding/Seperation task Assignment --- erpnext/hr/utils.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index f35eb5919e9..50580064317 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -54,10 +54,17 @@ class EmployeeBoardingController(Document): where parenttype='User' and role=%s''', activity.role) users = users + user_list + if "Administrator" in users: + users.remove("Administrator") + + # assign the task the users if users: + print(users) self.assign_task_to_users(task, set(users)) + users = [] + def assign_task_to_users(self, task, users): for user in users: args = { From bb6a7eb9d3b9e901c407b62ced4e1ff43973c43d Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Fri, 4 Jan 2019 12:32:51 +0530 Subject: [PATCH 2/4] refractor --- erpnext/hr/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index 50580064317..eb550375667 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -60,7 +60,6 @@ class EmployeeBoardingController(Document): # assign the task the users if users: - print(users) self.assign_task_to_users(task, set(users)) users = [] From 23a1b9895791edb3956e42274521417c6805fd3a Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Mon, 7 Jan 2019 13:10:18 +0530 Subject: [PATCH 3/4] fix: remove unnecessary code --- erpnext/hr/utils.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index eb550375667..2dc0ab0216b 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -62,8 +62,6 @@ class EmployeeBoardingController(Document): if users: self.assign_task_to_users(task, set(users)) - users = [] - def assign_task_to_users(self, task, users): for user in users: args = { From 3c74266763f2c7b1e85404a306f81fd3a798f746 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Mon, 7 Jan 2019 13:13:16 +0530 Subject: [PATCH 4/4] fix: PEP8 recommended whitspace --- erpnext/hr/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index 2dc0ab0216b..02262012f1c 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -57,7 +57,6 @@ class EmployeeBoardingController(Document): if "Administrator" in users: users.remove("Administrator") - # assign the task the users if users: self.assign_task_to_users(task, set(users))