diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index a66951e9f45..977cc22f005 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -73,7 +73,7 @@
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_root" sequence="5"/>
 
         <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e04cf1aaad..47efc17825e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
-        <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
+        <menuitem id="menu_hr_human_resources" sequence="2" name="Human Resources" parent="menu_hr_root"/>
         <menuitem
             id="menu_hr_configuration"
             name="Configuration"
@@ -58,7 +58,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Status" colspan="2"/>
                                 <field name="gender"/>
-                                <field name="marital"/>
+                                <field name="marital" widget="selection"/>
                                 <field name="country_id"/>
                                 <field name="birthday"/>
                             </group>
@@ -103,7 +103,7 @@
                     <newline />
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical" />
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
@@ -141,13 +141,15 @@
         <menuitem
             action="open_view_employee_list_my"
             id="menu_open_view_employee_list_my"
-            parent="menu_hr_human_resources"/>
+            sequence="3"
+            parent="menu_hr_root"/>
+
 
         <!--
         =======================
         Employee marital status
-        =======================
-        -->
+        =======================     -->
+
         <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
             <field name="name">hr.hr.employee.marital.status</field>
             <field name="model">hr.employee.marital.status</field>
@@ -172,6 +174,7 @@
             id="hr_menu_marital_status"
             parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
 
+
         <!--
         =======================
         Employee architecture
@@ -257,9 +260,10 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="open_view_categ_form" 
-            id="menu_view_employee_category_form" 
-            parent="menu_view_employee_category_configuration_form" sequence="1"/>
+        <menuitem action="open_view_categ_form"
+            id="menu_view_employee_category_form"
+            parent="menu_view_employee_category_configuration_form" sequence="1"
+            groups="base.group_extended"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -287,8 +291,8 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem 
-            action="open_view_categ_tree" 
+        <menuitem
+            action="open_view_categ_tree"
             groups="base.group_extended"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
@@ -375,9 +379,9 @@
             name="Recruitment"
             id="base.menu_crm_case_job_req_main"
             parent="menu_hr_root"/>
-        <menuitem 
-            parent="base.menu_crm_case_job_req_main" 
-            id="menu_hr_job" 
+        <menuitem
+            parent="base.menu_crm_case_job_req_main"
+            id="menu_hr_job"
             action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index cc2bfd97efe..2ea2d325867 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -56,18 +56,19 @@
                     <field name="action" select="1" />
                     <newline/>
                     <group expand="1" string="Group By..." colspan="11" col="11">
-                        <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>
             </field>
         </record>
-        
+
         <record id="open_view_attendance" model="ir.actions.act_window">
             <field name="name">Attendances</field>
             <field name="res_model">hr.attendance</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_employee":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
         </record>
 
@@ -76,7 +77,7 @@
         <menuitem
            id="menu_hr_time_tracking"
            name="Time Tracking"
-           parent="hr.menu_hr_root" sequence="5"/>
+           parent="hr.menu_hr_root" sequence="7"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance"
             parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 89272706eee..725ce7b5004 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -16,7 +16,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object"  icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 618217a1a66..220ceef2e48 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -17,7 +17,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object"  icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 16769f66df0..3061c263687 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -19,7 +19,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 62cffa720a9..d5253dffa25 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -46,7 +46,7 @@
 
         <menuitem action="action_hr_attendance_sigh_in_out"
         	id="menu_hr_attendance_sigh_in_out"
-        	parent="menu_hr_time_tracking" groups="group_hr_attendance" />
+        	parent="menu_hr_time_tracking" groups="base.group_extended" />
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 7578d66e98b..9951a9e3982 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -21,7 +21,7 @@
             <field name="arch" type="xml">
                 <form string="Wage Type">
                     <field colspan="4" name="name"/>
-                    <field name="period_id"/>
+                    <field name="period_id" widget="selection"/>
                     <field name="type"/>
                     <separator colspan="4" string="Hourly cost computation"/>
                     <field name="factor_type"/>
@@ -70,7 +70,7 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Contracts">
-                        <field colspan="4" name="contract_ids" nolabel="1">
+                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
                             <tree string="Contracts">
                                 <field name="name"/>
                                 <field name="job_id"/>
@@ -133,14 +133,24 @@
             </field>
         </record>
 
