diff --git a/account_move_base_import/i18n/es.po b/account_move_base_import/i18n/es.po
index b990338f..41dc3b2b 100644
--- a/account_move_base_import/i18n/es.po
+++ b/account_move_base_import/i18n/es.po
@@ -17,29 +17,29 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-06-06 06:36+0000\n"
 "X-Generator: Launchpad (build 17031)\n"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:credit.statement.import:0
-#: model:ir.actions.act_window,name:account_statement_base_import.statement_importer_action
+#: model:ir.actions.act_window,name:account_move_base_import.statement_importer_action
 msgid "Import statement"
 msgstr "Importar extracto"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:account.statement.profile:0
 msgid "Historical Import Logs"
 msgstr "Registro histórico de importaciones"
 
-#. module: account_statement_base_import
-#: model:ir.model,name:account_statement_base_import.model_credit_statement_import
+#. module: account_move_base_import
+#: model:ir.model,name:account_move_base_import.model_credit_statement_import
 msgid "credit.statement.import"
 msgstr "credit.statement.import"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,input_statement:0
 msgid "Statement file"
 msgstr "Archivo de extracto"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:168
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:168
 #, python-format
 msgid ""
 "Column %s you try to import is not present in the bank statement line!"
@@ -47,91 +47,91 @@ msgstr ""
 "La columna %s que intenta importar no está presente en la línea del extracto "
 "bancario."
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:162
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:162
 #, python-format
 msgid "Nothing to import"
 msgstr "Nada que importar"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,journal_id:0
 msgid "Financial journal to use transaction"
 msgstr "Diario contable a usar"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:102
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:102
 #, python-format
 msgid "Column %s not present in file"
 msgstr "La columna %s no está presente en el archivo"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:account.statement.profile:0
-#: model:ir.ui.menu,name:account_statement_base_import.statement_importer_menu
+#: model:ir.ui.menu,name:account_move_base_import.statement_importer_menu
 msgid "Import Bank Statement"
 msgstr "Importar extracto bancario"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:54
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:54
 #, python-format
 msgid "User Error"
 msgstr "Error de usuario"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:223
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:223
 #, python-format
 msgid "The statement cannot be created: %s"
 msgstr "El extracto no puede ser creado: %s"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:167
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:167
 #, python-format
 msgid "Missing column!"
 msgstr "Columna ausente"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/parser.py:166
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/parser.py:166
 #, python-format
 msgid "No buffer file given."
 msgstr "No se ha proporcionado ningún búfer de archivo."
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:107
-#: code:addons/account_statement_base_import/parser/file_parser.py:171
-#: code:addons/account_statement_base_import/parser/file_parser.py:205
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:107
+#: code:addons/account_move_base_import/parser/file_parser.py:171
+#: code:addons/account_move_base_import/parser/file_parser.py:205
 #, python-format
 msgid "Invalid data"
 msgstr "Datos inválidos"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,launch_import_completion:0
 msgid "Launch completion after import"
 msgstr "Lanzar el completado después de la importación"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,partner_id:0
 msgid "Credit insitute partner"
 msgstr "Empresa para el agente financiero"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:account.statement.profile:0
 msgid "Import related infos"
 msgstr "Importar información relacionada"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:163
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:163
 #, python-format
 msgid "The file is empty"
 msgstr "El archivo está vacío"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/wizard/import_statement.py:93
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/wizard/import_statement.py:93
 #, python-format
 msgid "Please use a file with an extention"
 msgstr "Use por favor un archivo con extensión"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:172
-#: code:addons/account_statement_base_import/parser/file_parser.py:206
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:172
+#: code:addons/account_move_base_import/parser/file_parser.py:206
 #, python-format
 msgid ""
 "Value %s of column %s is not valid.\n"
@@ -145,15 +145,15 @@ msgstr ""
 " \n"
 "Detalles: %s"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:29
