[tryton-debian-vcs] tryton-modules-account branch upstream-3.8 updated. upstream/3.8.6-1-gcb73fa2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:22:49 UTC 2017
The following commit has been merged in the upstream-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.8.6-1-gcb73fa2
commit cb73fa21bb819cb521c09532936f607d528964fe
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:37:04 2017 +0200
Adding upstream version 3.8.7.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 39f4244..38a1abe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.7 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.6 - 2017-08-08
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index e3bd6a9..1ab8fc3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.8.6
+Version: 3.8.7
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/party.py b/party.py
index 5fafb14..5e8d2c3 100644
--- a/party.py
+++ b/party.py
@@ -133,6 +133,7 @@ class Party:
if name not in ('receivable', 'payable',
'receivable_today', 'payable_today'):
raise Exception('Bad argument')
+ _, operator, value = clause
user = User(Transaction().user)
if not user.company:
@@ -146,14 +147,17 @@ class Party:
today_query = ((line.maturity_date <= Date.today())
| (line.maturity_date == Null))
- Operator = fields.SQL_OPERATORS[clause[1]]
+ Operator = fields.SQL_OPERATORS[operator]
# Need to cast numeric for sqlite
type_ = MoveLine.debit.sql_type().base
amount = Cast(
Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0)),
type_)
- value = Cast(Literal(Decimal(clause[2] or 0)), type_)
+ if operator in {'in', 'not in'}:
+ value = [Cast(Literal(Decimal(v or 0)), type_) for v in value]
+ else:
+ value = Cast(Literal(Decimal(value or 0)), type_)
query = line.join(account, condition=account.id == line.account
).select(line.party,
where=account.active
diff --git a/tryton.cfg b/tryton.cfg
index bdae83f..81ec435 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.6
+version=3.8.7
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index e1d3ac6..009f1ac 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account
-Version: 3.8.6
+Version: 3.8.7
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list