[update] fix report row and add delivery note from partner contact

models/stock_picking.py

@@ -7,9 +7,35 @@ from odoo import fields, models
 class FumocStockPicking(models.Model):
     _inherit = 'stock.picking'
 
+    # ------------------------------------------------------
+    # Fields declaration
+    # ------------------------------------------------------
     res_transporter_id = fields.Many2one(
         string='Transporteur',
         related='sale_id.res_transporter_id')
     packaging_id = fields.Many2one(
         string="Emballage",
         related='sale_id.packaging_id')
+
+    partner_contact_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Contact associé',
+        compute='_compute_partner_contact_id')
+
+    # ------------------------------------------------------
+    # Compute
+    # ------------------------------------------------------
+    def _compute_partner_contact_id(self):
+        for r in self:
+            partner = r.partner_id
+            is_contact = False
+            while not is_contact:
+                if partner.type != 'contact':
+                    if partner.parent_id:
+                        partner = partner.parent_id
+                    else:
+                        partner = False
+                        is_contact = True
+                else:
+                    is_contact = True
+            r.partner_contact_id = partner

report/report_deliveryslip.xml

@@ -6,15 +6,25 @@
     <template id="fumoc_sale_stock_report_delivery_document"
               inherit_id="stock.report_delivery_document">
 
-        <xpath expr="//div[@name='div_sched_date']" position="after">
-            <div t-if="o.res_transporter_id" class="col-6" name="div_transporter">
+        <xpath expr="//table[@name='stock_move_table']" position="before">
+            <div class="row mt32 mb32">
+                <div t-if="o.res_transporter_id" class="col-auto" name="div_transporter">
                     <strong>Transporteur :</strong>
                     <p t-field="o.res_transporter_id"/>
                 </div>
-            <div t-if="o.packaging_id" class="col-6" name="div_packaging">
+                <div t-if="o.packaging_id" class="col-auto" name="div_packaging">
                     <strong>Emballage :</strong>
                     <p t-field="o.packaging_id"/>
                 </div>
+            </div>
+            <div class="row mt32 mb32">
+                <t t-if="o.partner_contact_id">
+                    <div t-if="o.partner_contact_id.delivery_note" class="col-auto" name="div_delivery_note">
+                        <strong>Note :</strong>
+                        <p t-field="o.partner_contact_id.delivery_note"/>
+                    </div>
+                </t>
+            </div>
         </xpath>
 
     </template>

report/report_stockpicking_operations.xml

@@ -7,16 +7,28 @@
               inherit_id="stock.report_picking">
 
         <xpath expr="//div[@name='div_sched_date']" position="after">
-            <div class="col-6" name="div_transporter">
+            <div class="col-auto" name="div_transporter">
                 <strong>Transporteur :</strong>
                 <p t-field="o.res_transporter_id"/>
             </div>
-            <div class="col-6" name="div_packaging">
+            <div class="col-auto" name="div_packaging">
                 <strong>Emballage :</strong>
                 <p t-field="o.packaging_id"/>
             </div>
         </xpath>
 
+        <xpath expr="//table[1]" position="before">
+            <div class="row mt48 mb32">
+                <t t-if="o.partner_contact_id">
+                    <div t-if="o.partner_contact_id.delivery_note" class="col-auto" name="div_delivery_note">
+                        <strong>Note :</strong>
+                        <p t-field="o.partner_contact_id.delivery_note"/>
+                    </div>
+                </t>
+            </div>
+        </xpath>
+
+
     </template>
 
 </odoo>