[tryton-debian-vcs] tryton-modules-stock-supply branch upstream-2.6 updated. upstream/2.6.2-1-gc2bfdc9

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Dec 4 21:44:41 UTC 2014


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

commit c2bfdc9d44b16aaffca747a1580f191603b6d774
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:10:16 2014 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index bc9acb1..94b7b6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.2 - 2014-03-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 880460e..5612bc1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply
-Version: 2.6.2
+Version: 2.6.3
 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 7a4ce16..05142c5 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -425,16 +425,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, skip_zero=False)
             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 c5f2682..168bb4b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.2
+version=2.6.3
 depends:
     account
     ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 7b2d50e..bac91fd 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: 2.6.2
+Version: 2.6.3
 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 0e8c059..dbd2118 100644
--- a/trytond_stock_supply.egg-info/SOURCES.txt
+++ b/trytond_stock_supply.egg-info/SOURCES.txt
@@ -11,9 +11,23 @@ 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
 ./tests/__init__.py
 ./tests/test_stock_supply.py
 doc/index.rst
-- 
tryton-modules-stock-supply



More information about the tryton-debian-vcs mailing list