From b5780cf8bb07f98509d854f72d2c7e27585bdbae Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Mon, 25 Mar 2019 14:18:09 +0000
Subject: [PATCH] [FIX] mrp: by-products typo + default type on product

Be consistent with by-products and byproducts. Only use by-products.
When a product is created from the BoM view, it has a default type
as storable product, set the same type when the product is created
from by-products tab.
---
 addons/mrp/models/mrp_bom.py       | 6 +++---
 addons/mrp/views/mrp_bom_views.xml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py
index b2634443b9b..3b7e97d7315 100644
--- a/addons/mrp/models/mrp_bom.py
+++ b/addons/mrp/models/mrp_bom.py
@@ -364,13 +364,13 @@ class MrpSubProduct(models.Model):
     _name = 'mrp.subproduct'
     _description = 'Byproduct'
 
-    product_id = fields.Many2one('product.product', 'Product', required=True)
+    product_id = fields.Many2one('product.product', 'By-product', required=True)
     product_qty = fields.Float(
-        'Product Qty',
+        'Quantity',
         default=1.0, digits=dp.get_precision('Product Unit of Measure'), required=True)
     product_uom_id = fields.Many2one('uom.uom', 'Unit of Measure', required=True)
     bom_id = fields.Many2one('mrp.bom', 'BoM', ondelete='cascade')
-    operation_id = fields.Many2one('mrp.routing.workcenter', 'Produced at Operation')
+    operation_id = fields.Many2one('mrp.routing.workcenter', 'Produced in Operation')
 
     @api.onchange('product_id')
     def onchange_product_id(self):
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index 69423abd6d8..c2311c12dbe 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -69,15 +69,15 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Byproducts" attrs="{'invisible': [('type','!=','normal')]}" groups="mrp.group_mrp_byproducts">
+                        <page string="By-products" attrs="{'invisible': [('type','!=','normal')]}" groups="mrp.group_mrp_byproducts">
                             <field name="sub_products">
-                                <tree string="Byproducts"  editable="top">
-                                    <field name="product_id"/>
+                                <tree string="By-products"  editable="top">
+                                    <field name="product_id" context="{'default_type': 'product'}"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" groups="uom.group_uom"/>
                                     <field name="operation_id" groups="mrp.group_mrp_routings" domain="[('routing_id', '=', parent.routing_id)]" options="{'no_quick_create':True,'no_create_edit':True}"/>
                                 </tree>
-                                <form string="Byproducts">
+                                <form string="By-products">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" groups="uom.group_uom"/>