From d7a47d0d1fb181183f3c5c72eb97a51d2a936c4b Mon Sep 17 00:00:00 2001
From: Antoine Huvelle <ahu@odoo.com>
Date: Mon, 1 Dec 2014 14:43:04 +0100
Subject: [PATCH] [FIX] analytic_user_function: inherit conflict on account
 type

The field account_id was inherited with position="replace" meaning we erased
future changes made into hr_timesheet_sheet (41f2eba missed "type in []" and
65f31b9 missed use_timesheets).
Replace by position="attributes" to only change what matters: the on_change.
Fixes #3974
---
 addons/analytic_user_function/analytic_user_function_view.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 51e020b..051f15f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -65,8 +65,8 @@
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" context="{'default_use_timesheets': 1}"/>
+                <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="attributes">
+                    <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute>
                 </xpath>
             </field>
         </record>
-- 
1.7.10.4