diff --git a/erpnext/projects/doctype/time_log/time_log_list.js b/erpnext/projects/doctype/time_log/time_log_list.js index d4448068fac..a2eb05cfc90 100644 --- a/erpnext/projects/doctype/time_log/time_log_list.js +++ b/erpnext/projects/doctype/time_log/time_log_list.js @@ -3,7 +3,7 @@ // render frappe.listview_settings['Time Log'] = { - add_fields: ["status", "billable", "activity_type", "task", "project", "hours", "for_manufacturing"], + add_fields: ["status", "billable", "activity_type", "task", "project", "hours", "for_manufacturing", "billing_amount"], selectable: true, onload: function(me) { me.page.add_menu_item(__("Make Time Log Batch"), function() { @@ -37,7 +37,7 @@ frappe.listview_settings['Time Log'] = { $.extend(detail, { "time_log": d.name, "activity_type": d.activity_type, - "created_by": d.owner, + "billing_amount": d.billing_amount, "hours": d.hours }); }) diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js index 39141ed9683..6b5f08094d2 100644 --- a/erpnext/projects/doctype/time_log_batch/time_log_batch.js +++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.js @@ -36,3 +36,15 @@ $.extend(cur_frm.cscript, { }); } }); + +frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm, cdt, cdn) { + var tl = frm.doc.time_logs || []; + total_hr = 0; + total_amt = 0; + for(var i=0; i