From 24bef785975fc9bcc724eec253f6b20f7dd9fdc6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:57:06 +0200
Subject: [PATCH] [FIX] account_analytic_anlysis: fixed view inheritancies

bzr revid: qdp-launchpad@openerp.com-20120615085706-eshlyfxh3wbotq6t
---
 .../account_analytic_analysis_view.xml                 |  4 ----
 .../hr_timesheet_invoice/hr_timesheet_invoice_view.xml | 10 ++++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 63ba4c01f91..06e7cc9c1e4 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -90,10 +90,6 @@
                             </td>
                         </tr>
                     </table>
-                      <group col="4" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                        <field name="pricelist_id"/>
-                        <field name="to_invoice"/>
-                      </group>
                  </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 6f4987bd1c7..7e0d648df92 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -8,12 +8,14 @@
             <field name="priority">30</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr='//group[@name="toinvoice"]' position='inside'>
-                    <field name="pricelist_id" />
-                    <field name="to_invoice" widget="selection"/>
+                <xpath expr='//separator[@name="description"]' position='before'>
+                    <group col="4">
+                        <field name="pricelist_id" />
+                        <field name="to_invoice" widget="selection"/>
+                    </group>
                  </xpath>
                 <xpath expr="//field[@name='use_timesheets']" position="replace">
-                    <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)" string="USE TIMESHEETS blablabla"/>
+                    <field name="use_timesheets" on_change="on_change_use_timesheets(use_timesheets, context)"/>
                 </xpath>
                 <xpath expr="/form/sheet" position='before'>
                     <header>