[tryton-debian-vcs] tryton-modules-account branch upstream-4.0 updated. upstream/4.0.8-1-ge74081e
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-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/4.0.8-1-ge74081e
commit e74081eb720a795e53d6092a4837438a0753d8b3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:38:54 2017 +0200
Adding upstream version 4.0.9.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index c6ef5a2..5e23008 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.9 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.8 - 2017-08-08
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f6d5a4b..f181f47 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 4.0.8
+Version: 4.0.9
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/party.py b/party.py
index 646fa26..43e7ed4 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/tax.py b/tax.py
index c3505ba..56eae96 100644
--- a/tax.py
+++ b/tax.py
@@ -1280,7 +1280,7 @@ class TaxRule(ModelSQL, ModelView):
if vals:
values.append([rule])
values.append(vals)
- template2rule[rule.template.id] = rule.id
+ template2rule[rule.template.id] = rule.id
if values:
cls.write(*values)
diff --git a/tryton.cfg b/tryton.cfg
index 07c47d9..a6c2eef 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.8
+version=4.0.9
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index c68b2d7..49f3ca9 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: 4.0.8
+Version: 4.0.9
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