[tryton-debian-vcs] tryton-modules-account branch upstream updated. upstream/4.0.2-1-g9a03327
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Sep 4 16:54:56 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/4.0.2-1-g9a03327
commit 9a03327de6d67a2101410566023aaad88aa246ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 20:46:10 2016 +0200
Adding upstream version 4.0.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index c90bb78..6808ef0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.3 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.2 - 2016-08-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2c105db..b3bc4e9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 4.0.2
+Version: 4.0.3
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index a7416e7..aaaf038 100644
--- a/move.py
+++ b/move.py
@@ -390,6 +390,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 f949faf..13b8e25 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 296965c..b5b9672 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.2
+version=4.0.3
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index cf520d9..021b144 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.2
+Version: 4.0.3
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