[tryton-debian-vcs] tryton-modules-sale branch debian-stretch-3.8 updated. debian/3.8.2-1-4-g9542012

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:37:39 UTC 2017


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

commit 95420120579da46e3e5d3c6d808fe3fe3532d737
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:41:50 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 47d6724..b6a7324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale (3.8.3-1) unstable; urgency=medium
+
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Merging upstream version 3.8.3.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 11 Jun 2017 22:41:50 +0200
+
 tryton-modules-sale (3.8.2-1) unstable; urgency=medium
 
   * Setting the branch in the watch file to the fixed version 3.8.
commit cf25deeaa7b58f3f54e76c5b9fc02f9f4763c29a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:41:50 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index be43cf3..64e4429 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 5381155c72818ef97fa6193be8ef3e98b7a3df6a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:41:50 2017 +0200

    Merging upstream version 3.8.3.

diff --git a/CHANGELOG b/CHANGELOG
index b561e7d..2d602e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.3 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.2 - 2016-07-05
 * Bug fixes (see mercurial logs for details)
 
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 1467710..242dc11 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 3.8.2
+Version: 3.8.3
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 0af3c2e..b0b932d 100644
--- a/sale.py
+++ b/sale.py
@@ -1290,11 +1290,13 @@ class SaleLine(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 >= 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 be3a238..9f850d7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.2
+version=3.8.3
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 7a1a913..f02c364 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: 3.8.2
+Version: 3.8.3
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale



More information about the tryton-debian-vcs mailing list