Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions stock_release_channel/models/stock_release_channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -902,17 +902,17 @@ def _get_expected_date(self):
return False

def _localize(self, dt, tz=None):
"""Localize a datetime
"""Localize a naive datetime

Use the given tz or use the tz of the warehouse
"""
wh_tz = pytz.timezone(tz or self.warehouse_id.partner_id.tz or "UTC")
dt_tz = dt.astimezone(pytz.utc).astimezone(wh_tz)
dt_tz = pytz.utc.localize(dt).astimezone(wh_tz)
return dt_tz

@api.model
def _naive(self, dt_tz, reset_time=False):
"""Convert a datetime as naive datetime
"""Convert a localized datetime to a naive datetime

Allow to reset time
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def _next_delivery_date_warehouse_calendar(self, delivery_date, partner=None):
wh_tz = pytz.timezone(self.warehouse_id.partner_id.tz or "UTC")
batch_delta = timedelta(days=61)
while True:
delivery_date = delivery_date.astimezone(pytz.utc)
delivery_date = pytz.utc.localize(delivery_date)
work_intervals = calendar._work_intervals_batch(
delivery_date, delivery_date + batch_delta, tz=wh_tz
)[False]
Expand All @@ -45,4 +45,4 @@ def _next_delivery_date_warehouse_calendar(self, delivery_date, partner=None):
delivery_date = yield delivery_date.astimezone(pytz.utc).replace(
tzinfo=None
)
delivery_date = delivery_date.astimezone(pytz.utc)
delivery_date = pytz.utc.localize(delivery_date)
Loading