Skip to content

Commit 18daa31

Browse files
[MIG] stock_partner_delivery_window: Migration to 16.0
1 parent 749f6db commit 18daa31

File tree

6 files changed

+39
-31
lines changed

6 files changed

+39
-31
lines changed

stock_partner_delivery_window/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Stock Partner Delivery Window",
55
"summary": "Define preferred delivery time windows for partners",
6-
"version": "14.0.1.2.2",
6+
"version": "16.0.1.0.0",
77
"category": "Inventory",
88
"author": "Camptocamp, ACSONE SA/NV, Odoo Community Association (OCA)",
99
"license": "AGPL-3",

stock_partner_delivery_window/i18n/stock_partner_delivery_window.pot

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
#
55
msgid ""
66
msgstr ""
7-
"Project-Id-Version: Odoo Server 14.0\n"
7+
"Project-Id-Version: Odoo Server 16.0\n"
88
"Report-Msgid-Bugs-To: \n"
9+
"POT-Creation-Date: 2023-09-14 09:01+0000\n"
10+
"PO-Revision-Date: 2023-09-14 09:01+0000\n"
911
"Last-Translator: \n"
1012
"Language-Team: \n"
1113
"MIME-Version: 1.0\n"
@@ -16,7 +18,7 @@ msgstr ""
1618
#. module: stock_partner_delivery_window
1719
#: code:addons/stock_partner_delivery_window/models/res_partner.py:0
1820
#, python-format
19-
msgid "%s: %s"
21+
msgid "{}: {}"
2022
msgstr ""
2123

2224
#. module: stock_partner_delivery_window
@@ -64,8 +66,6 @@ msgstr ""
6466

6567
#. module: stock_partner_delivery_window
6668
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_partner_delivery_time_window__display_name
67-
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_res_partner__display_name
68-
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_stock_picking__display_name
6969
msgid "Display Name"
7070
msgstr ""
7171

@@ -82,20 +82,16 @@ msgstr ""
8282
#. module: stock_partner_delivery_window
8383
#: code:addons/stock_partner_delivery_window/models/res_partner.py:0
8484
#, python-format
85-
msgid "From %s to %s"
85+
msgid "From {} to {}"
8686
msgstr ""
8787

8888
#. module: stock_partner_delivery_window
8989
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_partner_delivery_time_window__id
90-
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_res_partner__id
91-
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_stock_picking__id
9290
msgid "ID"
9391
msgstr ""
9492

9593
#. module: stock_partner_delivery_window
9694
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_partner_delivery_time_window____last_update
97-
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_res_partner____last_update
98-
#: model:ir.model.fields,field_description:stock_partner_delivery_window.field_stock_picking____last_update
9995
msgid "Last Modified on"
10096
msgstr ""
10197

@@ -115,6 +111,7 @@ msgid "Partner"
115111
msgstr ""
116112

117113
#. module: stock_partner_delivery_window
114+
#. odoo-python
118115
#: code:addons/stock_partner_delivery_window/models/res_partner.py:0
119116
#, python-format
120117
msgid ""
@@ -128,20 +125,23 @@ msgid "Preferred delivery time windows"
128125
msgstr ""
129126

130127
#. module: stock_partner_delivery_window
128+
#. odoo-python
131129
#: code:addons/stock_partner_delivery_window/models/stock_picking.py:0
132130
#, python-format
133131
msgid "Scheduled date does not match partner's Delivery window preference."
134132
msgstr ""
135133

136134
#. module: stock_partner_delivery_window
135+
#. odoo-python
137136
#: code:addons/stock_partner_delivery_window/models/stock_picking.py:0
138137
#, python-format
139138
msgid ""
140-
"The scheduled date is %s (%s), but the partner is set to prefer deliveries on following time windows:\n"
141-
"%s"
139+
"The scheduled date is {date} ({tz}), but the partner is set to prefer deliveries on following time windows:\n"
140+
"{window}"
142141
msgstr ""
143142

