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

minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2014-12-17 16:22:02 +05:30
parent 41781ce686
commit 1fa7171bfa
6 changed files with 124 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
erpnext/manufacturing/doctype/bom/bom.js
View File

@ -31,7 +31,7 @@ cur_frm.cscript.with_operations = function(doc) {
} }
erpnext.bom.set_operation = function(doc) { erpnext.bom.set_operation = function(doc) {
var op_table = doc.bom_operations || []; var op_table = doc["bom_operations"] || [];
var operations = []; var operations = [];
for (var i=0, j=op_table.length; i<j; i++) { for (var i=0, j=op_table.length; i<j; i++) {
@ -51,9 +51,6 @@ cur_frm.cscript.bom_operations_remove = function(){
cur_frm.add_fetch("item", "description", "description"); cur_frm.add_fetch("item", "description", "description");
cur_frm.add_fetch("item", "stock_uom", "uom"); cur_frm.add_fetch("item", "stock_uom", "uom");
cur_frm.cscript.workstation = function(doc,dt,dn) {
get_workstation_detail(doc,dt,dn);
}
cur_frm.cscript.hour_rate = function(doc, dt, dn) { cur_frm.cscript.hour_rate = function(doc, dt, dn) {
erpnext.bom.calculate_op_cost(doc); erpnext.bom.calculate_op_cost(doc);
@ -153,9 +150,8 @@ erpnext.bom.calculate_rm_cost = function(doc) {
// Calculate Total Cost // Calculate Total Cost
erpnext.bom.calculate_total = function(doc) { erpnext.bom.calculate_total = function(doc) {
doc.total_variable_cost = flt(doc.raw_material_cost) + flt(doc.operating_cost) ; doc.total_variable_cost = flt(doc.raw_material_cost) + flt(doc.operating_cost) ;
refresh_field('total_variable_cost');
doc.total_cost = flt(doc.total_fixed_cost) + flt(doc.total_variable_cost); doc.total_cost = flt(doc.total_fixed_cost) + flt(doc.total_variable_cost);
refresh_field('total_cost'); refresh_field(['total_variable_cost', 'total_cost']);
} }
@ -175,7 +171,10 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, dt, dn) {
cur_frm.fields_dict['bom_materials'].grid.get_field('item_code').get_query = function(doc) { cur_frm.fields_dict['bom_materials'].grid.get_field('item_code').get_query = function(doc) {
return{ return{
query: "erpnext.controllers.queries.item_query" query: "erpnext.controllers.queries.item_query",
filters: {
"name": "!" + cstr(doc.item)
}
} }
} }
@ -197,29 +196,38 @@ cur_frm.cscript.validate = function(doc, dt, dn) {
erpnext.bom.calculate_total(doc); erpnext.bom.calculate_total(doc);
} }
cur_frm.cscript.operation = function(doc,dt,dn) { frappe.ui.form.on("BOM Operation", "operation", function(frm, cdt, cdn) {
var d = locals[dt][dn]; var d = locals[cdt][cdn];
if(d.parentfield=="bom_operations") { frappe.call({
erpnext.bom.set_operation(doc); "method": "frappe.client.get",
frappe.model.with_doc("Operation", d.operation, function(name, r) { args: {
d.opn_description = r.docs[0].opn_description; doctype: "Operation",
d.workstation = r.docs[0].workstation; name: d.operation
refresh_field("bom_operations"); },
get_workstation_detail(doc,dt,dn); callback: function (data) {
}); frappe.model.set_value(d.doctype, d.name, "opn_description", data.message.opn_description);
} frappe.model.set_value(d.doctype, d.name, "workstation", data.message.workstation);
} erpnext.bom.set_operation(frm.doc);
}
})
});
var get_workstation_detail = function(doc, dt, dn) { frappe.ui.form.on("BOM Operation", "workstation", function(frm, cdt, cdn) {
var d = locals[dt][dn]; var d = locals[cdt][cdn];
frappe.model.with_doc("Workstation", d.workstation, function(name, r) {
d.hour_rate = r.docs[0].hour_rate; frappe.call({
refresh_field("hour_rate", dn, "bom_operations"); "method": "frappe.client.get",
d.fixed_cycle_cost = r.docs[0].fixed_cycle_cost; args: {
refresh_field("fixed_cycle_cost", dn, "bom_operations"); doctype: "Workstation",
erpnext.bom.calculate_op_cost(doc); name: d.workstation
erpnext.bom.calculate_fixed_cost(doc); },
erpnext.bom.calculate_total(doc); callback: function (data) {
}); frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
} frappe.model.set_value(d.doctype, d.name, "fixed_cycle_cost", data.message.fixed_cycle_cost);
erpnext.bom.calculate_op_cost(frm.doc);
erpnext.bom.calculate_fixed_cost(frm.doc);
erpnext.bom.calculate_total(frm.doc);
}
})
});

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

@ -41,27 +41,43 @@
"reqd": 0 "reqd": 0
}, },
{ {
"fieldname": "hour_rate", "fieldname": "fixed_cost",
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 0, "in_list_view": 0,
"label": "Hour Rate", "label": "Fixed Cost",
"oldfieldname": "hour_rate", "permlevel": 0
"oldfieldtype": "Currency", },
"options": "Company:company:default_currency", {
"permlevel": 0, "fieldname": "hour_rate",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Hour Rate",
"oldfieldname": "hour_rate",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
"reqd": 0 "reqd": 0
}, },
{ {
"description": "In minutes",
"fieldname": "time_in_mins", "fieldname": "time_in_mins",
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 0, "in_list_view": 0,
"label": "Operation Time ", "label": "Operation Time ",
"oldfieldname": "time_in_mins", "oldfieldname": "time_in_mins",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "in min", "options": "",
"permlevel": 0, "permlevel": 0,
"reqd": 0 "reqd": 0
}, },
{
"fieldname": "variable_cost",
"fieldtype": "Currency",
"label": "Variable Cost",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"fieldname": "operating_cost", "fieldname": "operating_cost",
@ -70,22 +86,13 @@
"label": "Operating Cost", "label": "Operating Cost",
"oldfieldname": "operating_cost", "oldfieldname": "operating_cost",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
"reqd": 0 "reqd": 0
},
{
"fieldname": "fixed_cycle_cost",
"fieldtype": "Currency",
"in_list_view": 0,
"label": "Fixed Cycle Cost",
"options": "Company:company:default_currency",
"permlevel": 0
} }
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2014-12-12 11:16:49.031521", "modified": "2014-12-17 15:35:21.993660",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM Operation", "name": "BOM Operation",

4
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -3,7 +3,6 @@
$.extend(cur_frm.cscript, { $.extend(cur_frm.cscript, {
onload: function (doc, dt, dn) { onload: function (doc, dt, dn) {
if (!doc.status) doc.status = 'Draft'; if (!doc.status) doc.status = 'Draft';
cfn_set_fields(doc, dt, dn); cfn_set_fields(doc, dt, dn);
@ -75,7 +74,6 @@ $.extend(cur_frm.cscript, {
"from_time": child.planned_start_time, "from_time": child.planned_start_time,
"to_time": child.planned_end_time, "to_time": child.planned_end_time,
"project": doc.project, "project": doc.project,
"qty": doc.qty - child.qty_completed,
"workstation": child.workstation "workstation": child.workstation
}, },
callback: function(r) { callback: function(r) {
@ -164,3 +162,5 @@ cur_frm.set_query("bom_no", function(doc) {
}); });
cur_frm.add_fetch('bom_no', 'total_fixed_cost', 'total_fixed_cost'); cur_frm.add_fetch('bom_no', 'total_fixed_cost', 'total_fixed_cost');
cur_frm.add_fetch('bom_no', 'total_variable_cost', 'planned_variable_cost');
cur_frm.add_fetch('bom_no', 'total_operating_cost', 'total_operating_cost');

58
erpnext/manufacturing/doctype/production_order/production_order.json
View File

@ -191,13 +191,6 @@
"permlevel": 0, "permlevel": 0,
"precision": "" "precision": ""
}, },
{
"depends_on": "production_item",
"fieldname": "total_fixed_cost",
"fieldtype": "Float",
"label": "Total Fixed Cost",
"permlevel": 0
},
{ {
"fieldname": "production_order_operations", "fieldname": "production_order_operations",
"fieldtype": "Table", "fieldtype": "Table",
@ -207,6 +200,55 @@
"precision": "", "precision": "",
"read_only": 1 "read_only": 1
}, },
{
"fieldname": "section_break_22",
"fieldtype": "Section Break",
"label": "Operation Cost",
"options": "",
"permlevel": 0,
"precision": ""
},
{
"depends_on": "production_item",
"fieldname": "total_fixed_cost",
"fieldtype": "Currency",
"label": "Total Fixed Cost",
"options": "Company:company:default_currency",
"permlevel": 0
},
{
"fieldname": "planned_variable_cost",
"fieldtype": "Currency",
"label": "Planned Variable Cost",
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{
"fieldname": "actual_variable_cost",
"fieldtype": "Currency",
"label": "Actual Variable Cost",
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{
"fieldname": "column_break_24",
"fieldtype": "Column Break",
"permlevel": 0,
"precision": ""
},
{
"fieldname": "total_operating_cost",
"fieldtype": "Currency",
"label": "Total Operating Cost",
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{ {
"allow_on_submit": 1, "allow_on_submit": 1,
"depends_on": "eval:doc.docstatus==1", "depends_on": "eval:doc.docstatus==1",
@ -288,7 +330,7 @@
"idx": 1, "idx": 1,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-12-01 11:36:56.832268", "modified": "2014-12-17 15:16:28.054620",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order", "name": "Production Order",

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

@ -83,23 +83,13 @@
"default": "Pending", "default": "Pending",
"fieldname": "status", "fieldname": "status",
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 0, "in_list_view": 1,
"label": "Status", "label": "Status",
"options": "Pending\nWork in Progress\nCompleted", "options": "Pending\nWork in Progress\nCompleted",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"read_only": 1 "read_only": 1
}, },
{
"default": "0",
"fieldname": "qty_completed",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Qty Completed",
"permlevel": 0,
"precision": "",
"read_only": 1
},
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"fieldname": "workstation", "fieldname": "workstation",
@ -209,7 +199,7 @@
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 1,
"label": "Operation Time", "label": "Operation Time",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "time_in_mins", "oldfieldname": "time_in_mins",
@ -227,6 +217,7 @@
{ {
"fieldname": "planned_start_time", "fieldname": "planned_start_time",
"fieldtype": "Datetime", "fieldtype": "Datetime",
"in_list_view": 0,
"label": "Planned Start Time", "label": "Planned Start Time",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -235,6 +226,7 @@
{ {
"fieldname": "planned_end_time", "fieldname": "planned_end_time",
"fieldtype": "Datetime", "fieldtype": "Datetime",
"in_list_view": 0,
"label": "Planned End Time", "label": "Planned End Time",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -305,7 +297,7 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2014-12-01 14:06:40.068700", "modified": "2014-12-17 14:38:57.959478",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order Operation", "name": "Production Order Operation",

34
erpnext/templates/form_grid/production_order_grid.html
View File

@ -1,34 +0,0 @@
{% var visible_columns = row.get_visible_columns(["operation",
"opn_description", "status", "qty_completed", "workstation"]);
%}
{% if(!doc) { %}
<div class="row">
<div class="col-sm-7">{%= __("Operation") %}</div>
<div class="col-sm-2 text-right">{%= __("Workstation") %}</div>
<div class="col-sm-3 text-right">{%= __("Completed Qty") %}</div>
</div>
{% } else { %}
<div class="row">
<div class="col-sm-7">
<strong>{%= doc.operation %}</strong>
<span class="label label-primary">
{%= doc.status %}
</span>
{% include "templates/form_grid/includes/visible_cols.html" %}
<div>
{%= doc.get_formatted("opn_description") %}
</div>
</div>
<!-- workstation -->
<div class="col-sm-2 text-right">
{%= doc.get_formatted("workstation") %}
</div>
<!-- qty -->
<div class="col-sm-3 text-right">
{%= doc.get_formatted("qty_completed") %}
</div>
</div>
{% } %}