From 2fdd2000e604584fa486696ea8fc4bf670f1e95f Mon Sep 17 00:00:00 2001
From: "PSI(OpenERP)" <>
Date: Tue, 3 Aug 2010 12:11:46 +0530
Subject: [PATCH] [IMP] hr related modules

bzr revid: mra@mra-laptop-20100803064146-1tlbgy3huwxfer4e
---
 .../report/hr_evaluation_report_view.xml      |   2 +-
 .../report/hr_expense_report_view.xml         |   2 +-
 .../report/available_holidays_view.xml        |   4 +-
 .../report/hr_holidays_report_view.xml        |   2 +-
 addons/hr_payroll/hr_payroll_view.xml         | 117 +++++++++---------
 .../report/report_emp_salary_structure.py     |   2 +-
 .../report/report_emp_salary_structure.rml    |  39 +++---
 addons/hr_timesheet/hr_timesheet_view.xml     |   2 +-
 .../report/hr_timesheet_report_view.xml       |   2 +-
 .../report/timesheet_report_view.xml          |   2 +-
 10 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b4ab2743c0b..bb50e30c9be 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -58,7 +58,7 @@
                    		help = "Final Validation Evaluations"/>
                    	<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
   					<separator orientation="vertical"/>
-	                <field name="employee_id" widget="selection"/>
+	                <field name="employee_id"/>
 	                <field name="plan_id" widget="selection"/>
                 </group>
                 <newline/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 71187ef0726..942c7f13316 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -72,7 +72,7 @@
                     <field name="department_id"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Group By...">
+                <group expand="0" string="Group By...">
                     <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 205e8ce31ed..0b9f91e37dc 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -58,9 +58,9 @@
                     <field name="employee_id"/>
 		            </group>
 		            <newline/>
-	                <group expand="1" string="Group By..." colspan="10" col="12">
+	                <group expand="0" string="Group By..." colspan="10" col="12">
 	                    <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-	                    <filter icon="terp-personal" string="Employee" 
+	                    <filter icon="terp-personal" string="Employee"
                           name="user" context="{'group_by':'employee_id'}"
 	                        help="Leaves by employee"/>
                         <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e25a7487e51..d38aceeeeb9 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -62,7 +62,7 @@
 					<field name="employee_id"/>
 	            </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="0" string="Group By..." colspan="10" col="12">
                     <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 23fbd983483..394692fe26d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -62,7 +62,6 @@
             <field name="arch" type="xml">
                 <search string="Search Passport">
                     <group col="8" colspan="4">
-                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="employee_id"/>
                         <field name="country_id"/>
@@ -77,7 +76,7 @@
                     </group>
                 </search>
             </field>
-        </record>           
+        </record>
         <record id="action_hr_passport_tree" model="ir.actions.act_window">
             <field name="name">All Passports</field>
             <field name="res_model">hr.passport</field>
@@ -87,12 +86,12 @@
         </record>
         <menuitem id="passport_configure" parent="hr.menu_hr_configuration" name="Passport"/>
         <menuitem
-            id="menu_action_hr_passport_tree" 
-            action="action_hr_passport_tree" 
-            parent="passport_configure" 
+            id="menu_action_hr_passport_tree"
+            action="action_hr_passport_tree"
+            parent="passport_configure"
         />
         <!-- End Passport Views -->
-        
+
         <!-- Employee View -->
         <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
@@ -208,7 +207,7 @@
                 </notebook>
             </field>
         </record>
-        
+
         <record id="view_employee_passport_form" model="ir.ui.view">
             <field name="name">hr.employee.passport.form</field>
             <field name="model">hr.employee</field>
@@ -221,7 +220,7 @@
             </field>
         </record>
         <!-- End Employee View -->
-        
+
         <!-- Contract View -->
         <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
@@ -274,7 +273,7 @@
         </record>
         <menuitem action="hr_contract.action_hr_contract" id="hr_menu_contract" parent="payroll_configure" name="Contracts" sequence="4"/>
         <!-- End Contract View-->
-        
+
         <!-- Salary structure -->
         <record id="view_hr_employee_grade_tree" model="ir.ui.view">
             <field name="name">hr.payroll.structure.tree</field>
@@ -310,20 +309,20 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_view_hr_employee_grade_form" model="ir.actions.act_window">
             <field name="name">Salary Structure</field>
             <field name="res_model">hr.payroll.structure</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_hr_employee_grade_tree"/>
         </record>
-        <menuitem 
-            id="menu_hr_employee_function" 
-            action="action_view_hr_employee_grade_form" 
-            parent="payroll_configure" 
+        <menuitem
+            id="menu_hr_employee_function"
+            action="action_view_hr_employee_grade_form"
+            parent="payroll_configure"
         />
         <!-- End Salary structure -->
-        
+
         <!-- Holiday Status -->
         <record model="ir.ui.view" id="view_holiday_status_form1">
             <field name="name">hr.holidays.status.inherit</field>
