[tryton-debian-vcs] tryton-modules-stock-supply-production branch debian-wheezy-2.6 updated. upstream/2.6.0-7-gaf84323
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:57:06 UTC 2014
The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply-production.git;a=commitdiff;h=upstream/2.6.0-7-gaf84323
commit af84323d88fd4d685f9a4e2559f6d90638c3e0be
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:29:18 2014 +0100
Releasing debian version 2.6.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 0c86014..fde2c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-supply-production (2.6.2-1) unstable; urgency=medium
+
+ * Versioning watch file for Tryton branch 2.6.
+ * Improving update of major version in Depends.
+ * Merging upstream version 2.6.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 12 Nov 2014 13:29:18 +0100
+
tryton-modules-stock-supply-production (2.6.1-1) experimental; urgency=low
* Initial packaging.
commit f765da3eec40e95b6881f561b08dbad420a28c39
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:29:17 2014 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 900682e..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 Cédric Krier
- 2012 B2CK SPRL
+Copyright: 2012-2014 Cédric Krier
+ 2012-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 7354a29f7c9a9511421bce60a46544dc0fff5467
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:29:17 2014 +0100
Merging upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index ea0e50a..e317b7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.1 - 2012-12-23
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 747ae18..5695e54 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012 Cédric Krier.
-Copyright (C) 2012 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 53a2abf..63dc3fe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_supply_production
-Version: 2.6.1
+Version: 2.6.2
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 b55704d..7032944 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 bd107d5..7ae057c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
ir
product
diff --git a/trytond_stock_supply_production.egg-info/PKG-INFO b/trytond_stock_supply_production.egg-info/PKG-INFO
index 59cd9d5..5bf591f 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.6.1
+Version: 2.6.2
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 81e5804..6ff1bfa 100644
--- a/trytond_stock_supply_production.egg-info/SOURCES.txt
+++ b/trytond_stock_supply_production.egg-info/SOURCES.txt
@@ -10,7 +10,19 @@ 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
doc/index.rst
--
tryton-modules-stock-supply-production
More information about the tryton-debian-vcs
mailing list