-        <record id="hr_contract_type_view_form" model="ir.ui.view">
-            <field name="name">hr.contract.type.view.form</field>
-            <field name="model">hr.contract.type</field>
-            <field name="type">form</field>
+		<record id="hr_contract_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.view.search</field>
+            <field name="model">hr.contract</field>
+            <field name="type">search</field>
             <field name="arch" type="xml">
-                <form string="Contract Type">
-                    <field colspan="4" name="name" select="1"/>
-                </form>
+                <search string="Search Contract">
+                   <group col='15' colspan='4'>
+                   		<field name="name"/>
+                      	<field name="employee_id"/>
+                      	<field name="department_id"/>
+                       	<field name="date_start"/>
+                       	<field name="date_end"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+                    </group>
+               </search>
             </field>
         </record>
 
@@ -180,17 +190,6 @@
             </field>
         </record>
 
-        <record id="hr_contract_type_view_tree" model="ir.ui.view">
-            <field name="name">hr.contract.type.view.tree</field>
-            <field name="model">hr.contract.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Contract Type">
-                    <field colspan="4" name="name"/>
-                </tree>
-            </field>
-        </record>
-
         <record id="hr_contract_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.view.tree</field>
             <field name="model">hr.contract</field>
@@ -216,9 +215,30 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
+		<record id="hr_contract_type_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.form</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contract Type">
+                    <field colspan="4" name="name" select="1"/>
+                </form>
+            </field>
+        </record>
 
+		 <record id="hr_contract_type_view_tree" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.tree</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Contract Type">
+                    <field colspan="4" name="name"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_hr_contract_type" model="ir.actions.act_window">
             <field name="name">Contract Types</field>
             <field name="res_model">hr.contract.type</field>
@@ -227,8 +247,8 @@
         </record>
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
-        <menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
+        <!--<menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/> -->
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
 		<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cff66266686..e2b1532d17f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+
+    	<record id="view_hr_evaluation_plan_search" model="ir.ui.view">
+            <field name="name">hr_evaluation.plan.search</field>
+            <field name="model">hr_evaluation.plan</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Evaluation Plan">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                       <field name="company_id" widget="selection"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_plan_form">
             <field name="name">hr_evaluation.plan.form</field>
             <field name="model">hr_evaluation.plan</field>
@@ -42,7 +61,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
 
        <menuitem
             name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/>
@@ -169,19 +188,23 @@
                     <button name="button_plan_in_progress"
                             string="Start Evaluation"
                             states="draft"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-execute"/>
                     <button name="button_final_validation"
                             string="Final Validation"
                             states="wait"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-execute"/>
                     <button name="button_done"
                             string="Done"
                             states="progress"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-jump-to"/>
                     <button name="button_cancel"
                             string="Cancel"
                             states="draft,wait,progress"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-cancel"/>
                     </group>
               </form>
             </field>
@@ -279,7 +302,7 @@
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
-                        <field name="user_id"/>
+                        <field name="user_id" string="Interviewer"/>
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
@@ -328,7 +351,7 @@
                         <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id" widget="selection"/>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id" string="Interviewer" widget="selection"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 0417fb0ffd2..0dacc90c53c 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -112,8 +112,8 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/>
-    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index fff55095712..3769efcdfa8 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -10,8 +10,8 @@
              	<form string="Evaluation Reminders">
 			    	<field name="evaluation_id"/>
 			    	<newline/>
-			    	<button special="cancel" string="Cancel" />
-              		<button name="send_mail" string="Send Mail" type="object"/>
+			    	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+              		<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
              	</form>
             </field>
 		</record>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 292cbf6f027..cb74901fc4e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -30,8 +30,8 @@
                     <field name="date"/>
                     <field name="employee_id"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/>
                     <field name="ref"/>
+                    <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
                     <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
@@ -49,8 +49,8 @@
                     <field name="date"/>
                     <field name="employee_id"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/>
                     <field name="ref"/>
+                    <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
                     <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
@@ -68,8 +68,7 @@
                     <group colspan="4" col="6">
                         <field name="employee_id" select="1"/>
                         <field name="name" select="1"/>
-                        <field name="employee_id" select="1"/>
-                        <field name="ref"/>
+                        <field name="ref" groups="base.group_extended"/>
                         <field name="date" select="1"/>
                         <field name="amount"/>
                         <field name="currency_id"/>
@@ -82,7 +81,7 @@
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
                                     <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
