[tryton-debian-vcs] tryton-modules-account branch upstream-2.6 updated. upstream/2.6.7-1-gb60a7f5

[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.7-1-gb60a7f5

commit b60a7f5bc9a308cc4b8c26ec886817c45695bd56
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 17 14:03:24 2014 +0200

    Adding upstream version 2.6.8.

diff --git a/CHANGELOG b/CHANGELOG
index b4891f0..9680dcd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.8 - 2014-04-07
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.7 - 2014-03-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 43ac15a..81053e1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 2.6.7
+Version: 2.6.8
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 7935627..276634a 100644
--- a/account.py
+++ b/account.py
@@ -842,6 +842,7 @@ class Account(ModelSQL, ModelView):
             default = {}
         default['left'] = 0
         default['right'] = 0
+        default.setdefault('template')
         default.setdefault('deferrals', [])
         new_accounts = super(Account, cls).copy(accounts, default=default)
         cls._rebuild_tree('parent', None, 0)
diff --git a/tryton.cfg b/tryton.cfg
index 4970262..06117d7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.7
+version=2.6.8
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index d92255d..b63fe9f 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.7
+Version: 2.6.8
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account