From b1dc0beb352a5d09632a17897efc46b4e4fa7363 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 9 Jul 2012 15:39:03 +0530
Subject: [PATCH] [IMP]account: change account.analytic.line view

bzr revid: kjo@tinyerp.com-20120709100903-da6v6cu2ekorm2o2
---
 addons/account/project/project_view.xml       | 34 ++++++++-----------
 .../hr_timesheet_invoice_view.xml             |  2 +-
 .../project_timesheet_view.xml                |  2 +-
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7658ab111d9..e0e5df040fa 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -123,33 +123,27 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="account_id"/>
-                            <field name="journal_id"/>
+                            <field name="date"/>
+                            <label for="unit_amount"/>
+                                <group class="oe_inline">
+                                    <field name="unit_amount" nolabel="1"/>
+                                    <field name="product_uom_id" nolabel="1" />
+                                </group>
+                            <field name="amount"/>
+                        </group>
+                        <group>
+                            <field name="account_id"/>
+                            <field name="journal_id"/>
+                            <field name="product_id"/>
                         </group>
                         <group>
-                            <field name="date"/>
                             <field name="ref"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group string="Amount">
-                            <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
-                                <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="Product Information">
-                            <field name="product_id"/>
-                            <label for="unit_amount"/>
-                            <div>
-                                <field name="unit_amount" class="oe_inline"/>
-                                <field name="product_uom_id" class="oe_inline"/>
-                            </div>
-                        </group>
-                        <group string="General Accounting">
+                        <group>
                             <field name="general_account_id"/>
                             <field name="move_id" readonly="1"/>
+                            <field name="amount_currency" class="oe_inline"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index d07314498e1..92873614172 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -114,7 +114,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
-                <field name="product_uom_id" position="after">
+                <field name="amount" position="before">
                     <field name="to_invoice"/>
                     <field name="invoice_id"/>
                 </field>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2e2ec7f2677..9fb145aa536 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -70,7 +70,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                   <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
+                   <field name="account_id" string="Analytic Account/Project" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>