[tryton-debian-vcs] tryton-modules-account branch upstream-4.0 updated. upstream/4.0.7-1-g4bcd711
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Aug 17 12:21:32 UTC 2017
The following commit has been merged in the upstream-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/4.0.7-1-g4bcd711
commit 4bcd7119f2c354bb7a5e7bd6e33e01ea8a0a7734
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 13:19:20 2017 +0200
Adding upstream version 4.0.8.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 42fd573..c6ef5a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.8 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.7 - 2017-06-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f0c97d8..f6d5a4b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 4.0.7
+Version: 4.0.8
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index 0fcfbfa..814293f 100644
--- a/move.py
+++ b/move.py
@@ -913,7 +913,7 @@ class Line(ModelSQL, ModelView):
else:
line_amount -= tax_line['amount']
tax_amount += tax_line['amount'] * \
- tax_line['tax'][key + '_tax_sign']
+ getattr(tax_line['tax'], key + '_tax_sign')
line_amount = line.account.company.currency.round(
line_amount)
tax_amount = line.account.company.currency.round(
@@ -1059,7 +1059,7 @@ class Line(ModelSQL, ModelView):
tax_line = TaxLine(**TaxLine.default_get(
TaxLine._fields.keys()))
- tax_line.amount = base_amounts[code_id, tax_id],
+ tax_line.amount = base_amounts[code_id, tax_id]
tax_line.currency_digits = self.account.currency_digits
tax_line.code = code_id
tax_line.tax = tax_id
diff --git a/tax.py b/tax.py
index ccdd520..c3505ba 100644
--- a/tax.py
+++ b/tax.py
@@ -1149,10 +1149,6 @@ class TaxLine(ModelSQL, ModelView):
return self.move_line.currency_digits
return 2
- @fields.depends('tax')
- def on_change_tax(self):
- self.code = None
-
@fields.depends('_parent_move_line.account', 'move_line')
def on_change_with_company(self, name=None):
if self.move_line:
diff --git a/tryton.cfg b/tryton.cfg
index 73c577e..07c47d9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.7
+version=4.0.8
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 93435eb..c68b2d7 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.7
+Version: 4.0.8
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