[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch upstream updated. upstream/3.4.0-1-g67a1e7f

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:45:34 UTC 2015


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=upstream/3.4.0-1-g67a1e7f

commit 67a1e7f58998b8b93dae3a5acb4dce224f602bae
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 21:04:20 2015 +0100

    Adding upstream version 3.4.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 4683f19..efa9b5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-19
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.0 - 2014-10-20
 * Bug fixes (see mercurial logs for details)
 * Propagate exception handling from sale to purchase
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 ee4fdbd..ae4fad8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply_drop_shipment
-Version: 3.4.0
+Version: 3.4.1
 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 fb448aa..a3a4e9a 100644
--- a/sale.py
+++ b/sale.py
@@ -91,7 +91,7 @@ class SaleLine:
                 and self.supply_on_sale):
             if (self.purchase_request and self.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 ffb84d5..6ee2b43 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,12 @@ for dep in info.get('depends', []):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
+tests_require = [get_require_version('proteus')]
+dependency_links = []
+if minor_version % 2:
+    # Add development index for testing with proteus
+    dependency_links.append('https://trydevpi.tryton.org/')
+
 setup(name=name,
     version=version,
     description='Tryton module for sale supply drop shipment',
@@ -90,6 +96,7 @@ setup(name=name,
         ],
     license='GPL-3',
     install_requires=requires,
+    dependency_links=dependency_links,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
@@ -97,4 +104,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    tests_require=tests_require,
     )
diff --git a/tryton.cfg b/tryton.cfg
index 1b56780..8b32f41 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.4.1
 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 c29bac3..79ae531 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: 3.4.0
+Version: 3.4.1
 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