diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 36cb1aecddd..471b46b4bf0 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -204,12 +204,13 @@ $.extend(cur_frm.cscript, {
 			method:"erpnext.manufacturing.doctype.production_order.production_order.make_time_log",
 			args: {
 				"name": doc.name,
-				"operation": child.idx + ". " + child.operation,
+				"operation": child.operation,
 				"from_time": child.planned_start_time,
 				"to_time": child.planned_end_time,
 				"project": doc.project,
 				"workstation": child.workstation,
-				"qty": flt(doc.qty) - flt(child.completed_qty)
+				"qty": flt(doc.qty) - flt(child.completed_qty),
+				"operation_id": child.name
 			},
 			callback: function(r) {
 				var doclist = frappe.model.sync(r.message);
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 faa7687f1d5..40ecec5d3d6 100644
--- a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
+++ b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
@@ -126,7 +126,7 @@
   }, 
   {
    "allow_on_submit": 1, 
-   "depends_on": "eval:(doc.docstatus==1 && doc.status!=\"Completed\")", 
+   "depends_on": "eval:(doc.docstatus==1)", 
    "fieldname": "show_time_logs", 
    "fieldtype": "Button", 
    "label": "Show Time Logs", 
@@ -277,6 +277,7 @@
    "read_only": 1
   }, 
   {
+   "allow_on_submit": 1, 
    "depends_on": "eval:(doc.docstatus==1 && doc.status!=\"Completed\")", 
    "fieldname": "make_time_log", 
    "fieldtype": "Button", 
@@ -292,7 +293,7 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-03-24 07:02:54.203235", 
+ "modified": "2015-04-01 08:23:58.556092", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order Operation",