From 77c04ffee81fdc63457af2a74f7204e8258b569d Mon Sep 17 00:00:00 2001
From: debu-odoo <debu@odoo.com>
Date: Mon, 30 May 2022 13:18:49 +0000
Subject: [PATCH] [IMP] mrp: improve wording/content in MO Report

- Change some section and column headers to make content clearer based on MO status
- Add in columns/field for in progress MOs for easier tracking of MO status
- Update words to match field names more closely (i.e. Actual Duration, To Consume, etc.)

Task ID - 2688146

closes odoo/odoo#93066

Signed-off-by: Tiffany Chang <tic@odoo.com>
---
 .../mrp/report/mrp_production_templates.xml   | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/addons/mrp/report/mrp_production_templates.xml b/addons/mrp/report/mrp_production_templates.xml
index fddbfd1c80c..de56d6e03f0 100644
--- a/addons/mrp/report/mrp_production_templates.xml
+++ b/addons/mrp/report/mrp_production_templates.xml
@@ -18,18 +18,22 @@
                     </div>
                     <div class="row mt32 mb32">
                         <div class="col-3" t-if="o.origin">
-                            <strong>Source Document:</strong><br/>
+                            <strong>Source:</strong><br/>
                             <span t-field="o.origin"/>
                         </div>
-                        <div class="col-3">
+                        <div class="col-3" t-if="o.user_id">
                             <strong>Responsible:</strong><br/>
                             <span t-field="o.user_id"/>
                         </div>
+                        <div class="col-3" t-if="o.state not in ('done', 'cancel') and o.date_deadline">
+                            <strong>Deadline:</strong><br/>
+                            <span t-field="o.date_deadline"/>
+                        </div>
                     </div>
 
                     <div class="row mt32 mb32">
                         <div class="col-3">
-                            <strong>Finished Product:</strong><br/>
+                            <strong>Product:</strong><br/>
                             <span t-field="o.product_id"/>
                         </div>
                         <div class="col-3" t-if="o.product_description_variants">
@@ -41,18 +45,25 @@
                             <span t-field="o.product_qty"/>
                             <span t-field="o.product_uom_id.name" groups="uom.group_uom"/>
                         </div>
+                         <div class="col-3" t-if="o.qty_producing">
+                            <strong>Quantity Producing:</strong><br/>
+                            <span t-field="o.qty_producing"/>
+                            <span t-field="o.product_uom_id.name" groups="uom.group_uom"/>
+                        </div>
                     </div>
 
                     <div t-if="o.workorder_ids" groups="mrp.group_mrp_routings">
                         <h3>
                             <span t-if="o.state == 'done'">Operations Done</span>
-                            <span t-else="">Operations Planned</span>
+                            <span t-elif="o.is_planned">Operations Planned</span>
+                            <span t-else="">Operations</span>
                         </h3>
                         <table class="table table-sm">
                             <tr>
                                 <th><strong>Operation</strong></th>
                                 <th><strong>WorkCenter</strong></th>
-                                <th><strong>No. Of Minutes</strong></th>
+                                <th><strong>Duration (minutes)</strong></th>
+                                <th t-if="o.state in ('progress', 'to_close')"><strong>Actual Duration (minutes)</strong></th>
                             </tr>
                             <tr t-foreach="o.workorder_ids" t-as="line2">
                                 <td><span t-field="line2.name"/></td>
@@ -61,6 +72,9 @@
                                     <span t-if="o.state != 'done'" t-field="line2.duration_expected"/>
                                     <span t-if="o.state == 'done'" t-field="line2.duration"/>
                                 </td>
+                                <td t-if="o.state in ('progress', 'to_close')">
+                                    <span t-field="line2.duration"/>
+                                </td>
                             </tr>
                         </table>
                     </div>
@@ -76,11 +90,8 @@
 
 <template id="report_mrp_production_components">
     <h3>
-        <span t-if="o.state == 'done'">
-            Consumed Products
-        </span>
-        <span t-else="">
-            Products to Consume
+        <span>
+            Components
         </span>
     </h3>
     <table class="table table-sm">
@@ -88,7 +99,8 @@
         <thead>
             <tr>
                 <th>Product</th>
-                <th t-attf-class="{{ 'text-right' if not has_product_barcode else '' }}">Quantity</th>
+                <th t-if="o.state in ('progress', 'to_close','done')" t-attf-class="{{ 'text-right' if not has_product_barcode else '' }}">Consumed</th>
+                <th t-attf-class="{{ 'text-right' if not has_product_barcode else '' }}">To Consume</th>
                 <th t-if="has_product_barcode" width="15%" class="text-center">Barcode</th>
             </tr>
         </thead>
@@ -97,6 +109,11 @@
                 <td>
                     <span t-field="raw_line.product_id"/>
                 </td>
+                <td t-attf-class="{{ 'text-right' if not has_product_barcode else '' }}" t-if="o.state in ('progress', 'to_close','done')">
+                    <div>
+                        <span t-field="raw_line.quantity_done"/>
+                    </div>
+                </td>
                 <td t-attf-class="{{ 'text-right' if not has_product_barcode else '' }}">
                     <span t-field="raw_line.product_uom_qty"/>
                     <span t-field="raw_line.product_uom" groups="uom.group_uom"/>