From c38703f4e49bca4f7609049c25a744d2dd80dfbb Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Fri, 24 May 2019 07:09:37 +0000
Subject: [PATCH 1/6] [IMP] stock: remove colors from Traceability Report

Task-1943397
---
 .../static/src/xml/stock_traceability_report_line.xml     | 8 ++------
 addons/stock/views/report_stock_traceability.xml          | 5 -----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/addons/stock/static/src/xml/stock_traceability_report_line.xml b/addons/stock/static/src/xml/stock_traceability_report_line.xml
index 8db2d344084..fa39b9c3087 100644
--- a/addons/stock/static/src/xml/stock_traceability_report_line.xml
+++ b/addons/stock/static/src/xml/stock_traceability_report_line.xml
@@ -20,10 +20,6 @@
             <t t-set="domainClass" t-value="'o_stock_reports_domain_line_1'"/>
         </t>
 
-        <t t-set="span_color" t-value="'color: #666666;'"/>
-        <t t-if="l.usage == 'in'"><t t-set="span_color" t-value="'color: #3c763d;'"/></t>
-        <t t-if="l.usage == 'out'"><t t-set="span_color" t-value="'color: #a94442;'"/></t>
-
         <tr t-att-data-unfold="l.unfoldable" t-att-data-parent_id="l.parent_id" t-att-data-id="l.id"  t-att-data-model_id="l.model_id" t-att-data-model="l.model" t-att-class="trclass" t-att-data-lot_name="l.lot_name" t-att-data-lot_id="l.lot_id">
             <t t-if="l.unfoldable == true"><t t-set="tdclass" t-value="'o_stock_reports_unfoldable'" /></t>
             <t t-set="column" t-value="0" />
@@ -47,9 +43,9 @@
                             </span>
                         </t>
                     <t t-if="l.reference != c and l.lot_name != c">
-                        <t t-if="typeof c == 'string' || typeof c == 'number'"><span t-att-style="span_color">
+                        <t t-if="typeof c == 'string' || typeof c == 'number'">
                             <t t-raw="c"/>
-                        </span></t>
+                        </t>
                         <t t-if="typeof c != 'string' &amp; typeof c != 'number'"><span t-att-style="c[1]">
                             <t t-raw="c[0]"/>
                         </span></t>
diff --git a/addons/stock/views/report_stock_traceability.xml b/addons/stock/views/report_stock_traceability.xml
index 2863b3ac2ca..20936403bf0 100644
--- a/addons/stock/views/report_stock_traceability.xml
+++ b/addons/stock/views/report_stock_traceability.xml
@@ -13,9 +13,6 @@
             <tr t-att-data-unfold="a['unfoldable']" t-att-data-parent_id="a['parent_id']" t-att-data-id="a['id']" t-att-data-model_id="a['model_id']" t-att-data-model="a['model']" t-att-data-lot_name="a['lot_name']" t-att-data-lot_id="a['lot_id']" t-att-class="trclass">
                 <t t-set="tdclass" t-value="''" />
                 <t t-set="spanclass" t-value="''" />
-                <t t-set="span_color" t-value="'color: #666666;'"/>
-                <t t-if="a['usage'] == 'in'"><t t-set="span_color" t-value="'color: #3c763d;'"/></t>
-                <t t-if="a['usage'] == 'out'"><t t-set="span_color" t-value="'color: #a94442;'"/></t>
                 <t t-if="a.get('unfoldable')"><t t-set="tdclass" t-value="'o_stock_reports_unfoldable'" /></t>
                 <t t-if="not a.get('unfoldable')"><t t-set="spanclass" t-value="'o_stock_reports_nofoldable'" /></t>
                 <t t-set="column" t-value="0" />
@@ -41,9 +38,7 @@
                             </span>
                         </t>
                         <t t-else="">
-                            <span t-att-style="span_color">
                                 <t t-raw="c"/>
-                            </span>
                         </t>
                     </td>
                 </t>

From 03abe6b4ae011c7d45458539760d3bcdc3c63db7 Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Fri, 24 May 2019 07:17:54 +0000
Subject: [PATCH 2/6] [IMP] mrp: update demo data

Removed "Assembly station 1" from everywhere and replaced it
with "Assemmbly Line 1". Renamed "Assembly station 2" to
"Assembly Line 2".

Task-1943397
---
 addons/mrp/data/mrp_demo.xml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/addons/mrp/data/mrp_demo.xml b/addons/mrp/data/mrp_demo.xml
index 5c9311f332e..d488281865a 100644
--- a/addons/mrp/data/mrp_demo.xml
+++ b/addons/mrp/data/mrp_demo.xml
@@ -13,15 +13,6 @@
 
         <!-- Resource: mrp.workcenter -->
 
-        <record id="mrp_workcenter_0" model="mrp.workcenter">
-            <field name="name">Assembly Station 1</field>
-            <field name="resource_calendar_id" ref="resource.resource_calendar_std"/>
-            <field name="capacity">5</field>
-            <field name="time_start">10</field>
-            <field name="time_stop">8</field>
-            <field name="time_efficiency">87</field>
-        </record>
-
         <record id="mrp_workcenter_3" model="mrp.workcenter">
             <field name="name">Assembly Line 1</field>
             <field name="resource_calendar_id" ref="resource.resource_calendar_std"/>
