[IMP] shoppingfeed_integration: Change the carrier field from many2one to many2many in store carrier mappings

With this change, for each mapping line the user can configure multiple carriers, and the logic selects the first one that matches the shipping address.

For example, the customer buys from the Spain store, but the delivery address is in another country.

Author: carlos-lopez-tecnativa

shoppingfeed_integration/__manifest__.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
     "name": "Shoppingfeed Integration",
-    "version": "18.0.1.0.2",
+    "version": "18.0.1.0.3",
     "summary": "Integrate Odoo with Shoppingfeed for product export and order sync",
     "category": "Sales",
     "author": "Tecnativa, Odoo Community Association (OCA)",

shoppingfeed_integration/migrations/18.0.1.0.3/post-migration.py

@@ -0,0 +1,15 @@
+# Copyright 2026 Tecnativa - Carlos Lopez
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.m2o_to_x2m(
+        env.cr,
+        env["shoppingfeed.store.carrier.map"],
+        "shoppingfeed_store_carrier_map",
+        "delivery_carrier_ids",
+        "delivery_carrier_id",
+    )

shoppingfeed_integration/models/sale_order.py

@@ -255,20 +255,25 @@ def _shoppingfeed_validate_products(self, order):
         return missing_products
 
     def _shoppingfeed_get_carrier(
-        self, store, channel, carrier_name, shipping_country=None
+        self, store, channel, carrier_name, partner, shipping_partner=None
     ):
         carrier = False
+        shipping_partner = shipping_partner or partner
+        shipping_country = shipping_partner.country_id if shipping_partner else None
         if carrier_name:
             carrier_map = store.carrier_map_ids.filtered(
                 lambda m, carrier_name=carrier_name: m.carrier_name.strip().lower()
                 == carrier_name.strip().lower()
             )
             if carrier_map:
-                carrier = carrier_map.delivery_carrier_id
+                for candidate_carrier in carrier_map.delivery_carrier_ids:
+                    if candidate_carrier._match_address(shipping_partner):
+                        carrier = candidate_carrier
+                        break
         if not carrier:
             if channel and shipping_country and channel.country_carrier_ids:
                 country_rule = channel.country_carrier_ids.filtered(
-                    lambda r, c=shipping_country: r.country_id == c
+                    lambda rule, country=shipping_country: rule.country_id == country
                 )
                 if country_rule:
                     carrier = country_rule[0].delivery_carrier_id
@@ -442,11 +447,8 @@ def _import_orders_from_shoppingfeed(self, store):
                     # Carrier mapping
                     shipment = order.get("shipment", {}) or {}
                     carrier_name = shipment.get("carrier")
-                    shipping_country = (
-                        shipping_partner.country_id if shipping_partner else None
-                    )
                     carrier = self._shoppingfeed_get_carrier(
-                        store, sf_channel, carrier_name, shipping_country
+                        store, sf_channel, carrier_name, partner, shipping_partner
                     )
                     new_sale = self._shoppingfeed_create_sale_order(
                         store,

shoppingfeed_integration/models/shoppingfeed_store_carrier_map.py

@@ -17,7 +17,7 @@ class ShoppingfeedStoreCarrierMap(models.Model):
         required=True,
         help="Carrier name as received from Shoppingfeed",
     )
-    delivery_carrier_id = fields.Many2one(
+    delivery_carrier_ids = fields.Many2many(
         comodel_name="delivery.carrier",
         string="Odoo Delivery Carrier",
         required=True,

shoppingfeed_integration/views/shoppingfeed_store_views.xml

@@ -209,7 +209,11 @@
                                 <field name="carrier_map_ids">
                                     <list editable="bottom">
                                         <field name="carrier_name" />
-                                        <field name="delivery_carrier_id" />
+                                        <field
+                                            name="delivery_carrier_ids"
+                                            widget="many2many_tags"
+                                            options="{'no_create': True}"
+                                        />
                                     </list>
                                 </field>
                             </group>