[tryton-debian-vcs] tryton-modules-carrier-weight branch debian-jessie-2.8 updated. debian/2.8.0-2-3-g00eb459

[Mathias Behrle]

The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-carrier-weight.git;a=commitdiff;h=debian/2.8.0-2-3-g00eb459

commit 00eb4591188c79db0212d019a58a42361bf872af
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:08:18 2013 +0100

    Releasing debian version 2.8.1-1.

diff --git a/debian/changelog b/debian/changelog
index 35bcde8..58aa80d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-carrier-weight (2.8.1-1) unstable; urgency=low
+
+  * Fixing the branch version in the watch file.
+  * Merging upstream version 2.8.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 11 Dec 2013 18:42:05 +0100
+
 tryton-modules-carrier-weight (2.8.0-2) unstable; urgency=low
 
   * Moving doc/index.rst to appropriate subdirectory doc.
commit c08d36ab0147a9b329abbec971d00bf1c0dc7391
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 18:29:59 2013 +0100

    Merging upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index 8d85d43..e40ada3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 9b9465a..34a463c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_carrier_weight
-Version: 2.8.0
+Version: 2.8.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 bb7f271..533a128 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=2.8.1
 depends:
     carrier
     company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index d5cca13..ee2a389 100644
--- a/trytond_carrier_weight.egg-info/PKG-INFO
+++ b/trytond_carrier_weight.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-carrier-weight
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add cost method "on weight" on carrier
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-carrier-weight