[tryton-debian-vcs] tryton-modules-stock-supply-production branch upstream-3.2 updated. upstream/3.2.0-1-g12e4322

[Mathias Behrle]

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

commit 12e4322cf305c1c8b5cf8d258c972bdde3303b7b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:02:35 2014 +0100

    Adding upstream version 3.2.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index e5f2927..b10c2af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 09988ff..2722380 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply_production
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for stock supply of production
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/production.py b/production.py
index 338334b..959eda0 100644
--- a/production.py
+++ b/production.py
@@ -172,15 +172,6 @@ class Production:
                     shortages[product_id].append((current_date, quantity))
                     current_qties[product_id] += quantity
 
-            # Update current quantities
-            with Transaction().set_context(stock_date_start=current_date,
-                    stock_date_end=current_date):
-                pbl = Product.products_by_location([location_id],
-                    product_ids, with_childs=True)
-            for key, qty in pbl.iteritems():
-                _, product_id = key
-                current_qties[product_id] += qty
-
             # Remove product with smaller period
             while (products_period
                     and products_period[0][0] <= (current_date - date).days):
@@ -188,6 +179,16 @@ class Production:
                 product_ids.remove(product.id)
             current_date += datetime.timedelta(1)
 
+            # Update current quantities with next moves
+            with Transaction().set_context(forecast=True,
+                    stock_date_start=current_date,
+                    stock_date_end=current_date):
+                pbl = Product.products_by_location([location_id],
+                    product_ids, with_childs=True)
+            for key, qty in pbl.iteritems():
+                _, product_id = key
+                current_qties[product_id] += qty
+
         return shortages
 
 
diff --git a/tryton.cfg b/tryton.cfg
index dc3b837..37a93a7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.2.1
 depends:
     ir
     product
diff --git a/trytond_stock_supply_production.egg-info/PKG-INFO b/trytond_stock_supply_production.egg-info/PKG-INFO
index c42d023..95ca677 100644
--- a/trytond_stock_supply_production.egg-info/PKG-INFO
+++ b/trytond_stock_supply_production.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply-production
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for stock supply of production
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock_supply_production.egg-info/SOURCES.txt b/trytond_stock_supply_production.egg-info/SOURCES.txt
index 31a2da8..12a9b7d 100644
--- a/trytond_stock_supply_production.egg-info/SOURCES.txt
+++ b/trytond_stock_supply_production.egg-info/SOURCES.txt
@@ -10,9 +10,24 @@ tryton.cfg
 ./__init__.py
 ./product.py
 ./production.py
+./production.xml
 ./stock.py
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
 ./tests/__init__.py
 ./tests/test_stock_supply_production.py
+./view/production_configuration_form.xml
+./view/production_create_request_start_form.xml
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-stock-supply-production