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

Merge pull request #14225 from frappe/manassolanki-patch-8

Browse Source 
Update employee.py
This commit is contained in:
Manas Solanki 2018-05-25 14:47:49 +05:30 committed by GitHub
commit d09a6c9ccb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ class Employee(NestedSet):
def validate_onboarding_process(self): def validate_onboarding_process(self):
employee_onboarding = frappe.get_all("Employee Onboarding", employee_onboarding = frappe.get_all("Employee Onboarding",
filters={"job_applicant": self.job_applicant, "docstatus": 1, "status": ("!=", "Completed")}) filters={"job_applicant": self.job_applicant, "docstatus": 1, "boarding_status": ("!=", "Completed")})
if employee_onboarding: if employee_onboarding:
doc = frappe.get_doc("Employee Onboarding", employee_onboarding[0].name) doc = frappe.get_doc("Employee Onboarding", employee_onboarding[0].name)
doc.validate_employee_creation() doc.validate_employee_creation()
@ -341,4 +341,4 @@ def get_children(doctype, parent=None, company=None, is_root=False, is_tree=Fals
def on_doctype_update(): def on_doctype_update():
frappe.db.add_index("Employee", ["lft", "rgt"]) frappe.db.add_index("Employee", ["lft", "rgt"])