[tryton-debian-vcs] tryton-modules-stock branch upstream-2.8 updated. upstream/2.8.4-1-g07f583e

[Mathias Behrle]

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

commit 07f583e72172a7da3de0b696e8459fa65a010104
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 16:20:40 2014 +0200

    Adding upstream version 2.8.5.

diff --git a/CHANGELOG b/CHANGELOG
index 183ab67..63c7414 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.5 - 2014-05-07
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.4 - 2014-01-18
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index b9e8d97..06390fa 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2012 Openlabs Technologies & Consulting (P) LTD.
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index f57a58d..6a271ff 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.8.4
+Version: 2.8.5
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/location.py b/location.py
index 13cc197..18d2795 100644
--- a/location.py
+++ b/location.py
@@ -309,8 +309,9 @@ class Location(ModelSQL, ModelView):
                     default=default)
                 warehouse_locations = Transaction().context.get(
                     'cp_warehouse_locations') or {}
-                cp_warehouse = cls(Transaction().context['cp_warehouse_id'])
                 if location.id in warehouse_locations.values():
+                    cp_warehouse = cls(
+                        Transaction().context['cp_warehouse_id'])
                     for field, loc_id in warehouse_locations.iteritems():
                         if loc_id == location.id:
                             cls.write([cp_warehouse], {
diff --git a/product.py b/product.py
index 6bb1fd0..b1818a1 100644
--- a/product.py
+++ b/product.py
@@ -551,6 +551,8 @@ class Product:
                     res[(location_id, product_id)] = 0.0
 
         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:
diff --git a/tryton.cfg b/tryton.cfg
index 35aff47..ed39991 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.4
+version=2.8.5
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index c592941..a598d73 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: 2.8.4
+Version: 2.8.5
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock