[tryton-debian-vcs] tryton-modules-stock branch debian-wheezy-2.6 updated. debian/2.6.5-1-2-gc12ff34

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/2.6.5-1-2-gc12ff34

commit c12ff34695747048fc2fa723cbd38ae19985701d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jan 20 18:33:25 2014 +0100

    Releasing debian version 2.6.6-1.

diff --git a/debian/changelog b/debian/changelog
index 448e813..f626857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (2.6.6-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 20 Jan 2014 18:25:25 +0100
+
 tryton-modules-stock (2.6.5-1) unstable; urgency=low
 
   * Removing inadvertently commited .pc directory.
commit e810671d2a4af295e1165fd2b592f295e69a2193
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jan 20 18:23:26 2014 +0100

    Merging upstream version 2.6.6.

diff --git a/CHANGELOG b/CHANGELOG
index 2a1ef87..a41ea26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.6 - 2014-01-18
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.5 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 1a92d08..914218e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.6.5
+Version: 2.6.6
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/shipment.py b/shipment.py
index f2c5b1a..6299aa0 100644
--- a/shipment.py
+++ b/shipment.py
@@ -231,10 +231,10 @@ class ShipmentIn(Workflow, ModelSQL, ModelView):
         return Transaction().context.get('company')
 
     def on_change_supplier(self):
-        if not self.supplier:
-            return {'contact_address': None}
-        address = self.supplier.address_get()
-        return {'contact_address': address.id}
+        address = None
+        if self.supplier:
+            address = self.supplier.address_get()
+        return {'contact_address': address.id if address else None}
 
     def on_change_with_supplier_location(self, name=None):
         if self.supplier:
@@ -947,10 +947,10 @@ class ShipmentOut(Workflow, ModelSQL, ModelView):
         return Transaction().context.get('company')
 
     def on_change_customer(self):
-        if not self.customer:
-            return {'delivery_address': None}
-        address = self.customer.address_get(type='delivery')
-        return {'delivery_address': address.id}
+        address = None
+        if self.customer:
+            address = self.customer.address_get(type='delivery')
+        return {'delivery_address': address.id if address else None}
 
     def on_change_with_customer_location(self, name=None):
         if self.customer:
@@ -1446,11 +1446,11 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         return Transaction().context.get('company')
 
     def on_change_customer(self):
-        if not self.customer:
-            return {'delivery_address': None}
-        address = self.customer.address_get(type='delivery')
+        address = None
+        if self.customer:
+            address = self.customer.address_get(type='delivery')
         return {
-            'delivery_address': address.id,
+            'delivery_address': address.id if address else None,
             }
 
     def on_change_with_customer_location(self, name=None):
diff --git a/tryton.cfg b/tryton.cfg
index bc150ab..daff6d6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.5
+version=2.6.6
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index b65be59..1e124c7 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: 2.6.5
+Version: 2.6.6
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock