From 91f14201bf099a486528c27eb9e821ce50a035f8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 28 Feb 2011 10:56:43 +0100
Subject: [PATCH] [IMP] hr_payroll: renamed struct_id field of
 hr.payroll.structure into parent_id

bzr revid: qdp-launchpad@openerp.com-20110228095643-rji364bszjfq2a60
---
 addons/hr_payroll/hr_payroll.py       | 2 +-
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 3c6199ebef8..33f34973547 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -97,7 +97,7 @@ class hr_payroll_structure(osv.osv):
         'line_ids':fields.one2many('hr.payslip.line', 'function_id', 'Salary Structure', required=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'note': fields.text('Description'),
-        'struct_id':fields.many2one('hr.payroll.structure', 'Parent Structure'),
+        'parent_id':fields.many2one('hr.payroll.structure', 'Parent Structure'),
     }
     _defaults = {
         'company_id': lambda self, cr, uid, context: \
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index d73e6cc310c..9ec9b4a9982 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -210,7 +210,7 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="struct_id"/>
+                        <field name="parent_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">