diff --git a/models/res_users.py b/models/res_users.py index aebe0ed3d4183499956641f9d43a0ba73107b97b..ab62082b50cd5f2c916bebcf8400250e16a9ffb7 100644 --- a/models/res_users.py +++ b/models/res_users.py @@ -169,8 +169,9 @@ class ResUser(models.Model): # Only if Organizer is the same as Odoo user or if is not linked to # any active Odoo internal user if ( - bm_event.value.main.organizer.mailto == self.partner_id.email - or bm_event.value.main.organizer.mailto not in odoo_users_emails + bm_event.value.main.organizer + and (bm_event.value.main.organizer.mailto == self.partner_id.email + or bm_event.value.main.organizer.mailto not in odoo_users_emails) ): events_to_create.append(Calendar._bm_to_odoo_values(bm_event)) if events_to_create: @@ -182,7 +183,7 @@ class ResUser(models.Model): bm_events_to_update = bm_calendar.multipleGet(bm_updated_uids) # Update corresponding events for bm_event in bm_events_to_update: - odoo_event = odoo_events_bm_linked.filtered( + odoo_event = odoo_events_bm_linked.filtered_domain( [("bluemind_id", "=", bm_event.uid)] ) # If related event exists in Odoo and belongs to the user, update it @@ -198,7 +199,7 @@ class ResUser(models.Model): # Calendar entries that have been deleted on Bluemind to be deleted on Odoo # (only if belongs to user) if bm_deleted_uids: - odoo_events_to_delete = odoo_events_bm_linked.filtered( + odoo_events_to_delete = odoo_events_bm_linked.filtered_domain( [("bluemind_id", "in", bm_deleted_uids), ("user_id", "=", self.id)] ) if odoo_events_to_delete: @@ -228,7 +229,7 @@ class ResUser(models.Model): for user in users: _logger.info("Calendar Synchro - Starting synchronization for %s", user) try: - user.with_user(user).sudo().sync_bluemind_calendar() + user.with_user(user).sync_bluemind_calendar() _logger.info( "Calendar Synchro - Completed synchronization for %s", user )