@@ -348,7 +347,7 @@
             </field>
         </record>
         <!-- End Holiday Status -->
-        
+
         <!-- Payslip Line -->
         <record id="view_hr_payslip_line_tree" model="ir.ui.view">
             <field name="name">hr.payslip.line.tree</field>
@@ -434,7 +433,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_hr_payslip_form" model="ir.ui.view">
             <field name="name">hr.payslip.form</field>
             <field name="model">hr.payslip</field>
@@ -465,21 +464,21 @@
                                     <field name="analytic_account_id"/>
                                 </tree>
                             </field>
-                            
+
                             <group col="6" colspan="4">
                                 <separator string="Computation Overview" colspan="6"/>
                                 <field name="working_days"/>
                                 <field name="holiday_days"/>
                                 <field name="worked_days"/>
-                                
+
                                 <field name="basic_before_leaves"/>
                                 <field name="leaves"/>
                                 <field name="basic"/>
-                                
+
                                 <field name="allounce"/>
                                 <field name="deduction"/>
                                 <field name="other_pay"/>
-                                
+
                                 <field name="grows"/>
                                 <field name="net"/>
                                 <field name="total_pay"/>
@@ -538,7 +537,7 @@
                     </group>
                 </search>
             </field>
-        </record>   
+        </record>
         <record id="action_view_hr_payslip_form" model="ir.actions.act_window">
             <field name="name">Employee Payslip</field>
             <field name="res_model">hr.payslip</field>
@@ -547,9 +546,9 @@
             <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
-        
-        
-        
+
+
+
         <!-- Payment Heads -->
         <record id="hr_allounce_deduction_categoty_form" model="ir.ui.view">
             <field name="name">hr.allounce.deduction.categoty.form</field>
@@ -618,7 +617,7 @@
                </search>
             </field>
         </record>
-        
+
         <record id="hr_allounce_deduction_tree" model="ir.actions.act_window">
             <field name="name">Salary Heads</field>
             <field name="res_model">hr.allounce.deduction.categoty</field>
@@ -626,13 +625,13 @@
             <field name="view_id" ref="hr_allounce_deduction_categoty_tree"/>
            <field name="search_view_id" ref="view_allounce_deduction_categoty_filter"/>
         </record>
-        <menuitem 
-            id="menu_hr_allounce_deduction_tree" 
-            action="hr_allounce_deduction_tree" 
-            parent="payroll_configure" 
+        <menuitem
+            id="menu_hr_allounce_deduction_tree"
+            action="hr_allounce_deduction_tree"
+            parent="payroll_configure"
         />
         <!-- End Payment Heads -->
-        
+
         <!-- Company Contribution -->
         <record id="hr_company_contribution_form" model="ir.ui.view">
             <field name="name">company.contribution.form</field>
@@ -716,7 +715,7 @@
                     </group>
                 </search>
             </field>
-        </record>        
+        </record>
         <record id="action_hr_company_contribution_tree" model="ir.actions.act_window">
             <field name="name">Company Contributions</field>
             <field name="res_model">company.contribution</field>
@@ -724,13 +723,13 @@
             <field name="view_id" ref="hr_company_contribution_tree"/>
            	<field name="search_view_id" ref="view_hr_company_contribution_filter"/>
         </record>
-        <menuitem 
-            id="menu_hr_company_contribution_tree" 
-            action="action_hr_company_contribution_tree" 
-            parent="payroll_configure" 
+        <menuitem
+            id="menu_hr_company_contribution_tree"
+            action="action_hr_company_contribution_tree"
+            parent="payroll_configure"
         />
         <!-- End Company Contribution -->
-        
+
         <!-- Contract Form-->
 <!--        <record id="hr_contract.hr_contract_view_form" model="ir.ui.view">-->
 <!--            <field name="name">hr.contract.view.form</field>-->
@@ -776,7 +775,7 @@
 <!--            id="hr_menu_contract" -->
 <!--            parent="payroll_configure"-->
 <!--        />-->
-        
+
         <record id="view_hr_bank_advice_tree" model="ir.ui.view">
             <field name="name">hr.payroll.advice.tree</field>
             <field name="model">hr.payroll.advice</field>
@@ -790,7 +789,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_hr_bank_advice_form" model="ir.ui.view">
             <field name="name">hr.payroll.advice.form</field>
             <field name="model">hr.payroll.advice</field>
@@ -840,12 +839,12 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_hr_bank_advice_tree"/>
         </record>
-        <menuitem 
-            action="action_view_hr_bank_advice_tree" 
-            id="hr_menu_payment_advice" 
+        <menuitem
+            action="action_view_hr_bank_advice_tree"
+            id="hr_menu_payment_advice"
             parent="menu_hr_root_payroll"
         />
