Merge lp:~openerp-dev/openobject-addons/7.0-opw-593948-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello Sir,

Corrected the calculation for the amount of debit and credit in a stock journal entry for a product with average costing method.

Steps to produce:

Define two products s1 and s2 both with real time valuation. In s1, I used standard price (EUR 3.75) for cost method, and in s2 I used average price (EUR 3.75). The default unit of measure for both s1 and s2 is gram, and the purchase unit of measure is kg.Purchas one kg of each product and receive the shipments. The corresponding (in shipment) journal entry for s1 shows the correct value of 3750.0 while that of s2 shows 3750000.0. Purchase is done in USD while the currency of the company is EUR. The rate is (1 USD = 3.75 EUR). All other journal entries (invoice and payment) are correct.

[lp:~openerp-dev/openobject-addons/7.0-opw-593948-dhr]

9265. By Dharti Ratani(OpenERP) on 2013-07-17

[MERGE]Merge with 7.0

9266. By Dharti Ratani(OpenERP) on 2013-07-17

[IMP]Fixed the issue of wrong amount in debit credit in stock journal entries for second move when processing the shipment partially

9267. By Dharti Ratani(OpenERP) on 2014-01-27

[MERGE]Merged with latest 7.0

Unmerged revisions

9267. By Dharti Ratani(OpenERP) on 2014-01-27

[MERGE]Merged with latest 7.0

9266. By Dharti Ratani(OpenERP) on 2013-07-17

[IMP]Fixed the issue of wrong amount in debit credit in stock journal entries for second move when processing the shipment partially

9265. By Dharti Ratani(OpenERP) on 2013-07-17

[MERGE]Merge with 7.0

9264. By Dharti Ratani(OpenERP) on 2013-06-24

[FIX]Fixed the price unit for stock journal entries for a product with average costing method

=== modified file 'stock/stock.py'
--- stock/stock.py	2014-01-22 13:38:22 +0000
+++ stock/stock.py	2014-01-27 10:41:46 +0000
@@ -2320,7 +2320,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:
-            reference_amount = qty * move.price_unit
+            reference_amount = move.product_qty * move.price_unit
             reference_currency_id = move.price_currency_id.id or reference_currency_id
 
         # Otherwise we default to the company's valuation price type, considering that the values of the
@@ -2756,6 +2756,7 @@
                     {
                         'product_qty': move.product_qty - product_qty,
                         'product_uos_qty': move.product_qty - product_qty,
+                        'price_unit': move.price_unit,
                         'prodlot_id': False,
                         'tracking_id': False,
                     })