summaryrefslogtreecommitdiff
path: root/addons/mrp_subcontracting/models
diff options
context:
space:
mode:
authorArnold Moyaux <arm@odoo.com>2019-08-14 13:55:00 +0000
committerArnold Moyaux <arm@odoo.com>2019-08-19 15:03:59 +0000
commita684372fdd4247553978d893a354eec01dfad288 (patch)
tree6c7d7a7e368d24f006bcbeb6eaebe44a935dd319 /addons/mrp_subcontracting/models
parent39c5d0f35efbfbd43fbcc8e8ad48a9477b8fd77c (diff)
[IMP] mrp_subcontracting: subcontractors required
Force to set subcontractors on subcontracting BoM since it's always used in order to determine if a subcontracting should be apply on a receipt or not. Also there is not magical behavior has 'if there is no subcontractor on the BoM then it means all partners...'
Diffstat (limited to 'addons/mrp_subcontracting/models')
-rw-r--r--addons/mrp_subcontracting/models/mrp_bom.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/mrp_subcontracting/models/mrp_bom.py b/addons/mrp_subcontracting/models/mrp_bom.py
index b848ec854d1..a0a1d054cb9 100644
--- a/addons/mrp_subcontracting/models/mrp_bom.py
+++ b/addons/mrp_subcontracting/models/mrp_bom.py
@@ -2,7 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import fields, models
-
+from odoo.osv.expression import AND
class MrpBom(models.Model):
_inherit = 'mrp.bom'
@@ -13,7 +13,5 @@ class MrpBom(models.Model):
def _bom_subcontract_find(self, product_tmpl=None, product=None, picking_type=None, company_id=False, bom_type='subcontract', subcontractor=False):
domain = self._bom_find_domain(product_tmpl=product_tmpl, product=product, picking_type=picking_type, company_id=company_id, bom_type=bom_type)
if subcontractor:
- domain += ['|', ('subcontractor_ids', 'in', subcontractor.id), ('subcontractor_ids', '=', False)]
- else:
- domain += [('subcontractor_ids', '=', False)]
+ domain = AND([domain, [('subcontractor_ids', 'in', subcontractor.id)]])
return self.search(domain, order='subcontractor_ids, sequence, product_id', limit=1)