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

Title Feild added to Expense Claim

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-04-14 15:13:14 +05:30
parent 05f15bbb88
commit ec5c66f8f0
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@ -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_amount = function(doc,cdt,cdn){
cur_frm.cscript.calculate_total(doc,cdt,cdn); cur_frm.cscript.calculate_total(doc,cdt,cdn);
} }
cur_frm.cscript.claim_amount = function(doc,cdt,cdn){ cur_frm.cscript.claim_amount = function(doc,cdt,cdn){
cur_frm.cscript.calculate_total(doc,cdt,cdn); cur_frm.cscript.calculate_total(doc,cdt,cdn);
var child = locals[cdt][cdn]; var child = locals[cdt][cdn];
refresh_field("sanctioned_amount", child.name, child.parentfield); refresh_field("sanctioned_amount", child.name, child.parentfield);
} }
cur_frm.cscript.sanctioned_amount = function(doc,cdt,cdn){ cur_frm.cscript.sanctioned_amount = function(doc,cdt,cdn){
cur_frm.cscript.calculate_total(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); 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);
});

13
erpnext/hr/doctype/expense_claim/expense_claim.json
View File

@ -199,6 +199,13 @@
"permlevel": 0, "permlevel": 0,
"precision": "" "precision": ""
}, },
{
"fieldname": "title",
"fieldtype": "Data",
"label": "Title",
"permlevel": 0,
"precision": ""
},
{ {
"fieldname": "email_id", "fieldname": "email_id",
"fieldtype": "Data", "fieldtype": "Data",
@ -227,8 +234,8 @@
], ],
"icon": "icon-money", "icon": "icon-money",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2015-03-30 05:17:43.963137", "modified": "2015-04-14 05:08:06.541441",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Expense Claim", "name": "Expense Claim",
@ -302,5 +309,5 @@
"search_fields": "approval_status,employee,employee_name", "search_fields": "approval_status,employee,employee_name",
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "employee_name" "title_field": "title"
} }