From 401932b3834a7b6def46205502f2ed13a9c81a3a Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 3 Mar 2011 11:42:08 +0530
Subject: [PATCH 1/3] [FIX] hr_payroll_account: human resource Payroll

lp bug: https://launchpad.net/bugs/727711 fixed

bzr revid: ara@tinyerp.com-20110303061208-yb8plmh5ae2jppbi
---
 .../hr_payroll_account_view.xml                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index e62d2aecba3..0bf374c859c 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -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>

From e2426b8956328c61dfd4c2a4d26bca561deaaa41 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 3 Mar 2011 12:10:12 +0530
Subject: [PATCH 2/3] [FIX] hr_payroll_account: human resource Payroll

bzr revid: ara@tinyerp.com-20110303064012-vfet3j949bdfbpmf
---
 .../hr_payroll_account/hr_payroll_account_view.xml  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 0bf374c859c..42106870069 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -31,6 +31,19 @@
             </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"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="company_contrib" position="before">
+                   <field name="analytic_account_id"/>
+                   <field name="account_id" required="1"/>
+                </field>
+            </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>

From 9f127b34c135f9277de6ad9e7026fa10980596fe Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 3 Mar 2011 12:12:06 +0530
Subject: [PATCH 3/3] [FIX] hr_payroll_account: removing analytic account

bzr revid: ara@tinyerp.com-20110303064206-tlvgyjq0wl622av7
---
 addons/hr_payroll_account/hr_payroll_account_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 42106870069..5061cafb6e0 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -51,7 +51,6 @@
             <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="analytic_account_id"/>
                    <field name="account_id" required="1"/>
                 </xpath>
             </field>