From 7997f3b00f503a9b142b0e4df7769f1bd7abc428 Mon Sep 17 00:00:00 2001
From: Haresh Shyara <hsh@odoo.com>
Date: Thu, 16 Aug 2018 12:25:52 +0000
Subject: [PATCH] [IMP] mrp: replace _get_bom_reference by an xpath

In the BoM structure and cost report the purpose of _get_bom_reference
was to add content with an override in order to display it directly in
the column BoM. It could be improved by using the classic display name
and add a name to column in order to use an xpath in another module.
The function _get_bom and _get_bom_line can also be used in order to
introduce extra content directly in the column added with an xpath.

Task ID : 1875677

closes odoo/odoo#26493
---
 addons/mrp/report/mrp_report_bom_structure.py  |  7 ++-----
 addons/mrp/report/mrp_report_bom_structure.xml | 12 ++++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/mrp/report/mrp_report_bom_structure.py b/addons/mrp/report/mrp_report_bom_structure.py
index 3c3a49eb1d2..02379306d06 100644
--- a/addons/mrp/report/mrp_report_bom_structure.py
+++ b/addons/mrp/report/mrp_report_bom_structure.py
@@ -63,9 +63,6 @@ class ReportBomStructure(models.AbstractModel):
         }
         return self.env.ref('mrp.report_mrp_operation_line').render({'data': values})
 
-    def _get_bom_reference(self, bom):
-        return bom.display_name
-
     @api.model
     def _get_report_data(self, bom_id, searchQty=0, searchVariant=False):
         lines = {}
@@ -116,7 +113,7 @@ class ReportBomStructure(models.AbstractModel):
             'bom_prod_name': product.display_name,
             'currency': self.env.user.company_id.currency_id,
             'product': product,
-            'code': bom and self._get_bom_reference(bom) or '',
+            'code': bom and bom.display_name or '',
             'price': product.uom_id._compute_price(product.standard_price, bom.product_uom_id) * bom_quantity,
             'total': sum([op['total'] for op in operations]),
             'level': level or 0,
@@ -147,7 +144,7 @@ class ReportBomStructure(models.AbstractModel):
             components.append({
                 'prod_id': line.product_id.id,
                 'prod_name': line.product_id.display_name,
-                'code': line.child_bom_id and self._get_bom_reference(line.child_bom_id) or '',
+                'code': line.child_bom_id and line.child_bom_id.display_name or '',
                 'prod_qty': line_quantity,
                 'prod_uom': line.product_uom_id.name,
                 'prod_cost': self.env.user.company_id.currency_id.round(price),
diff --git a/addons/mrp/report/mrp_report_bom_structure.xml b/addons/mrp/report/mrp_report_bom_structure.xml
index 5cac378d05d..5b9c889a4e4 100644
--- a/addons/mrp/report/mrp_report_bom_structure.xml
+++ b/addons/mrp/report/mrp_report_bom_structure.xml
@@ -23,7 +23,7 @@
                                 <thead>
                                     <tr>
                                         <th>Product</th>
-                                        <th>BoM</th>
+                                        <th name="th_mrp_bom_h">BoM</th>
                                         <th class="text-right">Quantity</th>
                                         <th class="text-left" groups="uom.group_uom">Unit of Measure</th>
                                         <th t-if="data['report_structure'] != 'bom_cost'" class="o_mrp_prod_cost text-right" title="This is the cost defined on the product.">Product Cost</th>
@@ -36,7 +36,7 @@
                                         <td>
                                             <span><a href="#" t-if="data['report_type'] == 'html'" t-att-data-res-id="data['product'].id" t-att-data-model="'product.product'" class="o_mrp_bom_action"><t t-esc="data['bom_prod_name']"/></a><t t-else="" t-esc="data['bom_prod_name']"/></span>
                                         </td>
-                                        <td>
+                                        <td name="td_mrp_bom">
                                             <span><a href="#" t-if="data['report_type'] == 'html'" t-att-data-res-id="data['bom'].id" t-att-data-model="'mrp.bom'" class="o_mrp_bom_action"><t t-esc="data['code']"/></a><t t-else="" t-esc="data['code']"/></span>
                                         </td>
                                         <td class="text-right"><span><t t-esc="data['bom_qty']" t-options='{"widget": "float", "decimal_precision": "Product Unit of Measure"}'/></span></td>
@@ -61,7 +61,7 @@
                                 <tfoot>
                                     <tr>
                                         <td></td>
-                                        <td></td>
+                                        <td name="td_mrp_bom_f"></td>
                                         <td class="text-right"><span><strong>Unit Cost</strong></span></td>
                                         <td groups="uom.group_uom"></td>
                                         <td t-if="data['report_structure'] != 'bom_cost'" class="o_mrp_prod_cost text-right">
@@ -100,7 +100,7 @@
                         <span class="fa fa-dropbox" title="This is a BoM of type Kit!" role="img" aria-label="This is a BoM of type Kit!"/>
                     </t>
                 </td>
-                <td>
+                <td name="td_mrp_bom">
                     <span>
                         <a href="#" t-att-data-res-id="l['child_bom']" t-att-data-model="'mrp.bom'" class="o_mrp_bom_action"><t t-esc="l['code']"/></a>
                   </span>
@@ -125,7 +125,7 @@
         <t t-if="data['operations']">
             <t t-set="space_td" t-value="'margin-left: '+ str(data['level'] * 20) + 'px;'"/>
             <tr class="o_mrp_bom_report_line o_mrp_bom_cost" t-att-data-id="'operation-' + str(data['bom'].id)" t-att-data-bom-id="data['bom'].id" t-att-parent_id="data['bom'].id" t-att-data-qty="data['bom_qty']" t-att-data-level="data['level']">
-                <td>
+                <td name="td_opr">
                     <span t-att-style="space_td"/>
                     <span class="o_mrp_bom_unfoldable fa fa-fw fa-caret-right" t-att-data-function="'get_operations'" role="img" aria-label="Unfold" title="Unfold"/>
                     Operations
@@ -150,7 +150,7 @@
       <t t-foreach="data['operations']" t-as="op">
           <t t-set="space_td" t-value="'margin-left: '+ str(op['level'] * 20) + 'px;'"/>
           <tr class="o_mrp_bom_report_line o_mrp_bom_cost" t-att-parent_id="'operation-' + str(data['bom_id'])">
-              <td>
+              <td name="td_opr_line">
                   <span t-att-style="space_td"/>
                   <a href="#" t-att-data-res-id="op['operation'].id" t-att-data-model="'mrp.routing.workcenter'" class="o_mrp_bom_action"><t t-esc="op['name']"/></a>
               </td>