diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.js b/erpnext/hr/doctype/offer_letter/offer_letter.js index 9b057a2a40..7979efdfa7 100644 --- a/erpnext/hr/doctype/offer_letter/offer_letter.js +++ b/erpnext/hr/doctype/offer_letter/offer_letter.js @@ -11,4 +11,16 @@ cur_frm.cscript.job_applicant = function() { } } }); +} + +cur_frm.cscript.terms = function() { + frappe.call({ + doc: cur_frm.doc, + method: "set_view_terms", + callback: function(r) { + if(!r.exe){ + refresh_field("view_terms"); + } + } + }); } \ No newline at end of file diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.json b/erpnext/hr/doctype/offer_letter/offer_letter.json index 7d7f27a81c..7e2baa3d07 100644 --- a/erpnext/hr/doctype/offer_letter/offer_letter.json +++ b/erpnext/hr/doctype/offer_letter/offer_letter.json @@ -153,6 +153,20 @@ "permlevel": 0, "precision": "" }, + { + "fieldname": "company", + "fieldtype": "Link", + "label": "Company", + "options": "Company", + "permlevel": 0, + "precision": "" + }, + { + "fieldname": "section_break_14", + "fieldtype": "Section Break", + "permlevel": 0, + "precision": "" + }, { "allow_on_submit": 0, "fieldname": "terms", @@ -173,6 +187,14 @@ "search_index": 0, "set_only_once": 0 }, + { + "fieldname": "view_terms", + "fieldtype": "Text Editor", + "label": "View Terms", + "options": "view_terms", + "permlevel": 0, + "precision": "" + }, { "fieldname": "amended_from", "fieldtype": "Link", @@ -191,7 +213,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2015-03-04 15:51:12.341615", + "modified": "2015-03-04 16:30:16.012258", "modified_by": "Administrator", "module": "HR", "name": "Offer Letter", @@ -229,5 +251,5 @@ "read_only_onload": 0, "sort_field": "modified", "sort_order": "DESC", - "title_field": "job_applicant" + "title_field": "applicant_name" } \ 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 e41efbec77..ddf945934f 100644 --- a/erpnext/hr/doctype/offer_letter/offer_letter.py +++ b/erpnext/hr/doctype/offer_letter/offer_letter.py @@ -11,3 +11,6 @@ class OfferLetter(Document): def set_applicant_name(self): self.applicant_name = frappe.db.get_value("Job Applicant", self.job_applicant, "applicant_name") + + def set_view_terms(self): + self.view_terms = frappe.db.get_value("Terms and Conditions", self.terms, "terms") \ No newline at end of file