@@ -33,7 +24,7 @@
         </record>
 
         <record id="mrp_workcenter_2" model="mrp.workcenter">
-            <field name="name">Assemble Station 2</field>
+            <field name="name">Assembly Line 2</field>
             <field name="resource_calendar_id" ref="resource.resource_calendar_std"/>
         </record>
 
@@ -62,7 +53,7 @@
 
         <record id="mrp_routing_workcenter_0" model="mrp.routing.workcenter">
             <field name="routing_id" ref="mrp_routing_0"/>
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_3"/>
             <field name="name">Manual Assembly</field>
             <field name="time_cycle">60</field>
             <field name="sequence">5</field>
@@ -71,7 +62,7 @@
 
         <record id="mrp_routing_workcenter_1" model="mrp.routing.workcenter">
             <field name="routing_id" ref="mrp_routing_1"/>
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_3"/>
             <field name="name">Long time assembly</field>
             <field name="time_cycle">180</field>
             <field name="sequence">15</field>
@@ -80,7 +71,7 @@
 
         <record id="mrp_routing_workcenter_3" model="mrp.routing.workcenter">
             <field name="routing_id" ref="mrp_routing_1"/>
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_3"/>
             <field name="name">Testing</field>
             <field name="time_cycle">60</field>
             <field name="sequence">10</field>
