From b485ee48f36978417d51f717f55642b423b05f38 Mon Sep 17 00:00:00 2001
From: Ronald Portier <ronald@therp.nl>
Date: Thu, 26 Jun 2025 22:11:37 +0200
Subject: [PATCH] [FIX] mrp: correct grouping per kit on deliveryslip

These are the commits present in Odoo 18.0 (and possibly before)
contained in this fix.
da9c0fcbcb54 [FIX] mrp: always show kit comp under kit on delivery slip
0830747b54fb [IMP] account, l10n_gcc, *: remove bg on o_line_section
e1f4f2999d98 [FIX] mrp: delivery slip with kit and non kit component
20277898b25c [FIX] mrp: display product variant on the delivery slip
1fcd098af5fa [REF] *: BS5: migration
---
 addons/mrp/report/report_deliveryslip.xml | 28 +++++++++++------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/addons/mrp/report/report_deliveryslip.xml b/addons/mrp/report/report_deliveryslip.xml
index 18f5bc723b4b7..83ee71ac9d3b4 100644
--- a/addons/mrp/report/report_deliveryslip.xml
+++ b/addons/mrp/report/report_deliveryslip.xml
@@ -5,11 +5,10 @@
         <xpath expr="//t[@name='has_packages']" position="before">
             <!-- get only the top level kits' (i.e. no subkit) move lines for easier mapping later on + we ignore subkit groupings-->
             <!-- note that move.name uses top level kit's product.template.display_name value instead of product.template.name -->
-            <!-- Product template for non-variant and product id for variant bom -->
-            <t t-set="has_kits" t-value="o.move_line_ids.filtered(lambda l: l.move_id.bom_line_id and l.move_id.name in (l.move_id.bom_line_id.bom_id.product_tmpl_id.display_name, l.move_id.bom_line_id.bom_id.product_id.display_name))"/>
+            <t t-set="has_kits" t-value="o.move_line_ids.filtered(lambda l: l.move_id.bom_line_id and l.move_id.bom_line_id.bom_id.type == 'phantom')"/>
         </xpath>
         <xpath expr="//t[@name='no_package_section']" position="before">
-            <t t-set="has_kits" t-value="move_lines.filtered(lambda l: l.move_id.bom_line_id and l.move_id.name in (l.move_id.bom_line_id.bom_id.product_tmpl_id.display_name, l.move_id.bom_line_id.bom_id.product_id.display_name))"/>
+            <t t-set="has_kits" t-value="o.move_line_ids.filtered(lambda l: l.move_id.bom_line_id and l.move_id.bom_line_id.bom_id.type == 'phantom')"/>
             <t t-if="has_kits">
                 <!-- print the products not in a package or kit first -->
                 <t t-set="move_lines" t-value="move_lines.filtered(lambda m: not m.move_id.bom_line_id)"/>
@@ -28,36 +27,35 @@
     </template>
 
     <template id="stock_report_delivery_kit_sections">
-        <!-- get all kits-related SML, including subkits and excluding the packaged SML -->
-        <t t-set="all_kits_move_lines" t-value="o.move_line_ids.filtered(lambda l: l.move_id.bom_line_id.bom_id.type == 'phantom' and not l.result_package_id)"/>
+        <!-- get all kits-related SML, including subkits -->
+        <t t-set="all_kits_move_lines" t-value="o.move_line_ids.filtered(lambda l: l.move_id.bom_line_id.bom_id.type == 'phantom')"/>
         <!-- do another map to get unique top level kits -->
         <t t-set="boms" t-value="has_kits.mapped('move_id.bom_line_id.bom_id')"/>
         <t t-foreach="boms" t-as="bom">
             <!-- Separate product.product from template for variants-->
             <t t-if="bom.product_id">
-                <t t-set="kit" t-value="bom.product_id"/>
+                <t t-set="kit_product" t-value="bom.product_id"/>
             </t>
             <t t-else="">
-                <t t-set="kit" t-value="bom.product_tmpl_id"/>
+                <t t-set="kit_product" t-value="bom.product_tmpl_id"/>
             </t>
-            <tr t-att-class="'bg-200 font-weight-bold o_line_section'">
+            <tr t-att-class="'fw-bold o_line_section'">
                 <td colspan="99">
-                    <span t-esc="kit.display_name"/>
+                    <span t-esc="kit_product.display_name"/>
                 </td>
             </tr>
-            <t t-set="kit_move_lines" t-value="all_kits_move_lines.filtered(lambda l: l.move_id.name == kit.display_name)"/>
+            <t t-set="kit_move_lines" t-value="all_kits_move_lines.filtered(lambda l: l.move_id.bom_line_id.bom_id == bom)"/>
             <t t-if="has_serial_number">
                 <tr t-foreach="kit_move_lines" t-as="move_line">
                     <t t-set="description" t-value="move_line.move_id.description_picking"/>
-                    <t t-if="description == kit.display_name">
+                    <t t-if="description == kit_product.display_name">
                         <t t-set="description" t-value=""/>
                     </t>
                     <t t-call="stock.stock_report_delivery_has_serial_move_line"/>
                 </tr>
             </t>
             <t t-else="">
-                <!-- move line description by default is the product_template.name (kit name), instead of display_name-->
-                <t t-set="aggregated_lines" t-value="kit_move_lines._get_aggregated_product_quantities(kit_name=kit.display_name)"/>
+                <t t-set="aggregated_lines" t-value="kit_move_lines._get_aggregated_product_quantities(kit_name=kit_product.display_name)"/>
                 <t t-if="aggregated_lines">
                     <t t-call="stock.stock_report_delivery_aggregated_move_lines"/>
                 </t>
@@ -68,9 +66,9 @@
     <!-- No kit section is expected to only be called in no packages case -->
     <template id="stock_report_delivery_no_kit_section">
         <!-- Do another section for kit-less products if they exist -->
-        <t t-set="no_kit_move_lines" t-value="o.move_line_ids.filtered(lambda l: not l.move_id.bom_line_id)"/>
+        <t t-set="no_kit_move_lines" t-value="o.move_line_ids.filtered(lambda l: l.move_id.bom_line_id.bom_id.type != 'phantom')"/>
         <t t-if="no_kit_move_lines">
-            <tr t-att-class="'bg-200 font-weight-bold o_line_section'">
+            <tr t-att-class="'fw-bold o_line_section'">
                 <td colspan="99">
                     <span>Products not associated with a kit</span>
                 </td>