Merge lp:~openerp-dev/openobject-addons/trunk-bug-1258459-ssh into lp:openobject-addons

[Sunil Sharma(OpenERP)]

Hello,

       I have fix this bug, Leave allocation request can not be refused or deleted in hr_holidays.

Thanks
Sunil Sharma (SSH)

[lp:~openerp-dev/openobject-addons/trunk-bug-1258459-ssh]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

9153. By Sunil Sharma(OpenERP) on 2014-02-24

[MRG]lp:openobject-addons

Unmerged revisions

9153. By Sunil Sharma(OpenERP) on 2014-02-24

[MRG]lp:openobject-addons

9152. By Sunil Sharma(OpenERP) on 2014-02-17

[fix]:leave allocation request can not be refused or delete

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2014-02-11 15:48:27 +0000
+++ hr_holidays/hr_holidays_view.xml	2014-02-24 08:12:30 +0000
@@ -74,8 +74,8 @@
                                 <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)"  attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/>
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'required':[('type','=','remove')]}" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" attrs="{'required':[('type','=','remove')]}" class="oe_inline"/>
                                 </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
@@ -136,8 +136,8 @@
                     <group col="4">
                         <field name="holiday_status_id"/>
                         <field name="type"/>
-                        <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
-                        <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                        <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'invisible':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                        <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'invisible':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>