[tryton-debian-vcs] tryton-modules-carrier-weight branch upstream-2.6 updated. upstream/2.6.0-1-gc9a510b

[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-carrier-weight.git;a=commitdiff;h=upstream/2.6.0-1-gc9a510b

commit c9a510b4524faaf13aa32d8260622105f0214d30
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:24:04 2013 +0100

    Adding upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index d2beb67..26c116b 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)
 
diff --git a/PKG-INFO b/PKG-INFO
index daa1150..c0713aa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_carrier_weight
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add cost method "on weight" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index f7cc078..0511f59 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,
diff --git a/tryton.cfg b/tryton.cfg
index c3407df..f12fe01 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     carrier
     company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index 71ca47b..9fac515 100644
--- a/trytond_carrier_weight.egg-info/PKG-INFO
+++ b/trytond_carrier_weight.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-carrier-weight
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add cost method "on weight" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-carrier-weight