diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py index 9d3a61fac38..8044ecc2e26 100755 --- a/addons/mrp_operations/__terp__.py +++ b/addons/mrp_operations/__terp__.py @@ -55,7 +55,8 @@ "demo_xml" : ["mrp_operation_data.xml"], "update_xml" : [ "security/ir.model.access.csv", - "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml" + "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml", + "process/mrp_operation_process.xml" ], "active": False, "installable": True diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 72316aca8bd..0de73bad7e5 100755 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -47,14 +47,14 @@ class mrp_production_workcenter_line(osv.osv): 'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'), 'date_start': fields.datetime('Start Date'), 'date_finnished': fields.datetime('End Date'), - 'delay': fields.float('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True), + 'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True), 'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'), 'qty':fields.related('production_id','product_qty',type='float',string='Qty'), 'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'), } _defaults = { 'state': lambda *a: 'draft', - 'delay': lambda *a: 0.0 + 'delay': lambda *a: '0 Days 0 hrs and 0 mins' } def modify_production_order_state(self,cr,uid,ids,action): diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml new file mode 100644 index 00000000000..013a629d3a7 --- /dev/null +++ b/addons/mrp_operations/process/mrp_operation_process.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file