diff --git a/addons/l10n_multilang/__init__.py b/addons/l10n_multilang/__init__.py
index 0aea333e9a9..446f3beb668 100644
--- a/addons/l10n_multilang/__init__.py
+++ b/addons/l10n_multilang/__init__.py
@@ -20,5 +20,5 @@
 ##############################################################################
 
 import account
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+import l10n_multilang
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
index e2c754adb4b..481abb1bf65 100644
--- a/addons/l10n_multilang/__openerp__.py
+++ b/addons/l10n_multilang/__openerp__.py
@@ -25,16 +25,18 @@
     "author" : "OpenERP SA",
     "category": 'Localization/Account Charts',
     "description": """
-    * Multilanguage support for Chart of Accounts, Taxes, Tax Codes , Journals, Accounting Templates,
-        Analytic Chart of Accounts and Analytic Journals
+    * Multi language support for Chart of Accounts, Taxes, Tax Codes , Journals, Accounting Templates,
+        Analytic Chart of Accounts and Analytic Journals.
     * Setup wizard changes
-        - Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects
+        - Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects.
         - Add option to install languages during the setup.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     "depends" : ['account_accountant'],
     'update_xml': [
+                   'l10n_multilang.xml',
+                   'l10n_multilang_test.xml' 
     ],
     'demo_xml': [
     ],
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
new file mode 100644
index 00000000000..f9fab08c216
--- /dev/null
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from osv import fields, osv
+
+
+class wizard_multi_charts_accounts(osv.osv_memory):
+    """
+    Change wizard that a new account chart for a company.
+        * load Default languages
+        * Replace creation of financial accounts by copy from template.
+          This change results in adherence to Belgian MAR numbering scheme for cash accounts.
+        * Create financial journals for each account of type liquidity
+    """
+    _inherit = 'wizard.multi.charts.accounts'
+
+    _columns = {
+        'lang_ids': fields.many2many('res.lang', 'res_lang_type_rel', 'wizard_id', 'lang_id', 'Language'),
+        'bank_from_template': fields.boolean('Banks/Cash from Template', 
+            help="If True then Generate Bank/Cash accounts and journals from the Templates.", readonly=True),
+    }
+  
+wizard_multi_charts_accounts()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_multilang/l10n_multilang.xml b/addons/l10n_multilang/l10n_multilang.xml
new file mode 100644
index 00000000000..990407f9462
--- /dev/null
+++ b/addons/l10n_multilang/l10n_multilang.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+    <record id="multi_chart_configuration" model="ir.actions.todo">
+        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <field name="sequence">25</field>
+        <field name="restart">onskip</field>
+    </record>
+    <!--  Wizard for Multi Charts of Accounts -->
+    <record id="view_wizard_multi_chart_belgian_coa" model="ir.ui.view">
+      <field name="name">view.wizard.multi.chart</field>
+      <field name="model">wizard.multi.charts.accounts</field>
+      <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
+      <field name="arch" type="xml">
+        <data>
+          <field name="bank_accounts_id" position="before">
+            <field name="bank_from_template" />
+          </field>
+          <field name="bank_accounts_id" position="before">
+            <separator string="Languages" colspan="4"/>
+            <field name="lang_ids" colspan="4" nolabel="1"/>
+          </field>
+          <field name="bank_accounts_id" position="attributes">
+            <attribute name="attrs">{'invisible': [('bank_from_template', '=', False)]}</attribute>
+          </field>
+        </data>
+      </field>
+    </record>
+
+ 
+  </data>
+</openerp>
diff --git a/addons/l10n_multilang/l10n_multilang_test.xml b/addons/l10n_multilang/l10n_multilang_test.xml
new file mode 100644
index 00000000000..b91405cf27f
--- /dev/null
+++ b/addons/l10n_multilang/l10n_multilang_test.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data noupdate="0">
+
+        <!-- Config wizard to Generate Chart of Accounts from a Chart Template -->
+
+        <record id="config_call_account_template" model="ir.actions.todo">
+            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+            <field name="type">special</field>
+        </record>
+
+
+        <!-- Account Types -->
+
+        <record model="account.account.type" id="account_type_receivable" >
+          <field name="name">Receivable</field>
+          <field name="code">receivable</field>
+          <field name="report_type">income</field>
+          <field name="close_method">unreconciled</field>
+        </record>
+
+        <record model="account.account.type" id="account_type_payable" >
+          <field name="name">Payable</field>
+          <field name="code">payable</field>
+          <field name="report_type">expense</field>
+          <field name="close_method">unreconciled</field>
+        </record>
+
+	    <record model="account.account.type" id="acct_type_asset_view">
+	        <field name="name">Asset View</field>
+	        <field name="code">asset</field>
+	        <field name="report_type">asset</field>
+	    </record>
+
+        <record model="account.account.type" id="account_type_view">
+          <field name="name">View</field>
+          <field name="code">view</field>
+          <field name="close_method">none</field>
+        </record>
+	    
+	    <record model="account.account.type" id="acct_type_liability_view">
+	        <field name="name">Liability View</field>
+	        <field name="code">liability</field>
+	        <field name="report_type">liability</field>
+	    </record>
+
+	    <record model="account.account.type" id="acct_type_asset_view">
+	        <field name="name">Asset View</field>
+	        <field name="code">asset</field>
+	        <field name="report_type">asset</field>
+	    </record>
+
+        <!-- Account Templates for A -->
+
+        <record model="account.account.template" id="chart_a_root">
+            <field name="name">Chart of Account A</field>
+            <field name="code">0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_view"/>
+            <field name="reconcile" eval="False"/>
+        </record>
+
+        <record model="account.account.template" id="chart_a0">
+            <field name="name">Balance Sheet</field>
+            <field name="code">A00</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="chart_a_root"/>
+        </record>
+
+        <record model="account.account.template" id="chart_a1">
+            <field name="name">Profit and Loss</field>
+            <field name="code">A01</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="chart_a_root"/>
+        </record>
+
+        <record id="chart_a2" model="account.account.template">
+            <field name="code">A0011</field>
+            <field name="name">Bank Account</field>
+            <field ref="chart_a0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_view"/>
+        </record>
+
+        <!-- Tax Code template for A-->
+        <record id="atax0" model="account.tax.code.template">
+            <field name="name">Tax Template Root A</field>
+        </record>
+
+        <record id="atax1" model="account.tax.code.template">
+            <field name="name">Tax 001 A</field>
+            <field name="parent_id" ref="atax0"/>
+        </record>
+
+        <record id="atax2" model="account.tax.code.template">
+            <field name="name">Tax 002 A</field>
+            <field name="parent_id" ref="atax0"/>
+        </record>
+
+
+        <!-- Account Templates for B -->
+        <record model="account.account.template" id="chart_b1">
+            <field name="name">Assets B</field>
+            <field name="code">B00012</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_asset_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="chart_a0"/>
+        </record>
+
+        <record model="account.account.template" id="chart_b2">
+            <field name="name">Liabilities B</field>
+            <field name="code">B00014</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="acct_type_liability_view"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="chart_a0"/>
+        </record>
+
+        <record model="account.account.template" id="chart_b3">
+            <field name="name">Income B</field>
+            <field name="code">B00021</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_receivable"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="chart_a1"/>
+        </record>
+
+        <record model="account.account.template" id="chart_b4">
+            <field name="name">Expense B</field>
+            <field name="code">B00024</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_payable"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="chart_a1"/>
+        </record>
+
+
+        <!-- Chart template -->
+        <record id="account_chart_template_a" model="account.chart.template">
+            <field name="name">Demo Chart A</field>
+            <field name="account_root_id" ref="chart_a_root"/>
+            <field name="tax_code_root_id" ref="atax0"/>
+            <field name="bank_account_view_id" ref="chart_a2"/>
+        </record>
+
+        <record id="account_chart_template_b" model="account.chart.template">
+            <field name="name">Demo Chart B</field>
+            <field name="account_root_id" ref="chart_a_root"/>
+            <field name="tax_code_root_id" ref="atax0"/>
+            <field name="bank_account_view_id" ref="chart_a2"/>
+            <field name="parent_id" ref="account_chart_template_a"/>
+        </record>
+
+  </data>
+</openerp>
+