From 621e546580e503720e9e5a2c8d9ac19115e38cea Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 14:19:33 +0530
Subject: [PATCH] [IMP]improve view as per review

bzr revid: sgo@tinyerp.com-20120629084933-q6g14p68wwt818v7
---
 addons/hr_holidays/hr_holidays_view.xml       |  8 ++--
 addons/hr_timesheet/hr_timesheet_view.xml     | 43 +++++++++++--------
 .../hr_timesheet_sheet_view.xml               |  2 +-
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4b2f3707ac2..cff01b599e1 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -79,9 +79,11 @@
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration"/>
                             <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                                <field name="number_of_days_temp"/> days
+                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
+                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                <div>
+                                    <field name="number_of_days_temp" class="oe_inline"/> days
+                                </div>
                             </div>
                         </group>
                     </group>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 169824e7475..399c31c148b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -26,29 +26,38 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet Lines">
-                    <group col="4">
-                        <field name="name" colspan="4"/>
-                        <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
-                        <field name="date" on_change="on_change_date(date)"/>
+                <form string="Timesheet Lines" version="7.0">
+                    <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                        </group>
+                        <group>
+                            <field name="date" on_change="on_change_date(date)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Information">
-                            <group>
-                                <group string="Product">
-                                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                </group>
-                                <group string="Accounting">
-                                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
-                                    <field name="amount"/>
-                                    <field name="general_account_id"/>
-                                    <field name="journal_id"/>
-                                </group>
+                        <group>
+                            <group string="Product">
+                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
+                                <label string="Quantity" for="unit_amount" align="1.0"/>
+                                <div>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                </div>
                             </group>
+                            <group string="Accounting">
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
+                                <field name="amount"/>
+                                <field name="general_account_id"/>
+                                <field name="journal_id"/>
+                            </group>
+                        </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 36827fe7c48..8d0a6d1bec6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -231,7 +231,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="before">
+                <field name="date" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>