-                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
+                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
                                     <field name="name" select="1"/>
                                     <field name="date_value" select="1"/>
                                     <field name="unit_quantity"/>
@@ -133,6 +132,12 @@
                         domain="[('state','=','draft')]"
                         string="Draft"
                         help="Draft Expense"/>
+                	  <filter
+                        icon="terp-hr"
+                        string="My Expenses"
+                        default="1"
+                        domain="[('user_id','=',uid)]"/>
+                      <separator orientation="vertical"/>
                       <filter
                         icon="terp-hr"
                         domain="[('state','=','confirm')]"
@@ -146,12 +151,7 @@
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
-                      <field name="user_id" select="1" widget="selection">
-                          <filter
-                            icon="gtk-execute"
-                            help="My Expenses"
-                            default="1"
-                            domain="[('user_id','=',uid)]"/>
+                      <field name="user_id" select="1" widget="selection" string="User">
                         <filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
@@ -161,9 +161,9 @@
                 <newline />
                 <group expand="1" string="Group By..." colspan="11" col="11">
                     <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
                 </group>
                 </search>
             </field>
@@ -176,7 +176,7 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="6"
+        <menuitem id="next_id_49" name="Expenses" sequence="8"
            parent="hr.menu_hr_root"/>
 
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 972557edd0c..c376df3e4d7 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -137,8 +137,8 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/>
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d5e0602e5bb..5004635f59c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -198,7 +198,8 @@
         <menuitem
             name="Holidays Management"
             parent="hr.menu_hr_root"
-            id="menu_open_ask_holidays"/>
+            id="menu_open_ask_holidays"
+            sequence="9"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 244668ec719..c2873ed9ace 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -5,12 +5,12 @@
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="10" />
      <menuitem
             id="menu_hr_reporting_holidays"
             name="Holidays"
             parent="hr.menu_hr_reporting"
-            sequence="3" />
+            sequence="6" />
 	<!--<wizard string="Holidays by Departement"
 		  name="hr.holidays.summary"
 		  id="holidays_summary"/>-->
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e9e0e6aae36..a5502b9450d 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -67,6 +67,7 @@
                         default="1"
                         domain="[('user_id','=',uid)]"/>
                 </field>
+                <field name="date"/>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index fabc11d6021..01d3f4372ce 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.holidays.summary.dept</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Holidays by Departement">
+			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
 				    <field name="date_from"/>
 				    <newline/>
@@ -18,14 +18,14 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
         </record>
 
         <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window">
-            <field name="name">Holidays by Departement</field>
+            <field name="name">Holidays by Department</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.dept</field>
             <field name="view_type">form</field>
@@ -34,10 +34,11 @@
         </record>
 
 		<menuitem
-	        name="Leaves by Departement"
+	        name="Leaves by Department"
 	        parent="menu_hr_reporting_holidays"
 	        action="action_hr_holidays_summary_dept"
 	        id="menu_account_central_journal"
+	        groups="base.group_extended"
 	        icon="STOCK_PRINT"/>
 
 	</data>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 0957083a136..ce87b1172b1 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -18,7 +18,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7ea4f52a392..fe0e7f2dde1 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -62,6 +62,14 @@ class hr_applicant(osv.osv):
         'response' : fields.integer("Response"),
     }
 
+    def onchange_job(self,cr, uid, ids, job, context={}):
+        result = {}
+        if job:
+            job_obj = self.pool.get('hr.job')
+            result['department_id'] = job_obj.browse(cr, uid, job).department_id.id
+            return {'value': result}
+        return {'value': {'department_id': []}}
+
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage
              using available stage for that case type
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index ba3278b3c66..760c7f08f2f 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -37,7 +37,8 @@
      <menuitem
         name="Recruitment"
         id="base.menu_crm_case_job_req_main"
-        parent="base.menu_hr"/>
+        parent="base.menu_hr"
+        sequence="1"/>
 
  <!--
         ALL JOBS REQUESTS
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index beb9467814c..461b10181b7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -69,27 +69,27 @@
         <field name="arch" type="xml">
             <form string="Jobs - Recruitment Form">
                 <group colspan="4" col="8">
-                    <field name="name" string="Subject"/>
-                    <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="stage_id" nolabel="1"/>
+                     <group colspan="3" col="6">
+                        <field name="name" string="Subject"/>
+                        <field name="stage_id"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                    <field name="user_id"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
-						icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
                     <newline/>
