diff --git a/addons/account/account.py b/addons/account/account.py
index 37455e59cd1..8dc3f98ff02 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2784,7 +2784,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             data = data_pool.browse(cr, uid, data_id[0])
             account_id = data.res_id
             acc_ids = obj_acc._get_children_and_consol(cr, uid, [account_id])
-            if account_id:
+            if acc_ids:
                 cr.execute("update account_account set active='f' where id in " + str(tuple(acc_ids)))
 wizard_multi_charts_accounts()
 
diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index a082a10747c..5ef0ee4992d 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         
         <!--
         Fiscal year
@@ -19,6 +19,7 @@
         -->    
         
         <record id="period_1" model="account.period">
+            <field eval="'01/'+time.strftime('%Y')" name="code"/>
             <field eval="'01/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -27,6 +28,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_2" model="account.period">
+            <field eval="'02/'+time.strftime('%Y')" name="code"/>
             <field eval="'02/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -35,6 +37,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_3" model="account.period">
+            <field eval="'03/'+time.strftime('%Y')" name="code"/>
             <field eval="'03/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -43,6 +46,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_4" model="account.period">
+            <field eval="'04/'+time.strftime('%Y')" name="code"/>
             <field eval="'04/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -51,6 +55,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_5" model="account.period">
+            <field eval="'05/'+time.strftime('%Y')" name="code"/>
             <field eval="'05/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -59,6 +64,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_6" model="account.period">
+            <field eval="'06/'+time.strftime('%Y')" name="code"/>
             <field eval="'06/'+time.strftime('%Y')" name="name"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
             <field eval="True" name="special"/>
@@ -67,6 +73,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_7" model="account.period">
+            <field eval="'07/'+time.strftime('%Y')" name="code"/>
             <field eval="'07/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -75,6 +82,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_8" model="account.period">
+            <field eval="'08/'+time.strftime('%Y')" name="code"/>
             <field eval="'08/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -83,6 +91,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_9" model="account.period">
+            <field eval="'09/'+time.strftime('%Y')" name="code"/>
             <field eval="'09/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -91,6 +100,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_10" model="account.period">
+            <field eval="'10/'+time.strftime('%Y')" name="code"/>
             <field eval="'10/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -99,6 +109,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_11" model="account.period">
+            <field eval="'11/'+time.strftime('%Y')" name="code"/>
             <field eval="'11/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
@@ -107,6 +118,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         <record id="period_12" model="account.period">
+            <field eval="'12/'+time.strftime('%Y')" name="code"/>
             <field eval="'12/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
             <field name="fiscalyear_id" ref="data_fiscalyear"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b8d0192770c..6684e2b8554 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -490,7 +490,7 @@ class account_installer(osv.osv_memory):
             data = data_pool.browse(cr, uid, data_id[0])
             account_id = data.res_id
             acc_ids = obj_acc._get_children_and_consol(cr, uid, [account_id])
-            if account_id:
+            if acc_ids:
                 cr.execute("update account_account set active='f' where id in " + str(tuple(acc_ids)))
 
 
@@ -546,4 +546,4 @@ class account_installer_modules(osv.osv_memory):
 
 account_installer_modules()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: