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

minor changes and fixed the conflicts

Browse Source
This commit is contained in:
Manas Solanki 2018-05-14 20:33:28 +05:30
parent b698846c30
commit 094e1841e0
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/utils.py
View File

@ -22,7 +22,7 @@ class EmployeeBoardingController(Document):
def on_submit(self): def on_submit(self):
# create the project for the given employee onboarding # create the project for the given employee onboarding
project_name = self.doctype + " for " + self.employee_name project_name = _(self.doctype) + " : " + self.employee_name
if self.doctype == "Employee Onboarding": if self.doctype == "Employee Onboarding":
project_name += " (" + self.job_applicant + ")" project_name += " (" + self.job_applicant + ")"
else: else:
@ -41,7 +41,7 @@ class EmployeeBoardingController(Document):
task = frappe.get_doc({ task = frappe.get_doc({
"doctype": "Task", "doctype": "Task",
"project": project.name, "project": project.name,
"subject": activity.activity_name + " for " + self.employee_name, "subject": activity.activity_name + " : " + self.employee_name,
"description": activity.description, "description": activity.description,
"department": self.department, "department": self.department,
"company": self.company "company": self.company