diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json index ca040a0862..2dc6ce89ad 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": "Float", + "fieldtype": "Currency", "in_list_view": 0, "label": "Hour Rate", "oldfieldname": "hour_rate", @@ -77,7 +77,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-02-22 10:26:15.377498", + "modified": "2015-04-21 07:11:38.730014", "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 40ecec5d3d..2034ae5ac2 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": "Float", + "fieldtype": "Currency", "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, @@ -266,7 +266,7 @@ "read_only": 1 }, { - "description": "Hour Rate * Actual Operating Cost", + "description": "(Hour Rate / 60) * Actual Operation Time", "fieldname": "actual_operating_cost", "fieldtype": "Currency", "label": "Actual Operating Cost", @@ -293,7 +293,7 @@ "is_submittable": 0, "issingle": 0, "istable": 1, - "modified": "2015-04-01 08:23:58.556092", + "modified": "2015-04-21 07:10:43.341203", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Order Operation",