[tryton-debian-vcs] tryton-modules-stock-supply branch upstream-3.2 updated. upstream/3.2.1-1-g78c11fc

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:56:35 UTC 2014


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.git;a=commitdiff;h=upstream/3.2.1-1-g78c11fc

commit 78c11fcf43e96c9e8857721e3053cf0c186fad36
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:42:24 2014 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index d2add3f..9c1aed8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-08-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 2be7935..efdd92f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase_request.py b/purchase_request.py
index 40b2b78..8015c23 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -432,16 +432,19 @@ class PurchaseRequest(ModelSQL, ModelView):
                     if (not res_qty) or (current_qty < res_qty):
                         res_qties[product_id] = current_qty
 
-            with Transaction().set_context(stock_date_start=current_date,
+            if current_date == datetime.date.max:
+                break
+            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
-            if current_date == datetime.date.max:
-                break
-            current_date += datetime.timedelta(1)
 
         return dict((x, (res_dates.get(x), res_qties.get(x)))
             for x in product_ids)
diff --git a/tryton.cfg b/tryton.cfg
index 8c16ec2..2e6c8e2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.1
+version=3.2.2
 depends:
     account
     ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 678adf5..18a6856 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock_supply.egg-info/SOURCES.txt b/trytond_stock_supply.egg-info/SOURCES.txt
index b9c26a3..cfe2daa 100644
--- a/trytond_stock_supply.egg-info/SOURCES.txt
+++ b/trytond_stock_supply.egg-info/SOURCES.txt
@@ -11,11 +11,35 @@ shipment.xml
 tryton.cfg
 ./__init__.py
 ./order_point.py
+./order_point.xml
 ./product.py
 ./purchase_request.py
+./purchase_request.xml
 ./shipment.py
+./shipment.xml
+./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/scenario_stock_internal_supply.rst
 ./tests/test_stock_supply.py
+./view/order_point_form.xml
+./view/order_point_tree.xml
+./view/purchase_request_create_purchase_ask_party_form.xml
+./view/purchase_request_create_purchase_ask_term_form.xml
+./view/purchase_request_create_start_form.xml
+./view/purchase_request_form.xml
+./view/purchase_request_tree.xml
+./view/stock_shipment_internal_create_start_form.xml
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-stock-supply



More information about the tryton-debian-vcs mailing list