Merge lp:~openerp-dev/openobject-addons/trunk-bug-731332-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

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

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[OpenERP buildbot (openerp-buildbot)]

mrp/test/mrp_phantom_bom.yml: duplicate key value violates unique constraint "product_uom_factor_category_id_uniq"
stock_no_autopicking/test/stock_no_autopicking.yml: duplicate key value violates unique constraint "product_uom_factor_category_id_uniq"
crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove

=== 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'),