[tryton-debian-vcs] tryton-modules-stock branch debian-jessie-3.0 updated. debian/3.0.2-1-2-g9e87e21

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jul 3 16:02:49 UTC 2014


The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/3.0.2-1-2-g9e87e21

commit 9e87e21b202d0bb4bc890229c4698f687e21b711
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:22:46 2014 +0200

    Releasing debian version 3.0.3-1.

diff --git a/debian/changelog b/debian/changelog
index 595934f..76da44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (3.0.3-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 03 Jul 2014 14:22:45 +0200
+
 tryton-modules-stock (3.0.2-1) unstable; urgency=medium
 
   * Removing  LC_ALL=C.UTF-8 as build environment.
commit 2d6555638161d618b986c1b2c4cc1c9d3fb5273a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Jul 3 14:22:43 2014 +0200

    Merging 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