[tryton-debian-vcs] tryton-modules-analytic-invoice branch upstream-4.4 updated. upstream/4.4.0-1-gcdd49bd
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:37:08 UTC 2017
The following commit has been merged in the upstream-4.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-invoice.git;a=commitdiff;h=upstream/4.4.0-1-gcdd49bd
commit cdd49bd2384e328acad636cbe3dd42d6481a1c17
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 18:53:58 2017 +0100
Adding upstream version 4.4.1.
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 e78bf8d..909e251 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.1 - 2017-11-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index fb77934..c0eaeb8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 4.4.0
+Version: 4.4.1
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 5476143..32bc19f 100644
--- a/invoice.py
+++ b/invoice.py
@@ -98,13 +98,14 @@ class AnalyticAccountEntry:
domain = super(AnalyticAccountEntry, cls).search_company(name, clause),
domain = ['OR',
domain,
- (('origin.company',) + tuple(clause[1:]) +
- ('account.invoice.line',)),
+ (('origin.' + clause[0],) + tuple(clause[1:3])
+ + ('account.invoice.line',) + tuple(clause[3:])),
]
try:
pool.get('account.asset')
domain.append(
- (('origin.company',) + tuple(clause[1:]) + ('account.asset',)))
+ (('origin.' + clause[0],) + tuple(clause[1:3])
+ + ('account.asset',) + tuple(clause[3:])))
except KeyError:
pass
return domain
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..08e43cf
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[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
+ sqlite: sqlitebck
+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 1aa4139..8c0dd7a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.4.1
depends:
account_invoice
analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 8c76e29..cce4815 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-analytic-invoice
-Version: 4.4.0
+Version: 4.4.1
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 2b10ef9..a34bb00 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -1,12 +1,18 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+asset.py
asset.xml
+invoice.py
invoice.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./asset.py
@@ -55,6 +61,10 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
+tests/scenario_analytic_invoice.rst
+tests/scenario_analytic_invoice_asset.rst
+tests/test_analytic_invoice.py
trytond_analytic_invoice.egg-info/PKG-INFO
trytond_analytic_invoice.egg-info/SOURCES.txt
trytond_analytic_invoice.egg-info/dependency_links.txt
--
tryton-modules-analytic-invoice
More information about the tryton-debian-vcs
mailing list