[IMP] intrastat_delivery: Añadido un orden de prioridad distinto para que establezca el incoterm en primer lugar del partner, despúes del método de envio y por último el general, si no quedará vacío.

odoo-16/fl-v16#6678

Author: diego.fernandez

intrastat_delivery/models/sale_order.py

@@ -1,27 +1,41 @@
 # © 2023 FactorLibre - Aritz Olea <aritz.olea@factorlibre.com>
-from odoo import models
-
+from odoo import models, api
 
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    def _get_default_incoterm(self):
+        """Obtiene el Incoterm por orden de prioridad"""
+        self.ensure_one()
+        partner_incoterm = self.partner_id.sale_incoterm_id
+        if partner_incoterm:
+            return partner_incoterm
+        carrier_incoterm = self.carrier_id.incoterm
+        if carrier_incoterm:
+            return carrier_incoterm
+        company_incoterm = self.company_id.incoterm_id
+        if company_incoterm:
+            return company_incoterm
+        return False
+
+    @api.onchange("partner_id", "carrier_id")
+    def _onchange_partner_or_carrier(self):
+        for order in self:
+            order.incoterm = order._get_default_incoterm()
+
     def _action_confirm(self):
         ret = super()._action_confirm()
         for order in self:
-            order.write(
-                {
-                    "incoterm": order.carrier_id.incoterm.id,
-                    "intrastat_transport_id": order.carrier_id.intrastat_transport_id.id,
-                }
-            )
+            order.write({
+                "incoterm": order._get_default_incoterm().id,
+                "intrastat_transport_id": order.carrier_id.intrastat_transport_id.id,
+            })
         return ret
 
     def _prepare_invoice(self):
-        ret = super()._prepare_invoice()
-        ret.update(
-            {
-                "invoice_incoterm_id": self.incoterm.id,
-                "intrastat_transport_id": self.intrastat_transport_id.id,
-            }
-        )
-        return ret
+        invoice_vals = super()._prepare_invoice()
+        invoice_vals.update({
+            "invoice_incoterm_id": self.incoterm.id,
+            "intrastat_transport_id": self.intrastat_transport_id.id,
+        })
+        return invoice_vals

intrastat_delivery/readme/CONTRIBUTORS.rst

@@ -1 +1,2 @@
 * Aritz Olea <aritz.olea@factorlibre.com>
+* Diego Fernández <diego.fernandez@factorlibre.com>

intrastat_delivery/readme/DESCRIPTION.rst

@@ -8,4 +8,13 @@ The mode of transport and incoterm are assigned to the sales order when it goes
 from that sales order.
 
 It is recommended to set TRUE the "Show incoterms in orders and invoices" value at
-"Settings / Sales".
+"Settings / Sales".
+
+Incoterm selection priority:
+
+When assigning the Incoterm to a sales order, the following priority is applied:
+
+1. First, the Incoterm set on the partner is used.
+2. If not defined, the Incoterm from the shipping method is used.
+3. If still not defined, the general settings Incoterm is used.
+4. If none of the above are set, the Incoterm field remains empty.