[tryton-debian-vcs] tryton-modules-stock-supply-production branch debian-jessie-2.8 updated. debian/2.8.0-2-4-ga078951

Wed Nov 12 13:57:02 UTC 2014

The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply-production.git;a=commitdiff;h=debian/2.8.0-2-4-ga078951

commit a07895136d46646edb0cc1d95f401672de8e600e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:30:06 2014 +0100

    Releasing debian version 2.8.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 3777c50..ea2b372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-supply-production (2.8.1-1) unstable; urgency=medium
+
+  * Fixing the branch version in the watch file.
+  * Merging upstream version 2.8.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 12 Nov 2014 13:30:06 +0100
+
 tryton-modules-stock-supply-production (2.8.0-2) unstable; urgency=low
 
   * Moving doc/index.rst to appropriate subdirectory doc.
commit 0d156c5e0dfaedf97f694609bcfa47d1653be3b7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:30:05 2014 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 629bf50..422a7f4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2012-2013 Cédric Krier
-           2012-2013 B2CK SPRL
+Copyright: 2012-2014 Cédric Krier
+           2012-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit a72083fd009911b0e6535f1de3a857e55c77355f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:30:05 2014 +0100

    Merging upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index a038a0f..c2a7aa1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 7668cfa..5695e54 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2013 Cédric Krier.
-Copyright (C) 2012-2013 B2CK SPRL.
+Copyright (C) 2012-2014 Cédric Krier.
+Copyright (C) 2012-2014 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 6000935..c4cab1b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply_production
-Version: 2.8.0
+Version: 2.8.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 00f982b..09470ac 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, skip_zero=False)
-            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, skip_zero=False)
+            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 bdab2c0..4dcec2a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=2.8.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 0ebf9df..a653afc 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: 2.8.0
+Version: 2.8.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 6e8f3eb..0572ee4 100644
--- a/trytond_stock_supply_production.egg-info/SOURCES.txt
+++ b/trytond_stock_supply_production.egg-info/SOURCES.txt
@@ -10,9 +10,23 @@ 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
 ./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

