diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index 8076bf7b60..2ba4d2257b 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -133,12 +133,14 @@ cur_frm.cscript.calculate_total = function(doc,cdt,cdn){ cur_frm.cscript.calculate_total_amount = function(doc,cdt,cdn){ cur_frm.cscript.calculate_total(doc,cdt,cdn); } + cur_frm.cscript.claim_amount = function(doc,cdt,cdn){ cur_frm.cscript.calculate_total(doc,cdt,cdn); var child = locals[cdt][cdn]; refresh_field("sanctioned_amount", child.name, child.parentfield); } + cur_frm.cscript.sanctioned_amount = function(doc,cdt,cdn){ cur_frm.cscript.calculate_total(doc,cdt,cdn); } @@ -148,3 +150,22 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) { cur_frm.email_doc(frappe.boot.notification_settings.expense_claim_message); } } + +erpnext.expense_claim = { + set_title :function(frm) { + if (!frm.doc.task) { + frm.set_value("title", frm.doc.employee_name); + } + else { + frm.set_value("title", frm.doc.employee_name + " for "+ frm.doc.task); + } + } +} + +frappe.ui.form.on("Expense Claim", "employee_name", function(frm) { + erpnext.expense_claim.set_title(frm); +}); + +frappe.ui.form.on("Expense Claim", "task", function(frm) { + erpnext.expense_claim.set_title(frm); +}); diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json index 7392138025..95b8a81e6e 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.json +++ b/erpnext/hr/doctype/expense_claim/expense_claim.json @@ -199,6 +199,13 @@ "permlevel": 0, "precision": "" }, + { + "fieldname": "title", + "fieldtype": "Data", + "label": "Title", + "permlevel": 0, + "precision": "" + }, { "fieldname": "email_id", "fieldtype": "Data", @@ -227,8 +234,8 @@ ], "icon": "icon-money", "idx": 1, - "is_submittable": 1, - "modified": "2015-03-30 05:17:43.963137", + "is_submittable": 1, + "modified": "2015-04-14 05:08:06.541441", "modified_by": "Administrator", "module": "HR", "name": "Expense Claim", @@ -302,5 +309,5 @@ "search_fields": "approval_status,employee,employee_name", "sort_field": "modified", "sort_order": "DESC", - "title_field": "employee_name" + "title_field": "title" } \ No newline at end of file