summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Laurent <olt@tinyerp.com>2008-11-18 09:37:12 +0100
committerOlivier Laurent <olt@tinyerp.com>2008-11-18 09:37:12 +0100
commitd2e48d09bfa1f0286b3430f3515cbdb6ef045cbd (patch)
tree80ac0f57d94e17322ba0cbffdb878ce98267c01d
parent1a2825511b6823bfc4ce82d8b95a921435736300 (diff)
parent6ae82d907d5fee77324de138ef97d16737bcaf46 (diff)
merge
bzr revid: olt@tinyerp.com-20081118083712-pxu8cg14s35o0tvf
-rw-r--r--addons/hr_holidays/hr_view.xml11
1 files changed, 4 insertions, 7 deletions
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 2b39a7ba99d..d9a39e5af23 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -35,8 +35,7 @@
<record model="ir.ui.view" id="view_holiday">
<field name="name">hr.holidays.tree</field>
- <field name="model">hr.holidays</field>
- <field name="inherit_id" eval="False"/>
+ <field name="model">hr.holidays</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Employee holidays">
@@ -54,8 +53,7 @@
<!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form">
<field name="name">hr.holidays.status.form</field>
- <field name="model">hr.holidays.status</field>
- <field name="inherit_id" eval="False"/>
+ <field name="model">hr.holidays.status</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Define holiday status">
@@ -69,8 +67,7 @@
</record>
<record model="ir.ui.view" id="view_holiday_status_tree">
<field name="name">hr.holidays.status.tree</field>
- <field name="model">hr.holidays.status</field>
- <field name="inherit_id" eval="False"/>
+ <field name="model">hr.holidays.status</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Holiday status">
@@ -145,7 +142,7 @@
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
- <field name="view_id" ref="edit_holiday_inherit_new" />
+ <field name="view_id" ref="edit_holiday_new" />
</record>
<menuitem