From 33ab996f5117199f844c96cf44418d4e64c588c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:58:59 +0200 Subject: [PATCH 1/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index c3407df50f..f12fe01edd 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: carrier company From 8720fc0585416dcf79929e288882136580ef6e2f Mon Sep 17 00:00:00 2001 From: Albert Cervera i Areny Date: Sun, 20 Oct 2013 15:51:29 +0200 Subject: [PATCH 2/5] Avoid crash when weight is NULL review1171003 issue3433 (transplanted from e9b490ba230159872772c6bd7c231c87e3ce11f6) --- stock.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stock.py b/stock.py index f7cc0786b6..0511f59eb3 100644 --- a/stock.py +++ b/stock.py @@ -37,7 +37,10 @@ class ShipmentIn: for key, parcel in groupby(lines, key=keyfunc): weight = 0 for line in parcel: - if line.product and line.quantity and line.uom: + if (line.product + and line.quantity + and line.uom + and line.product.weight): quantity = Uom.compute_qty(line.uom, line.quantity, line.product.default_uom, round=False) weight += Uom.compute_qty(line.product.weight_uom, @@ -75,7 +78,10 @@ class ShipmentOut: for key, parcel in groupby(lines, key=keyfunc): weight = 0 for line in parcel: - if line.product and line.quantity and line.uom: + if (line.product + and line.quantity + and line.uom + and line.product.weight): quantity = Uom.compute_qty(line.uom, line.quantity, line.product.default_uom, round=False) weight += Uom.compute_qty(line.product.weight_uom, From 0c5108ad347cd5622b04603c216ddcf78d437eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:34:11 +0100 Subject: [PATCH 3/5] Prepare release 2.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d2beb67aef..26c116b88d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) From ba4bfb828e624a36217fd2824ef00309d299e56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:34:12 +0100 Subject: [PATCH 4/5] Added tag 2.6.1 for changeset ce8708800cad --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 712ee93eea..b499fdb950 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 7b90b4f94834c2f7d2c4d9c6d02303fe7a33c75a 2.4.0 d4ce3d05f5cb49277ba7d694c72ded4ae9164a61 2.6.0 +ce8708800cada4a0f92c963574d89000e991332f 2.6.1 From b0cd7a8978cbc6a1d69c6febc9fb63d69577c019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:34:39 +0100 Subject: [PATCH 5/5] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index f12fe01edd..fff7577eda 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: carrier company