Merge lp:~openerp-dev/openobject-addons/7.0-bug-1258459-avo into lp:openobject-addons/7.0

[Amit Vora(OpenERP)]

Hello,

I have fixed Leave allocation request can not be refused or deleted.

Thanks.
avo

[lp:~openerp-dev/openobject-addons/7.0-bug-1258459-avo]

9856. By Amit Vora(OpenERP) on 2014-03-03

[IMP] improve code

9857. By Amit Vora(OpenERP) on 2014-03-03

[IMP] improve code

9858. By Amit Vora(OpenERP) on 2014-03-13

[MERGE] merge with main branch

9859. By Amit Vora(OpenERP) on 2014-04-23

[MRG] merge with main branch

9860. By Amit Vora(OpenERP) on 2014-04-25

[MRG] merge with main branch

9861. By Amit Vora(OpenERP) on 2014-05-06

[MRG] merge with main branch

9862. By Amit Vora(OpenERP) on 2014-05-07

[IMP] remove space

Unmerged revisions

9862. By Amit Vora(OpenERP) on 2014-05-07

[IMP] remove space

9861. By Amit Vora(OpenERP) on 2014-05-06

[MRG] merge with main branch

9860. By Amit Vora(OpenERP) on 2014-04-25

[MRG] merge with main branch

9859. By Amit Vora(OpenERP) on 2014-04-23

[MRG] merge with main branch

9858. By Amit Vora(OpenERP) on 2014-03-13

[MERGE] merge with main branch

9857. By Amit Vora(OpenERP) on 2014-03-03

[IMP] improve code

9856. By Amit Vora(OpenERP) on 2014-03-03

[IMP] improve code

9855. By Amit Vora(OpenERP) on 2014-02-25

[FIX] Leave allocation request can not be refused or deleted

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2013-06-11 11:57:00 +0000
+++ hr_holidays/hr_holidays_view.xml	2014-05-07 11:18:48 +0000
@@ -64,12 +64,14 @@
                     <group>
                         <group>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="type" invisible="1"/>
                             <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration" help="The default duration interval between the start date and the end date is 8 hours.  Feel free to adapt it to your needs."/>
                             <div>
-                                <group col="3">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
+                                <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" class="oe_inline" attrs="{'required': [('type', '=', 'remove')]}"/>
+                                    <label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" class="oe_inline" attrs="{'required': [('type', '=', 'remove')]}"/>
                                 </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days