openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-727711-ara into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #727711 human resource Payroll
  https://bugs.launchpad.net/bugs/727711

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-727711-ara/+merge/52007

Hello,

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

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-727711-ara/+merge/52007
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-727711-ara.

=== 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:19:03 +0000
@@ -31,16 +31,16 @@
             </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>
@@ -166,7 +166,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 +204,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>