[tryton-debian-vcs] tryton-modules-account branch debian-stretch-3.8 updated. debian/3.8.3-1-2-g8f162c0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Oct 3 14:10:58 UTC 2016
The following commit has been merged in the debian-stretch-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=debian/3.8.3-1-2-g8f162c0
commit 8f162c03ae88fe273e22ddd91087b51df4f040e0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:41:39 2016 +0200
Releasing debian version 3.8.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 53f58da..f86aee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account (3.8.4-1) unstable; urgency=medium
+
+ * Merging upstream version 3.8.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 03 Oct 2016 12:41:39 +0200
+
tryton-modules-account (3.8.3-1) unstable; urgency=medium
* Merging upstream version 3.8.3.
commit 3842019c7b148a5992fc9778311dd1a2d8964195
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 3 12:41:38 2016 +0200
Merging upstream version 3.8.4.
diff --git a/CHANGELOG b/CHANGELOG
index 5d3c125..a133d8c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.4 - 2016-10-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.3 - 2016-09-03
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 90e4484..849fc10 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.8.3
+Version: 3.8.4
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/party.py b/party.py
index c76aac2..5fafb14 100644
--- a/party.py
+++ b/party.py
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from sql import Literal, Null
+from sql import Literal, Null, Cast
from sql.aggregate import Sum
from sql.conditionals import Coalesce
@@ -146,9 +146,14 @@ class Party:
today_query = ((line.maturity_date <= Date.today())
| (line.maturity_date == Null))
- line_query, _ = MoveLine.query_get(line)
Operator = fields.SQL_OPERATORS[clause[1]]
+ # 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_)
query = line.join(account, condition=account.id == line.account
).select(line.party,
where=account.active
@@ -156,9 +161,7 @@ class Party:
& (line.party != Null)
& (line.reconciliation == Null)
& (account.company == company_id)
- & line_query & today_query,
+ & today_query,
group_by=line.party,
- having=Operator(Sum(Coalesce(line.debit, 0)
- - Coalesce(line.credit, 0)),
- Decimal(clause[2] or 0)))
+ having=Operator(amount, value))
return [('id', 'in', query)]
diff --git a/tryton.cfg b/tryton.cfg
index d28f5ef..bd4c2e7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.3
+version=3.8.4
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index dda879c..fbd2d45 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.3
+Version: 3.8.4
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