[IMP] l10n_it_delivery_note: UI improvements

OCA · Feb 22, 2024 · 7665a7f · 7665a7f
1 parent dc4441a
commit 7665a7f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/l10n_it_delivery_note/models/stock_delivery_note.py b/l10n_it_delivery_note/models/stock_delivery_note.py
@@ -138,6 +138,14 @@ def _domain_weight_uom(self):
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
     )
 
+    customer_id = fields.Many2one(
+        "res.partner",
+        string="Customer",
+        compute="_compute_customer_id",
+        store=True,
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+    )
+
     carrier_id = fields.Many2one(
         "res.partner",
         string="Carrier",
@@ -318,6 +326,18 @@ def name_get(self):
 
         return result
 
+    @api.depends(
+        "sale_ids",
+        "partner_id",
+        "partner_shipping_id",
+    )
+    def _compute_customer_id(self):
+        for note in self:
+            if note.sale_ids:
+                note.customer_id = note.partner_id
+            else:
+                note.customer_id = note.partner_shipping_id
+
     @api.depends("state", "line_ids", "line_ids.invoice_status")
     def _compute_invoice_status(self):
         for note in self:

diff --git a/l10n_it_delivery_note/models/stock_picking.py b/l10n_it_delivery_note/models/stock_picking.py
@@ -32,6 +32,7 @@ class StockPicking(models.Model):
     delivery_note_partner_shipping_id = fields.Many2one(
         "res.partner", related="delivery_note_id.partner_shipping_id"
     )
+    delivery_note_customer_id = fields.Many2one(related="delivery_note_id.customer_id")
 
     delivery_note_carrier_id = fields.Many2one(
         "res.partner", string="DN Carrier", related="delivery_note_id.carrier_id"

diff --git a/l10n_it_delivery_note/report/report_delivery_note.xml b/l10n_it_delivery_note/report/report_delivery_note.xml
@@ -38,12 +38,12 @@
                     </t>
                     <t t-else="">
                         <div
-                            t-field="doc.partner_id"
+                            t-field="doc.customer_id"
                             t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
                         />
-                        <p t-if="doc.partner_id.vat"><t
+                        <p t-if="doc.customer_id.vat"><t
                                 t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                            />: <span t-field="doc.partner_id.vat" /></p>
+                            />: <span t-field="doc.customer_id.vat" /></p>
                     </t>
                 </t>
             </t>

diff --git a/l10n_it_delivery_note/views/stock_picking.xml b/l10n_it_delivery_note/views/stock_picking.xml
@@ -207,13 +207,8 @@
                                                     'readonly': [('delivery_note_readonly', '=', True)]}"
                                     />
                                     <field
-                                        name="delivery_note_carrier_id"
-                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
-                                        string="Carrier"
-                                    />
-                                    <field
-                                        name="delivery_method_id"
-                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
+                                        name="delivery_note_date"
+                                        attrs="{'readonly': [('delivery_note_draft', '=', False)]}"
                                     />
                                 </group>
                                 <group>
@@ -223,9 +218,10 @@
                                         attrs="{'required': [('delivery_note_exists', '=', True)],
                                                     'readonly': [('delivery_note_draft', '=', False)]}"
                                     />
+                                    <field name="sale_id" invisible="1" />
                                     <field
-                                        name="delivery_note_date"
-                                        attrs="{'readonly': [('delivery_note_draft', '=', False)]}"
+                                        name="delivery_note_customer_id"
+                                        attrs="{'readonly': [('sale_id', '=', False)]}"
                                     />
                                     <label for="transport_datetime" />
                                     <div class="o_row">
@@ -249,6 +245,11 @@
                                 attrs="{'invisible': [('delivery_note_exists', '=', False)]}"
                             >
                                 <group>
+                                    <field
+                                        name="delivery_note_carrier_id"
+                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
+                                        string="Carrier"
+                                    />
                                     <field
                                         name="packages"
                                         attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
@@ -269,6 +270,10 @@
                                     </div>
                                 </group>
                                 <group>
+                                    <field
+                                        name="delivery_method_id"
+                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
+                                    />
                                     <label for="gross_weight" />
                                     <div class="o_row">
                                         <field