small modifications on mrp_operations workflow

bzr revid: nch@tinyerp.com-20081021093353-k2gdr94tmel9yjw7

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index a8c6232..79319e1 100755 (executable)
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -58,7 +58,7 @@ class mrp_production_workcenter_line(osv.osv):
        '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 = {
@@ -70,8 +70,8 @@ class mrp_production_workcenter_line(osv.osv):
         wf_service = netsvc.LocalService("workflow")
         oper_obj=self.browse(cr,uid,ids)[0]
         prod_obj=self.pool.get('mrp.production').browse(cr,uid,[oper_obj.production_id.id])[0]
-        if action=='start': 
-               if prod_obj.state =='ready': 
+        if action=='start':
+               if prod_obj.state =='ready':
                    wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
                elif prod_obj.state =='in_production':
                    return
@@ -87,35 +87,29 @@ class mrp_production_workcenter_line(osv.osv):
             if flag:
                 wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
         return
-    
+
     def action_draft(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state':'draft'})
-#       self.write(cr, uid, ids, {'state':'draft','date_start':None})
         return True
 
     def action_start_working(self, cr, uid, ids):
         self.modify_production_order_state(cr,uid,ids,'start')
         self.write(cr, uid, ids, {'state':'startworking'})
-#       self.write(cr, uid, ids, {'state':'confirm','date_start':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_done(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state':'done'})
         self.modify_production_order_state(cr,uid,ids,'done')
-#       self.write(cr, uid, ids, {'state':'done','date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_cancel(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state':'cancel'})
-#       self.write(cr, uid, ids, {'state':'cancel','date_start':None})
         return True
-    
+
     def action_pause(self, cr, uid, ids):
-        print "callled THE ACTUAL PAUSE"
         self.write(cr, uid, ids, {'state':'pause'})
-#       self.write(cr, uid, ids, {'state':'draft','date_start':None})
         return True
-   
+
     def action_resume(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state':'startworking'})
         return True
@@ -127,18 +121,12 @@ class mrp_production(osv.osv):
     _inherit = 'mrp.production'
     _description = 'Production'
 
-#    def action_confirm(self, cr, uid, ids):
-#        obj=self.browse(cr,uid,ids)[0]
-#        for workcenter_line in obj.workcenter_lines:
-#            tmp=self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,[workcenter_line.id])
-#        return super(mrp_production,self).action_confirm(cr,uid,ids)
-
     def action_production_end(self, cr, uid, ids):
         obj=self.browse(cr,uid,ids)[0]
         for workcenter_line in obj.workcenter_lines:
             tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
         return super(mrp_production,self).action_production_end(cr,uid,ids)
-#
+
     def action_cancel(self, cr, uid, ids):
         obj=self.browse(cr,uid,ids)[0]
         for workcenter_line in obj.workcenter_lines:
@@ -158,32 +146,32 @@ mrp_operations_operation_code()
 
 class mrp_operations_operation(osv.osv):
     _name="mrp_operations.operation"
-    
+
     def _order_date_search_production(self,cr,uid,ids):
         operation_ids=self.pool.get('mrp_operations.operation').search(cr,uid,[('production_id','=',ids[0])])
         return operation_ids
-        
+
     def _get_order_date(self, cr, uid, ids, field_name, arg, context):
         res={}
         operation_obj=self.browse(cr, uid, ids, context=context)
         for operation in operation_obj:
                 res[operation.id]=operation.production_id.date_planned
         return res
-    
+
     def calc_delay(self,cr,uid,vals):
         code_lst=[]
         time_lst=[]
-        
+
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
         code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
-        
+
         oper_ids=self.search(cr,uid,[('production_id','=',vals['production_id']),('workcenter_id','=',vals['workcenter_id'])])
         oper_objs=self.browse(cr,uid,oper_ids)
-        
+
         for oper in oper_objs:
             code_lst.append(oper.code_id.start_stop)
             time_lst.append(oper.date_start)
-            
+
         code_lst.append(code.start_stop)
         time_lst.append(vals['date_start'])
         h=m=s=days=0
@@ -211,34 +199,34 @@ class mrp_operations_operation(osv.osv):
                     h=0
         delay=str(days) +" Days "+ str(h) + " hrs  and " + str(m)+ " mins"
         return delay
-    
+
     def check_operation(self,cr,uid,vals):
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
         code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
         code_lst = []
         oper_ids=self.search(cr,uid,[('production_id','=',vals['production_id']),('workcenter_id','=',vals['workcenter_id'])])
         oper_objs=self.browse(cr,uid,oper_ids)
-        
+
         if not oper_objs:
             if code.start_stop!='start':
                 raise osv.except_osv(_('Sorry!'),_('Operation is not started yet !'))
                 return False
-        else:    
+        else:
             for oper in oper_objs:
                  code_lst.append(oper.code_id.start_stop)
             if code.start_stop=='start':
-                    if 'start' in code_lst:        
+                    if 'start' in code_lst:
                         raise osv.except_osv(_('Sorry!'),_('Operation has already started !' 'You  can either Pause /Finish/Cancel the operation'))
                         return False
             if code.start_stop=='pause':
-                    if  code_lst[len(code_lst)-1]!='resume' and code_lst[len(code_lst)-1]!='start':        
+                    if  code_lst[len(code_lst)-1]!='resume' and code_lst[len(code_lst)-1]!='start':
                         raise osv.except_osv(_('Error!'),_('You cannot Pause the Operation other then Start/Resume state !'))
                         return False
-            if code.start_stop=='resume':    
-                if code_lst[len(code_lst)-1]!='pause':        
+            if code.start_stop=='resume':
+                if code_lst[len(code_lst)-1]!='pause':
                    raise osv.except_osv(_('Error!'),_(' You cannot Resume the operation other then Pause state !'))
                    return False
-   
+
             if code.start_stop=='done':
                if code_lst[len(code_lst)-1]!='start' and code_lst[len(code_lst)-1]!='resume':
                   raise osv.except_osv(_('Sorry!'),_('You cannot finish the operation without Starting/Resuming it !'))
@@ -254,24 +242,24 @@ class mrp_operations_operation(osv.osv):
                   raise osv.except_osv(_('Error!'),_('Operation is already finished !'))
                   return False
         return True
-        
+
     def write(self, cr, uid, ids, vals, context=None):
         oper_objs=self.browse(cr,uid,ids)[0]
         vals['production_id']=oper_objs.production_id.id
         vals['workcenter_id']=oper_objs.workcenter_id.id
-        
+
         if 'code_id' in vals:
             self.check_operation(cr, uid, vals)
-            
+
         if 'date_start' in vals:
             vals['date_start']=vals['date_start']
             vals['code_id']=oper_objs.code_id.id
             delay=self.calc_delay(cr, uid, vals)
             wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
             self.pool.get('mrp.production.workcenter.line').write(cr,uid,wc_op_id,{'delay':delay})
-            
+
         return super(mrp_operations_operation, self).write(cr, uid, ids, vals, context=context)
-        
+
     def create(self, cr, uid, vals, context=None):
         wf_service = netsvc.LocalService('workflow')
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
@@ -281,31 +269,34 @@ class mrp_operations_operation(osv.osv):
             if not wc_op_id:
                 production_obj=self.pool.get('mrp.production').browse(cr,uid,vals['production_id'])
                 wc_op_id.append(self.pool.get('mrp.production.workcenter.line').create(cr,uid,{'production_id':vals['production_id'],'name':production_obj.product_id.name,'workcenter_id':vals['workcenter_id']}))
-                
             if code.start_stop=='start':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,wc_op_id)
-                
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_start_working', cr)
+
             if code.start_stop=='done':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr)
                 self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
