[tryton-debian-vcs] tryton-modules-stock branch upstream-2.6 updated. upstream/2.6.11-1-g58a3630

[Mathias Behrle]

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

commit 58a36300ee81372c52b5325a2fce3b0eebc92af3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 21:17:14 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 02c0a8e..b864746 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.12 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.11 - 2015-02-19
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index fbfe53a..5c73d1a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.6.11
+Version: 2.6.12
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index d238a44..8a0aa0f 100644
--- a/move.py
+++ b/move.py
@@ -588,18 +588,19 @@ class Move(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),
                     'state': 'assigned',
                     }
                 if first:
diff --git a/shipment.py b/shipment.py
index df8f7d1..54c9efa 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1102,6 +1102,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)
                 Move.create({
diff --git a/tryton.cfg b/tryton.cfg
index 6e4d1e5..fca4d27 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.11
+version=2.6.12
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index e8015cb..28eb0d5 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.6.11
+Version: 2.6.12
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock