diff --git a/addons/mrp_subcontracting/models/mrp_bom.py b/addons/mrp_subcontracting/models/mrp_bom.py index 34b439a8c8c..954318cae54 100644 --- a/addons/mrp_subcontracting/models/mrp_bom.py +++ b/addons/mrp_subcontracting/models/mrp_bom.py @@ -21,7 +21,7 @@ class MrpBom(models.Model): else: return self.env['mrp.bom'] - @api.constrains('operation_ids', 'type') + @api.constrains('operation_ids', 'byproduct_ids', 'type') def _check_subcontracting_no_operation(self): - if self.filtered_domain([('type', '=', 'subcontract'), ('operation_ids', '!=', False)]): - raise ValidationError(_('You can not set a Bill of Material with operations as subcontracting.')) + if self.filtered_domain([('type', '=', 'subcontract'), '|', ('operation_ids', '!=', False), ('byproduct_ids', '!=', False)]): + raise ValidationError(_('You can not set a Bill of Material with operations or by-product line as subcontracting.')) diff --git a/addons/mrp_subcontracting/views/mrp_production_views.xml b/addons/mrp_subcontracting/views/mrp_production_views.xml index 1dd6a18153f..1107d551539 100644 --- a/addons/mrp_subcontracting/views/mrp_production_views.xml +++ b/addons/mrp_subcontracting/views/mrp_production_views.xml @@ -11,6 +11,7 @@ + 1 @@ -23,15 +24,12 @@ 1 - - 1 - - - 1 - 1 + + 1 + 1