Skip to content

Commit cef6737

Browse files
victoralmauvictoralmau
committed
[MIG] partner_delivery_schedule: Migration to 16.0
TT47628
1 parent 9225408 commit cef6737

File tree

5 files changed

+35
-32
lines changed

5 files changed

+35
-32
lines changed

‎partner_delivery_schedule/README.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Partner Delivery Schedule
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:5f16a375c1709272d51209ac6680bc7e556f837443e800b2e0c6bb5daee7d9e4
10+
!! source digest: sha256:305031db746daa3f6ede0d99e71e8509ea7614d53f52afcdfed19ece126b4abc
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -17,13 +17,13 @@ Partner Delivery Schedule
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
1919
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github
20-
:target: https://github.com/OCA/delivery-carrier/tree/15.0/partner_delivery_schedule
20+
:target: https://github.com/OCA/delivery-carrier/tree/16.0/partner_delivery_schedule
2121
:alt: OCA/delivery-carrier
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-0-partner_delivery_schedule
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-partner_delivery_schedule
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=15.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=16.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -54,7 +54,7 @@ Bug Tracker
5454
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
5555
In case of trouble, please check there if your issue has already been reported.
5656
If you spotted it first, help us to smash it by providing a detailed and welcomed
57-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_schedule%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
57+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_schedule%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
5858

5959
Do not contact contributors directly about support or help with technical issues.
6060

@@ -86,6 +86,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
8686
mission is to support the collaborative development of Odoo features and
8787
promote its widespread use.
8888

89-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/15.0/partner_delivery_schedule>`_ project on GitHub.
89+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/16.0/partner_delivery_schedule>`_ project on GitHub.
9090

9191
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

‎partner_delivery_schedule/__manifest__.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Partner Delivery Schedule",
55
"summary": "Set on partners a schedule for delivery goods",
6-
"version": "15.0.1.0.2",
6+
"version": "16.0.1.0.0",
77
"development_status": "Production/Stable",
88
"category": "Delivery",
99
"website": "https://github.com/OCA/delivery-carrier",
@@ -18,4 +18,9 @@
1818
"views/res_partner_view.xml",
1919
"views/report_shipping.xml",
2020
],
21+
"assets": {
22+
"web._assets_bootstrap": [
23+
"/partner_delivery_schedule/static/src/scss/partner_delivery_schedule.scss"
24+
],
25+
},
2126
}

‎partner_delivery_schedule/static/description/index.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
32
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
43
<head>
@@ -367,9 +366,9 @@ <h1 class="title">Partner Delivery Schedule</h1>
367366
!! This file is generated by oca-gen-addon-readme !!
368367
!! changes will be overwritten. !!
369368
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370-
!! source digest: sha256:5f16a375c1709272d51209ac6680bc7e556f837443e800b2e0c6bb5daee7d9e4
369+
!! source digest: sha256:305031db746daa3f6ede0d99e71e8509ea7614d53f52afcdfed19ece126b4abc
371370
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/15.0/partner_delivery_schedule"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-15-0/delivery-carrier-15-0-partner_delivery_schedule"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
371+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/16.0/partner_delivery_schedule"><img alt="OCA/delivery-carrier" src="https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-partner_delivery_schedule"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373372
<p>This module extends the functionality of delivery module to allow set delivery
374373
hours and days for partners.</p>
375374
<p><strong>Table of contents</strong></p>
@@ -401,7 +400,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
401400
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
402401
In case of trouble, please check there if your issue has already been reported.
403402
If you spotted it first, help us to smash it by providing a detailed and welcomed
404-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_schedule%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
403+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20partner_delivery_schedule%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
405404
<p>Do not contact contributors directly about support or help with technical issues.</p>
406405
</div>
407406
<div class="section" id="credits">
@@ -428,7 +427,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
428427
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
429428
mission is to support the collaborative development of Odoo features and
430429
promote its widespread use.</p>
431-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/15.0/partner_delivery_schedule">OCA/delivery-carrier</a> project on GitHub.</p>
430+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/16.0/partner_delivery_schedule">OCA/delivery-carrier</a> project on GitHub.</p>
432431
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
433432
</div>
434433
</div>

‎partner_delivery_schedule/static/src/scss/partner_delivery_schedule.scss

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Restore v15 class
2+
.badge-dark {
3+
color: #fff;
4+
background-color: #343a40;
5+
}
6+
.badge-pill {
7+
padding-right: 0.6em;
8+
padding-left: 0.6em;
9+
border-radius: 10rem;
10+
}

‎partner_delivery_schedule/tests/test_partner_delivery_schedule.py

+9-20
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,14 @@
33
from odoo.exceptions import ValidationError
44
from odoo.tests import Form, TransactionCase
55

6+
from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
7+
68

79
class TestStockPikingReturnRefundOption(TransactionCase):
810
@classmethod
911
def setUpClass(cls):
1012
super().setUpClass()
11-
cls.env = cls.env(
12-
context=dict(
13-
cls.env.context,
14-
mail_create_nolog=True,
15-
mail_create_nosubscribe=True,
16-
mail_notrack=True,
17-
no_reset_password=True,
18-
tracking_disable=True,
19-
)
20-
)
13+
cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
2114
cls.schedule = cls.env["delivery.schedule"].create(
2215
{
2316
"name": "test",
@@ -66,16 +59,13 @@ def _create_sale_order(self):
6659

6760
def test_partner_schedule_name(self):
6861
self.assertEqual(self.schedule.name_get()[0][1], "08:00-10:00 (Mo, Tu)")
69-
7062
day_update = {}
7163
for day in self.schedule._days_of_week():
7264
day_update[day[0]] = True
7365
self.schedule.update(day_update)
7466
self.assertEqual(self.schedule.name_get()[0][1], "08:00-10:00 (All days)")
75-
7667
with self.assertRaises(ValidationError):
7768
self.schedule.update({"hour_from": 0, "hour_to": 25})
78-
7969
day_update = {}
8070
for day in self.schedule._days_of_week():
8171
day_update[day[0]] = False
@@ -87,7 +77,6 @@ def test_partner_allow_delivery(self):
8777
self.assertTrue(self.partner.allow_delivery_date("2018-09-04 09:00:00"))
8878
self.assertFalse(self.partner.allow_delivery_date("2018-09-04 12:01:00"))
8979
self.assertFalse(self.partner.allow_delivery_date("2018-09-05 10:01:00"))
90-
9180
# Allow delivery in all days
9281
day_update = {}
9382
for day in self.schedule._days_of_week():
@@ -96,15 +85,15 @@ def test_partner_allow_delivery(self):
9685
self.assertTrue(self.partner.allow_delivery_date("2018-09-09 09:00:00"))
9786

9887
def test_report_picking(self):
99-
res = self.report_model._get_report_from_name(
100-
"stock.report_picking"
101-
)._render_qweb_text(self.picking.ids, False)
88+
res = self.report_model._render_qweb_text(
89+
"stock.report_picking", self.picking.ids, False
90+
)
10291
self.assertRegex(str(res[0]), "08:00-10:00")
10392
self.assertRegex(str(res[0]), "10:00-12:00")
10493

10594
def test_report_deliveryslip(self):
106-
res = self.report_model._get_report_from_name(
107-
"stock.report_deliveryslip"
108-
)._render_qweb_text(self.picking.ids, False)
95+
res = self.report_model._render_qweb_text(
96+
"stock.report_deliveryslip", self.picking.ids, False
97+
)
10998
self.assertRegex(str(res[0]), "08:00-10:00")
11099
self.assertRegex(str(res[0]), "10:00-12:00")

0 commit comments

Comments
 (0)