Odoo Addons (MOVED TO GITHUB)

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

  1. trunk-bug-1258459-ssh
  2. Merge into trunk
Proposed by Sunil Sharma(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1258459-ssh
Merge into: lp:openobject-addons
Diff against target: 25 lines (+4/-4)
1 file modified
hr_holidays/hr_holidays_view.xml (+4/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1258459-ssh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+206847@code.launchpad.net

Description of the change

Hello,

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

Thanks
Sunil Sharma (SSH)

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-bug-1258459-ssh updated
9087. By Niko (OpenERP)

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

9153. By Sunil Sharma(OpenERP)

[MRG]lp:openobject-addons

Unmerged revisions

9153. By Sunil Sharma(OpenERP)

[MRG]lp:openobject-addons

9152. By Sunil Sharma(OpenERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_holidays/hr_holidays_view.xml'
2--- hr_holidays/hr_holidays_view.xml 2014-02-11 15:48:27 +0000
3+++ hr_holidays/hr_holidays_view.xml 2014-02-24 08:12:30 +0000
4@@ -74,8 +74,8 @@
5 <label for="number_of_days_temp" string="Duration"/>
6 <div>
7 <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
8- <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"/>
9- <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/>
10+ <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"/>
11+ <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" attrs="{'required':[('type','=','remove')]}" class="oe_inline"/>
12 </group>
13 <div>
14 <field name="number_of_days_temp" class="oe_inline"/> days
15@@ -136,8 +136,8 @@
16 <group col="4">
17 <field name="holiday_status_id"/>
18 <field name="type"/>
19- <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
20- <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
21+ <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'invisible':[('type','=','add')], 'required':[('type','=','remove')]}"/>
22+ <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'invisible':[('type','=','add')], 'required':[('type','=','remove')]}"/>
23 <field name="number_of_days_temp"/>
24 <field name="manager_id"/>
25 </group>

Subscribers

People subscribed via source and target branches

to all changes: