From c6c66045aadd866f47141abb4fbf7270693bfb7f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Mon, 17 Nov 2008 11:09:37 +0100
Subject: [PATCH] Merge two views Remove the inherit_id field

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

bzr revid: stephane@tinyerp.com-20081117100937-jbiqhki6ifmd9l93
---
 addons/hr_holidays/hr_view.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index b69b2373d3a..2b39a7ba99d 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -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>