From 094e1841e023a4553ffe7bb29d18d9927bc98f12 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Mon, 14 May 2018 20:33:28 +0530 Subject: [PATCH] minor changes and fixed the conflicts --- erpnext/hr/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index 076b1452df9..213d46ea3d7 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -22,7 +22,7 @@ class EmployeeBoardingController(Document): def on_submit(self): # 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": project_name += " (" + self.job_applicant + ")" else: @@ -41,7 +41,7 @@ class EmployeeBoardingController(Document): task = frappe.get_doc({ "doctype": "Task", "project": project.name, - "subject": activity.activity_name + " for " + self.employee_name, + "subject": activity.activity_name + " : " + self.employee_name, "description": activity.description, "department": self.department, "company": self.company