← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-746471-pso into lp:openobject-addons

 

pso (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-746471-pso into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #746471 in OpenERP Addons: "[6.0] hr_holidays cannot set allocation request to draft state"
  https://bugs.launchpad.net/openobject-addons/+bug/746471

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-746471-pso/+merge/55864

Fixed bug : 746471 (https://bugs.launchpad.net/openobject-addons/+bug/746471)
Now, its possible to set to draft refused allocation request.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-746471-pso/+merge/55864
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-746471-pso.
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-03-11 11:32:04 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-04-01 05:32:26 +0000
@@ -139,7 +139,7 @@
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                             <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel,validate,validate1,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>


Follow ups