[tryton-debian-vcs] tryton-modules-analytic-invoice branch debian-stretch-4.2 updated. debian/4.2.0-1-7-g7eb6d27
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Nov 12 16:30:52 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-invoice.git;a=commitdiff;h=debian/4.2.0-1-7-g7eb6d27
commit 7eb6d2780e4881171c84cc801c48a1b3ff3699fe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 12 16:30:11 2017 +0100
Releasing debian version 4.2.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 36d7914..65146a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-analytic-invoice (1:4.2.1-1) unstable; urgency=medium
+
+ * Add the actual upstream maintainer key to signing-key.asc.
+ * Setting the branch in the watch file to the fixed version 4.2.
+ * Use the preferred https URL format in the copyright file.
+ * Bump the Standards-Version to 4.0.1.
+ * Merging upstream version 4.2.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 12 Nov 2017 16:30:11 +0100
+
tryton-modules-analytic-invoice (1:4.2.0-1) unstable; urgency=medium
* Merging upstream version 4.2.0.
commit d181f108e1d50ddcdf05d605ed04cb616511b140
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 12 16:30:10 2017 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 9215391..e73c5ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2016 Cédric Krier
+Copyright: 2008-2017 Cédric Krier
2008-2012 Bertrand Chenal
- 2008-2016 B2CK SPRL
+ 2008-2017 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 50beb9ee133d771f797c93ff7431c9958f5259df
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 12 16:30:10 2017 +0100
Merging upstream version 4.2.1.
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 b2dc8a3..cebf632 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-11-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Add support for depreciable assets
diff --git a/COPYRIGHT b/COPYRIGHT
index 808b71b..1474fa9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index fe0065d..2d08f3f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 4.2.0
+Version: 4.2.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 f75d953..c8886ee 100644
--- a/invoice.py
+++ b/invoice.py
@@ -93,13 +93,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 9b5a8ef..256ddd6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.2.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 394bbd9..1ead94a 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.2.0
+Version: 4.2.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