[tryton-debian-vcs] tryton-modules-sale branch upstream-4.0 updated. upstream/4.0.3-1-gecf75b3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:37:40 UTC 2017
The following commit has been merged in the upstream-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/4.0.3-1-gecf75b3
commit ecf75b3081d36824a832c15788b6472b4c434768
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:43:07 2017 +0200
Adding upstream version 4.0.4.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index d760ede..b324d00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.4 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.3 - 2016-09-03
* 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 5912235..a566890 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 4.0.3
+Version: 4.0.4
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 030cde8..9c35384 100644
--- a/sale.py
+++ b/sale.py
@@ -1265,11 +1265,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 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 4a582ec..6fec402 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.3
+version=4.0.4
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 8412bf2..482c2d9 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.0.3
+Version: 4.0.4
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