From 6a066e07e541b0e95c84c9efbf9629949befef45 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 22 Apr 2015 12:51:31 +0530 Subject: [PATCH 1/3] Time Log - to_time trigger called on_load to calculate hours if Tl is created via Calender --- erpnext/projects/doctype/time_log/time_log.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js index ba933018ef..19fa5bedf8 100644 --- a/erpnext/projects/doctype/time_log/time_log.js +++ b/erpnext/projects/doctype/time_log/time_log.js @@ -7,6 +7,9 @@ frappe.ui.form.on("Time Log", "onload", function(frm) { if (frm.doc.for_manufacturing) { frappe.ui.form.trigger("Time Log", "production_order"); } + if (frm.doc.to_time && frm.doc.to_time) { + frappe.ui.form.trigger("Time Log", "to_time"); + } }); frappe.ui.form.on("Time Log", "refresh", function(frm) { From d3179a733bebd7b20a6cf394199ac41b0e7012fb Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 22 Apr 2015 12:59:25 +0530 Subject: [PATCH 2/3] datatype of hour_rate in Production order operations and bom operation changed to float --- .../manufacturing/doctype/bom_operation/bom_operation.json | 4 ++-- .../production_order_operation.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json index 2dc6ce89ad..0c25e8fcc2 100644 --- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json +++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json @@ -42,7 +42,7 @@ }, { "fieldname": "hour_rate", - "fieldtype": "Currency", + "fieldtype": "Float", "in_list_view": 0, "label": "Hour Rate", "oldfieldname": "hour_rate", @@ -77,7 +77,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-04-21 07:11:38.730014", + "modified": "2015-04-22 03:24:47.809532", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM Operation", diff --git a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json index 2034ae5ac2..83134853e2 100644 --- a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json +++ b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json @@ -194,7 +194,7 @@ { "allow_on_submit": 0, "fieldname": "hour_rate", - "fieldtype": "Currency", + "fieldtype": "Float", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -293,7 +293,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-04-21 07:10:43.341203", + "modified": "2015-04-22 03:25:18.542350", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order Operation", From 8e4cf13d01a19565fceb9a4938d5a3028ecf7522 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 22 Apr 2015 16:23:36 +0530 Subject: [PATCH 3/3] fixes time log hours calculation --- erpnext/projects/doctype/time_log/time_log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js index 19fa5bedf8..536ddf8c9c 100644 --- a/erpnext/projects/doctype/time_log/time_log.js +++ b/erpnext/projects/doctype/time_log/time_log.js @@ -7,7 +7,7 @@ frappe.ui.form.on("Time Log", "onload", function(frm) { if (frm.doc.for_manufacturing) { frappe.ui.form.trigger("Time Log", "production_order"); } - if (frm.doc.to_time && frm.doc.to_time) { + if (frm.doc.from_time && frm.doc.to_time) { frappe.ui.form.trigger("Time Log", "to_time"); } });