From 76183fd50279149a6819b057fa79ff72b273b7c0 Mon Sep 17 00:00:00 2001
From: Unai Beristain <unaiberis@gmail.com>
Date: Wed, 5 Feb 2025 17:08:13 +0100
Subject: [PATCH] [IMP] mrp_bom_report: Simplify report and add fields in
 origin module's report

---
 .../report/mrp_bom_report.xml                 | 33 ++++++++++++-------
 mrp_bom_report/report/mrp_bom_report.xml      | 28 ----------------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/mrp_bom_line_product_brand_info/report/mrp_bom_report.xml b/mrp_bom_line_product_brand_info/report/mrp_bom_report.xml
index c7815cf8b..ea18a172a 100644
--- a/mrp_bom_line_product_brand_info/report/mrp_bom_report.xml
+++ b/mrp_bom_line_product_brand_info/report/mrp_bom_report.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-<template
-    id="report_mrp_bom_customized_document"
-    inherit_id="mrp_bom_report.report_mrp_bom_customized_document"
-  >
+  <template id="report_mrp_bom_customized_document" inherit_id="mrp_bom_report.report_mrp_bom_customized_document">
     <span id="product_name" position="after">
-        <span
-        t-if="line and 'manufacturer_codes' in line and line['manufacturer_codes']"
-      >
-            <br />
-            <span t-esc="line['manufacturer_codes']" />
-        </span>
+      <span t-if="line and 'manufacturer_codes' in line and line['manufacturer_codes']">
+        <br />
+        <span t-esc="line['manufacturer_codes']" />
+      </span>
     </span>
-</template>
+    <xpath expr="//table/thead/tr" position="inside">
+      <th class="text-start">Product Code</th>
+      <th class="text-start">Manufacturer Codes</th>
+      <th class="text-start">Brand</th>
+    </xpath>
+    <xpath expr="//table/tbody//tr" position="inside">
+      <td class="text-start">
+        <span t-esc="bom_line_id['product_code'] or ''" />
+      </td>
+      <td class="text-start">
+        <span t-esc="bom_line_id['manufacturer_codes'] or ''" />
+      </td>
+      <td class="text-start">
+        <span t-esc="bom_line_id['markings'].name if bom_line_id['markings'] else ''" />
+      </td>
+    </xpath>
+  </template>
 </odoo>
diff --git a/mrp_bom_report/report/mrp_bom_report.xml b/mrp_bom_report/report/mrp_bom_report.xml
index ed90cf0ef..504abe7f9 100644
--- a/mrp_bom_report/report/mrp_bom_report.xml
+++ b/mrp_bom_report/report/mrp_bom_report.xml
@@ -14,11 +14,6 @@
                                 <th class="text-start">Reference/Description</th>
                                 <th name="th-qty" class="text-end">Qty.</th>
                                 <th name="th-operation" class="text-start">Fase</th>
-                                <th class="text-start">Product Code</th>
-                                <th class="text-start">Manufacturer Codes</th>
-                                <th class="text-start">Brand</th>
-                                <th class="text-start">Layer</th>
-                                <th class="text-start">Designator</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -47,29 +42,6 @@
                                     <td name="td-operation" class="text-start">
                                         <span t-esc="line['operation'] or ''" />
                                     </td>
-                                    <td class="text-start">
-                                            <span
-                        t-esc="bom_line_id['product_code'] or ''"
-                      />
-                                    </td>
-                                    <td class="text-start">
-                                            <span
-                        t-esc="bom_line_id['manufacturer_codes'] or ''"
-                      />
-                                    </td>
-                                    <td class="text-start">
-                                            <span
-                        t-esc="bom_line_id['markings'].name if bom_line_id['markings'] else ''"
-                      />
-                                    </td>
-                                    <td class="text-start">
-                                            <span t-esc="bom_line_id['layer'] or ''" />
-                                    </td>
-                                    <td class="text-start">
-                                            <span
-                        t-esc="bom_line_id['designator'] or ''"
-                      />
-                                    </td>
                                 </t>
                                 </t>
                             </tr>