[MERGE] lp:openobject-addons

[odoo/odoo.git] / addons / hr_timesheet_sheet / hr_timesheet_sheet_view.xml

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 0715ba1..a77e896 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -7,11 +7,13 @@
             <field name="model">hr_timesheet_sheet.sheet.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by Accounts">
-                    <field name="sheet_id" select="1"/>
-                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="total" sum="Total"/>
-                    <field name="invoice_rate"/>
+                <form string="Timesheet by Accounts" version="7.0">
+                    <group col="4">
+                        <field name="sheet_id"/>
+                        <field name="name" groups="analytic.group_analytic_accounting"/>
+                        <field name="total" sum="Total"/>
+                        <field name="invoice_rate"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -48,7 +50,7 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form string="Timesheet" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -56,18 +58,21 @@
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
-                <sheet string="Timesheet" layout="auto">
-                    <group colspan="4" col="6" class="oe_form_header">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="user_id" invisible="1"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <newline/>
+                <sheet>
+                    <label for="employee_id" class="oe_form_readonly_hidden"/>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                    <label for="date_from" class="oe_form_readonly_hidden" string="Timesheet Period"/>
+                    <h2>
+                        From <field name="date_from"/>
+                        to <field name="date_to"/>
+                    </h2>
+                    <group col="4">
                         <field name="name"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
                         <field name="department_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" invisible="1"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Daily">
                             <group col="6" colspan="4">
                                 <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
@@ -105,7 +110,7 @@
                                     <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
-                                <form string="Timesheet Lines">
+                                <form string="Timesheet Lines" version="7.0">
                                     <field name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
@@ -222,7 +227,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <field name="sheet_id" select="1"/>
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
@@ -238,7 +243,7 @@
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
                 <field name="action" position="after">
-                    <field name="sheet_id" select="1" />
+                    <field name="sheet_id" />
                 </field>
             </field>
         </record>