openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05050
[Merge] lp:~openerp-dev/openobject-addons/trunk-bug-hr_holidays-amp into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind
Amit Parik (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-hr_holidays-amp into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_holidays-amp/+merge/56329
Hello,
Fix : Fixes the holiday workflow problem
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-hr_holidays-amp/+merge/56329
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-bug-hr_holidays-amp into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.
=== 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-05 10:58:23 +0000
@@ -93,7 +93,7 @@
<newline/>
<field name="state" colspan="2"/>
<group colspan="2" col="6">
- <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+ <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
<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"/>
Follow ups