[tryton-debian-vcs] tryton-modules-account branch upstream-3.2 updated. upstream/3.2.10-1-ga3dc2ee

[Mathias Behrle]

The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.2.10-1-ga3dc2ee

commit a3dc2eec17beb3dd09d857771cac46b6f9538e1e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 3 12:38:13 2016 +0200

    Adding upstream version 3.2.11.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index bb7785d..104eaa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.11 - 2016-10-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.10 - 2016-09-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 861e57e..d33dd87 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.2.10
+Version: 3.2.11
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/party.py b/party.py
index fcf6f6a..a2ab7a8 100644
--- a/party.py
+++ b/party.py
@@ -1,7 +1,7 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 from decimal import Decimal
-from sql import Literal
+from sql import Literal, Cast
 from sql.aggregate import Sum
 from sql.conditionals import Coalesce
 
@@ -161,9 +161,14 @@ class Party:
             today_query = ((line.maturity_date <= Date.today())
                 | (line.maturity_date == None))
 
-        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
@@ -171,9 +176,7 @@ class Party:
                     & (line.party != None)
                     & (line.reconciliation == None)
                     & (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 54de2dc..f0d9fe1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.10
+version=3.2.11
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 6d9a836..cbed230 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.2.10
+Version: 3.2.11
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account