[tryton-debian-vcs] tryton-modules-account branch upstream-3.6 updated. upstream/3.6.5-1-g233954d

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Sun Sep 4 16:54:58 UTC 2016


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

commit 233954d31dd790a635e5d89e9c17f0beccb41428
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Sep 3 20:49:48 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index c61dc4e..9ae95ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.6 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.5 - 2016-07-05
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 49dfcc4..b58bf0c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.6.5
+Version: 3.6.6
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index 452b728..ff6e136 100644
--- a/move.py
+++ b/move.py
@@ -391,6 +391,8 @@ class Move(ModelSQL, ModelView):
         for line in cancel_move.lines:
             line.debit *= -1
             line.credit *= -1
+            if line.second_currency:
+                line.amount_second_currency *= -1
             for tax_line in line.tax_lines:
                 tax_line.amount *= -1
             line.tax_lines = line.tax_lines  # Force tax_lines changing
diff --git a/party.py b/party.py
index c96ffee..c76aac2 100644
--- a/party.py
+++ b/party.py
@@ -90,8 +90,6 @@ class Party:
             return result
         company_id = user.company.id
 
-        line_query, _ = MoveLine.query_get(line)
-
         amount = Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0))
         for name in names:
             code = name
@@ -110,7 +108,6 @@ class Party:
                             & (account.kind == code)
                             & (line.reconciliation == Null)
                             & (account.company == company_id)
-                            & line_query
                             & party_where
                             & today_where
                             & (account.kind == code)),
diff --git a/tryton.cfg b/tryton.cfg
index 5dc9a81..c88ef2a7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.5
+version=3.6.6
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 01e6029..f440df6 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.6.5
+Version: 3.6.6
 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