[tryton-debian-vcs] tryton-modules-stock branch upstream-3.0 updated. upstream/3.0.6-1-gb6e0b5e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun May 24 12:20:27 UTC 2015
The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=upstream/3.0.6-1-gb6e0b5e
commit b6e0b5e3afcc8ca366dcbf230a5be72d27481f1c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 23 21:19:06 2015 +0200
Adding upstream version 3.0.7.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 2948bd3..395dbc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.7 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.6 - 2015-02-19
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index cdd3ecd..587a103 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.0.6
+Version: 3.0.7
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index db8c9bf..02447cf 100644
--- a/move.py
+++ b/move.py
@@ -747,18 +747,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 72cb754..d4d4c36 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1150,6 +1150,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({
diff --git a/tryton.cfg b/tryton.cfg
index e567e47..1548c2e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.6
+version=3.0.7
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 96ed733..2ef9f0a 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.6
+Version: 3.0.7
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