From 9a6036f38d9494c5c82656b49c537ffb5be6f4f2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 17:25:44 +0200
Subject: [PATCH] [FIX+IMP]  project_timesheet:fixed bad reference; project=
 usabilty improvements

bzr revid: qdp-launchpad@openerp.com-20120615152544-yy9zdx3pxeyol4bc
---
 addons/project/project_view.xml               | 22 ++++++++++---------
 .../project_timesheet_view.xml                |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 30f0db38497..86a744a87ba 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -85,16 +85,18 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <group string="Administration">
-                                <field name="planned_hours" widget="float_time"/>
-                                <field name="effective_hours" widget="float_time" />
-                                <field name="resource_calendar_id"/>
-                            </group>
-                            <group string="Miscellaneous" name="misc">
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="priority"/>
-                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                            <group>
+                                <group string="Administration">
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time" />
+                                    <field name="resource_calendar_id"/>
+                                </group>
+                                <group string="Miscellaneous" name="misc">
+                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="priority"/>
+                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Tasks Stages">
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 96a564b4152..122ee3dc4ab 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -33,7 +33,7 @@
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="project_invoice_form"/>
+            <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
                     <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"  attrs="{'required':[('to_invoice','!=',False)]}"/>