diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 92fdd43ca81..c5a1be4bf51 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -7,8 +7,9 @@
         <menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
+        <!-- This menu is used in account_code module -->
+        <menuitem id="menu_account_coda" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
         <menuitem id="menu_finance_periodical_processing_bank" name="Bank Reconciliation" parent="menu_finance_periodical_processing" sequence="8" groups="group_account_user,group_account_manager,base.group_system,group_account_invoice"/>
-        
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index f758e04aa5b..4aa61c20827 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -32,6 +32,7 @@
     "demo_xml"  : [],
     "init_xml"  : [],
     "update_xml": ["security/ir.model.access.csv",
+                    "security/account_security.xml",
                     "wizard/account_coda_import.xml",
                     "account_coda_view.xml"],
     "active"    : False,
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index 1671c9a53f7..8dd4067c571 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -33,10 +33,12 @@ class account_coda(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True, select=True, help="Bank Journal"),
         'date': fields.date('Date', readonly=True, select=True, help="Import Date"),
         'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True)
     }
     _defaults = {
         'date': time.strftime('%Y-%m-%d'),
         'user_id': lambda self,cr,uid,context: uid,
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c),
     }
 
 account_coda()
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 30d8a22cb5d..bc64a4048f7 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -12,6 +12,7 @@
 				<field name="journal_id" />
 				<field name="date" />
 				<field name="user_id" />
+				<field name="company_id" widget="selection" groups="base.group_multi_company"/>
 				<notebook colspan="4">
 					<page string="Log">
 					   <field name="note" colspan="4" nolabel="1"/>
@@ -33,7 +34,7 @@
 				<field name="journal_id" />
 				<field name="date" />
 				<field name="user_id" />
-				<field name="statement_ids"/>
+				<field name="company_id" widget="selection" groups="base.group_multi_company"/>
 			</tree>
 		</field>
 	</record>
@@ -46,8 +47,9 @@
                 <search string="Search Coda">
                    <group col="10" colspan="4">
                         <field name="journal_id"/>
-                        <field name="user_id" default="uid"/>
                         <field name="date"/>
+                        <field name="user_id" default="uid"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -55,13 +57,14 @@
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                         <separator orientation="vertical"/>
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
+                        <filter string="Company" icon="terp-personal" domain="[]"  context="{'group_by':'company_id'}"/>
                     </group>
                </search>
             </field>
         </record>
 
 	<record model="ir.actions.act_window" id="action_account_coda">
-		<field name="name">Coda Statements</field>
+		<field name="name">Statements</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">account.coda</field>
 		<field name="view_type">form</field>
@@ -70,12 +73,10 @@
 		<field name="search_view_id" ref="view_aaccount_coda_filter"/>
 	</record>
 
-	<menuitem name="Coda Statements" parent="account.menu_finance_periodical_processing" id="menu_account_coda"  sequence="12"/>
+	<menuitem name="Coda Import Logs" parent="account.menu_finance_bank_and_cash" id="menu_account_coda_statement" action="action_account_coda" groups="base.group_extended" sequence="18"/>
 
-	<menuitem name="Coda Statements" parent="menu_account_coda" id="menu_account_coda_statement" action="action_account_coda" sequence="15"/>
-
-	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="menu_account_coda"
-	 id="menu_account_coda_import" sequence="13"/>
+	<menuitem name="Import Coda Statements" action="action_account_coda_import" parent="account.menu_account_coda"
+	 id="menu_account_coda_import" sequence="20"/>
 
 	<act_window name="Coda File"
 		domain="[('statement_ids', 'in', [active_id])]"
diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml
new file mode 100644
index 00000000000..f1a453da542
--- /dev/null
+++ b/addons/account_coda/security/account_security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp><data>
+
+    <record id="account_coda_comp_rule" model="ir.rule">
+        <field name="name">Account Coda model company rule</field>
+        <field model="ir.model" name="model_id" ref="model_account_coda"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
+    </record>
+
+</data></openerp>