144143
#. module: stock_partner_delivery_window
144+
#. odoo-python
145145
#: code:addons/stock_partner_delivery_window/models/stock_picking.py:0
146146
#, python-format
147147
msgid ""
@@ -180,4 +180,4 @@ msgid ""
180180
"When printing documents and exporting/importing data, time values are computed according to this timezone.\n"
181181
"If the timezone is not set, UTC (Coordinated Universal Time) is used.\n"
182182
"Anywhere else, time values are computed according to the time offset of your web client."
183-
msgstr ""
183+
msgstr ""

stock_partner_delivery_window/models/delivery_time_window.py

-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55

66

77
class DeliveryTimeWindow(models.Model):
8-
98
_name = "partner.delivery.time.window"
109
_inherit = "time.window.mixin"
1110
_description = "Preferred delivery time windows"
12-
1311
_time_window_overlap_check_field = "partner_id"
1412

1513
partner_id = fields.Many2one(
1614
"res.partner", required=True, index=True, ondelete="cascade"
1715
)
18-
1916
tz = fields.Selection(related="partner_id.tz", readonly=True)
2017

2118
@api.constrains("partner_id")

stock_partner_delivery_window/models/res_partner.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Copyright 2020 Camptocamp SA
22
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
3+
import warnings
34
from collections import defaultdict
45
from datetime import time
56

@@ -99,9 +100,19 @@ def is_in_delivery_window(self, date_time):
99100
return False
100101

101102
def _get_delivery_time_format_string(self):
102-
return _("From %s to %s")
103+
warnings.warn(
104+
"Method `_get_delivery_time_format_string` will be deprecated in the next version",
105+
DeprecationWarning,
106+
stacklevel=2,
107+
)
108+
return _("From {} to {}")
103109

104110
def get_delivery_time_description(self):
111+
warnings.warn(
112+
"Method `get_delivery_time_description` will be deprecated in the next version",
113+
DeprecationWarning,
114+
stacklevel=2,
115+
)
105116
res = dict()
106117
day_translated_values = dict(
107118
self.env["time.weekday"]._fields["name"]._description_selection(self.env)
@@ -148,7 +159,7 @@ def short_format_time(time):
148159
opening_times_description = list()
149160
for day_name, time_list in opening_times.items():
150161
opening_times_description.append(
151-
_("%s: %s") % (day_name, _(", ").join(time_list))
162+
_("{}: {}").format(day_name, _(", ").join(time_list))
152163
)
153164
res[partner.id] = "\n".join(opening_times_description)
154165
return res

stock_partner_delivery_window/models/stock_picking.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ def _scheduled_date_no_delivery_window_match_msg(self):
3333
).format(formatted_scheduled_date, scheduled_date.weekday())
3434
else:
3535
delivery_windows_strings = []
36-
for w in partner.get_delivery_windows().get(partner.id):
37-
delivery_windows_strings.append(
38-
" * {} ({})".format(w.display_name, partner.tz)
39-
)
36+
if partner:
37+
for w in partner.get_delivery_windows().get(partner.id):
38+
delivery_windows_strings.append(
39+
" * {} ({})".format(w.display_name, partner.tz)
40+
)
4041
message = _(
41-
"The scheduled date is %s (%s), but the partner is "
42-
"set to prefer deliveries on following time windows:\n%s"
43-
% (
44-
format_datetime(self.env, self.scheduled_date),
45-
self.env.context.get("tz"),
46-
"\n".join(delivery_windows_strings),
47-
)
42+
"The scheduled date is {date} ({tz}), but the partner is "
43+
"set to prefer deliveries on following time windows:\n{window}"
44+
).format(
45+
date=format_datetime(self.env, self.scheduled_date),
46+
tz=self.env.context.get("tz"),
47+
window="\n".join(delivery_windows_strings),
4848
)
4949
return {
5050
"title": _(

stock_partner_delivery_window/tests/test_delivery_window.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
33
from freezegun import freeze_time
44

5-
from odoo.tests import SavepointCase
5+
from odoo.tests.common import TransactionCase
66

77

8-
class TestPartnerDeliveryWindow(SavepointCase):
8+
class TestPartnerDeliveryWindow(TransactionCase):
99
@classmethod
1010
def setUpClass(cls):
1111
super().setUpClass()

0 commit comments

Comments
 (0)