-#: code:addons/account_statement_base_import/parser/generic_file_parser.py:31
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:29
+#: code:addons/account_move_base_import/parser/generic_file_parser.py:31
 #, python-format
 msgid "Please install python lib xlrd"
 msgstr "Por favor instale la librería de Python xlrd"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:160
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:160
 #, python-format
 msgid ""
 " It should be YYYY-MM-DD for column: %s value: %s \n"
@@ -169,24 +169,24 @@ msgstr ""
 " \n"
 "Detalles: %s"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,last_import_date:0
 msgid "Last Import Date"
 msgstr "Última fecha de importación"
 
-#. module: account_statement_base_import
-#: model:ir.model,name:account_statement_base_import.model_account_statement_profile
+#. module: account_move_base_import
+#: model:ir.model,name:account_move_base_import.model_account_statement_profile
 msgid "Statement Profile"
 msgstr "Perfil de extracto"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:234
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:234
 #, python-format
 msgid "Statement import error"
 msgstr "Error de importación del extracto"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:193
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:193
 #, python-format
 msgid ""
 "Please modify the cell formatting to date format for column: %s value: %s\n"
@@ -200,18 +200,18 @@ msgstr ""
 " \n"
 "Detalles: %s"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:192
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:192
 #, python-format
 msgid "Date format is not valid"
 msgstr "El formato de fecha no es válido"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,import_type:0
 msgid "Type of import"
 msgstr "Tipo de importación"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:account.statement.profile,launch_import_completion:0
 msgid ""
 "Tic that box to automatically launch the completion on each imported file "
@@ -220,7 +220,7 @@ msgstr ""
 "Marque esta casilla para lanzar automáticamente el completado en cada "
 "archivo importado usando este perfil."
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:credit.statement.import,balance_check:0
 msgid ""
 "Tic that box if you want OpenERP to control the start/end balance before "
@@ -231,81 +231,81 @@ msgstr ""
 "antes de confirmar un extracto bancaria. Si no está marcada, no se realizará "
 "ningún control de saldo."
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:154
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:154
 #, python-format
 msgid "No Profile!"
 msgstr "Sin perfil"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:159
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:159
 #, python-format
 msgid "Date format is not valid."
 msgstr "El formato de fecha no es válido."
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,profile_id:0
 msgid "Import configuration parameter"
 msgstr "Parámetros de configuración de la importación"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,rec_log:0
 msgid "log"
 msgstr "registro"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:credit.statement.import:0
 msgid "Import Parameters Summary"
 msgstr "Resumen de parámetros de importación"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,balance_check:0
 msgid "Balance check"
 msgstr "Comprobar saldo"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,force_partner_on_bank:0
 msgid "Force partner on bank move"
 msgstr "Forzar empresa en el apunte bancario"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,file_name:0
 msgid "File Name"
 msgstr "Nombre del archivo"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:55
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:55
 #, python-format
 msgid "Invalid file type %s. Please use csv or xls"
 msgstr "Tipo de archivo %s no válido. Utilice por favor CSV o XLS."
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:155
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:155
 #, python-format
 msgid "You must provide a valid profile to import a bank statement!"
 msgstr "Debe introducir un perfil válido para importar un extracto bancario"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:83
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:83
 #, python-format
 msgid "Statement ID %s have been imported with %s lines."
 msgstr "El extracto con ID %s ha sido importado con %s líneas."
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,receivable_account_id:0
 msgid "Force Receivable/Payable Account"
 msgstr "Forzar cuenta a cobrar/a pagar"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:164
-#: code:addons/account_statement_base_import/parser/file_parser.py:174
-#: code:addons/account_statement_base_import/parser/file_parser.py:198
-#: code:addons/account_statement_base_import/parser/file_parser.py:208
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:164
+#: code:addons/account_move_base_import/parser/file_parser.py:174
+#: code:addons/account_move_base_import/parser/file_parser.py:198
+#: code:addons/account_move_base_import/parser/file_parser.py:208
 #, python-format
 msgid "Missing"
 msgstr "Ausente"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:account.statement.profile,import_type:0
 msgid ""
 "Choose here the method by which you want to import bank statement for this "
