[FIX] hr_payroll_account: human resource Payroll
authorARA (OpenERP) <ara@tinyerp.com>
Thu, 3 Mar 2011 06:12:08 +0000 (11:42 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Thu, 3 Mar 2011 06:12:08 +0000 (11:42 +0530)
lp bug: https://launchpad.net/bugs/727711 fixed

bzr revid: ara@tinyerp.com-20110303061208-yb8plmh5ae2jppbi

addons/hr_payroll_account/hr_payroll_account_view.xml

index e62d2ae..0bf374c 100644 (file)
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_hr_payslip_line_inherit_form">
-            <field name="name">hr.payslip.line.inherit.form</field>
-            <field name="model">hr.payslip.line</field>
-            <field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_form"/>
+        <record model="ir.ui.view" id="view_hr_employee_grade_inherit_form">
+            <field name="name">hr.employee.grade.inherit.form</field>
+            <field name="model">hr.payroll.structure</field>
+            <field name="inherit_id" ref="hr_payroll.view_hr_employee_grade_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="company_contrib" position="before">
+                <xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/form/group/field[@name='company_contrib']" position="before">
                    <field name="analytic_account_id"/>
                    <field name="account_id" required="1"/>
-                </field>
+                </xpath>
             </field>
         </record>
 
@@ -57,7 +57,7 @@
             </field>
         </record>
 
+
          <record id="view_hr_payslip_form_inherit_1" model="ir.ui.view">
             <field name="name">hr.payslip.form.inherit1</field>
             <field name="model">hr.payslip</field>
                 </field>
             </field>
         </record>
-    
+
         <record id="view_hr_payslip_form_inherit" model="ir.ui.view">
                    <field name="name">hr.payslip.form</field>
                    <field name="model">hr.payslip</field>
                   </page>
                    </field>
                </record>
-               
+
                <record id="view_hr_payslip_form_inherit1" model="ir.ui.view">
                    <field name="name">hr.payslip.form</field>
                    <field name="model">hr.payslip</field>