Skip to content

Commit 0664b95

Browse files
BhaveshHeliconiaBhaveshHeliconia
committed
[MIG] delivery_driver: Migration to 18.0
1 parent 3c0c7e7 commit 0664b95

File tree

9 files changed

+56
-46
lines changed

9 files changed

+56
-46
lines changed

‎delivery_driver/README.rst

+10-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Delivery Driver
1717
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
1818
:alt: License: LGPL-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/16.0/delivery_driver
20+
:target: https://github.com/OCA/delivery-carrier/tree/18.0/delivery_driver
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-16-0/delivery-carrier-16-0-delivery_driver
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-18-0/delivery-carrier-18-0-delivery_driver
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=16.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/delivery-carrier&target_branch=18.0
2727
:alt: Try me on Runboat
2828

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

9191
Do not contact contributors directly about support or help with technical issues.
9292

@@ -101,8 +101,11 @@ Authors
101101
Contributors
102102
------------
103103

104-
- Emilio Pascual (`Moduon <https://www.moduon.team/>`__)
105-
- Rafael Blasco (`Moduon <https://www.moduon.team/>`__)
104+
- Emilio Pascual (`Moduon <https://www.moduon.team/>`__)
105+
- Rafael Blasco (`Moduon <https://www.moduon.team/>`__)
106+
- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
107+
108+
- Bhavesh Heliconia
106109

107110
Maintainers
108111
-----------
@@ -128,6 +131,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
128131

129132
|maintainer-EmilioPascual| |maintainer-rafaelbn|
130133

131-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/16.0/delivery_driver>`_ project on GitHub.
134+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/18.0/delivery_driver>`_ project on GitHub.
132135

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

