From b08119cf4e00e867d264b624b590a35a635a5cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Sainl=C3=A9ger?= Date: Mon, 6 Feb 2023 23:23:09 +0100 Subject: [PATCH] [FIX] hr_luncheon_voucher: only consider employee's meetings --- hr_luncheon_voucher/__manifest__.py | 2 +- hr_luncheon_voucher/models/hr_lv_allocation.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hr_luncheon_voucher/__manifest__.py b/hr_luncheon_voucher/__manifest__.py index 675e9f4..b292850 100755 --- a/hr_luncheon_voucher/__manifest__.py +++ b/hr_luncheon_voucher/__manifest__.py @@ -2,7 +2,7 @@ { "name": "HR Luncheon Voucher", "category": "Human Resources", - "version": "14.0.2.0.0", + "version": "14.0.2.0.1", "summary": "Manage luncheon vouchers credit and distribution", "author": "Elabore", "website": "https://elabore.coop/", diff --git a/hr_luncheon_voucher/models/hr_lv_allocation.py b/hr_luncheon_voucher/models/hr_lv_allocation.py index 30e432f..be8842b 100644 --- a/hr_luncheon_voucher/models/hr_lv_allocation.py +++ b/hr_luncheon_voucher/models/hr_lv_allocation.py @@ -98,7 +98,12 @@ class LuncheonVouchersAllocation(models.Model): def _has_cancelling_voucher_event(self, day): category_no_voucher_ids = self.env["calendar.event.type"].search([("remove_luncheon_voucher", "=", True)]) - events = self.env["calendar.event"].search([("categ_ids", "in", category_no_voucher_ids.ids)]) + events = self.env["calendar.event"].search( + [ + ("categ_ids", "in", category_no_voucher_ids.ids), + ("partner_ids", "in", self.employee_id.user_id.partner_id.id) + ] + ) day_start = fields.Datetime.to_datetime(day.date()) day_end = fields.Datetime.to_datetime(day.date()) + timedelta(hours=24) cancelling_events = events.filtered(lambda x: not((x.start < day_start) and (x.stop <= day_start)) and not((x.start >= day_end) and (x.stop > day_end)) )