From 870d0441a88ca3020bf9d796f2d6ec027dbb3ff2 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 16 Feb 2016 15:53:09 +0530 Subject: [PATCH] [minor] moved make_employee from Employee to Offer Letter --- erpnext/hr/doctype/employee/employee.py | 14 -------------- erpnext/hr/doctype/offer_letter/offer_letter.js | 11 +++++------ erpnext/hr/doctype/offer_letter/offer_letter.py | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index a8b7d8f6ad..a2b56fcb82 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -187,20 +187,6 @@ def make_salary_structure(source_name, target=None): target.make_earn_ded_table() return target - -@frappe.whitelist() -def make_employee(source_name, target_doc=None): - def set_missing_values(source, target): - target.personal_email = frappe.db.get_value("Job Applicant", source.job_applicant, "email_id") - doc = get_mapped_doc("Offer Letter", source_name, { - "Offer Letter": { - "doctype": "Employee", - "field_map": { - "applicant_name": "employee_name", - }} - }, target_doc, set_missing_values) - return doc - def validate_employee_role(doc, method): # called via User hook if "Employee" in [d.role for d in doc.get("user_roles")]: diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.js b/erpnext/hr/doctype/offer_letter/offer_letter.js index 526833a4ce..643eaa88e7 100755 --- a/erpnext/hr/doctype/offer_letter/offer_letter.js +++ b/erpnext/hr/doctype/offer_letter/offer_letter.js @@ -18,14 +18,13 @@ frappe.ui.form.on("Offer Letter", { } ); } - } + } }); - -erpnext.offer_letter.make_employee = function(frm) { +erpnext.offer_letter.make_employee = function(frm) { frappe.model.open_mapped_doc({ - method: "erpnext.hr.doctype.employee.employee.make_employee", - frm : frm + method: "erpnext.hr.doctype.offer_letter.offer_letter.make_employee", + frm: frm }); -} \ No newline at end of file +}; diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.py b/erpnext/hr/doctype/offer_letter/offer_letter.py index b3eb865f14..f3479287f9 100644 --- a/erpnext/hr/doctype/offer_letter/offer_letter.py +++ b/erpnext/hr/doctype/offer_letter/offer_letter.py @@ -4,6 +4,21 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from frappe.model.mapper import get_mapped_doc class OfferLetter(Document): pass + +@frappe.whitelist() +def make_employee(source_name, target_doc=None): + def set_missing_values(source, target): + target.personal_email = frappe.db.get_value("Job Applicant", source.job_applicant, "email_id") + doc = get_mapped_doc("Offer Letter", source_name, { + "Offer Letter": { + "doctype": "Employee", + "field_map": { + "applicant_name": "employee_name", + }} + }, target_doc, set_missing_values) + return doc +