[MERGE] forward port branch 11.0 up to bb6f6c57f9

addons/resource/models/resource.py

@@ -437,8 +437,9 @@ class ResourceCalendar(models.Model):
         if not end_dt:
             end_dt = datetime.datetime.combine(start_dt.date(), datetime.time.max)
 
-        start_dt = to_naive_user_tz(start_dt, self.env.user)
-        end_dt = to_naive_user_tz(end_dt, self.env.user)
+        if not self.env.context.get('no_tz_convert', False):
+            start_dt = to_naive_user_tz(start_dt, self.env.user)
+            end_dt = to_naive_user_tz(end_dt, self.env.user)
 
         for day in rrule.rrule(rrule.DAILY,
                                dtstart=start_dt,

addons/resource/models/resource_mixin.py

@@ -57,6 +57,7 @@ class ResourceMixin(models.AbstractModel):
         days_count = 0.0
         total_work_time = timedelta()
         calendar = calendar or self.resource_calendar_id
+        calendar = calendar.with_context(no_tz_convert=self.env.context.get('no_tz_convert', False))
         for day_intervals in calendar._iter_work_intervals(
                 from_datetime, to_datetime, self.resource_id.id,
                 compute_leaves=True, domain=domain):