From adb7ad24059aeda7dbc25765bad134b1a3b82e45 Mon Sep 17 00:00:00 2001
From: oihane <oihanecruce@gmail.com>
Date: Thu, 30 Apr 2015 13:42:42 +0200
Subject: [PATCH] [FIX] <stock_quant_merge> Fixed cost calculation error

---
 README.rst      | 2 +-
 models/stock.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index bacfede3a..c9dd3c29a 100644
--- a/README.rst
+++ b/README.rst
@@ -11,4 +11,4 @@ Contributors
 ------------
 * Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
 * Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
-* Ana Juaristi <ajuaristo@gmail.com>
\ No newline at end of file
+* Ana Juaristi <ajuaristio@gmail.com>
\ No newline at end of file
diff --git a/models/stock.py b/models/stock.py
index 7cfcd5c74..c2356fdae 100644
--- a/models/stock.py
+++ b/models/stock.py
@@ -24,13 +24,17 @@ class StockQuant(models.Model):
                      ('reservation_id', '=', False),
                      ('propagated_from_id', '=',
                       quant2merge.propagated_from_id.id)])
+                cont = 1
+                cost = quant2merge.cost
                 for quant in quants:
                     if (self._get_latest_move(quant2merge) ==
                             self._get_latest_move(quant)):
                         quant2merge.sudo().qty += quant.qty
-                        quant2merge.sudo().cost += quant.cost
+                        cost += quant.cost
+                        cont += 1
                         pending_quants -= quant
                         quant.sudo().unlink()
+                quant2merge.sudo().cost = cost / cont
 
     @api.model
     def quants_unreserve(self, move):