pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mrp: BOM recursion with different variants

Browse Source 
Let's consider two variants V1 and V2

The function check_cycle was too restrictive, it didn't allow
to create a BOM for V1 with a dependence to V2.

But a common use case could be for example:

A black T-shirt made  from a white T-shirt and black color.

opw:1911622

closes odoo/odoo#29038
This commit is contained in:
Goffin Simon
2018-11-26 14:22:17 +00:00
parent 034a27f630
commit 00bf6709a8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/models/mrp_bom.py
+7 -7
View File
@@ -71,7 +71,7 @@ class MrpBom(models.Model):
@api.constrains('product_id', 'product_tmpl_id', 'bom_line_ids')
def _check_product_recursion(self):
for bom in self:
if bom.bom_line_ids.filtered(lambda x: x.product_id.product_tmpl_id == bom.product_tmpl_id):
if bom.bom_line_ids.filtered(lambda x: x.product_id.id == bom.product_id.id):
raise ValidationError(_('BoM line product %s should not be same as BoM product.') % bom.display_name)
@api.onchange('product_uom_id')
@@ -150,12 +150,12 @@ class MrpBom(models.Model):
boms_done = [(self, {'qty': quantity, 'product': product, 'original_qty': quantity, 'parent_line': False})]
lines_done = []
V |= set([product.product_tmpl_id.id])
V |= set([product.id])
bom_lines = [(bom_line, product, quantity, False) for bom_line in self.bom_line_ids]
for bom_line in self.bom_line_ids:
V |= set([bom_line.product_id.product_tmpl_id.id])
graph[product.product_tmpl_id.id].append(bom_line.product_id.product_tmpl_id.id)
V |= set([bom_line.product_id.id])
graph[product.id].append(bom_line.product_id.id)
while bom_lines:
current_line, current_product, current_qty, parent_line = bom_lines[0]
bom_lines = bom_lines[1:]
@@ -169,10 +169,10 @@ class MrpBom(models.Model):
converted_line_quantity = current_line.product_uom_id._compute_quantity(line_quantity / bom.product_qty, bom.product_uom_id)
bom_lines = [(line, current_line.product_id, converted_line_quantity, current_line) for line in bom.bom_line_ids] + bom_lines
for bom_line in bom.bom_line_ids:
graph[current_line.product_id.product_tmpl_id.id].append(bom_line.product_id.product_tmpl_id.id)
if bom_line.product_id.product_tmpl_id.id in V and check_cycle(bom_line.product_id.product_tmpl_id.id, {key: False for key in V}, {key: False for key in V}, graph):
graph[current_line.product_id.id].append(bom_line.product_id.id)
if bom_line.product_id.id in V and check_cycle(bom_line.product_id.id, {key: False for key in V}, {key: False for key in V}, graph):
raise UserError(_('Recursion error! A product with a Bill of Material should not have itself in its BoM or child BoMs!'))
V |= set([bom_line.product_id.product_tmpl_id.id])
V |= set([bom_line.product_id.id])
boms_done.append((bom, {'qty': converted_line_quantity, 'product': current_product, 'original_qty': quantity, 'parent_line': current_line}))
else:
# We round up here because the user expects that if he has to consume a little more, the whole UOM unit