[IMP]:improved HR Application view after reviewed

bzr revid: apa@tinyerp.com-20120628131210-gpy7i3d2ekg6b7da

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 266ade6..5483d06 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -48,15 +48,17 @@
                         </group>
                         <notebook>
                             <page string="Information">
-                                <group col="4">
-                                    <group string="Linked User">
+                                <group>
+                                    <group>
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <!--<field name="identification_id" groups="base.group_hr_user"/>-->
                                         <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="otherid" groups="base.group_hr_user"/>
+                                    </group>
+                                    <group name="active_group">
                                         <field name="active"/>
                                     </group>
                                 <!-- <group string="General">

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 306caa7..ff707d3 100644 (file)
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -136,7 +136,8 @@
                 <field name="active" position="before">
                                        <label for="state"/>
                                        <div>
-                                               <field name="state" class="oe_inline"/> 
+                                               <field name="state" class="oe_inline"/>
+                                               <label/>
                                                <button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
                                                <button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                                        </div>

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index bb74e35..0c6d961 100644 (file)
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -12,10 +12,12 @@
                     <xpath expr="//field[@name='parent_id']" position="before">
                         <field name="manager"/>
                     </xpath>
-                    <field name="coach_id" position="after">
-                        <field name="vehicle"/>
-                        <field name="vehicle_distance"/>
-                    </field>
+                                       <xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+                                                       <field name="vehicle"/>
+                                                       <field name="vehicle_distance"/>
+                                               </group>
+                    </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>
                     </field>

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3102fdf..4b2f370 100644 (file)
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -489,11 +489,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
-                </xpath>
                 <field name="active" position="before">
-                    <field name="remaining_leaves"/>
+                    <label for="remaining_leaves"/>
+                    <div>
+                        <field name="remaining_leaves" class="oe_inline"/>
+                        <label/>
+                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline"/>
+                    </div>
                 </field>
             </field>
         </record>

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 669c9af..f789f85 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -422,10 +422,12 @@
                     <xpath expr="//field[@name='parent_id']" position="before">
                         <field name="manager"/>
                     </xpath>
-                    <field name="coach_id" position="after">
-                        <field name="vehicle"/>
-                        <field name="vehicle_distance"/>
-                    </field>
+                    <xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+                                                       <field name="vehicle"/>
+                                                       <field name="vehicle_distance"/>
+                                               </group>
+                    </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>
                     </field>

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 24ab5d2..169824e 100644 (file)
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -114,9 +114,14 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
+                        <div class="oe_right oe_button_box" name="button_timesheet">
+                            <!-- Put here related buttons -->
+                        </div>
                         <group col="4">
-                            <field name="product_id" domain="[('type','=','service')]"/>
-                            <field name="journal_id"/>
+                            <group col="2">
+                                <field name="product_id" domain="[('type','=','service')]"/>
+                                <field name="journal_id"/>
+                            </group>
                         </group>
                     </page>
                 </page>

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 157ff40..bd691fc 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -360,9 +360,9 @@
       <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//div[@name='button_timesheet']" position="inside">
                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>