Merge lp:~camptocamp/margin-analysis/7.0-fix-product_historical_margin-no-product-yvr into lp:~margin-analysis-core-editors/margin-analysis/7.0

[Yannick Vaucher @ Camptocamp]

Make sure we don't read a product of invoice line without product.

[Pedro Manuel Baeza (pedro.baeza)]

Why do you need to re-read product record? You can make:

product = obj.product_id

Or there is something I'm missing?

Regards.

review: Needs Information (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Read operation is made with a specific context using company as a product can have a different cost_price with different company.

By the way I have to test if I should keep the second test as this context could implies there is no product for a company.

[Pedro Manuel Baeza (pedro.baeza)]

OK, I understand. Thanks for the explanation. I wait for your test then.

Regards.

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

LGTM

review: Approve (code review, test)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@Pedro I checked and found no way to have the read method gives a False or an empty list when giving a valid id to it.

[Pedro Manuel Baeza (pedro.baeza)]

OK, thanks for the investigation.

Regards.

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

=== modified file 'product_historical_margin/invoice.py'
--- product_historical_margin/invoice.py	2013-11-29 15:38:55 +0000
+++ product_historical_margin/invoice.py	2014-03-17 16:13:09 +0000
@@ -98,10 +98,10 @@
                 company = company_obj.browse(cr, uid, company_id, context=context)
             company_currency_id = company.currency_id.id
             ctx['company_id'] = company.id
+            if not obj.product_id:
+                continue
             product = product_obj.read(cr, uid, obj.product_id.id,
                                        ['id','cost_price'], context=ctx)
-            if not product:
-                continue
             if obj.invoice_id.currency_id is None:
                 currency_id = company_currency_id
             else: