Merge remote-tracking branch 'odoo/10.0' into 10.0

OCA · Apr 24, 2019 · 6672c85 · 6672c85
2 parents 33ebbe4 + 90af625
commit 6672c85
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/addons/mrp_byproduct/models/mrp_subproduct.py b/addons/mrp_byproduct/models/mrp_subproduct.py
@@ -13,7 +13,7 @@ class MrpSubProduct(models.Model):
     product_qty = fields.Float(
         'Product Qty',
         default=1.0, digits=dp.get_precision('Product Unit of Measure'), required=True)
-    product_uom_id = fields.Many2one('product.uom', 'Unit of Measure', required=True)
+    product_uom_id = fields.Many2one('product.uom', 'Unit of Measure', required=True, oldname='product_uom')
     bom_id = fields.Many2one('mrp.bom', 'BoM', ondelete='cascade')
     operation_id = fields.Many2one('mrp.routing.workcenter', 'Produced at Operation')