[MERGE] merge with latest stable

[odoo/odoo.git] / addons / hr_payroll / hr_payroll_view.xml

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 9ad5a88..78b9da0 100644 (file)
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -91,7 +91,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="/form/notebook/page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous">
+                    <page string="Miscellaneous" groups="base.group_hr_user">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
                             <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
@@ -274,23 +274,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <xpath expr="//group[@name='selection']" position="replace">
-                               <group colspan="2">
-                                                       <separator string="Validation" colspan="2"/>
-                                                               <newline/>
-                                                       <field name="active" />
-                                                               <newline/>
-                                                       <field name="double_validation"/>
-                                                               <newline/>
-                                                       <field name="limit"/>
-                               </group>
-                               <group colspan="2">
-                                       <separator colspan="2" string="Payroll Configurtion"/><newline/>
-                                       <field name="type"/><newline/>
-                                       <field name="head_id"/><newline/>
-                                       <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/><newline/>
-                                       <field name="code" readonly="True"/>
-                               </group>
-                       </xpath>
+                <group colspan="2">
+                            <separator string="Validation" colspan="2"/>
+                                <newline/>
+                            <field name="double_validation"/>
+                                <newline/>
+                            <field name="limit"/>
+                  </group>
+                <group colspan="2">
+                    <separator colspan="2" string="Payroll Configurtion"/><newline/>
+                    <field name="type"/><newline/>
+                    <field name="head_id"/><newline/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/><newline/>
+                    <field name="code" readonly="True"/>
+                </group>
+            </xpath>
         </field>
         </record>
         <!-- End Holiday Status -->
@@ -934,7 +932,7 @@
             </field>
         </record>
         <record id="action_contibution_register_form" model="ir.actions.act_window">
-            <field name="name">Contibution Register</field>
+            <field name="name">Contribution Register</field>
             <field name="res_model">hr.contibution.register</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_contibution_register_tree"/>
@@ -960,13 +958,18 @@
             </field>
         </record>
 
+
+
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
+            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
             res_model="hr.payslip"
             src_model="hr.employee"
             view_id ="view_hr_payslip_tree"
-            id="act_hr_employee_payslip_list"/>
+            id="act_hr_employee_payslip_list"
+            groups="base.group_hr_manager"/>
+
     </data>
 </openerp>