Merge PR OCA#4900 into 18.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

delivery_gls_asm/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ================
 Delivery GLS-ASM
 ================
@@ -17,7 +13,7 @@ Delivery GLS-ASM
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github
@@ -190,6 +186,7 @@ Contributors
 
   - David Vidal
   - Víctor Martínez
+  - Sergio Teruel
 
 - `Studio73 <https://www.studio73.es>`__:
 

delivery_gls_asm/models/delivery_carrier.py

@@ -154,8 +154,8 @@ def _prepare_gls_asm_shipping(self, picking):
             "remite_provincia": escape(sender_partner.state_id.name or ""),
             "remite_pais": "34",  # [mandatory] always 34=Spain
             "remite_cp": sender_partner.zip or "",
-            "remite_telefono": sender_partner.phone or "",
-            "remite_movil": sender_partner.mobile or "",
+            "remite_telefono": self._sanitize_phone_gls(sender_partner.phone or ""),
+            "remite_movil": self._sanitize_phone_gls(sender_partner.mobile or ""),
             "remite_email": escape(sender_partner.email or ""),
             "remite_departamento": "",
             "remite_nif": sender_partner.vat or "",
@@ -172,8 +172,12 @@ def _prepare_gls_asm_shipping(self, picking):
             "destinatario_cp": consignee.zip,
             # For certain destinations the consignee mobile and email are required to
             # make the expedition. Try to fallback to the commercial entity one
-            "destinatario_telefono": consignee.phone or consignee_entity.phone or "",
-            "destinatario_movil": consignee.mobile or consignee_entity.mobile or "",
+            "destinatario_telefono": self._sanitize_phone_gls(
+                consignee.phone or consignee_entity.phone or ""
+            ),
+            "destinatario_movil": self._sanitize_phone_gls(
+                consignee.mobile or consignee_entity.mobile or ""
+            ),
             "destinatario_email": escape(
                 consignee.email or consignee_entity.email or ""
             ),
@@ -231,10 +235,10 @@ def _prepare_gls_asm_pickup(self, picking):
             "remite_provincia": sender_partner.state_id.name or "",
             "remite_pais": (sender_partner.country_id.phone_code or ""),
             "remite_cp": sender_partner.zip or "",
