[tryton-debian-vcs] tryton-modules-stock branch upstream updated. upstream/3.2.0-1-g18e5c42

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=upstream/3.2.0-1-g18e5c42

commit 18e5c42c98a25deeff025c2a198ef1252bf1d364
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:14:22 2014 +0200

    Adding upstream version 3.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 8f18144..15115bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2014-07-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 * Add warning for moves without origin
diff --git a/PKG-INFO b/PKG-INFO
index a395af4..4ede28d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/TODO b/TODO
deleted file mode 100644
index 617e1d9..0000000
--- a/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Add an indexed period on move with automatic creation and default duration
-  defined on company
-
diff --git a/product.py b/product.py
index 9acfc84..d4cdfed 100644
--- a/product.py
+++ b/product.py
@@ -106,7 +106,7 @@ class Product(object, StockMixin):
         cost_values = {}
         context = {}
         trans_context = Transaction().context
-        if 'stock_date_end' in context:
+        if trans_context.get('stock_date_end'):
             context['_datetime'] = trans_context['stock_date_end']
         with Transaction().set_context(context):
             for product in products:
@@ -162,15 +162,12 @@ class Product(object, StockMixin):
             grouping=grouping, grouping_filter=grouping_filter)
 
         if wh_to_add:
-            if product_ids is None:
-                product_ids = set((p for s, p in quantities))
             for wh, storage in wh_to_add.iteritems():
-                for product in product_ids:
-                    if (storage, product) in quantities:
-                        quantities[(wh, product)] = quantities[
-                            (storage, product)]
+                for key in quantities:
+                    if key[0] == storage:
+                        quantities[(wh,) + key[1:]] = quantities[key]
                         if storage in storage_to_remove:
-                            del quantities[(storage, product)]
+                            del quantities[key]
         return quantities
 
 
diff --git a/tryton.cfg b/tryton.cfg
index 639b32a..04de374 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.2.1
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index ed043a0..4654365 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index 7910ad4..d59d051 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
-TODO
 configuration.xml
 customer_return_restocking_list.odt
 delivery_note.odt
-- 
tryton-modules-stock