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-731332-ara into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #731332 [6.0.1] HR-category: many2many link defined incorrectly
  https://bugs.launchpad.net/bugs/731332

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

Hello,

Fix: [6.0.1] HR-category: many2many link defined incorrectly
https://bugs.launchpad.net/openobject-addons/+bug/731332

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

=== modified file 'hr/hr.py'
--- hr/hr.py	2011-03-09 13:14:25 +0000
+++ hr/hr.py	2011-03-10 06:11:55 +0000
@@ -155,7 +155,7 @@
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
         'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, readonly=True, help="It is linked with manager of Department"),
-        'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
+        'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Category'),
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),