-            "remite_telefono": (
+            "remite_telefono": self._sanitize_phone_gls(
                 sender_partner.phone or sender_partner.parent_id.phone or ""
             ),
-            "remite_movil": (
+            "remite_movil": self._sanitize_phone_gls(
                 sender_partner.mobile or sender_partner.parent_id.mobile or ""
             ),
             "remite_email": (
@@ -248,10 +252,10 @@ def _prepare_gls_asm_pickup(self, picking):
             "destinatario_provincia": receiving_partner.state_id.name or "",
             "destinatario_pais": (receiving_partner.country_id.code or ""),
             "destinatario_cp": receiving_partner.zip or "",
-            "destinatario_telefono": (
+            "destinatario_telefono": self._sanitize_phone_gls(
                 receiving_partner.phone or receiving_partner.parent_id.phone or ""
             ),
-            "destinatario_movil": (
+            "destinatario_movil": self._sanitize_phone_gls(
                 receiving_partner.mobile or receiving_partner.parent_id.mobile or ""
             ),
             "destinatario_email": (
@@ -533,3 +537,13 @@ def action_get_manifest(self):
             "res_id": wizard.id,
             "context": self.env.context,
         }
+
+    @api.model
+    def _sanitize_phone_gls(self, phone_number):
+        """Use method from phone_validation module without add it to dependencies
+        Default format is E164
+        """
+        sanitize = getattr(self, "_phone_format", None)
+        if sanitize:
+            phone_number = sanitize(number=phone_number)
+        return phone_number

delivery_gls_asm/readme/CONTRIBUTORS.md

@@ -1,6 +1,7 @@
 - [Tecnativa](https://www.tecnativa.com):
   - David Vidal
   - Víctor Martínez
+  - Sergio Teruel
 - [Studio73](https://www.studio73.es):
   - Ethan Hildick
   - David López

delivery_gls_asm/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Delivery GLS-ASM</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="delivery-gls-asm">
+<h1 class="title">Delivery GLS-ASM</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="delivery-gls-asm">
-<h1>Delivery GLS-ASM</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:d06e60c25de1f81ca2dae99923ac9b0aa5483d0c0f75b199c6b68b616c5b51cb
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/l10n-spain/tree/18.0/delivery_gls_asm"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-18-0/l10n-spain-18-0-delivery_gls_asm"><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/l10n-spain&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<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/l10n-spain/tree/18.0/delivery_gls_asm"><img alt="OCA/l10n-spain" src="https://img.shields.io/badge/github-OCA%2Fl10n--spain-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-spain-18-0/l10n-spain-18-0-delivery_gls_asm"><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/l10n-spain&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Este módulo integra la API de GLS España (antigua API de ASM) con Odoo.
 No es válido para integraciones de GLS en otros países, que podrían usar
 otras APIs.</p>
@@ -404,7 +399,7 @@ <h1>Delivery GLS-ASM</h1>
 </ul>
 </div>
 <div class="section" id="installation">
-<h2><a class="toc-backref" href="#toc-entry-1">Installation</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 <p>Este módulo necesita la librería python suds-py3 y depende igualmente de
 los módulos de OCA/delivery-carrier delivery_package_number y
 delivery_state.</p>
@@ -413,7 +408,7 @@ <h2><a class="toc-backref" href="#toc-entry-1">Installation</a></h2>
 módulo delivery_price_method.</p>
 </div>
 <div class="section" id="configuration">
-<h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
 <p>Para configurar el transportista:</p>
 <ol class="arabic simple">
 <li>Vaya a <em>Inventario &gt; Configuración &gt; Entrega &gt; Método de envío</em> y
@@ -429,10 +424,10 @@ <h2><a class="toc-backref" href="#toc-entry-2">Configuration</a></h2>
 los <em>Parámetros del sistema</em> en la clave delivery_gls_asm.api_user_demo.</p>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-3">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
 <p>Estas son las distintas operaciones posibles con este módulo:</p>
 <div class="section" id="grabar-servicios">
-<h3><a class="toc-backref" href="#toc-entry-4">Grabar servicios</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-4">Grabar servicios</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>Al confirmar el albarán, el servicio se grabará en GLS.</li>
@@ -448,7 +443,7 @@ <h3><a class="toc-backref" href="#toc-entry-4">Grabar servicios</a></h3>
 </blockquote>
 </div>
 <div class="section" id="pedir-recogidas">
-<h3><a class="toc-backref" href="#toc-entry-5">Pedir recogidas</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-5">Pedir recogidas</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>Al confirmar el albarán con un servicio de recogida, el envío NO
@@ -465,7 +460,7 @@ <h3><a class="toc-backref" href="#toc-entry-5">Pedir recogidas</a></h3>
 </blockquote>
 </div>
 <div class="section" id="cancelar-servicios">
-<h3><a class="toc-backref" href="#toc-entry-6">Cancelar servicios</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Cancelar servicios</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>Al igual que en otros métodos de envío, en los albaranes de salida
@@ -479,7 +474,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Cancelar servicios</a></h3>
 </blockquote>
 </div>
 <div class="section" id="obtener-etiquetas">
-<h3><a class="toc-backref" href="#toc-entry-7">Obtener etiquetas</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Obtener etiquetas</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>Si por error hubiésemos eliminado el adjunto de las etiquetas que
@@ -490,7 +485,7 @@ <h3><a class="toc-backref" href="#toc-entry-7">Obtener etiquetas</a></h3>
 </blockquote>
 </div>
 <div class="section" id="seguimiento-de-envios">
-<h3><a class="toc-backref" href="#toc-entry-8">Seguimiento de envíos</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-8">Seguimiento de envíos</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>El módulo está integrado con delivery_state para poder recabar la
@@ -504,7 +499,7 @@ <h3><a class="toc-backref" href="#toc-entry-8">Seguimiento de envíos</a></h3>
 </blockquote>
 </div>
 <div class="section" id="manifiesto-de-envios">
-<h3><a class="toc-backref" href="#toc-entry-9">Manifiesto de envíos</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-9">Manifiesto de envíos</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>Para obtener el manifiesto de expediciones que firmaría el
@@ -520,7 +515,7 @@ <h3><a class="toc-backref" href="#toc-entry-9">Manifiesto de envíos</a></h3>
 </blockquote>
 </div>
 <div class="section" id="depuracion-de-errores">
-<h3><a class="toc-backref" href="#toc-entry-10">Depuración de errores</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-10">Depuración de errores</a></h2>
 <blockquote>
 <ol class="arabic simple">
 <li>Es importante tener en cuenta que solo funcionará con códigos
@@ -536,7 +531,7 @@ <h3><a class="toc-backref" href="#toc-entry-10">Depuración de errores</a></h3>
 </div>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-11">Known issues / Roadmap</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-11">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>La API no facilita métodos para cotizar el coste real de los envíos,
 por lo que siempre se cotizan a 0. Si la cotización de envíos es
@@ -545,27 +540,28 @@ <h2><a class="toc-backref" href="#toc-entry-11">Known issues / Roadmap</a></h2>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-12">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-12">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-spain/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/l10n-spain/issues/new?body=module:%20delivery_gls_asm%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-13">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-13">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-14">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-14">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-15">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-15">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
 <li>David Vidal</li>
 <li>Víctor Martínez</li>
+<li>Sergio Teruel</li>
 </ul>
 </li>
 <li><a class="reference external" href="https://www.studio73.es">Studio73</a>:<ul>
@@ -576,7 +572,7 @@ <h3><a class="toc-backref" href="#toc-entry-15">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-16">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-16">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -591,6 +587,5 @@ <h3><a class="toc-backref" href="#toc-entry-16">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>