[tryton-debian-vcs] tryton-modules-stock branch upstream-2.8 updated. upstream/2.8.2-1-g495af11

[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.2-1-g495af11

commit 495af111d38e52a82dc59946ed755fde444a3b31
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 18:28:40 2013 +0100

    Adding upstream version 2.8.3.

diff --git a/CHANGELOG b/CHANGELOG
index 733a200..e9eb375 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.3 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.2 - 2013-07-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d1026ee..04875e0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.8.2
+Version: 2.8.3
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index 1c2cc91..6824a54 100644
--- a/move.py
+++ b/move.py
@@ -363,7 +363,7 @@ class Move(Workflow, ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        return [('product',) + clause[1:]]
+        return [('product',) + tuple(clause[1:])]
 
     def _update_product_cost_price(self, direction):
         """
@@ -534,7 +534,8 @@ class Move(Workflow, ModelSQL, ModelView):
         for move in moves:
             internal_quantity = cls._get_internal_quantity(move.quantity,
                     move.uom, move.product)
-            if internal_quantity != move.internal_quantity:
+            if (internal_quantity != move.internal_quantity
+                    and internal_quantity != vals.get('internal_quantity')):
                 cls.write([move], {
                         'internal_quantity': internal_quantity,
                         })
diff --git a/shipment.py b/shipment.py
index aeb17d9..5c20026 100644
--- a/shipment.py
+++ b/shipment.py
@@ -2140,8 +2140,8 @@ class PickingList(CompanyReport):
                 from_location_ids.add(move.from_location.id)
                 to_location_ids.add(move.to_location.id)
 
-        from_locations = Location.search(list(from_location_ids))
-        to_locations = Location.search(list(to_location_ids))
+        from_locations = Location.browse(list(from_location_ids))
+        to_locations = Location.browse(list(to_location_ids))
 
         return {
             'from_location_ids': [l.id for l in from_locations],
@@ -2187,8 +2187,8 @@ class SupplierRestockingList(CompanyReport):
                 from_location_ids.add(move.from_location.id)
                 to_location_ids.add(move.to_location.id)
 
-        from_locations = Location.search(list(from_location_ids))
-        to_locations = Location.search(list(to_location_ids))
+        from_locations = Location.browse(list(from_location_ids))
+        to_locations = Location.browse(list(to_location_ids))
 
         return {
             'from_location_ids': [l.id for l in from_locations],
@@ -2234,8 +2234,8 @@ class CustomerReturnRestockingList(CompanyReport):
                 from_location_ids.add(move.from_location.id)
                 to_location_ids.add(move.to_location.id)
 
-        from_locations = Location.search(list(from_location_ids))
-        to_locations = Location.search(list(to_location_ids))
+        from_locations = Location.browse(list(from_location_ids))
+        to_locations = Location.browse(list(to_location_ids))
 
         return {
             'from_location_ids': [l.id for l in from_locations],
@@ -2281,8 +2281,8 @@ class InteralShipmentReport(CompanyReport):
                 from_location_ids.add(move.from_location.id)
                 to_location_ids.add(move.to_location.id)
 
-        from_locations = Location.search(list(from_location_ids))
-        to_locations = Location.search(list(to_location_ids))
+        from_locations = Location.browse(list(from_location_ids))
+        to_locations = Location.browse(list(to_location_ids))
 
         return {
             'from_location_ids': [l.id for l in from_locations],
diff --git a/tryton.cfg b/tryton.cfg
index 99bdad7..d81e746 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.2
+version=2.8.3
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 600870d..986a4da 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.2
+Version: 2.8.3
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock