Merge lp:~max3903/addons-tko/import_odbc into lp:~dreis-pt/addons-tko/reis

[Maxime Chambreuil (http://www.savoirfairelinux.com)]

[lp:~max3903/addons-tko/import_odbc]

15. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2012-08-02

[MERGE]

=== renamed directory 'reis_import_odbc' => 'import_odbc'
=== modified file 'import_odbc/__openerp__.py' (properties changed: +x to -x)
--- reis_import_odbc/__openerp__.py	2012-07-20 16:24:33 +0000
+++ import_odbc/__openerp__.py	2012-08-02 14:53:22 +0000
@@ -25,34 +25,37 @@
     'category': 'Tools',
     'description': """
 Import data directly from other databases.
-Installed in the Administration module, menu Configuration > Import from ODBC.
+
+Installed in the Administration module, menu Configuration -> Import from ODBC.
 
 Features:
-* Connects to other databases using ODBC (pyodbc) or Oracle Client (cx_Oracle).
-* Fetched data from the databases are used to build lines equivalent to regular import files. These are imported using the standard "import_data()" ORM method, benefiting from all its features, including xml_ids.
-* Each table import is defined by an SQL statement, used to build the equivalent for an import file. Each column's name should correspond to the column names you would use in an import file. The first column must provide an unique identifier for the record, and will be used to build it's xml_id.
-* The last sync date is the last (successfull) execution. You can select only records changed since the last execution by adding a WHERE clause using this date with the representation "%s".
-* When errors are found, only the record with the error fails import. The other correct records are commited. However, the "last sync date" will only be automaticaly updated when no errors are found.
-* The import execution can be scheduled to run automaticaly.
+ * Connects to other databases using ODBC (pyodbc) or Oracle Client (cx_Oracle).
+ * Fetched data from the databases are used to build lines equivalent to regular import files. These are imported using the standard "import_data()" ORM method, benefiting from all its features, including xml_ids.
+ * Each table import is defined by an SQL statement, used to build the equivalent for an import file. Each column's name should match the column names you would use in an import file. The first column must provide an unique identifier for the record, and will be used to build its xml_id.
+ * The last sync date is the last (successfull) execution. You can select only records changed since the last execution by adding a WHERE clause using this date with the representation "%s".
+ * When errors are found, only the record with the error fails import. The other correct records are commited. However, the "last sync date" will only be automaticaly updated when no errors are found.
+ * The import execution can be scheduled to run automatically.
 
 Example SQL:
 SELECT PRODUCT_CODE as "ref", PRODUCT_NAME as "name", 'res_partner_id_'+SUPPLIER_ID as "partner_id/id"
 FROM T_PRODUCTS 
 WHERE DATE_CHANGED >= %s
 
-To use ODBC you need to install unixodbc and python-pyodbc packages.
-To connect to SQLServer you need to install and configure FreeTDS driver (tdsodbc package) and confire it through ODBC.
-To connect to Oracle you need to install and configure the Instant Client, and install the cx_Oracle python library. This library can be used to establish the connection without the nedd for ODBC.
+To use ODBC, you need to install unixodbc and python-pyodbc packages.
+
+To connect to MS SQL Server, you need to install and configure FreeTDS driver (tdsodbc package) and configure it through ODBC.
+
+To connect to Oracle, you need to install and configure the Instant Client, and install the cx_Oracle python library. This library can be used to establish the connection without the nedd for ODBC.
     """,
     'author': 'Daniel Reis',
     'website': '',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
+    'init': [],
+    'data': [
         'import_odbc_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [], 
     'installable': True,
     'active': False,

=== modified file 'import_odbc/import_odbc.py' (properties changed: +x to -x)
=== modified file 'import_odbc/import_odbc_view.xml' (properties changed: +x to -x)