-                                
+
             if code.start_stop=='pause':
-                print "in PAUSE"
                 tmp=self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
-                
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_pause', cr)
+
             if code.start_stop=='resume':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_resume(cr,uid,wc_op_id)
-            
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_resume', cr)
+
             if code.start_stop=='cancel':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_cancel(cr,uid,wc_op_id)
-               
+                wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_cancel', cr)
+
         if not self.check_operation(cr, uid, vals):
             return
         delay=self.calc_delay(cr, uid, vals)
         self.pool.get('mrp.production.workcenter.line').write(cr,uid,wc_op_id,{'delay':delay})
-        
+
         return super(mrp_operations_operation, self).create(cr, uid, vals,  context=context)
-    
+
     _columns={
         'production_id':fields.many2one('mrp.production','Production',required=True),
         'workcenter_id':fields.many2one('mrp.workcenter','Workcenter',required=True),

diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index a16808b..642d2fe 100755 (executable)
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -10,7 +10,7 @@
         <field name="arch" type="xml">
             <field name="hour" position="after">
                 <button name="button_done" string="Finished" states="startworking"/>
-                <button name="button_start_working" string="Start working" states="draft,pause"/>            
+                <button name="button_start_working" string="Start working" states="draft,pause"/>
                 <field name="uom"/>
                 <field name="qty"/>
                 <field name="product"/>
@@ -167,7 +167,7 @@
             </field>
         </record>
 
-        
+
 
     <!--<record model="ir.ui.view" id="mrp_production_operation_form_view">
         <field name="name">mrp.production.operation.form</field>
@@ -191,12 +191,12 @@
         <field name="view_id" ref="mrp_production_operation_tree_view"/>
     </record>
 
-    <menuitem 
+    <menuitem
         name="Work Order Events Using Bar Codes"
-        parent="mrp.menu_mrp_root" 
-        id="menu_mrp_production_operation_action" 
+        parent="mrp.menu_mrp_root"
+        id="menu_mrp_production_operation_action"
         action="mrp_production_operation_action"/>
-    
+
     <record model="ir.ui.view" id="operation_calendar_view">
             <field name="name">mrp.perations.calendar</field>
             <field name="model">mrp_operations.operation</field>

diff --git a/addons/mrp_operations/mrp_operations_workflow.xml b/addons/mrp_operations/mrp_operations_workflow.xml
index 6dea60c..2524f55 100755 (executable)
--- a/addons/mrp_operations/mrp_operations_workflow.xml
+++ b/addons/mrp_operations/mrp_operations_workflow.xml
@@ -49,7 +49,7 @@
                        <field name="flow_stop">True</field>
                        <field name="action">action_done()</field>
                </record>
-               
+
        # -----------------------------------------------------------
        # Transition
        # -----------------------------------------------------------
@@ -84,11 +84,29 @@
                        <field name="act_to" ref="prod_act_wc_pause"/>
                        <field name="signal">button_pause</field>
                </record>
-               
+
                <record model="workflow.transition" id="prod_trans_wc_pause_resume">
                        <field name="act_from" ref="prod_act_wc_pause"/>
                        <field name="act_to" ref="prod_act_wc_resume"/>
                        <field name="signal">button_resume</field>
                </record>
+
+               <record model="workflow.transition" id="prod_trans_wc_resume_pause">
+                       <field name="act_from" ref="prod_act_wc_resume"/>
+                       <field name="act_to" ref="prod_act_wc_pause"/>
+                       <field name="signal">button_pause</field>
+               </record>
+               <record model="workflow.transition" id="prod_trans_wc_resume_cancel">
+                       <field name="act_from" ref="prod_act_wc_resume"/>
+                       <field name="act_to" ref="prod_act_wc_cancel"/>
+                       <field name="signal">button_cancel</field>
+               </record>
+               <record model="workflow.transition" id="prod_trans_wc_resume_done">
+                       <field name="act_from" ref="prod_act_wc_resume"/>
+                       <field name="act_to" ref="prod_act_wc_done"/>
+                       <field name="signal">button_done</field>
+               </record>
+
+
 </data>
 </openerp>