@@ -644,21 +635,21 @@
         <!-- OEE -->
 
         <record id="mrp_workcenter_efficiency_0" model="mrp.workcenter.productivity">
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_3"/>
             <field name="loss_id" ref="block_reason7"/>
             <field name="date_start" eval="(datetime.now() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="date_end" eval="(datetime.now() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
 
         <record id="mrp_workcenter_efficiency_1" model="mrp.workcenter.productivity">
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_3"/>
             <field name="loss_id" ref="block_reason0"/>
             <field name="date_start" eval="(datetime.now() - timedelta(hours=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="date_end" eval="(datetime.now() - timedelta(hours=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
         </record>
 
         <record id="mrp_workcenter_efficiency_2" model="mrp.workcenter.productivity">
-            <field name="workcenter_id" ref="mrp_workcenter_0"/>
+            <field name="workcenter_id" ref="mrp_workcenter_3"/>
             <field name="loss_id" ref="block_reason1"/>
             <field name="date_start" eval="(datetime.now() - timedelta(days=5, hours=4)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="date_end" eval="(datetime.now() - timedelta(days=5, hours=3)).strftime('%Y-%m-%d %H:%M:%S')"/>

From b13dfb502ef3acc7a1a6b611755b2067d394795d Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Mon, 27 May 2019 07:20:16 +0000
Subject: [PATCH 3/6] [IMP] mrp: hide "operations" upon inactive advanced
 routes

Task-1943397
---
 addons/mrp/views/mrp_bom_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 7ffb50dde88..cb16d89224a 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -105,7 +105,7 @@
                                 </group>
                                 <group>
                                     <field name="ready_to_produce" attrs="{'invisible': [('type','!=','normal')]}" string="Manufacturing Readiness"/>
-                                    <field name="picking_type_id" attrs="{'invisible': [('type','!=','normal')]}" string="Operation"/>
+                                    <field name="picking_type_id" attrs="{'invisible': [('type','!=','normal')]}" string="Operation" groups="stock.group_adv_location"/>
                                 </group>
                             </group>
                         </page>

From ef977fe634f44f6599f13f514dbd16f7c8c33dec Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Mon, 27 May 2019 07:26:11 +0000
Subject: [PATCH 4/6] [IMP] mrp: hide "manufacturing readiness" upon inactive
 WO

Task-1943397
---
 addons/mrp/views/mrp_bom_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index cb16d89224a..179e8a3d14c 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -101,10 +101,10 @@
                             <group>
                                 <group>
                                     <field name="sequence"/>
+                                    <field name="ready_to_produce" attrs="{'invisible': [('type','!=','normal')]}" string="Manufacturing Readiness" groups="mrp.group_mrp_routings"/>
                                     <field name="consumption" attrs="{'invisible': [('type','!=','normal')]}"/>
                                 </group>
                                 <group>
-                                    <field name="ready_to_produce" attrs="{'invisible': [('type','!=','normal')]}" string="Manufacturing Readiness"/>
                                     <field name="picking_type_id" attrs="{'invisible': [('type','!=','normal')]}" string="Operation" groups="stock.group_adv_location"/>
                                 </group>
                             </group>

From 71308383160c1d3f4be15880271d9cb1210740c3 Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Mon, 27 May 2019 07:28:48 +0000
Subject: [PATCH 5/6] [IMP] mrp: hide sequence field

Task-1943397
---
 addons/mrp/views/mrp_bom_views.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 179e8a3d14c..c64dbee0ab9 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -100,7 +100,6 @@
                         <page string="Miscellaneous">
                             <group>
                                 <group>
-                                    <field name="sequence"/>
                                     <field name="ready_to_produce" attrs="{'invisible': [('type','!=','normal')]}" string="Manufacturing Readiness" groups="mrp.group_mrp_routings"/>
                                     <field name="consumption" attrs="{'invisible': [('type','!=','normal')]}"/>
                                 </group>

From 2f2ac551423ba5c746b7fedf0971a4ea25a04ab3 Mon Sep 17 00:00:00 2001
From: Hetal Dhanak <hdh@odoo.com>
Date: Fri, 24 May 2019 08:48:23 +0000
Subject: [PATCH 6/6] [IMP] stock: filter data for field 'product_id' in form
 view of 'stock.production.lot'

previously in the selection field 'product_id' of
'stock.production.lot', all the products were always visible
no matter from where this view was getting opened from.
which is not ideal because if a user is creating a new lot
for a specific product, i.e. let's say if he opens this view
from 'product.template', he must not be able to select a
product variant other than of the product itself.

after this commit,
  if a user opens form view of 'stock.production.lot'
  by clicking on the menu action, all the products will be
  visible.
  if he opens it from product.template, only variants of
  the given products will be visible.
  if he opens it from product.product, only that particular
  variant will be visible and it will be readonly because
  there are no other valid values.

Task-1943397
---
 addons/stock/models/product.py                    | 8 ++++----
 addons/stock/models/stock_production_lot.py       | 9 ++++++++-
 addons/stock/views/stock_production_lot_views.xml | 4 +---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index cd838f35c93..0a0c6faf05a 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -471,7 +471,7 @@ class Product(models.Model):
         self.ensure_one()
         action = self.env.ref('stock.action_production_lot_form').read()[0]
         action['domain'] = [('product_id', '=', self.id)]
-        action['context'] = {'default_product_id': self.id}
+        action['context'] = {'default_product_id': self.id, 'set_product_readonly': True}
         return action
 
     # Be aware that the exact same function exists in product.template
@@ -769,11 +769,11 @@ class ProductTemplate(models.Model):
         self.ensure_one()
         action = self.env.ref('stock.action_production_lot_form').read()[0]
         action['domain'] = [('product_id.product_tmpl_id', '=', self.id)]
+        action['context'] = {'default_product_tmpl_id': self.id}
         if self.product_variant_count == 1:
-            action['context'] = {
+            action['context'].update({
                 'default_product_id': self.product_variant_id.id,
-            }
-
+            })
         return action
 
     def action_product_tmpl_forecast_report(self):
diff --git a/addons/stock/models/stock_production_lot.py b/addons/stock/models/stock_production_lot.py
index 82c50565c39..17f0275c84e 100644
--- a/addons/stock/models/stock_production_lot.py
+++ b/addons/stock/models/stock_production_lot.py
@@ -3,6 +3,7 @@
 
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
+from odoo.osv import expression
 
 
 class ProductionLot(models.Model):
@@ -16,7 +17,7 @@ class ProductionLot(models.Model):
     ref = fields.Char('Internal Reference', help="Internal reference number in case it differs from the manufacturer's lot/serial number")
     product_id = fields.Many2one(
         'product.product', 'Product',
-        domain=[('type', '=', 'product')], required=True)
+        domain=lambda self: self._domain_product_id(), required=True)
     product_uom_id = fields.Many2one(
         'uom.uom', 'Unit of Measure',
         related='product_id.uom_id', store=True, readonly=False)
@@ -29,6 +30,12 @@ class ProductionLot(models.Model):
         ('name_ref_uniq', 'unique (name, product_id)', 'The combination of serial number and product must be unique !'),
     ]
 
+    def _domain_product_id(self):
+        domain = [('type', '=', 'product')]
+        if self.env.context.get('default_product_tmpl_id'):
+            domain = expression.AND([domain, [('product_tmpl_id', '=', self.env.context['default_product_tmpl_id'])]])
+        return domain
+
     def _check_create(self):
         active_picking_id = self.env.context.get('active_picking_id', False)
         if active_picking_id:
diff --git a/addons/stock/views/stock_production_lot_views.xml b/addons/stock/views/stock_production_lot_views.xml
index 7caf76f7dde..937cdde3dcf 100644
--- a/addons/stock/views/stock_production_lot_views.xml
+++ b/addons/stock/views/stock_production_lot_views.xml
@@ -21,9 +21,7 @@
                 </div>
                 <group name="main_group">
                     <group>
-                        <field name="product_id"
-                               help="Product this lot/serial number contains. You cannot change it anymore if it has already been moved."
-                               attrs="{'readonly': [('id', '!=', False), ('product_id', '!=', False)]}"/>
+                        <field name="product_id" readonly="context.get('set_product_readonly', False)" force_save="1" help="Product this lot/serial number contains. You cannot change it anymore if it has already been moved."/>
                         <label for="product_qty" attrs="{'invisible': [('display_complete', '=', False)]}"/>
                         <div class="o_row" attrs="{'invisible': [('display_complete', '=', False)]}">
                             <field name="product_qty"/>