[tryton-debian-vcs] tryton-modules-commission branch debian-stretch-3.6 updated. debian/3.6.2-1-3-g7af8b69
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:31:27 UTC 2017
The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-commission.git;a=commitdiff;h=debian/3.6.2-1-3-g7af8b69
commit 7af8b6925550857b005f35c073f267e503a46403
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 14:10:21 2017 +0100
Releasing debian version 3.6.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 5cdf3f1..5864c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-commission (3.6.3-1) unstable; urgency=medium
+
+ * Add the actual upstream maintainer key to signing-key.asc.
+ * Merging upstream version 3.6.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 11 Nov 2017 14:10:21 +0100
+
tryton-modules-commission (3.6.2-1) unstable; urgency=medium
* Updating signing-key.asc with the actual upstream maintainer keys.
commit c4b23907f3ba11971c67378fcd71ba9fa6927af2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 14:10:21 2017 +0100
Merging upstream version 3.6.3.
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 d9fc3a0..4a05ed9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.3 - 2017-11-08
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.2 - 2017-01-03
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 162a8d8..4d5dfac 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_commission
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module for commission
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/commission.py b/commission.py
index 01d29de..81f043a 100644
--- a/commission.py
+++ b/commission.py
@@ -69,8 +69,8 @@ class Agent(ModelSQL, ModelView):
else:
bool_op = 'OR'
return [bool_op,
- ('party',) + tuple(clause[1:]),
- ('plan',) + tuple(clause[1:]),
+ ('party.rec_name',) + tuple(clause[1:]),
+ ('plan.rec_name',) + tuple(clause[1:]),
]
@classmethod
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/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 f1e52d1..b12c539 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.2
+version=3.6.3
depends:
account
account_invoice
diff --git a/trytond_commission.egg-info/PKG-INFO b/trytond_commission.egg-info/PKG-INFO
index a33e9c6..6a6b28b 100644
--- a/trytond_commission.egg-info/PKG-INFO
+++ b/trytond_commission.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-commission
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module for commission
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_commission.egg-info/SOURCES.txt b/trytond_commission.egg-info/SOURCES.txt
index 00de6d1..d130f96 100644
--- a/trytond_commission.egg-info/SOURCES.txt
+++ b/trytond_commission.egg-info/SOURCES.txt
@@ -1,15 +1,23 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
account.xml
+commission.py
commission.xml
+invoice.py
invoice.xml
+product.py
product.xml
+sale.py
sale.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./account.xml
@@ -57,7 +65,9 @@ locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/sl_SI.po
+tests/__init__.py
tests/scenario_commission.rst
+tests/test_commission.py
trytond_commission.egg-info/PKG-INFO
trytond_commission.egg-info/SOURCES.txt
trytond_commission.egg-info/dependency_links.txt
--
tryton-modules-commission
More information about the tryton-debian-vcs
mailing list