-        
+
         <record id="view_hr_payroll_register_tree" model="ir.ui.view">
             <field name="name">hr.payroll.register.tree</field>
             <field name="model">hr.payroll.register</field>
@@ -921,12 +920,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem 
-            action="action_view_hr_payroll_register_form" 
-            id="hr_menu_payroll_register" 
+        <menuitem
+            action="action_view_hr_payroll_register_form"
+            id="hr_menu_payroll_register"
             parent="menu_hr_root_payroll"
         />
-        
+
         <!--
         Contribution Register
         -->
@@ -961,10 +960,10 @@
                                 <tree string="Register Lines" editable="top">
                                     <field name="code"/>
                                     <field name="employee_id"/>
-                                    <field name="period_id"/>    
+                                    <field name="period_id"/>
                                     <field name="emp_deduction"/>
-                                    <field name="comp_deduction"/>    
-                                    <field name="total"/>                        
+                                    <field name="comp_deduction"/>
+                                    <field name="total"/>
                                 </tree>
                              </field>
                          </page>
@@ -993,9 +992,9 @@
             <field name="view_id" ref="hr_contibution_register_tree"/>
         </record>
         <menuitem
-            id="menu_action_hr_contibution_register_form" 
-            action="action_contibution_register_form" 
-            parent="payroll_configure" 
+            id="menu_action_hr_contibution_register_form"
+            action="action_contibution_register_form"
+            parent="payroll_configure"
         />
         <record id="hr_contibution_register_line_form" model="ir.ui.view">
             <field name="name">hr.contibution.register.line.form</field>
@@ -1005,15 +1004,15 @@
                 <form string="Contribution">
                       <field name="name"/>
                       <field name="code"/>
-                      <field name="employee_id"/>    
-                      <field name="period_id"/>    
+                      <field name="employee_id"/>
+                      <field name="period_id"/>
                       <field name="emp_deduction"/>
-                      <field name="comp_deduction"/>    
-                      <field name="total"/>                    
+                      <field name="comp_deduction"/>
+                      <field name="total"/>
                 </form>
             </field>
         </record>
-        
+
         <record id="hr_payslip_line_condition_tree" model="ir.ui.view">
             <field name="name">hr.payslip.line.condition.tree</field>
             <field name="model">hr.payslip.line.condition</field>
@@ -1022,7 +1021,7 @@
                 <form string="Condition">
                     <field name="name"/>
                     <field name="date_start"/>
-                    <field name="date_end"/>    
+                    <field name="date_end"/>
                     <field name="state"/>
                 </form>
             </field>
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.py b/addons/hr_payroll/report/report_emp_salary_structure.py
index 8d0b1333dfe..0c63f446c38 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.py
+++ b/addons/hr_payroll/report/report_emp_salary_structure.py
@@ -42,7 +42,7 @@ class salary_structure_report(report_sxw.rml_parse):
     def get_contract(self,emp):
         curr_date = "'"+time.strftime("%Y-%m-%d")+"'"
         sql_req= '''
-            SELECT c.id as id, c.wage as wage, function as function
+            SELECT c.id as id, c.wage as wage, struct_id as struct
             FROM hr_contract c
               LEFT JOIN hr_employee emp on (c.employee_id=emp.id)
               LEFT JOIN hr_contract_wage_type cwt on (cwt.id = c.wage_type_id)
diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index 18211b254f3..d5864beb675 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -185,14 +185,14 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -202,8 +202,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -218,10 +218,10 @@
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
     <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -230,16 +230,16 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'employee')]]</para>
     <blockTable colWidths="539.0" style="Table1">
@@ -308,7 +308,7 @@
             <para style="terp_tblheader_Details">Designation</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ cont.function.name or '' ]]</para>
+            <para style="terp_default_9">[[ cont.job_id.name or '' ]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Phone No.</para>
@@ -427,7 +427,7 @@
           <font color="white"> </font>
         </para>
         <section>
-          <para style="terp_default_9">[[repeatIn(cont.function.line_ids,'line')]]</para>
+          <para style="terp_default_9">[[repeatIn(cont.struct_id.line_ids,'line')]]</para>
           <blockTable colWidths="34.0,117.0,39.0,67.0,44.0,110.0,69.0,59.0" style="Table8">
             <tr>
               <td>
@@ -550,3 +550,4 @@
     </para>
   </story>
 </document>
+
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d612706257f..9f8100cd184 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -52,7 +52,7 @@
                     <group col='8' colspan='4'>
                         <filter icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id"/>
                         <field name="account_id" select="1" widget="selection"/>
                         <field name="date" select="1"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 8ab227a1870..4515215e4a1 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -58,7 +58,7 @@
                             <field name="user_id" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 0a4aaf1dbf3..cff67ddca5e 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -76,7 +76,7 @@
                       <field name="user_id" />
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By...">
+                    <group expand="0" string="Group By...">
                         <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                         <separator orientation="vertical"/>