@@ -314,12 +314,12 @@ msgstr ""
 "Escoja aquí el método con el que quiere importar el extracto bancario para "
 "este perfil."
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:credit.statement.import:0
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:credit.statement.import,force_partner_on_bank:0
 msgid ""
 "Tic that box if you want to use the credit insitute partner in the "
diff --git a/account_move_base_import/i18n/fr.po b/account_move_base_import/i18n/fr.po
index a1418535..15407a9f 100644
--- a/account_move_base_import/i18n/fr.po
+++ b/account_move_base_import/i18n/fr.po
@@ -17,119 +17,119 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-05-22 06:49+0000\n"
 "X-Generator: Launchpad (build 17017)\n"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:credit.statement.import:0
-#: model:ir.actions.act_window,name:account_statement_base_import.statement_importer_action
+#: model:ir.actions.act_window,name:account_move_base_import.statement_importer_action
 msgid "Import statement"
 msgstr "Import de relevé"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:account.statement.profile:0
 msgid "Historical Import Logs"
 msgstr ""
 
-#. module: account_statement_base_import
-#: model:ir.model,name:account_statement_base_import.model_credit_statement_import
+#. module: account_move_base_import
+#: model:ir.model,name:account_move_base_import.model_credit_statement_import
 msgid "credit.statement.import"
 msgstr "credit.statement.import"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,input_statement:0
 msgid "Statement file"
 msgstr "Fichier à importer"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:168
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:168
 #, python-format
 msgid ""
 "Column %s you try to import is not present in the bank statement line!"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:162
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:162
 #, python-format
 msgid "Nothing to import"
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,journal_id:0
 msgid "Financial journal to use transaction"
 msgstr "Journal"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:102
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:102
 #, python-format
 msgid "Column %s not present in file"
 msgstr "Colonne %s non présente dans le fichier"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:account.statement.profile:0
-#: model:ir.ui.menu,name:account_statement_base_import.statement_importer_menu
+#: model:ir.ui.menu,name:account_move_base_import.statement_importer_menu
 msgid "Import Bank Statement"
 msgstr "Importation de relevé"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:54
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:54
 #, python-format
 msgid "User Error"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:223
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:223
 #, python-format
 msgid "The statement cannot be created: %s"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:167
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:167
 #, python-format
 msgid "Missing column!"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/parser.py:166
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/parser.py:166
 #, python-format
 msgid "No buffer file given."
 msgstr "Pas de fichier tampon donné."
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:107
-#: code:addons/account_statement_base_import/parser/file_parser.py:171
-#: code:addons/account_statement_base_import/parser/file_parser.py:205
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:107
+#: code:addons/account_move_base_import/parser/file_parser.py:171
+#: code:addons/account_move_base_import/parser/file_parser.py:205
 #, python-format
 msgid "Invalid data"
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,launch_import_completion:0
 msgid "Launch completion after import"
 msgstr "Lancer l'auto-complétion après import"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,partner_id:0
 msgid "Credit insitute partner"
 msgstr "Organisme bancaire"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:account.statement.profile:0
 msgid "Import related infos"
 msgstr "Importation des informations liées"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:163
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:163
 #, python-format
 msgid "The file is empty"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/wizard/import_statement.py:93
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/wizard/import_statement.py:93
 #, python-format
 msgid "Please use a file with an extention"
 msgstr "Veuillez sélectionner un fichier avec une extension"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:172
-#: code:addons/account_statement_base_import/parser/file_parser.py:206
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:172
+#: code:addons/account_move_base_import/parser/file_parser.py:206
 #, python-format
 msgid ""
 "Value %s of column %s is not valid.\n"
@@ -138,15 +138,15 @@ msgid ""
 " Detail: %s"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:29
