[IMP] l10n_it_delivery_note: link carrier with delivery method

l10n_it_delivery_note/README.rst

@@ -7,7 +7,7 @@ ITA - Documento di trasporto
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:86cc264b131150d0e14a593b955879a5dfe4ecfe7db4069f8ede4f8a416c9e20
+   !! source digest: sha256:e389fbd4dff70da2d65271df7684c21141a86b5e861217fe285b4df642e5a57a
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

l10n_it_delivery_note/__manifest__.py

@@ -13,12 +13,12 @@
     "author": "Marco Calcagni, Gianmarco Conte, Link IT Europe Srl, "
     "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/l10n-italy",
-    "version": "14.0.2.5.1",
+    "version": "14.0.2.6.0",
     "category": "Localization/Italy",
     "license": "AGPL-3",
     "maintainers": ["MarcoCalcagni", "aleuffre", "renda-dev"],
     "depends": [
-        "delivery",
+        "delivery_carrier_partner",
         "l10n_it_delivery_note_base",
         "mail",
         "sale_stock",

l10n_it_delivery_note/cli/migrate_l10n_it_ddt.py

@@ -288,7 +288,8 @@ def vals_getter(record):
                 "type_id": self._document_types[record.ddt_type_id].id,
                 "date": record.date,
                 "carrier_id": record.carrier_id.id,
-                "delivery_method_id": record.partner_id.property_delivery_carrier_id.id,
+                "delivery_method_id": record.picking_ids.mapped("carrier_id")[:1].id
+                or record.partner_id.property_delivery_carrier_id.id,
                 "transport_datetime": record.date_done,
                 "packages": record.parcels,
                 "volume": record.volume,

l10n_it_delivery_note/migrations/14.0.2.6.0/post-migrate.py

@@ -0,0 +1,11 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    note_ids = env["stock.delivery.note"].search(
+        [("carrier_id", "!=", False), ("delivery_method_id", "!=", False)]
+    )
+
+    for note_id in note_ids:
+        note_id.delivery_method_id.write({"partner_id": note_id.carrier_id.id})

l10n_it_delivery_note/models/res_partner.py

@@ -19,4 +19,3 @@ class ResPartner(models.Model):
     default_transport_method_id = fields.Many2one(
         "stock.picking.transport.method", string="Method of transport"
     )
-    is_carrier = fields.Boolean("Is Carrier")

l10n_it_delivery_note/models/stock_delivery_note.py

@@ -143,7 +143,8 @@ def _domain_weight_uom(self):
         string="Carrier",
         states=DONE_READONLY_STATE,
         tracking=True,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        store=True,
+        compute="_compute_carrier_id",
     )
     delivery_method_id = fields.Many2one(
         "delivery.carrier",
@@ -313,6 +314,11 @@ def name_get(self):
 
         return result
 
+    @api.depends("delivery_method_id.partner_id")
+    def _compute_carrier_id(self):
+        for note in self:
+            note.carrier_id = note.delivery_method_id.partner_id
+
     @api.depends("state", "line_ids", "line_ids.invoice_status")
     def _compute_invoice_status(self):
         for note in self:

l10n_it_delivery_note/models/stock_picking.py

@@ -346,7 +346,8 @@ def _create_delivery_note(self):
                 "partner_shipping_id": partners[1].id,
                 "type_id": type_id.id,
                 "date": self.date_done,
-                "delivery_method_id": self.partner_id.property_delivery_carrier_id.id,
+                "delivery_method_id": self.mapped("carrier_id")[:1].id
+                or self.partner_id.property_delivery_carrier_id.id,
                 "transport_condition_id": (
                     self.sale_id.default_transport_condition_id.id
                     or partners[1].default_transport_condition_id.id

l10n_it_delivery_note/security/ir.model.access.csv

@@ -23,3 +23,4 @@ access_stock_delivery_note_create_wizard_manager,access_stock_delivery_note_crea
 access_stock_delivery_note_select_wizard_manager,access_stock_delivery_note_select_wizard manager,l10n_it_delivery_note.model_stock_delivery_note_select_wizard,,1,1,1,1
 access_stock_delivery_note_base_wizard_manager,access_stock_delivery_note_base_wizard manager,l10n_it_delivery_note.model_stock_delivery_note_base_wizard,,1,1,1,1
 access_stock_delivery_note_invoice_wizard_manager,access_stock_delivery_note_invoice_wizard manager,l10n_it_delivery_note.model_stock_delivery_note_invoice_wizard,,1,1,1,1
+access_delivery_carrier_portal,delivery.carrier portal,delivery.model_delivery_carrier,base.group_portal,1,0,0,0

l10n_it_delivery_note/static/description/index.html

@@ -1,3 +1,4 @@
+<?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>
@@ -366,7 +367,7 @@ <h1 class="title">ITA - Documento di trasporto</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:86cc264b131150d0e14a593b955879a5dfe4ecfe7db4069f8ede4f8a416c9e20
+!! source digest: sha256:e389fbd4dff70da2d65271df7684c21141a86b5e861217fe285b4df642e5a57a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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-italy/tree/14.0/l10n_it_delivery_note"><img alt="OCA/l10n-italy" src="https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-italy-14-0/l10n-italy-14-0-l10n_it_delivery_note"><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-italy&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p><strong>English</strong></p>

l10n_it_delivery_note/views/res_partner.xml

@@ -12,7 +12,6 @@
         <field name="arch" type="xml">
             <xpath expr="//page[@name='sales_purchases']/group" position="inside">
                 <group string="Shipping information">
-                    <field name="is_carrier" />
                     <field name="default_goods_appearance_id" widget="selection" />
                     <field name="default_transport_condition_id" widget="selection" />
                     <field name="default_transport_reason_id" widget="selection" />

l10n_it_delivery_note/views/stock_delivery_note.xml

@@ -156,10 +156,7 @@
                     </group>
                     <group>
                         <group>
-                            <field
-                                name="carrier_id"
-                                domain="[('is_carrier','=', True)]"
-                            />
+                            <field name="carrier_id" />
                             <field name="delivery_method_id" />
                         </group>
                         <group>

l10n_it_delivery_note/views/stock_picking.xml

@@ -204,7 +204,6 @@
                                     <field
                                         name="delivery_note_carrier_id"
                                         attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
-                                        domain="[('is_carrier','=', True)]"
                                         string="Carrier"
                                     />
                                     <field
@@ -356,6 +355,9 @@
                 <field name="delivery_note_state" optional="show" />
                 <field name="delivery_note_date" optional="show" />
             </field>
+            <field name="partner_id" position="after">
+                <field name="carrier_id" string="Delivery Method" />
+            </field>
         </field>
     </record>
 

l10n_it_delivery_note/wizard/delivery_note_base.py

@@ -38,6 +38,7 @@ def _domain_type_id(self):
     )
 
     error_message = fields.Html(compute="_compute_fields")
+    warning_message = fields.Char("Warning", readonly=True, compute="_compute_fields")
 
     def _get_validation_errors(self, pickings):
         validators = [
@@ -63,6 +64,16 @@ def _get_validation_errors(self, pickings):
 
         return errors
 
+    def _get_warning_message(self):
+        """
+        This method is used to be inherited and extended
+        to display whatever message could be used to improve the
+        user experience when creating a delivery note
+
+        :return: message to be displayed
+        """
+        return False
+
     @api.depends("selected_picking_ids")
     def _compute_fields(self):
         try:
@@ -84,6 +95,7 @@ def _compute_fields(self):
             )
 
         else:
+            self.warning_message = self._get_warning_message()
             partners = self.selected_picking_ids.get_partners()
             self.partner_sender_id = partners[0]
             self.partner_id = partners[1]

l10n_it_delivery_note/wizard/delivery_note_create.py

@@ -88,7 +88,10 @@ def _prepare_delivery_note_vals(self, sale_order_id):
             "partner_shipping_id": self.partner_shipping_id.id,
             "type_id": self.type_id.id,
             "date": self.date,
-            "delivery_method_id": self.partner_id.property_delivery_carrier_id.id,
+            "delivery_method_id": (
+                self.selected_picking_ids.mapped("carrier_id")[:1].id
+                or self.partner_id.property_delivery_carrier_id.id
+            ),
             "transport_condition_id": (
                 sale_order_id
                 and sale_order_id.default_transport_condition_id.id

l10n_it_delivery_note/wizard/delivery_note_select.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2019, Link IT Europe Srl
 # @author: Matteo Bilotta <mbilotta@linkeurope.it>
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
 
 
 class StockDeliveryNoteSelectWizard(models.TransientModel):
@@ -37,6 +37,17 @@ def _compute_fields(self):
             self.picking_ids += self.selected_picking_ids
         else:
             self.picking_ids = self.picking_ids
+        self.warning_message = self._get_warning_message()
+
+    def _get_warning_message(self):
+        res = super()._get_warning_message()
+        carrier_ids = self.picking_ids.mapped("carrier_id.partner_id")
+        if len(carrier_ids) > 1:
+            res = _(
+                "The selected pickings have different delivery methods: %(carriers)s",
+                carriers=", ".join(carrier_ids.mapped("name")),
+            )
+        return res
 
     def check_compliance(self, pickings):
         super().check_compliance(pickings)

l10n_it_delivery_note/wizard/delivery_note_select.xml

@@ -14,6 +14,14 @@
                     <field name="error_message" />
                 </div>
                 <field name="selected_picking_ids" invisible="True" />
+                <p
+                    class="text-center alert alert-warning"
+                    role="alert"
+                    attrs="{'invisible': [('warning_message', '=', False)]}"
+                >
+                    <span class="fa fa-warning" title="Warning!" />
+                    <field name="warning_message" />
+                </p>
                 <div
                     class="oe_title"
                     attrs="{'invisible': [('error_message', '!=', False)]}"