‎delivery_driver/__manifest__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"name": "Delivery Driver",
66
"summary": "Allow choose driver in delivery methods",
7-
"version": "16.0.1.3.0",
7+
"version": "18.0.1.0.0",
88
"development_status": "Alpha",
99
"category": "Inventory/Delivery",
1010
"website": "https://github.com/OCA/delivery-carrier",
@@ -14,7 +14,7 @@
1414
"application": False,
1515
"installable": True,
1616
"depends": [
17-
"delivery",
17+
"stock_delivery",
1818
],
1919
"data": [
2020
"views/delivery_carrier.xml",

‎delivery_driver/migrations/16.0.1.0.1/post-migration.py

-19
This file was deleted.

‎delivery_driver/models/res_partner.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
33

44

5-
from odoo import _, api, fields, models
5+
from odoo import api, fields, models
66
from odoo.exceptions import ValidationError
77

88

@@ -20,7 +20,7 @@ def _check_is_driver(self):
2020
[("driver_id.is_driver", "=", False)]
2121
):
2222
raise ValidationError(
23-
_(
23+
self.env._(
2424
"You can't remove the driver flag from a partner that"
2525
" is set as driver in a delivery method."
2626
)

‎delivery_driver/readme/CONTRIBUTORS.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
- Emilio Pascual ([Moduon](https://www.moduon.team/))
22
- Rafael Blasco ([Moduon](https://www.moduon.team/))
3+
- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
4+
- Bhavesh Heliconia

‎delivery_driver/static/description/index.html

+14-7
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
/*
1010
:Author: David Goodger (goodger@python.org)
11-
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
11+
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1516
1617
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1718
customize this style sheet.
@@ -274,7 +275,7 @@
274275
margin-left: 2em ;
275276
margin-right: 2em }
276277

277-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
278279
pre.code, code { background-color: #eeeeee }
279280
pre.code .comment, code .comment { color: #5C6576 }
280281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
300301
span.pre {
301302
white-space: pre }
302303

303-
span.problematic {
304+
span.problematic, pre.problematic {
304305
color: red }
305306

306307
span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">Delivery Driver</h1>
368369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
369370
!! source digest: sha256:c83a6eea62d4e564b60889d82dfa9623fda994e9840613c66d611dbbebadfa70
370371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
371-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/16.0/delivery_driver"><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-delivery_driver"><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>
372+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_driver"><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-18-0/delivery-carrier-18-0-delivery_driver"><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=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372373
<p>This module extends the functionality of delivery and to allow you to
373374
assign default driver in delivery carriers and pickings.</p>
374375
<div class="admonition important">
@@ -433,7 +434,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
433434
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
434435
In case of trouble, please check there if your issue has already been reported.
435436
If you spotted it first, help us to smash it by providing a detailed and welcomed
436-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_driver%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
437+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_driver%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
437438
<p>Do not contact contributors directly about support or help with technical issues.</p>
438439
</div>
439440
<div class="section" id="credits">
@@ -449,18 +450,24 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
449450
<ul class="simple">
450451
<li>Emilio Pascual (<a class="reference external" href="https://www.moduon.team/">Moduon</a>)</li>
451452
<li>Rafael Blasco (<a class="reference external" href="https://www.moduon.team/">Moduon</a>)</li>
453+
<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
454+
<li>Bhavesh Heliconia</li>
455+
</ul>
456+
</li>
452457
</ul>
453458
</div>
454459
<div class="section" id="maintainers">
455460
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
456461
<p>This module is maintained by the OCA.</p>
457-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
462+
<a class="reference external image-reference" href="https://odoo-community.org">
463+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
464+
</a>
458465
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
459466
mission is to support the collaborative development of Odoo features and
460467
promote its widespread use.</p>
461468
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
462469
<p><a class="reference external image-reference" href="https://github.com/EmilioPascual"><img alt="EmilioPascual" src="https://github.com/EmilioPascual.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/rafaelbn"><img alt="rafaelbn" src="https://github.com/rafaelbn.png?size=40px" /></a></p>
463-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/16.0/delivery_driver">OCA/delivery-carrier</a> project on GitHub.</p>
470+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/18.0/delivery_driver">OCA/delivery-carrier</a> project on GitHub.</p>
464471
<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>
465472
</div>
466473
</div>

‎delivery_driver/tests/test_delivery_driver.py

+17-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
33

44

5+
from odoo import Command
56
from odoo.exceptions import ValidationError
67
from odoo.tests.common import TransactionCase
78

@@ -49,9 +50,7 @@ def test_sale_flow(self):
4950
"partner_invoice_id": self.partner_test.id,
5051
"partner_shipping_id": self.partner_test.id,
5152
"order_line": [
52-
(
53-
0,
54-
0,
53+
Command.create(
5554
{
5655
"product_id": self.product_test.id,
5756
"product_uom_qty": 1,
@@ -74,9 +73,7 @@ def test_stock_flow(self):
7473
"location_id": self.env.ref("stock.stock_location_stock").id,
7574
"location_dest_id": self.env.ref("stock.stock_location_customers").id,
7675
"move_ids": [
77-
(
78-
0,
79-
0,
76+
Command.create(
8077
{
8178
"name": "Test",
8279
"product_id": self.product_test.id,
@@ -95,3 +92,17 @@ def test_stock_flow(self):
9592
}
9693
)
9794
self.assertEqual(stock_picking.driver_id, self.driver_test)
95+
96+
def test_get_name_with_show_driver_context(self):
97+
"""Test _get_name method when 'show_driver' is in the context."""
98+
# Set the context to include 'show_driver'
99+
self.env.context = dict(self.env.context, show_driver=True)
100+
101+
# Ensure _get_name returns the driver's name
102+
self.assertEqual(self.driver_test._get_name(), "My Test Driver")
103+
104+
def test_get_name_without_show_driver_context(self):
105+
"""Test _get_name method when 'show_driver' is NOT in the context."""
106+
# Ensure _get_name returns the parent class's _get_name result
107+
# Here we are simulating the default behavior by calling the super method.
108+
self.assertEqual(self.driver_test._get_name(), "My Test Driver")

‎delivery_driver/views/stock_move_line.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
>
99
<field name="name">Stock Move Line Tree Detailed Driver</field>
1010
<field name="model">stock.move.line</field>
11-
<field name="inherit_id" ref="delivery.view_move_line_tree_detailed_delivery" />
11+
<field
12+
name="inherit_id"
13+
ref="stock_delivery.view_move_line_tree_detailed_delivery"
14+
/>
1215
<field name="arch" type="xml">
1316
<xpath expr="//field[@name='carrier_id']" position="after">
1417
<field

‎delivery_driver/views/stock_picking.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
>
99
<field name="name">Stock Picking Driver Form</field>
1010
<field name="model">stock.picking</field>
11-
<field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form" />
11+
<field
12+
name="inherit_id"
13+
ref="stock_delivery.view_picking_withcarrier_out_form"
14+
/>
1215
<field name="arch" type="xml">
1316
<xpath expr="//group[@name='carrier_data']" position="inside">
1417
<field
@@ -22,7 +25,7 @@
2225
<record id="vpicktree_view_tree_inherit_delivery_driver" model="ir.ui.view">
2326
<field name="name">Stock Picking Driver Tree</field>
2427
<field name="model">stock.picking</field>
25-
<field name="inherit_id" ref="delivery.vpicktree_view_tree" />
28+
<field name="inherit_id" ref="stock_delivery.vpicktree_view_tree" />
2629
<field name="arch" type="xml">
2730
<xpath expr="//field[@name='carrier_id']" position="after">
2831
<field

0 commit comments

Comments
 (0)