Odoo Addons (MOVED TO GITHUB)

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

  1. 7.0-bug-1258459-avo
  2. Merge into 7.0
Proposed by Amit Vora(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-bug-1258459-avo
Merge into: lp:openobject-addons/7.0
Diff against target: 21 lines (+5/-3)
1 file modified
hr_holidays/hr_holidays_view.xml (+5/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-bug-1258459-avo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+208089@code.launchpad.net

Description of the change

Hello,

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

Thanks.
avo

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/7.0-bug-1258459-avo updated
9856. By Amit Vora(OpenERP)

[IMP] improve code

9857. By Amit Vora(OpenERP)

[IMP] improve code

9858. By Amit Vora(OpenERP)

[MERGE] merge with main branch

9859. By Amit Vora(OpenERP)

[MRG] merge with main branch

9860. By Amit Vora(OpenERP)

[MRG] merge with main branch

9861. By Amit Vora(OpenERP)

[MRG] merge with main branch

9862. By Amit Vora(OpenERP)

[IMP] remove space

Unmerged revisions

9862. By Amit Vora(OpenERP)

[IMP] remove space

9861. By Amit Vora(OpenERP)

[MRG] merge with main branch

9860. By Amit Vora(OpenERP)

[MRG] merge with main branch

9859. By Amit Vora(OpenERP)

[MRG] merge with main branch

9858. By Amit Vora(OpenERP)

[MERGE] merge with main branch

9857. By Amit Vora(OpenERP)

[IMP] improve code

9856. By Amit Vora(OpenERP)

[IMP] improve code

9855. By Amit Vora(OpenERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
64 <group>64 <group>
65 <group>65 <group>
66 <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>66 <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
67 <field name="type" invisible="1"/>
67 <field name="holiday_status_id" context="{'employee_id':employee_id}"/>68 <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
68 <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."/>69 <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."/>
69 <div>70 <div>
70 <group col="3">71 <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
71 <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"/>72 <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" class="oe_inline" attrs="{'required': [('type', '=', 'remove')]}"/>
72 <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>73 <label string="-" class="oe_inline"/>
74 <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" class="oe_inline" attrs="{'required': [('type', '=', 'remove')]}"/>
73 </group>75 </group>
74 <div>76 <div>
75 <field name="number_of_days_temp" class="oe_inline"/> days77 <field name="number_of_days_temp" class="oe_inline"/> days