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

Merge pull request #3146 from neilLasrado/project

Browse Source 
FIxes - Time Log Hours calculation
This commit is contained in:
Nabin Hait 2015-04-23 14:37:23 +05:30
commit 218a1267c9
3 changed files with 7 additions and 4 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",
"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",

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

@ -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",

3
erpnext/projects/doctype/time_log/time_log.js
View File

@ -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.from_time && frm.doc.to_time) {
frappe.ui.form.trigger("Time Log", "to_time");
}
});
frappe.ui.form.on("Time Log", "refresh", function(frm) {