[tryton-debian-vcs] tryton-modules-account branch upstream-2.6 updated. upstream/2.6.9-1-g2423493

[Mathias Behrle]

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

commit 2423493407715f018363c9432496c2274d6affce
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:26:41 2014 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 815170c..5282373 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.10 - 2014-12-03
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.9 - 2014-05-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 5b0dcc8..1eb0f6e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 2.6.9
+Version: 2.6.10
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 9d7554f..a76c030 100644
--- a/account.py
+++ b/account.py
@@ -896,7 +896,7 @@ class Account(ModelSQL, ModelView):
             current_type = self.type.id if self.type else None
             template_type = (template2type.get(self.template.type.id)
                 if self.template.type else None)
-            if current_type != template2type:
+            if current_type != template_type:
                 vals['type'] = template_type
             if vals:
                 self.write([self], vals)
diff --git a/tryton.cfg b/tryton.cfg
index 52d7695..a263ae6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.9
+version=2.6.10
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 534da72..329aa80 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: 2.6.9
+Version: 2.6.10
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account.egg-info/SOURCES.txt b/trytond_account.egg-info/SOURCES.txt
index c95c16c..53369c1 100644
--- a/trytond_account.egg-info/SOURCES.txt
+++ b/trytond_account.egg-info/SOURCES.txt
@@ -22,13 +22,38 @@ trial_balance.odt
 tryton.cfg
 ./__init__.py
 ./account.py
+./account.xml
+./aged_balance.odt
 ./configuration.py
+./configuration.xml
 ./fiscalyear.py
+./fiscalyear.xml
+./general_journal.odt
+./general_ledger.odt
 ./journal.py
+./journal.xml
 ./move.py
+./move.xml
 ./party.py
+./party.xml
 ./period.py
+./period.xml
 ./tax.py
+./tax.xml
+./third_party_balance.odt
+./trial_balance.odt
+./tryton.cfg
+./icons/tryton-financial.svg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
 ./tests/__init__.py
 ./tests/test_account.py
 doc/index.rst
-- 
tryton-modules-account