[16.0][MIG] delivery_multi_destination: Continue Migration

carolinafernandez-tecnativa · carolinafernandez-tecnativa · commit 6f559a9b8e7c · 2024-01-31T16:17:42.000+01:00
diff --git a/delivery_multi_destination/README.rst b/delivery_multi_destination/README.rst
@@ -7,7 +7,7 @@ Multiple destinations for the same delivery method
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:2bae037f6463833430c93739fa098bd379b7e9307ae8b3a4f8b8e02aeb33e2e4
+   !! source digest: sha256:2cb9cc1f227af0d903b43f5511bdd469acf455504f9aa767342cff2c1dd7fdf5
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -90,6 +90,7 @@ Contributors
   * Pedro M. Baeza
   * Luis M. Ontalba
   * Carlos Roca
+  * Carolina Fernandez
 
 * `Dinamiche Aziendali <https://www.dinamicheaziendali.it>__`:
 
diff --git a/delivery_multi_destination/__manifest__.py b/delivery_multi_destination/__manifest__.py
@@ -1,11 +1,12 @@
 # Copyright 2016-2019 Tecnativa - Pedro M. Baeza
 # Copyright 2017 Tecnativa - Luis M. Ontalba
 # Copyright 2021 Gianmarco Conte <gconte@dinamicheaziendali.it>
+# Copyright 2024 Tecnativa - Carolina Fernandez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 {
     "name": "Multiple destinations for the same delivery method",
-    "version": "16.0.1.0.2",
+    "version": "16.0.1.0.0",
     "category": "Delivery",
     "website": "https://github.com/OCA/delivery-carrier",
     "author": "Tecnativa, Odoo Community Association (OCA)",
diff --git a/delivery_multi_destination/models/delivery_carrier.py b/delivery_multi_destination/models/delivery_carrier.py
@@ -1,6 +1,7 @@
 # Copyright 2016-2020 Tecnativa - Pedro M. Baeza
 # Copyright 2017 Tecnativa - Luis M. Ontalba
 # Copyright 2021 Gianmarco Conte <gconte@dinamicheaziendali.it>
+# Copyright 2024 Tecnativa - Carolina Fernandez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
@@ -69,23 +70,22 @@ def rate_shipment(self, order):
         """We have to override this method for getting the proper price
         according destination on sales orders.
         """
-        if self.destination_type == "one":
-            return super().rate_shipment(order)
-        else:
+        if self.destination_type != "one":
             carrier = self.with_context(show_children_carriers=True)
             for subcarrier in carrier.child_ids:
                 if subcarrier._match_address(order.partner_shipping_id):
                     return super(
                         DeliveryCarrier,
                         subcarrier,
                     ).rate_shipment(order)
+        return super().rate_shipment(order)
 
     def send_shipping(self, pickings):
         """We have to override this method for redirecting the result to the
         proper "child" carrier.
         """
         if self.destination_type == "one" or not self:
-            return super().send_shipping(pickings)
+            res = super().send_shipping(pickings)
         else:
             carrier = self.with_context(show_children_carriers=True)
             res = []
@@ -121,4 +121,4 @@ def send_shipping(self, pickings):
                 if not picking_res:
                     raise ValidationError(_("There is no matching delivery rule."))
                 res += picking_res
-            return res
+        return res
diff --git a/delivery_multi_destination/readme/CONTRIBUTORS.rst b/delivery_multi_destination/readme/CONTRIBUTORS.rst
@@ -3,6 +3,7 @@
   * Pedro M. Baeza
   * Luis M. Ontalba
   * Carlos Roca
+  * Carolina Fernandez
 
 * `Dinamiche Aziendali <https://www.dinamicheaziendali.it>__`:
 
diff --git a/delivery_multi_destination/static/description/index.html b/delivery_multi_destination/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Multiple destinations for the same delivery method</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2bae037f6463833430c93739fa098bd379b7e9307ae8b3a4f8b8e02aeb33e2e4
+!! source digest: sha256:2cb9cc1f227af0d903b43f5511bdd469acf455504f9aa767342cff2c1dd7fdf5
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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_multi_destination"><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_multi_destination"><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>
 <p>This module allows to set different price rules depending on the destination.</p>
@@ -439,6 +438,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <li>Pedro M. Baeza</li>
 <li>Luis M. Ontalba</li>
 <li>Carlos Roca</li>
+<li>Carolina Fernandez</li>
 </ul>
 </li>
 <li><cite>Dinamiche Aziendali &lt;https://www.dinamicheaziendali.it&gt;__</cite>:<ul>
