From 6a9f9bd54a3da527c6a914474eee47a91d5cc151 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Thu, 17 Apr 2014 08:02:42 -0400
Subject: [PATCH] [FIX] Menu, views and version number

---
 base_external_dbsource/__openerp__.py |  7 +++-
 import_odbc/__openerp__.py            |  7 +++-
 import_odbc/import_odbc_view.xml      | 48 +++++++++++++++------------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/base_external_dbsource/__openerp__.py b/base_external_dbsource/__openerp__.py
index ddc2ca43c..40af248ef 100644
--- a/base_external_dbsource/__openerp__.py
+++ b/base_external_dbsource/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name': 'External Database Sources',
-    'version': '61.3',
+    'version': '1.3',
     'category': 'Tools',
     'description': """
 This module allows you to define connections to foreign databases using ODBC,
@@ -35,6 +35,11 @@ Depending on the database, you need:
    connect to Microsoft SQL Server.
  * to install and configure Oracle Instant Client and cx_Oracle python library
    to connect to Oracle.
+
+Contributors
+============
+
+* Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
     """,
     'author': 'Daniel Reis',
     'website': 'http://launchpad.net/addons-tko',
diff --git a/import_odbc/__openerp__.py b/import_odbc/__openerp__.py
index 08a8fcbce..ad0e1239c 100644
--- a/import_odbc/__openerp__.py
+++ b/import_odbc/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name': 'Import data from SQL and ODBC data sources.',
-    'version': '61.3',
+    'version': '1.3',
     'category': 'Tools',
     'description': """
 Import data directly from other databases.
@@ -57,6 +57,11 @@ Improvements ideas waiting for a contributor:
  * Allow to import many2one fields (currently not supported). Done by adding a second SQL sentence to get child record list?
  * Allow "import sets" that can be executed at different time intervals using different scheduler jobs.
  * Allow to inactivate/delete OpenERP records when not present in an SQL result set.
+
+Contributors
+============
+
+* Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
     """,
     'author': 'Daniel Reis',
     'website': 'http://launchpad.net/addons-tko',
diff --git a/import_odbc/import_odbc_view.xml b/import_odbc/import_odbc_view.xml
index a78e283c6..ac754303c 100644
--- a/import_odbc/import_odbc_view.xml
+++ b/import_odbc/import_odbc_view.xml
@@ -9,7 +9,7 @@
             <field name="model">import.odbc.dbtable</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	        <form>
+	        <form string="Table">
 	            <field name="name" search="1"/>
 	            <field name="exec_order"/>
 	            <field name="model_target"/>
@@ -42,7 +42,7 @@
 	    <field name="model">import.odbc.dbtable</field>
 	    <field name="type">tree</field>
 	    <field name="arch" type="xml">
-                <tree colors="grey: enabled==False; red:last_error_count&gt;0; blue:last_warn_count&gt;0">
+                <tree string="Tables" colors="grey: enabled==False; red:last_error_count&gt;0; blue:last_warn_count&gt;0">
 			<field name="exec_order"/>
 			<field name="name"/>
 			<field name="model_target"/>
@@ -57,29 +57,33 @@
 	</field>
 </record>
 
-
-<!-- Tree Search -->
+       <!-- Tree Search -->
        <record id="view_import_dbtable_filter" model="ir.ui.view">
-            <field name="name">import.odbc.dbtable.filter</field>
-		<field name="model">import.odbc.dbtable</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search ODBC Imports">
-				<field name="name"/>
-				<field name="dbsource_id"/>
-				<field name="model_target"/>
+           <field name="name">import.odbc.dbtable.filter</field>
+           <field name="model">import.odbc.dbtable</field>
+           <field name="type">search</field>
+           <field name="arch" type="xml">
+               <search string="Search ODBC Imports">
+                   <field name="name"/>
+                   <field name="dbsource_id"/>
+                   <field name="model_target"/>
                </search>
-            </field>
-        </record>
+           </field>
+       </record>
+
+       <!--Menu-->
+       <record model="ir.actions.act_window" id="action_import_dbtable">
+           <field name="name">Import from SQL</field>
+           <field name="res_model">import.odbc.dbtable</field>
+           <field name="view_type">form</field>
+       </record>
+
+       <menuitem name="Import from SQL"
+                 id="menu_import_dbtable"
+                 parent="base.next_id_9"
+                 action="action_import_dbtable"/>
 
-<!--Menu-->
-    <record model="ir.actions.act_window" id="action_import_dbtable">
-      <field name="name">Import from SQL</field>
-      <field name="res_model">import.odbc.dbtable</field>
-      <field name="view_type">form</field>
-    </record>
-    <menuitem name="Import from SQL" id="menu_import_dbtable" parent="base.next_id_15" action="action_import_dbtable"/>
-</data>
+    </data>
 </openerp>