[tryton-debian-vcs] tryton-modules-stock branch upstream-3.2 updated. upstream/3.2.4-1-g7687151

[Mathias Behrle]

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

commit 7687151311ae8abac733b4c60a635b5b1211b780
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 21:20:10 2015 +0200

    Adding upstream version 3.2.5.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 4340449..9d9fd72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.5 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.4 - 2015-02-19
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c0bd804..16f09ee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.2.4
+Version: 3.2.5
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index a86ae91..1b23333 100644
--- a/move.py
+++ b/move.py
@@ -797,18 +797,19 @@ class Move(Workflow, ModelSQL, ModelView):
             for _, qty in to_pick:
                 picked_qties += qty
 
-            if picked_qties < move.quantity:
+            if move.quantity - picked_qties >= move.uom.rounding:
                 success = False
                 first = False
                 cls.write([move], {
-                    'quantity': move.quantity - picked_qties,
+                    'quantity': Uom.round(
+                            move.quantity - picked_qties, move.uom.rounding),
                     })
             else:
                 first = True
             for from_location, qty in to_pick:
                 values = {
                     'from_location': from_location.id,
-                    'quantity': qty,
+                    'quantity': Uom.round(qty, move.uom.rounding),
                     }
                 if first:
                     cls.write([move], values)
diff --git a/shipment.py b/shipment.py
index 7cf7c33..5d9f2c2 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1171,6 +1171,8 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
                 else:
                     out_quantity = move.quantity
 
+                if not out_quantity:
+                    continue
                 unit_price = Uom.compute_price(move.product.default_uom,
                         move.product.list_price, move.uom)
                 to_create.append(shipment._get_outgoing_move(move))
diff --git a/tryton.cfg b/tryton.cfg
index c998b03..26dfccc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.4
+version=3.2.5
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index e925d94..216de7d 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.2.4
+Version: 3.2.5
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock