Tejas Tank (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-1021130-tta into lp:openobject-addons.
Requested reviews: OpenERP Core Team (openerp) Related bugs: Bug #1021130 in OpenERP Addons: "[trunk] hr_payroll: Can not duplicate salary structure" https://bugs.launchpad.net/openobject-addons/+bug/1021130 For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1021130-tta/+merge/142464 Hello, make correction in calling the hr_payroll_structure_inherit(). Thanks, tta -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1021130-tta/+merge/142464 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-1021130-tta.
=== modified file 'hr_payroll/hr_payroll.py' --- hr_payroll/hr_payroll.py 2012-12-17 15:23:03 +0000 +++ hr_payroll/hr_payroll.py 2013-01-09 10:16:23 +0000 @@ -951,14 +951,14 @@ hr_payslip_line() -class hr_payroll_structure(osv.osv): +class hr_payroll_structure_inherit(osv.osv): _inherit = 'hr.payroll.structure' _columns = { 'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'), } -hr_payroll_structure() +hr_payroll_structure_inherit() class hr_employee(osv.osv): '''
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : openerp-dev-gtk@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp