Merge lp:~therp-nl/openobject-addons/lp1190022 into lp:openobject-addons

[Holger Brunn (Therp)]

[Olivier Dony (Odoo) (odo-openerp)]

As I mentioned on the bug report: In trunk all workflow signals are now routed through Model.signal_xxx() methods that you can override as you want, so I think we can consider this wishlist implemented without needing any extra code in hr_timesheet_sheet itself:
   https://doc.openerp.com/trunk/server/orm-methods/#orm-workflows

Moving the code of the workflow activities into Python methods would also reduce the flexibility of the workflows (the fact that they can be customized to some extent without needing to write a module), so it's better to keep the best of both world, I think.

Thanks!

review: Disapprove

Unmerged revisions

8758. By Holger Brunn (Therp) on 2013-06-12

[IMP] call methods in workflow to write state

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2013-05-21 12:23:59 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-12 09:57:37 +0000
@@ -193,6 +193,22 @@
         self.create_workflow(cr, uid, ids)
         return True
 
+    def workflow_new(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'new'}, context=context)
+        return True
+
+    def workflow_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        return True
+
+    def workflow_confirm(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+        return True
+
+    def workflow_done(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'done'}, context=context)
+        return True
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []

=== modified file 'hr_timesheet_sheet/hr_timesheet_workflow.xml'
--- hr_timesheet_sheet/hr_timesheet_workflow.xml	2011-07-11 11:23:29 +0000
+++ hr_timesheet_sheet/hr_timesheet_workflow.xml	2013-06-12 09:57:37 +0000
@@ -14,26 +14,26 @@
             <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">new</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'new'})</field>
+            <field name="action">workflow_new()</field>
             <field name="flow_start">True</field>
         </record>
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">draft</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'draft'})</field>
+            <field name="action">workflow_draft()</field>
         </record>
         <record id="act_confirm" model="workflow.activity">
             <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">confirm</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'confirm'})</field>
+            <field name="action">workflow_confirm()</field>
         </record>
         <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_timesheet"/>
             <field name="name">done</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'done'})</field>
+            <field name="action">workflow_done()</field>
             <field name="flow_stop">True</field>
         </record>