Merge lp:~openerp-dev/openobject-addons/trunk-bug-727711-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix the bug: human resource Payroll
https://bugs.launchpad.net/openobject-addons/+bug/727711

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Why did you remove view_hr_payslip_line_inherit_form ?

you have to create new XML id for your inheritance (Putting account id on form of payslip line available on payroll structure).

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

hello,

I have changed as you describe above.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'hr_payroll_account/hr_payroll_account_view.xml'
--- hr_payroll_account/hr_payroll_account_view.xml	2011-01-14 00:11:01 +0000
+++ hr_payroll_account/hr_payroll_account_view.xml	2011-03-03 06:46:42 +0000
@@ -44,6 +44,18 @@
             </field>
         </record>
 
+        <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">
+                <xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/form/group/field[@name='company_contrib']" position="before">
+                   <field name="account_id" required="1"/>
+                </xpath>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
             <field name="name">hr.payslip.inherit.form</field>
             <field name="model">hr.payslip</field>
@@ -57,7 +69,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>
@@ -166,7 +178,7 @@
                 </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>
@@ -204,7 +216,7 @@
 	           </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>