[tryton-debian-vcs] tryton-modules-account branch upstream-3.6 updated. upstream/3.6.8-1-g911e6b5

[Mathias Behrle]

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.8-1-g911e6b5

commit 911e6b5d474055e08dc72cb4b4811530be5c2094
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Aug 17 13:15:08 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 31223a2..98045fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.9 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.8 - 2016-12-17
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 48f96af..dba4452 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 5a68b6c..3f0bf0e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.6.8
+Version: 3.6.9
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index 01a1d27..96fa59f 100644
--- a/move.py
+++ b/move.py
@@ -885,7 +885,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(
@@ -1031,7 +1031,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
@@ -1824,7 +1824,7 @@ class Reconcile(Wizard):
         Account = pool.get('account.account')
         account = Account.__table__()
         cursor = Transaction().cursor
-        account_rule = Rule.query_get(Account.__name__)
+        account_rule = Rule.domain_get(Account.__name__)
 
         balance = line.debit - line.credit
         cursor.execute(*line.join(account,
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tax.py b/tax.py
index 0901b1a..f83889f 100644
--- a/tax.py
+++ b/tax.py
@@ -1207,10 +1207,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 9311e72..ab4a57d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.8
+version=3.6.9
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 66a5bc9..46a55b8 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.8
+Version: 3.6.9
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account