-#: code:addons/account_statement_base_import/parser/generic_file_parser.py:31
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:29
+#: code:addons/account_move_base_import/parser/generic_file_parser.py:31
 #, python-format
 msgid "Please install python lib xlrd"
 msgstr "Veuillez installer la bibliothèque python xlrd"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:160
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:160
 #, python-format
 msgid ""
 " It should be YYYY-MM-DD for column: %s value: %s \n"
@@ -157,24 +157,24 @@ msgid ""
 " Detail: %s"
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,last_import_date:0
 msgid "Last Import Date"
 msgstr "Date de dernier import"
 
-#. module: account_statement_base_import
-#: model:ir.model,name:account_statement_base_import.model_account_statement_profile
+#. module: account_move_base_import
+#: model:ir.model,name:account_move_base_import.model_account_statement_profile
 msgid "Statement Profile"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:234
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:234
 #, python-format
 msgid "Statement import error"
 msgstr "Erreur d'import de relevé"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:193
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:193
 #, python-format
 msgid ""
 "Please modify the cell formatting to date format for column: %s value: %s\n"
@@ -183,25 +183,25 @@ msgid ""
 " Detail: %s"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:192
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:192
 #, python-format
 msgid "Date format is not valid"
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,import_type:0
 msgid "Type of import"
 msgstr "Type d'import"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:account.statement.profile,launch_import_completion:0
 msgid ""
 "Tic that box to automatically launch the completion on each imported file "
 "using this profile."
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:credit.statement.import,balance_check:0
 msgid ""
 "Tic that box if you want OpenERP to control the start/end balance before "
@@ -209,93 +209,93 @@ msgid ""
 "done."
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:154
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:154
 #, python-format
 msgid "No Profile!"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:159
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:159
 #, python-format
 msgid "Date format is not valid."
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,profile_id:0
 msgid "Import configuration parameter"
 msgstr "Paramètres de configuration d'import"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:account.statement.profile,rec_log:0
 msgid "log"
 msgstr "journal"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:credit.statement.import:0
 msgid "Import Parameters Summary"
 msgstr "Résumé des paramètres d'import"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,balance_check:0
 msgid "Balance check"
 msgstr "Vérification des soldes"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,force_partner_on_bank:0
 msgid "Force partner on bank move"
 msgstr "Forcer un partenaire sur la ligne du compte de banque"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,file_name:0
 msgid "File Name"
 msgstr "Nom du fichier"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:55
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:55
 #, python-format
 msgid "Invalid file type %s. Please use csv or xls"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:155
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:155
 #, python-format
 msgid "You must provide a valid profile to import a bank statement!"
 msgstr ""
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/statement.py:83
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/statement.py:83
 #, python-format
 msgid "Statement ID %s have been imported with %s lines."
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: field:credit.statement.import,receivable_account_id:0
 msgid "Force Receivable/Payable Account"
 msgstr "Forcer le compte Client/Fournisseur"
 
-#. module: account_statement_base_import
-#: code:addons/account_statement_base_import/parser/file_parser.py:164
-#: code:addons/account_statement_base_import/parser/file_parser.py:174
-#: code:addons/account_statement_base_import/parser/file_parser.py:198
-#: code:addons/account_statement_base_import/parser/file_parser.py:208
+#. module: account_move_base_import
+#: code:addons/account_move_base_import/parser/file_parser.py:164
+#: code:addons/account_move_base_import/parser/file_parser.py:174
+#: code:addons/account_move_base_import/parser/file_parser.py:198
+#: code:addons/account_move_base_import/parser/file_parser.py:208
 #, python-format
 msgid "Missing"
 msgstr ""
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:account.statement.profile,import_type:0
 msgid ""
 "Choose here the method by which you want to import bank statement for this "
 "profile."
 msgstr "Choisissez la méthode d'import de relevé pour ce profil."
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: view:credit.statement.import:0
 msgid "Cancel"
 msgstr "Annulation"
 
