From 8b495f3989fed5bceccc6aff1c539575334ee1bf Mon Sep 17 00:00:00 2001
From: Hardik Prajapati <hpr@odoo.com>
Date: Thu, 30 May 2019 12:43:33 +0000
Subject: [PATCH] [IMP] mrp: better labels for the fields on the WO to
 consistency with the MO.

-hide the quantity done when the workorder has not start to work
-change the label of done to consumed when finish workorder

pad- https://pad.odoo.com/p/r.ed6d2ceefdd46214b72dc4e79552350e

task-1889396

closes odoo/odoo#34202

Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
---
 addons/mrp/views/mrp_production_views.xml | 2 +-
 addons/mrp/views/mrp_workorder_views.xml  | 4 ++--
 addons/stock/models/product.py            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index f49312a6c41..70cfd6434ba 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -181,7 +181,7 @@
                                     <field name="product_id" readonly="1"/>
                                     <field name="lot_id" groups="stock.group_production_lot" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" attrs="{'invisible': [('lots_visible', '=', False)]}"/>
                                     <field name="product_uom_id" groups="uom.group_uom"/>
-                                    <field name="qty_done"/>
+                                    <field name="qty_done" string="Produced"/>
                                     <field name="lots_visible" invisible="1"/>
                                     <field name="done_move" invisible="1"/>
                                     <field name="state" invisible="1"/>
diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml
index bf80f6f0d8f..9612689cb59 100644
--- a/addons/mrp/views/mrp_workorder_views.xml
+++ b/addons/mrp/views/mrp_workorder_views.xml
@@ -161,7 +161,7 @@
                             <field name="lot_id" attrs="{'readonly': [('product_tracking', '=', 'none')]}" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id, 'active_mo_id': parent.production_id}"/>
                             <field name="qty_to_consume" readonly="1"/>
                             <field name="qty_reserved" readonly="1"/>
-                            <field name="qty_done" string="Done"/>
+                            <field name="qty_done" attrs="{'column_invisible': [('parent.state', 'not in', ('progress', 'done'))]}"/>
                             <field name="product_uom_id" invisible="1"/>
                             <field name="move_id" invisible="1"/>
                         </tree>
@@ -173,7 +173,7 @@
                             <field name="product_tracking" invisible="1"/>
                             <field name="lot_id" attrs="{'readonly': [('product_tracking', '=', 'none')]}" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"/>
                             <field name="qty_to_consume" readonly="1" string="To Produce"/>
-                            <field name="qty_done" string="Done"/>
+                            <field name="qty_done" string="Produced"/>
                             <field name="product_uom_id" invisible="1"/>
                             <field name="move_id" invisible="1"/>
                         </tree>
diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index 56844ddb5b1..c0f5e5cca4f 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -401,7 +401,7 @@ class Product(models.Model):
                 return {
                     'warning': {
                         'title': _('Warning!'),
-                        'message': _("You have products in stock that have no lot number.  You can assign serial numbers by doing an inventory.  ")}}
+                        'message': _("You have product(s) in stock that have no lot/serial number. You can assign lot/serial numbers by doing an inventory adjustment.")}}
 
     @api.model
     def view_header_get(self, view_id, view_type):