Merge lp:~openerp-dev/openobject-addons/7.0-opw-599516-han into lp:openobject-addons/7.0

[Hardik Ansodariya (OpenERP)]

Fixed the issue of Phantom sets in valuation of components.

to reproduce:
* Create 3 product lets say:
  product 101011 cost price: 12.12
  product 101005 "" : 6.38
  product 101008 "" : 2.87

* Product config:
  Costing Method: Average
  Inventory Valuation: Real Time
* BOM
  Product 101011(BOM Type: Sets / Phantom)
  Product 101005 and 101008 as component.

* create a sale order with one line:
   - product 101011 (qty=1)
* "compute" and "confirm" that sale order
* in warehouse, delivery orders:
   - check availability
   - process
   - validate
* accounting / chart of accounts -> choose "All Entries"
   - edit account "330000"
-> you'll see that for this sale, there are 2 lines:
   - product 101005: credit = 12.12
   - product 101008: credit = 24.24

The credit values takes the price of product 101011 instead of taking
their price for their corresponding product (101005 or 101008).

The journal items should be:
   - product 101005: credit = 6.38
   - product 101008: credit = 5.74 (2.87*2)

With the reference of Maintenance case: 599516.

Unmerged revisions

9517. By Hardik Ansodariya (OpenERP) on 2013-10-22

[FIX] stock: Bug with Phantom sets in valuation of components (Maintanance case: 599516)

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-10-15 11:20:16 +0000
+++ stock/stock.py	2013-10-22 11:40:33 +0000
@@ -2308,7 +2308,7 @@
 
         # if product is set to average price and a specific value was entered in the picking wizard,
         # we use it
-        if move.product_id.cost_method == 'average' and move.price_unit:
+        if move.product_id.cost_method == 'average' and move.price_unit and move.picking_id.type in ('in', 'internal'):
             reference_amount = qty * move.price_unit
             reference_currency_id = move.price_currency_id.id or reference_currency_id