[tryton-debian-vcs] tryton-modules-account branch debian updated. debian/4.4.1-3-3-gee12c03

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:22:45 UTC 2017


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

commit ee12c03d5f53eb705f5a4512ace6f86a03b93ca0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 11:33:17 2017 +0200

    Releasing debian version 4.4.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 8e50686..3dbe1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account (4.4.2-1) unstable; urgency=medium
+
+  * Bump the Standards-Version to 4.1.0, no changes needed.
+  * Merging upstream version 4.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 05 Oct 2017 11:33:17 +0200
+
 tryton-modules-account (4.4.1-3) unstable; urgency=medium
 
   * Switch to Python3.
commit c2848126aa000118db4b9af7d17cf826009d562f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 11:33:16 2017 +0200

    Merging upstream version 4.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index 4cdf3ba..ccc8ab5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.2 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.4.1 - 2017-08-08
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index a6a7bf5..18a2ad1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 4.4.1
+Version: 4.4.2
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/party.py b/party.py
index a584476..298e4d0 100644
--- a/party.py
+++ b/party.py
@@ -198,6 +198,7 @@ class Party(CompanyMultiValueMixin):
         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:
@@ -211,14 +212,17 @@ class Party(CompanyMultiValueMixin):
             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 5a7472a..d019e83 100644
--- a/tax.py
+++ b/tax.py
@@ -1272,7 +1272,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 9f17622..b9bd4ed 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.1
+version=4.4.2
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index d653486..8b97f08 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.4.1
+Version: 4.4.2
 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