-                    <field name="partner_name"/>
-                    <field name="job_id"/>
-                    <field name="department_id" widget="selection"/>
-                    <button name="action_makeMeeting" type="object"
-                        string="Schedule Meeting" icon="terp-hr" />
-                    <button name="action_print_survey" string="Print Interview" type="object"
-                        icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                </group>
+                    <group colspan="3" col="6">
+	                  	<field name="partner_name"/>
+	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
+	                   	<button string="Schedule a Phone Call" name="223" icon="gtk-redo" type="action"/>
+                     </group>
+                    <newline/>
+                    <group colspan="3" col="6">
+                        <field name="user_id"/>
+                        <field name="department_id" widget="selection"/>
+                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
+                    </group>
+                    <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+            	</group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 83f7d2b7602..ec7f08bbbe0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -139,8 +139,8 @@
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 6fa7185c7e9..f161c8c07f9 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -5,12 +5,12 @@
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="10" />
          <menuitem
             id="menu_hr_reporting_timesheet"
             name="Timesheet"
             parent="hr.menu_hr_reporting"
-            sequence="1" />
+            sequence="4" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index a3b53a05d22..d6c7398864a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
@@ -34,7 +34,7 @@
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_manager" />
+        	groups="base.group_extended"/>
 
 
       <!-- Print My Timesheet -->
@@ -47,11 +47,10 @@
                 	<group colspan="4" >
 	                	<field name="month" />
 	                	<field name="year" />
-	                	<field name="user_id" colspan="3" readonly="1" />
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 4e12f4f2333..de834621c23 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 487208bfbf6..6f6ce56b091 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -52,6 +52,7 @@
 
         <menuitem action="action_hr_timesheet_sign_in"
         	id="menu_hr_timesheet_sign_in"
+        	groups="base.group_extended"
         	parent="hr_attendance.menu_hr_time_tracking"
         	/>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index f2d9f5a8c4a..a801e21082b 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -5,12 +5,12 @@
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="10" />
         <menuitem
             id="menu_hr_reporting_timesheet_invoice"
             name="Timesheet Invoice"
             parent="hr.menu_hr_reporting"
-            sequence="2" />
+            sequence="5" />
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 4de60162d1a..cb6c8d5771c 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -441,6 +441,30 @@
 
         <!-- Random Timesheet Lines of random activities -->
 
+		<record id="view_random_timesheet_lines_search" model="ir.ui.view">
+            <field name="name">random.timesheet.lines.search</field>
+            <field name="model">random.timesheet.lines</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Timesheet Lines">
+                   <group col='15' colspan='4'>
+                    	<field name="date"/>
+                    	<field name="user_id" widget="selection"/>
+                    	<field name="product_id" widget="selection"/>
+                    	<field name="analytic_account_id" widget="selection"/>
+                    	<field name="general_account_id" widget="selection"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>
+                   		<filter string="General Account" icon="terp-project" domain="[]" context="{'group_by':'general_account_id'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_random_timesheet_lines_tree">
             <field name="name">random.timesheet.lines.tree</field>
             <field name="model">random.timesheet.lines</field>
@@ -448,7 +472,7 @@
             <field name="arch" type="xml">
                 <tree string="Random Timesheets Lines">
                     <field name="date" select="1"/>
-                    <field name="user_id" />
+                    <field name="user_id"/>
                     <field name="name" select="1"/>
                     <field name="quantity" />
                     <field name="product_id" select="1"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index f79cae2eef8..b68112a5a38 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -17,7 +17,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
@@ -34,7 +34,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="menu_hr_reporting_timesheet_invoice" groups="hr.group_hr_manager" />
+        	parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/>
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index c8f9806a309..ea14e52ed52 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -15,7 +15,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1a8b110d690..eae4e8e1e9a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -114,7 +114,7 @@
                             </group>
 
                             <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
-                                <tree string="Attendances">
+                                <tree string="Attendances" editable="bottom">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
@@ -192,7 +192,7 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" />
+                        <filter name="my_timesheet" icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" />
                         <separator orientation="vertical"/>
                         <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
@@ -220,8 +220,10 @@
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{'search_default_my_timesheet':1}</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
+
         <!--Time Tracking menu in project Management-->
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
           <menuitem