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

[Ashvin Rathod (OpenERP)]

Hello,

Fix: [trunk] hr_holidays: Can not refuse leave if its category is "by employee category"
https://bugs.launchpad.net/openobject-addons/+bug/731795

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
warning[warning]: Form view model product.product is slow (u0.320, r0.630), please optimize

review: Disapprove

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2011-02-01 12:40:38 +0000
+++ hr_holidays/hr_holidays.py	2011-03-10 10:06:53 +0000
@@ -294,8 +294,8 @@
 
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
-            for id in record.linked_request_ids or []:
-                wf_service.trg_validate(uid, 'hr.holidays', id, 'cancel', cr)
+            for request in record.linked_request_ids or []:
+                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
 
         return True