Merge branch 'fix/11.0/purchase_by_sale_history_mrp__error_bom_specific_product' into '11.0'

fix/11.0/purchase_by_sale_history_mrp__error_bom_specific_product into 11.0

See merge request hibou-io/hibou-odoo/suite!290
This commit is contained in:
Jared Kipe
2020-02-14 14:46:57 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -46,6 +46,7 @@ class MTestPurchaseBySaleHistoryMRP(test_purchase_by_sale_history.TestPurchaseBy
product11_bom = self.env['mrp.bom'].create({
'product_tmpl_id': product11.product_tmpl_id.id,
# 'product_id': product11.id, # To test specific product
'product_qty': 1.0,
'product_uom_id': product11.uom_id.id,
'bom_line_ids': [(0, 0, {

View File

@@ -50,7 +50,7 @@ class PurchaseBySaleHistory(models.TransientModel):
def bom_parent_product_ids_line(line):
product_ids = set()
if line.bom_id.product_id:
product_ids.add((line.bom_id.product_id, line.product_qty))
product_ids.add((line.bom_id.product_id.id, line.product_qty))
else:
for p in line.bom_id.product_tmpl_id.product_variant_ids:
product_ids.add((p.id, line.product_qty))