[MERGE] merge with latest stable
[odoo/odoo.git] / addons / hr_payroll / hr_payroll_view.xml
index ce68f1e..78b9da0 100644 (file)
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Passport Views    -->
@@ -32,9 +32,6 @@
                             <separator string="Description" colspan="2"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Contracts" groups="base.group_extended">
-                            <field name="contracts_ids" colspan="4" nolabel="1"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
         <!-- End Passport Views -->
 
         <!-- Employee View -->
-        <record id="view_employee_bank_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" invisible="context.get('display_partner', False)"/>
-                </field>
-            </field>
-        </record>
-        
         <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
             <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}"/>
                             <field name="medic_exam" select="1" string="Medical Examination"/>
                         </group>
                     </page>
-                    <page string="Contracts" groups="base.group_extended">
-                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
-                            <tree string="Contracts">
-                                <field name="name"/>
-                                <field name="job_id"/>
-                                <field name="date_start"/>
-                                <field name="date_end"/>
-                                <field name="working_hours"/>
-                                <field name="wage_type_id"/>
-                                <field name="wage"/>
-                            </tree>
-                            <form string="Contracts">
-                                <group colspan="4" col="6">
-                                    <field name="name" select="1"/>
-                                    <field name="job_id"/>
-                                    <newline/>
-                                    <field name="wage"/>
-                                    <field name="wage_type_id" widget="selection"/>
-                                    <field name="type_id" widget="selection"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Contract Details">
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Duration"/>
-                                            <field name="date_start" select="1"/>
-                                            <field name="date_end" select="1"/>
-                                            <field name="working_hours"/>
-                                        </group>
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Advantages"/>
-                                            <field name="struct_id" select="1"/>
-                                            <field name="advantages_gross"/>
-                                            <field name="advantages_net"/>
-                                            <field name="advantages" nolabel="1" colspan="2"/>
-                                        </group>
-                                    </page>
-                                    <page string="Work Permit">
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Passport"/>
-                                            <field name="passport_id" domain="[('employee_id','=',parent.id)]"/>
-                                        </group>
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Valid for"/>
-                                            <field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                            <field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                            <field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                        </group>
-                                    </page>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="notes" nolabel="1"/>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                </xpath>
-                <xpath expr="/form/notebook/page[@string='Notes']" position="before">
-                    <page string="Salary Structure" groups="base.group_extended">
-                        <group col="10" colspan="4">
-                            <separator string="Salary Computation" colspan="10"/>
-                            <field name="basic"/>
-                            <field name="advantages_gross"/>
-                            <field name="gross"/>
-                            <field name="advantages_net"/>
-                            <field name="net"/>
-                        </group>
-                        <separator string="Employee specific allowances and deductions" colspan="4"/>
-                        <field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
-                            <tree string="Salary Structure" editable="bottom">
-                                <field name="category_id" on_change="onchange_category(category_id)"/>
-                                <field name="sequence" groups="base.group_extended"/>
-                                <field name="name"/>
-                                <field name="code"/>
-                                <field name="type"/>
-                                <field name="amount_type"/>
-                                <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
-                            </tree>
-                            <form string="Payslip Line">
-                                <group col="6" colspan="4">
-                                    <field name="name" colspan="4" select="1"/>
-                                    <field name="code" select="1"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <separator colspan="4" string="Calculations"/>
-                                    <field name="category_id" on_change="onchange_category(category_id)"/>
-                                    <field name="type"/>
-                                    <field name="amount_type"/>
-                                    <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
-                                    <field name="sequence" groups="base.group_extended"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <separator colspan="4" string="Company contribution"/>
-                                    <field name="company_contrib"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Function">
-                                        <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
-                                            <tree string="Function Arguments" editable="bottom">
-                                                <field name="name"/>
-                                                <field name="sequence" groups="base.group_extended"/>
-                                                <field name="from_val"/>
-                                                <field name="to_val"/>
-                                                <field name="amount_type"/>
-                                                <field name="value"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Description">
-                                        <separator colspan="4" string="Description"/>
-                                        <field name="note" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
                 </xpath>
             </data>
             </field>
                 </field>
             </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>
             <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 -->
             </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"/>
                 </form>
             </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 ="eval('view_hr_payslip_tree')"
-            id="act_hr_employee_payslip_list"/>
+            view_id ="view_hr_payslip_tree"
+            id="act_hr_employee_payslip_list"
+            groups="base.group_hr_manager"/>
+
     </data>
 </openerp>