Skip to content

Commit 32c9811

Browse files
committed
[MIG] delivery_correos_express: Migration to 16.0
1 parent b29d3c2 commit 32c9811

File tree

6 files changed

+27
-22
lines changed

6 files changed

+27
-22
lines changed

delivery_correos_express/README.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Delivery Correos Express
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/14.0/delivery_correos_express
20+
:target: https://github.com/OCA/delivery-carrier/tree/16.0/delivery_correos_express
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-14-0/delivery-carrier-14-0-delivery_correos_express
23+
:target: https://translation.odoo-community.org/projects/delivery-carrier-16-0/delivery-carrier-16-0-delivery_correos_express
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=14.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|
@@ -122,7 +122,7 @@ Bug Tracker
122122
Bugs are tracked on `GitHub Issues <https://github.com/OCA/delivery-carrier/issues>`_.
123123
In case of trouble, please check there if your issue has already been reported.
124124
If you spotted it first, help us to smash it by providing a detailed and welcomed
125-
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_correos_express%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
125+
`feedback <https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_correos_express%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
126126

127127
Do not contact contributors directly about support or help with technical issues.
128128

@@ -154,6 +154,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
154154
mission is to support the collaborative development of Odoo features and
155155
promote its widespread use.
156156

157-
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/14.0/delivery_correos_express>`_ project on GitHub.
157+
This module is part of the `OCA/delivery-carrier <https://github.com/OCA/delivery-carrier/tree/16.0/delivery_correos_express>`_ project on GitHub.
158158

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

delivery_correos_express/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Delivery Correos Express",
55
"summary": "Delivery Carrier implementation for Correos Express using their API",
6-
"version": "14.0.1.0.1",
6+
"version": "16.0.1.0.0",
77
"category": "Stock",
88
"website": "https://github.com/OCA/delivery-carrier",
99
"author": "Studio73, Odoo Community Association (OCA)",

delivery_correos_express/models/correos_express_request.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,18 @@ def _send_api_request(self, request_type, url, data=None, skip_auth=False):
7777
self.carrier_id.log_xml(result, "correos_express_last_response")
7878
_logger.debug(res.json())
7979
res.raise_for_status()
80-
except requests.exceptions.Timeout:
81-
raise UserError(_("Timeout: the server did not reply within 60s"))
80+
except requests.exceptions.Timeout as tmo:
81+
raise UserError(_("Timeout: the server did not reply within 60s")) from tmo
8282
except Exception as e:
83-
raise UserError(_("{}\n{}".format(e, result if result else "")))
83+
raise UserError(
84+
_("{error}\n{result}".format(error=e, result=result if result else ""))
85+
) from e
8486
return_code, message = self._check_for_error(result)
8587
if return_code != 0:
8688
raise UserError(
87-
_("Correos Express Error: {} {}").format(return_code, message)
89+
_("Correos Express Error: {return_code} {message}").format(
90+
return_code=return_code, message=message
91+
)
8892
)
8993
return res
9094

delivery_correos_express/models/delivery_carrier.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class DeliveryCarrier(models.Model):
2121
selection_add=[("correos_express", "Correos Express")],
2222
ondelete={"correos_express": "set default"},
2323
)
24-
correos_express_username = fields.Char(string="Correos Express Username")
25-
correos_express_password = fields.Char(string="Correos Express Password")
24+
correos_express_username = fields.Char()
25+
correos_express_password = fields.Char()
2626
correos_express_customer_code = fields.Char(string="Correos Express Client code")
2727
correos_express_sender_code = fields.Char(string="Correos Express Sender ID")
2828
correos_express_label_type = fields.Selection(
@@ -34,7 +34,6 @@ class DeliveryCarrier(models.Model):
3434
default="93",
3535
)
3636
correos_express_transport = fields.Selection(
37-
string="Correos Express Transport",
3837
selection=CORREOS_EXPRESS_PORTES,
3938
default="P",
4039
)

delivery_correos_express/static/description/index.html

+10-8
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>
@@ -9,10 +8,11 @@
98

109
/*
1110
:Author: David Goodger (goodger@python.org)
12-
: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 $
1312
:Copyright: This stylesheet has been placed in the public domain.
1413
1514
Default cascading style sheet for the HTML output of Docutils.
15+
Despite the name, some widely supported CSS2 features are used.
1616
1717
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1818
customize this style sheet.
@@ -275,7 +275,7 @@
275275
margin-left: 2em ;
276276
margin-right: 2em }
277277

278-
pre.code .ln { color: grey; } /* line numbers */
278+
pre.code .ln { color: gray; } /* line numbers */
279279
pre.code, code { background-color: #eeeeee }
280280
pre.code .comment, code .comment { color: #5C6576 }
281281
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
301301
span.pre {
302302
white-space: pre }
303303

304-
span.problematic {
304+
span.problematic, pre.problematic {
305305
color: red }
306306

307307
span.section-subtitle {
@@ -369,7 +369,7 @@ <h1 class="title">Delivery Correos Express</h1>
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370370
!! source digest: sha256:569dc8d47a2b2602b2faabbf139440e63b8a045210613407d46b36b4e103458e
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/14.0/delivery_correos_express"><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-14-0/delivery-carrier-14-0-delivery_correos_express"><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=14.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="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/delivery_correos_express"><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_correos_express"><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>
373373
<p>Este módulo integra la API de Correos Express con Odoo.</p>
374374
<p><strong>Table of contents</strong></p>
375375
<div class="contents local topic" id="contents">
@@ -497,7 +497,7 @@ <h1><a class="toc-backref" href="#toc-entry-11">Bug Tracker</a></h1>
497497
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/delivery-carrier/issues">GitHub Issues</a>.
498498
In case of trouble, please check there if your issue has already been reported.
499499
If you spotted it first, help us to smash it by providing a detailed and welcomed
500-
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_correos_express%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
500+
<a class="reference external" href="https://github.com/OCA/delivery-carrier/issues/new?body=module:%20delivery_correos_express%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
501501
<p>Do not contact contributors directly about support or help with technical issues.</p>
502502
</div>
503503
<div class="section" id="credits">
@@ -520,11 +520,13 @@ <h2><a class="toc-backref" href="#toc-entry-14">Contributors</a></h2>
520520
<div class="section" id="maintainers">
521521
<h2><a class="toc-backref" href="#toc-entry-15">Maintainers</a></h2>
522522
<p>This module is maintained by the OCA.</p>
523-
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
523+
<a class="reference external image-reference" href="https://odoo-community.org">
524+
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
525+
</a>
524526
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
525527
mission is to support the collaborative development of Odoo features and
526528
promote its widespread use.</p>
527-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/14.0/delivery_correos_express">OCA/delivery-carrier</a> project on GitHub.</p>
529+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/delivery-carrier/tree/16.0/delivery_correos_express">OCA/delivery-carrier</a> project on GitHub.</p>
528530
<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>
529531
</div>
530532
</div>

delivery_correos_express/tests/test_delivery_correos_express.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def setUpClass(cls):
4848
cls.sale_order.carrier_id = cls.carrier_correos_express.id
4949
cls.sale_order.action_confirm()
5050
cls.picking = cls.sale_order.picking_ids[0]
51-
cls.picking.move_lines.quantity_done = 20
51+
cls.picking.move_ids.quantity_done = 20
5252

5353
@mock.patch(
5454
"%s.create_shipment" % request_model,

0 commit comments

Comments
 (0)