[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch upstream-4.0 updated. upstream/4.0.5-1-g74ddfc3

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

commit 74ddfc3e580ecb27b73da5c86864ea03a32c2f37
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 11 13:51:57 2017 +0100

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

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..c4fd423
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,9 @@
+image: python:all
+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,py33,py34,py35}-{sqlite,postgresql}" --skip-missing-interpreters
+services:
+  - postgres
diff --git a/CHANGELOG b/CHANGELOG
index 9f37a83..5fa6918 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.6 - 2017-11-07
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.5 - 2017-10-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 6e03bfe..165a96e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply_drop_shipment
-Version: 4.0.5
+Version: 4.0.6
 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 4592e9f..5573386 100644
--- a/stock.py
+++ b/stock.py
@@ -482,7 +482,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..3dda9ab
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+[tox]
+envlist = {py27,py33,py34,py35}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    {py27,py33,py34,py35}-postgresql: psycopg2 >= 2.5
+    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 017d30e..db1db14 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.5
+version=4.0.6
 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 59b2b23..1a11209 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: 4.0.5
+Version: 4.0.6
 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 0b519c4..5f2b417 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
@@ -71,7 +78,9 @@ locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
 locale/zh_CN.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