Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3141 from neilLasrado/production-planning

Browse Source 
Fix - #3123
This commit is contained in:
Rushabh Mehta 2015-04-21 16:47:01 +05:30
commit 7337c80f09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/bom_operation/bom_operation.json
View File

@ -42,7 +42,7 @@
}, },
{ {
"fieldname": "hour_rate", "fieldname": "hour_rate",
"fieldtype": "Float", "fieldtype": "Currency",
"in_list_view": 0, "in_list_view": 0,
"label": "Hour Rate", "label": "Hour Rate",
"oldfieldname": "hour_rate", "oldfieldname": "hour_rate",
@ -77,7 +77,7 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2015-02-22 10:26:15.377498", "modified": "2015-04-21 07:11:38.730014",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Operation", "name": "BOM Operation",

6
erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
View File

@ -194,7 +194,7 @@
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"fieldname": "hour_rate", "fieldname": "hour_rate",
"fieldtype": "Float", "fieldtype": "Currency",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
@ -266,7 +266,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"description": "Hour Rate * Actual Operating Cost", "description": "(Hour Rate / 60) * Actual Operation Time",
"fieldname": "actual_operating_cost", "fieldname": "actual_operating_cost",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Actual Operating Cost", "label": "Actual Operating Cost",
@ -293,7 +293,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-04-01 08:23:58.556092", "modified": "2015-04-21 07:10:43.341203",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order Operation", "name": "Production Order Operation",