[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch debian-stretch-3.8 updated. debian/3.8.4-1-2-g5bd02ea

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:35:34 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-supply-drop-shipment.git;a=commitdiff;h=debian/3.8.4-1-2-g5bd02ea

commit 5bd02ea6916075c140ea56fa9fd4f73a52565d89
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 11 13:50:21 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 3f19ded..a9ecec4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-sale-supply-drop-shipment (3.8.5-1) unstable; urgency=medium
+
+  * Merging upstream version 3.8.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 11 Nov 2017 13:50:21 +0100
+
 tryton-modules-sale-supply-drop-shipment (3.8.4-1) unstable; urgency=medium
 
   * Merging upstream version 3.8.4.
commit a3eb8d66bd7b84286b9cf6106d66e17ab7e2055d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 11 13:50:21 2017 +0100

    Merging upstream version 3.8.5.

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..9d7c769
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,9 @@
+image: python2.7
+env:
+  - POSTGRESQL_URI=postgresql://postgres@127.0.0.1:5432/
+  - MYSQL_URI=mysql://root@127.0.0.1:3306/
+script:
+  - pip install tox
+  - tox -e "py27-{sqlite,postgresql}"
+services:
+  - postgres
diff --git a/CHANGELOG b/CHANGELOG
index 9b43f1e..597f605 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.5 - 2017-11-07
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.4 - 2017-10-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 38304ee..8d48005 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply_drop_shipment
-Version: 3.8.4
+Version: 3.8.5
 Summary: Tryton module for sale supply drop shipment
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index 78f4e8a..659ee97 100644
--- a/stock.py
+++ b/stock.py
@@ -481,7 +481,8 @@ class Move:
     @classmethod
     def search_customer_drop(cls, name, clause):
         return ['OR',
-            ('origin.sale.party',) + tuple(clause[1:]) + ('sale.line',),
-            (('origin.purchase.customer',) + tuple(clause[1:])
-                + ('purchase.line',)),
+            ('origin.sale.party' + clause[0].lstrip(name),)
+            + tuple(clause[1:3]) + ('sale.line',) + tuple(clause[3:]),
+            ('origin.purchase.customer' + clause[0].lstrip(name),)
+            + tuple(clause[1:3]) + ('purchase.line',) + tuple(clause[3:]),
             ]
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..e9d2876
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+[tox]
+envlist = py27-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    py27-postgresql: psycopg2 >= 2.0
+    pypy-postgresql: psycopg2cffi >= 2.5
+    mysql: MySQL-python
+setenv =
+    sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+    postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+    mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+    sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+    postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+    mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index a8a022b..256bfe9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.4
+version=3.8.5
 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 006a8b7..1af89f9 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.8.4
+Version: 3.8.5
 Summary: Tryton module for sale supply drop shipment
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
index 9c4b57f..dd9e3a4 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
@@ -1,13 +1,20 @@
+.drone.yml
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
 LICENSE
 MANIFEST.in
 README
+__init__.py
+purchase.py
 purchase.xml
+sale.py
 sale.xml
 setup.py
+stock.py
 stock.xml
+tox.ini
 tryton.cfg
 ./__init__.py
 ./purchase.py
@@ -67,7 +74,9 @@ locale/nl_NL.po
 locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
+tests/__init__.py
 tests/scenario_sale_supply_drop_shipment.rst
+tests/test_sale_supply_drop_shipment.py
 trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
 trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
 trytond_sale_supply_drop_shipment.egg-info/dependency_links.txt
-- 
tryton-modules-sale-supply-drop-shipment



More information about the tryton-debian-vcs mailing list