odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge two views 

Remove the inherit_id field

lp bug: https://launchpad.net/bugs/296683 fixed

bzr revid: stephane@tinyerp.com-20081117100937-jbiqhki6ifmd9l93
This commit is contained in:
Stephane Wirtel 2008-11-17 11:09:37 +01:00
parent 5c5d49c20c
commit c6c66045aa
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/hr_holidays/hr_view.xml
View File

@ -3,11 +3,10 @@
<data>
<!-- Holidays -->
<record model="ir.ui.view" id="edit_holiday_inherit_new">
<field name="name">hr.holidays.form.inherit</field>
<record model="ir.ui.view" id="edit_holiday_new">
<field name="name">hr.holidays.form</field>
<field name="model">hr.holidays</field>
<field name="type">form</field>
<field name="inherit_id" eval="False"/>
<field name="arch" type="xml">
<form string="Employee holidays">
<field colspan="4" name="name" select="1"/>
@ -42,6 +41,8 @@
<field name="arch" type="xml">
<tree string="Employee holidays">
<field name="name"/>
<field name="employee_id"/>
<field name="number_of_days" string="Number of Days"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="holiday_status"/>
@ -50,19 +51,6 @@
</field>
</record>
<record model="ir.ui.view" id="view_holiday_2">
<field name="name">hr.holidays.tree</field>
<field name="model">hr.holidays</field>
<field name="inherit_id" ref="view_holiday"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="employee_id"/>
<field name="number_of_days" string="Number of Days"/>
</field>
</field>
</record>
<!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form">
<field name="name">hr.holidays.status.form</field>