Merge lp:~camptocamp/sale-financial/6.1-sale_markup-multiple_boms-1174733 into lp:~sale-core-editors/sale-financial/6.1

[Guewen Baconnier @ Camptocamp]

Fix lp:1174733

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

review: Approve (no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

The fix is already there in the branch so I assume it has been corrected in another MP. Put as 'Merged'

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

It doesn't seems already in it:

http://bazaar.launchpad.net/~sale-core-editors/sale-financial/6.1/view/head:/sale_markup/product_markup.py#L119

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Apologies, you are right Yannick, it is not merged. Thanks for your alertness.

Can I ask a reviewer to merge my MP please?

=== modified file 'sale_markup/product_markup.py'
--- sale_markup/product_markup.py	2012-07-12 13:56:17 +0000
+++ sale_markup/product_markup.py	2013-04-30 12:35:31 +0000
@@ -116,7 +116,7 @@
         bom_obj = self.pool.get('mrp.bom')
         bom_ids = bom_obj.search(cursor, user, [('product_id','in',ids)])
         for bom in bom_obj.browse(cursor, user, bom_ids):
-            res = _get_parent_bom(bom)
+            res += _get_parent_bom(bom)
         final_bom_ids = list(set(res + bom_ids))
         return list(set(ids + self._get_product(cursor, user, final_bom_ids, context)))