From 172efb1e873c0a66873305fdd4f23740c2c749b8 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 27 Jan 2016 19:11:05 +0530 Subject: [PATCH] Fixed error messages while making Time Log Batch from Time Log List view --- erpnext/projects/doctype/time_log/time_log_list.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/erpnext/projects/doctype/time_log/time_log_list.js b/erpnext/projects/doctype/time_log/time_log_list.js index a2eb05cfc9..361a930319 100644 --- a/erpnext/projects/doctype/time_log/time_log_list.js +++ b/erpnext/projects/doctype/time_log/time_log_list.js @@ -18,12 +18,20 @@ frappe.listview_settings['Time Log'] = { for(var i in selected) { var d = selected[i]; if(!d.billable) { - msgprint(__("Time Log is not billable") + ": " + d.name); + msgprint(__("Time Log is not billable") + ": " + d.name + " - " + d.title); + return; + } + if(d.status=="Batched for Billing") { + msgprint(__("Time Log has been Batched for Billing") + ": " + d.name + " - " + d.title); + return; + } + if(d.status=="Billed") { + msgprint(__("Time Log has been Billed") + ": " + d.name + " - " + d.title); return; } if(d.status!="Submitted") { - msgprint(__("Time Log Status must be Submitted.")); - return + msgprint(__("Time Log Status must be Submitted.") + ": " + d.name + " - " + d.title); + return; } }