-#. module: account_statement_base_import
+#. module: account_move_base_import
 #: help:credit.statement.import,force_partner_on_bank:0
 msgid ""
 "Tic that box if you want to use the credit insitute partner in the "
diff --git a/account_move_base_import/models/account_journal.py b/account_move_base_import/models/account_journal.py
index b703a798..d5fbbbe6 100644
--- a/account_move_base_import/models/account_journal.py
+++ b/account_move_base_import/models/account_journal.py
@@ -17,14 +17,6 @@ class AccountJournal(models.Model):
     _name = 'account.journal'
     _inherit = ['account.journal', 'mail.thread']
 
-    def _get_import_type_selection(self):
-        """This is the method to be inherited for adding the parser"""
-        return [('generic_csvxls_so', 'Generic .csv/.xls based on SO Name')]
-
-    def __get_import_type_selection(self):
-        """ Call method which can be inherited """
-        return self._get_import_type_selection()
-
     used_for_import = fields.Boolean(
         string="Journal used for import")
 
@@ -33,7 +25,7 @@ class AccountJournal(models.Model):
         string='Commission account')
 
     import_type = fields.Selection(
-        __get_import_type_selection,
+        [('generic_csvxls_so', 'Generic .csv/.xls based on SO Name')],
         string='Type of import',
         default='generic_csvxls_so',
         required=True,
diff --git a/account_move_base_import/models/account_move.py b/account_move_base_import/models/account_move.py
index fc9bff32..b5a4a9cf 100644
--- a/account_move_base_import/models/account_move.py
+++ b/account_move_base_import/models/account_move.py
@@ -44,25 +44,6 @@ class AccountMoveCompletionRule(models.Model):
     _name = "account.move.completion.rule"
     _order = "sequence asc"
 
-    def _get_functions(self):
-        """List of available methods for rules.
-
-        Override this to add you own."""
-        return [
-            ('get_from_name_and_invoice',
-             'From line name (based on customer invoice number)'),
-            ('get_from_name_and_supplier_invoice',
-             'From line name (based on supplier invoice number)'),
-            ('get_from_name_and_partner_field',
-             'From line name (based on partner field)'),
-            ('get_from_name_and_partner_name',
-             'From line name (based on partner name)')
-        ]
-
-    def __get_functions(self):
-        """ Call method which can be inherited """
-        return self._get_functions()
-
     sequence = fields.Integer(
         string='Sequence',
         help="Lower means parsed first.")
@@ -72,9 +53,16 @@ class AccountMoveCompletionRule(models.Model):
         comodel_name='account.journal',
         rel='as_rul_st_prof_rel',
         string='Related journals')
-    function_to_call = fields.Selection(
-        __get_functions,
-        string='Method')
+    function_to_call = fields.Selection([
+        ('get_from_name_and_invoice',
+            'From line name (based on customer invoice number)'),
+        ('get_from_name_and_supplier_invoice',
+            'From line name (based on supplier invoice number)'),
+        ('get_from_name_and_partner_field',
+            'From line name (based on partner field)'),
+        ('get_from_name_and_partner_name',
+            'From line name (based on partner name)')
+        ], string='Method')
 
     def _find_invoice(self, line, inv_type):
         """Find invoice related to statement line"""
diff --git a/account_move_base_import/views/journal_view.xml b/account_move_base_import/views/journal_view.xml
index d3696218..37d17106 100644
--- a/account_move_base_import/views/journal_view.xml
+++ b/account_move_base_import/views/journal_view.xml
@@ -24,7 +24,7 @@
                         <field name="partner_id" attrs="{'required': [('used_for_import', '=', True)]}"/>
                     </group>
                     <group>
-                        <button name="%(account_statement_base_import.move_importer_action)d"
+                        <button name="%(account_move_base_import.move_importer_action)d"
                                 string="Import Bank Statement"
                                 type="action" icon="gtk-ok"
                                 colspan = "2"/>