From 6ee6b211b61bb2032c897c92eb67a6c894684864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 2 Sep 2013 15:49:44 +0200 Subject: [PATCH] [IMP] hr_contract: base_action_rule: add resource for leave computation bzr revid: tde@openerp.com-20130902134944-4b4ex8e7il32uvy5 --- addons/hr_contract/base_action_rule.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_contract/base_action_rule.py b/addons/hr_contract/base_action_rule.py index d06d5e47e89..c5a29743497 100644 --- a/addons/hr_contract/base_action_rule.py +++ b/addons/hr_contract/base_action_rule.py @@ -44,9 +44,11 @@ class base_action_rule(osv.Model): and user.employee_ids[0].contract_id.working_hours: calendar = user.employee_ids[0].contract_id.working_hours start_dt = get_datetime(record_dt) + resource_id = user.employee_ids[0].resource_id.id action_dt = self.pool['resource.calendar'].schedule_days_get_date( cr, uid, calendar.id, action.trg_date_range, - day_date=start_dt, compute_leaves=True, context=context + day_date=start_dt, compute_leaves=True, resource_id=resource_id, + context=context ) return action_dt return super(base_action_rule, self)._check_delay(cr, uid, action, record, record_dt, context=context)