[tryton-debian-vcs] tryton-modules-commission branch debian-stretch-4.4 created. debian/4.4.1-1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 15 09:38:57 UTC 2017
The following commit has been merged in the debian-stretch-4.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-commission.git;a=commitdiff;h=debian/4.4.1-1
commit dac77314341537a92ab00015c81751e69db39a5a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 14:16:44 2017 +0100
Releasing debian version 4.4.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index e6db978..b2da1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-commission (4.4.1-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Bump the Standards-Version to 4.1.1, no changes needed.
+ * Setting the branch in the watch file to the fixed version 4.4.
+ * Merging upstream version 4.4.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 11 Nov 2017 14:16:43 +0100
+
tryton-modules-commission (4.4.0-4) unstable; urgency=medium
* Switch to Python3.
commit 1af8822272891931021dc76da33bfe2e8f5e33b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 11 14:16:43 2017 +0100
Merging upstream version 4.4.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 98e0a48..8d83f7c 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)
* Add category as plan matching criteria
diff --git a/PKG-INFO b/PKG-INFO
index 4222ec3..4b54e14 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_commission
-Version: 4.4.0
+Version: 4.4.1
Summary: Tryton module for commission
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/commission.py b/commission.py
index 1624aed..25bcdbc 100644
--- a/commission.py
+++ b/commission.py
@@ -70,8 +70,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/invoice.py b/invoice.py
index 2151cc0..c5577cd 100644
--- a/invoice.py
+++ b/invoice.py
@@ -99,9 +99,9 @@ class Invoice:
Commission.save(to_save)
def _credit(self):
- values = super(Invoice, self)._credit()
- values['agent'] = self.agent.id if self.agent else None
- return values
+ credit = super(Invoice, self)._credit()
+ credit.agent = self.agent
+ return credit
class InvoiceLine:
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 2c08fdb..a181f68 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.4.1
depends:
account
account_invoice
diff --git a/trytond_commission.egg-info/PKG-INFO b/trytond_commission.egg-info/PKG-INFO
index 05155fc..a364c3f 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: 4.4.0
+Version: 4.4.1
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 818dd62..ab2d95a 100644
--- a/trytond_commission.egg-info/SOURCES.txt
+++ b/trytond_commission.egg-info/SOURCES.txt
@@ -1,15 +1,24 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
account.xml
+commission.py
commission.xml
+invoice.py
invoice.xml
+party.py
+product.py
product.xml
+sale.py
sale.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./account.xml
@@ -78,7 +87,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.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
commit 7517b006cb85767c14d3c0a4d275dd4996c49899
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 12:26:10 2017 +0100
Setting the branch in the watch file to the fixed version 4.4.
diff --git a/debian/watch b/debian/watch
index 6384691..f6a8ed0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_commission-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/4.4/ .*trytond_commission-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-commission
More information about the tryton-debian-vcs
mailing list