[tryton-debian-vcs] tryton-modules-sale branch debian-stretch-4.2 updated. debian/4.2.0-1-5-g4a5a7b6

[Mathias Behrle]

The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=debian/4.2.0-1-5-g4a5a7b6

commit 4a5a7b61485756b559e3b99ed31c46111f5998e8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:44:25 2017 +0200

    Releasing debian version 4.2.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index a94d2a5..c1e86f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-sale (4.2.1-1) unstable; urgency=medium
+
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Setting the branch in the watch file to the fixed version 4.2.
+  * Merging upstream version 4.2.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 11 Jun 2017 22:44:25 +0200
+
 tryton-modules-sale (4.2.0-1) unstable; urgency=medium
 
   * Merging upstream version 4.2.0.
commit 89f5a8c29627e63a01d738a3bc78c7bd3666cb14
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:44:24 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 7f27de8..bcee35d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2016 Cédric Krier
+Copyright: 2008-2017 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2016 B2CK SPRL
+           2008-2017 B2CK SPRL
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit c82d3948052bcbf11f5e80e77d438096a194e401
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:44:24 2017 +0200

    Merging upstream version 4.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 25a9951..bbcff62 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Manage readonly state on Sale Line
diff --git a/COPYRIGHT b/COPYRIGHT
index 48f96af..dba4452 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 6c34169..7ce6d45 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 331b8aa..76fc6ea 100644
--- a/sale.py
+++ b/sale.py
@@ -1279,11 +1279,13 @@ class SaleLine(sequence_ordered(), ModelSQL, ModelView):
             if self.warehouse:
                 return self.warehouse.output_location.id
         else:
-            return self.sale.party.customer_location.id
+            party = self.sale.shipment_party or self.sale.party
+            return party.customer_location.id
 
     def get_to_location(self, name):
         if (self.quantity or 0) >= 0:
-            return self.sale.party.customer_location.id
+            party = self.sale.shipment_party or self.sale.party
+            return party.customer_location.id
         else:
             if self.warehouse:
                 return self.warehouse.input_location.id
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index 329da9d..50dece3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 14c9dc6..c9203b6 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale