[tryton-debian-vcs] tryton-modules-account-statement branch upstream-3.6 updated. upstream/3.6.2-1-g15ad37d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:29:54 UTC 2017
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-statement.git;a=commitdiff;h=upstream/3.6.2-1-g15ad37d
commit 15ad37d99ff08c2f590717c537eeb718f92d7f32
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 13:30:28 2017 +0100
Adding upstream version 3.6.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
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 5534207..f786f9c 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-07-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 431fbe9..6accd09 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_statement
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/statement.py b/statement.py
index 9b01467..f996d17 100644
--- a/statement.py
+++ b/statement.py
@@ -789,7 +789,7 @@ class LineGroup(ModelSQL, ModelView):
@classmethod
def search_journal(cls, name, clause):
- return [('statement.journal',) + tuple(clause[1:])]
+ return [('statement.' + clause[0],) + tuple(clause[1:])]
def get_currency(self, name):
return self.statement.journal.currency.id
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 913aeb5..c86f6df 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_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 16bc76b..3431fc2 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-statement
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module with account statements
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_statement.egg-info/SOURCES.txt b/trytond_account_statement.egg-info/SOURCES.txt
index 622fb2f..da3dd12 100644
--- a/trytond_account_statement.egg-info/SOURCES.txt
+++ b/trytond_account_statement.egg-info/SOURCES.txt
@@ -1,13 +1,20 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+account.py
+journal.py
journal.xml
setup.py
statement.odt
+statement.py
statement.xml
+tox.ini
tryton.cfg
./__init__.py
./account.py
@@ -54,7 +61,9 @@ locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
locale/sl_SI.po
+tests/__init__.py
tests/scenario_account_statement.rst
+tests/test_account_statement.py
trytond_account_statement.egg-info/PKG-INFO
trytond_account_statement.egg-info/SOURCES.txt
trytond_account_statement.egg-info/dependency_links.txt
--
tryton-modules-account-statement
More information about the tryton-debian-vcs
mailing list