Merge lp:~camptocamp/margin-analysis/7.0-fix_1280221-afe into lp:~margin-analysis-core-editors/margin-analysis/7.0

[Alexandre Fayolle - camptocamp]

fixes the crash by not calling _bom_explode in the case that will cause an infinite recursion

[Pedro Manuel Baeza (pedro.baeza)]

LGTM, but I wonder if there is any possibility to test the infinite recursion itself, because for now, if we have a future regression, test will enter also in an infinite loop.

Don't you think it's better to propose a patch for _bom_explode that avoid infinite recursion? Or is it a specific problem of this module?

Regards.

review: Needs Information (code review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hello Pedro,

Thanks for looking into this.

I wrote the fix in this way to avoid going through the hassle of a fix in openobject-addons. I just reported a bug about this (lp:1281054).

[lp:~camptocamp/margin-analysis/7.0-fix_1280221-afe]

58. By Alexandre Fayolle - camptocamp on 2014-02-17

product_cost_incl_bom: add comment about the bug we are working around here

[Pedro Manuel Baeza (pedro.baeza)]

Great, Alexandre, thank you very much!

Regards.

review: Approve

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM thanks

review: Approve (code review, no tests)

=== modified file 'product_cost_incl_bom/__openerp__.py'
--- product_cost_incl_bom/__openerp__.py	2013-12-11 13:27:22 +0000
+++ product_cost_incl_bom/__openerp__.py	2014-02-17 10:46:27 +0000
@@ -72,6 +72,7 @@
  'test': [
     'test/cost_price_update.yml',
     'test/cost_price_update_by_bom.yml',
+    'test/cost_price_empty_phantom_bom.yml',
  ],
  'installable': True,
  'auto_install': False,

=== modified file 'product_cost_incl_bom/product_cost_incl_bom.py'
--- product_cost_incl_bom/product_cost_incl_bom.py	2013-12-12 11:26:17 +0000
+++ product_cost_incl_bom/product_cost_incl_bom.py	2014-02-17 10:46:27 +0000
@@ -147,6 +147,9 @@
             if not bom_id:  # no BoM: use standard_price
                 continue
             bom = bom_obj.browse(cr, uid, bom_id, context=context)
+            if bom.type == 'phantom' and not bom.bom_lines:
+                continue # work around lp:1281054 calling _bom_explode in that
+                         # case will cause an infinite recursion
             subproducts, routes = bom_obj._bom_explode(cr, uid, bom,
                                                        factor=1,
                                                        properties=bom_properties,

=== added file 'product_cost_incl_bom/test/cost_price_empty_phantom_bom.yml'
--- product_cost_incl_bom/test/cost_price_empty_phantom_bom.yml	1970-01-01 00:00:00 +0000
+++ product_cost_incl_bom/test/cost_price_empty_phantom_bom.yml	2014-02-17 10:46:27 +0000
@@ -0,0 +1,16 @@
+-
+  I create a phantom BOM without lines for product_34
+-
+  !record {model: mrp.bom, id: mrp_bom_product_34}:
+    company_id: base.main_company
+    name: product 4
+    product_id: product.product_product_34
+    product_qty: 1.0
+    type: phantom
+-
+  Test the prices of product_34 are updated correctly
+-
+  !python {model: product.product}: |
+    product = self.browse(cr, uid, ref('product.product_product_34'))
+    assert product.standard_price == 38, "02 The standard_price has not been recorded correctly %s" % product.standard_price
+    assert product.cost_price == 38.0, "02 The cost_price has not been recorded correctly %s"  % product.cost_price