Merge lp:~hbrunn/ocb-addons/lp1190022 into lp:ocb-addons/6.1

[Holger Brunn (Therp)]

Automatically derived from https://code.launchpad.net/~therp-nl/openobject-addons/lp1190022 for https://code.launchpad.net/~openerp/openobject-addons/trunk.

[Holger Brunn (Therp) (hbrunn)]

rejecting as per https://bugs.launchpad.net/openobject-addons/+bug/1190022

we don't want incompatible changes

review: Disapprove

Unmerged revisions

6753. 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-01-08 12:50:40 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2013-06-12 13:34:26 +0000
@@ -441,6 +441,22 @@
             wf_service.trg_create(uid, self._name, id, cr)
         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 len(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 13:34:26 +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>