[tryton-debian-vcs] tryton-modules-account-be branch upstream updated. upstream/3.6.0-1-g307f3b4

[Mathias Behrle]

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-be.git;a=commitdiff;h=upstream/3.6.0-1-g307f3b4

commit 307f3b48e502f205368dc54d583c53a75f92883a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 21:14:31 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index e9d1515..a1e24e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add localization infrastructure
diff --git a/PKG-INFO b/PKG-INFO
index fa05a91..74b0386 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_be
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module with Belgian chart of accounts
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 6de92bb..56a4e5e 100644
--- a/account.py
+++ b/account.py
@@ -21,10 +21,14 @@ class AccountTemplate:
         model_data = ModelData.__table__()
 
         # Migration from 3.4: translation of the account chart
-        cursor.execute(*model_data.update(
-                columns=[model_data.fs_id],
-                values=[Concat(model_data.fs_id, '_fr')],
-                where=((Position('_fr', model_data.fs_id) == 0)
+        cursor.execute(*model_data.select(model_data.id,
+                where=((model_data.fs_id == 'be')
                     & (model_data.module == 'account_be'))))
+        if cursor.fetchone():
+            cursor.execute(*model_data.update(
+                    columns=[model_data.fs_id],
+                    values=[Concat(model_data.fs_id, '_fr')],
+                    where=((Position('_fr', model_data.fs_id) == 0)
+                        & (model_data.module == 'account_be'))))
 
         super(AccountTemplate, cls).__register__(module_name)
diff --git a/tryton.cfg b/tryton.cfg
index e111957..a18dbd8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     account
 xml:
diff --git a/trytond_account_be.egg-info/PKG-INFO b/trytond_account_be.egg-info/PKG-INFO
index 5842f43..ec968a1 100644
--- a/trytond_account_be.egg-info/PKG-INFO
+++ b/trytond_account_be.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-be
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module with Belgian chart of accounts
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account_be.egg-info/SOURCES.txt b/trytond_account_be.egg-info/SOURCES.txt
index 5e8513f..74ad367 100644
--- a/trytond_account_be.egg-info/SOURCES.txt
+++ b/trytond_account_be.egg-info/SOURCES.txt
@@ -14,10 +14,8 @@ tax_be_nl.xml
 tryton.cfg
 ./__init__.py
 ./account.py
-./account_be.xml
 ./account_be_fr.xml
 ./account_be_nl.xml
-./tax_be.xml
 ./tax_be_fr.xml
 ./tax_be_nl.xml
 ./tryton.cfg
-- 
tryton-modules-account-be