openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payrol-installation-fix into lp:~openerp-dev/openobject-addons/trunk-payroll.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payrol-installation-fix/+merge/56906

Hello,

Fix: set to draft button not working in cancel state.

Thanks,
ara


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payrol-installation-fix/+merge/56906
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-payrol-installation-fix into lp:~openerp-dev/openobject-addons/trunk-payroll.

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2011-04-07 12:40:50 +0000
+++ hr_payroll/hr_payroll.py	2011-04-08 09:42:18 +0000
@@ -276,9 +276,6 @@
         }
         return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
 
-    def set_to_draft(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
-
     def cancel_sheet(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 

=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml	2011-04-07 13:06:34 +0000
+++ hr_payroll/hr_payroll_view.xml	2011-04-08 09:42:18 +0000
@@ -270,7 +270,7 @@
                         <button string="Verify Sheet" icon="terp-camera_test" name="verify_sheet" states="draft"/>
                         <button string="Approve Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
                         <button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
-                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>
+                        <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
                     </group>
                 </form>
             </field>

=== modified file 'hr_payroll/hr_payroll_workflow.xml'
--- hr_payroll/hr_payroll_workflow.xml	2011-04-05 16:46:17 +0000
+++ hr_payroll/hr_payroll_workflow.xml	2011-04-08 09:42:18 +0000
@@ -11,8 +11,10 @@
             <field name="wkf_id" ref="wkf"/>
             <field name="name">draft</field>
             <field name="flow_start">True</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state': 'draft'})</field>
             <field name="split_mode">OR</field>
-            <field name="kind">dummy</field>
+
         </record>
 
         <record id="act_hr_check" model="workflow.activity">
@@ -89,7 +91,7 @@
         <record id="t12" model="workflow.transition">
             <field name="act_from" ref="act_cancel"/>
             <field name="act_to" ref="act_draft"/>
-            <field name="signal">set_to_draft</field>
+            <field name="signal">draft</field>
         </record>
     </data>
 </openerp>