[tryton-debian-vcs] tryton-modules-stock branch upstream-3.0 updated. upstream/3.0.2-1-gf1f4f39
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jul 3 16:02:50 UTC 2014
The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=upstream/3.0.2-1-gf1f4f39
commit f1f4f39a897135e8daa0acbf79660789fc7883ff
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Jul 3 14:22:42 2014 +0200
Adding upstream version 3.0.3.
diff --git a/CHANGELOG b/CHANGELOG
index 0668f78..03d8fed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.3 - 2014-07-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.2 - 2014-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 76410a9..8220a42 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.0.2
+Version: 3.0.3
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index b6fe10a..691f4c3 100644
--- a/product.py
+++ b/product.py
@@ -102,7 +102,7 @@ class Product(object, StockMixin):
cost_values = {}
context = {}
trans_context = Transaction().context
- if 'stock_date_end' in context:
+ if trans_context.get('stock_date_end'):
context['_datetime'] = trans_context['stock_date_end']
with Transaction().set_context(context):
for product in products:
@@ -454,14 +454,12 @@ class Product(object, StockMixin):
res[key] = Uom.round(quantity, uom.rounding)
if wh_to_add:
- if product_ids is None:
- product_ids = set((p for s, p in res))
for wh, storage in wh_to_add.iteritems():
- for product in product_ids:
- if (storage, product) in res:
- res[(wh, product)] = res[(storage, product)]
+ for key in res:
+ if key[0] == storage:
+ res[(wh,) + key[1:]] = res[key]
if storage in storage_to_remove:
- del res[(storage, product)]
+ del res[key]
return res
diff --git a/tryton.cfg b/tryton.cfg
index 3d61757..ef8fb7c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.2
+version=3.0.3
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 567d234..4764f6b 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock
-Version: 3.0.2
+Version: 3.0.3
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list