[tryton-debian-vcs] tryton-modules-stock branch debian-jessie-3.4 updated. debian/3.4.1-1-4-gc8bfe3b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun May 24 12:20:22 UTC 2015
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/3.4.1-1-4-gc8bfe3b
commit c8bfe3ba061613e748836963aedf5da79c4ed0e9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 23 21:21:16 2015 +0200
Releasing debian version 3.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 3e3c055..5f936d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock (3.4.2-1) unstable; urgency=medium
+
+ * Wrapping and sorting control files (wrap-and-sort -bts).
+ * Setting the branch in the watch file to the fixed version 3.4.
+ * Merging upstream version 3.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 May 2015 21:21:16 +0200
+
tryton-modules-stock (3.4.1-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit 501655e533ee9ffa35d59b133a84045ad2d7a98e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 23 21:21:15 2015 +0200
Merging upstream version 3.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 7643166..4e3febc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2015-02-19
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index e28c6d1..b18211d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.4.1
+Version: 3.4.2
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index ee7a483..956101d 100644
--- a/move.py
+++ b/move.py
@@ -800,18 +800,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 1b839f2..02337f5 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(shipment._get_outgoing_move(move))
diff --git a/tryton.cfg b/tryton.cfg
index 24b710d..0ae4f69 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.4.2
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 70a4d9f..d9cc725 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.4.1
+Version: 3.4.2
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