[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch debian-jessie-2.8 updated. debian/2.8.3-1-3-g82a5d09
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:45:33 UTC 2015
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-sale-supply-drop-shipment.git;a=commitdiff;h=debian/2.8.3-1-3-g82a5d09
commit 82a5d093d96564f3b4342dbc5922ce77e36741a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 21:05:19 2015 +0100
Releasing debian version 2.8.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index b74dcba..e1948d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-sale-supply-drop-shipment (2.8.4-1) unstable; urgency=medium
+
+ * Merging upstream version 2.8.4.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 Feb 2015 21:05:19 +0100
+
tryton-modules-sale-supply-drop-shipment (2.8.3-1) unstable; urgency=medium
* Merging upstream version 2.8.3.
commit c65d161f7801fa2ec383777edfe9d506c77e4ab1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 21:05:18 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 839508f..1486cd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2014 Cédric Krier
- 2011-2014 B2CK SPRL
+Copyright: 2011-2015 Cédric Krier
+ 2011-2015 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 3d3164c0228400f081c2c8b118fe43302ac6b9f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 21:05:18 2015 +0100
Merging upstream version 2.8.4.
diff --git a/CHANGELOG b/CHANGELOG
index 7edbcf7..23f7268 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.4 - 2015-02-19
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.3 - 2014-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7bcdb7f..196a420 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2014 Cédric Krier.
-Copyright (C) 2011-2014 B2CK SPRL.
+Copyright (C) 2011-2015 Cédric Krier.
+Copyright (C) 2011-2015 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index e2a8318..e8f18ec 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 2.8.3
+Version: 2.8.4
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 2021bf7..5507528 100644
--- a/sale.py
+++ b/sale.py
@@ -96,7 +96,7 @@ class SaleLine:
line = self.__class__(self.id)
if (line.purchase_request and line.purchase_request.customer
and self.purchase_request_state != 'cancel'):
- return {}
+ return
return result
def get_purchase_request(self):
diff --git a/setup.py b/setup.py
index 848b856..9fd98b3 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,9 @@ for dep in info.get('depends', []):
requires.append('trytond >= %s.%s, < %s.%s' %
(major_version, minor_version, major_version, minor_version + 1))
+tests_require = ['proteus >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1)]
+
setup(name='trytond_sale_supply_drop_shipment',
version=info.get('version', '0.0.1'),
description='Tryton module for sale supply drop shipment',
@@ -79,4 +82,5 @@ setup(name='trytond_sale_supply_drop_shipment',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ tests_require=tests_require,
)
diff --git a/tryton.cfg b/tryton.cfg
index b951399..dd865ca 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.3
+version=2.8.4
depends:
company
ir
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index 433cf8d..3b97352 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 2.8.3
+Version: 2.8.4
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale-supply-drop-shipment
More information about the tryton-debian-vcs
mailing list