Merge lp:~mallorymarcot/unifield-server/us-1830 into lp:unifield-server

[Quentin THEURET @Amaris]

[lp:~mallorymarcot/unifield-server/us-1830]

4021. By Mallory MARCOT on 2016-11-21

US-1830 [IMP] Cannot delete manual import job in progress

4022. By Mallory MARCOT on 2016-11-22

US-1830 [IMP] CSV error report in attachment

4023. By Mallory MARCOT on 2016-11-22

US-1830 [IMP] add missing french translation

4024. By Mallory MARCOT on 2016-11-22

US-1830 [IMP] fixing encoding issue with french translation

Unmerged revisions

4024. By Mallory MARCOT on 2016-11-22

US-1830 [IMP] fixing encoding issue with french translation

4023. By Mallory MARCOT on 2016-11-22

US-1830 [IMP] add missing french translation

4022. By Mallory MARCOT on 2016-11-22

US-1830 [IMP] CSV error report in attachment

4021. By Mallory MARCOT on 2016-11-21

US-1830 [IMP] Cannot delete manual import job in progress

4020. By Mallory MARCOT on 2016-11-15

US-1830 [IMP] translate missing strings

4019. By Mallory MARCOT on 2016-11-14

US-1830 [IMP] Better warning/error messages with translations

4018. By Mallory MARCOT on 2016-11-14

US-1830 [IMP] Manual import, background import functionnality

4017. By Mallory MARCOT on 2016-11-14

US-1830 [IMP] make changes compatible with automated imports

4016. By Mallory MARCOT on 2016-11-10

US-1830 [IMP] Manual import basic functionnalities OK

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-11-21 13:32:46 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-11-22 13:43:46 +0000
@@ -6413,10 +6413,18 @@
 msgid "Either there are no moves linked to the picking or Accounting Journals are misconfigured!"
 msgstr "Soit les Journaux Comptables sont mal configurés, soit il n'y a pas de mouvement connexe à ce prélèvement !"
 
+<<<<<<< TREE
 #. modules: msf_tools, tender_flow, financing_contract, account_voucher, account_override, purchase_allocation_report, register_accounting, msf_accrual, account_msf, return_claim, res_currency_tables, procurement_request, stock_forecast, analytic, msf_doc_import, analytic_distribution, msf_order_date, account_payment, msf_homere_interface, msf_instance, purchase_override, specific_rules, kit, out_step, base, msf_budget, account_corrections, account, msf_outgoing, sale_override, sale, sales_followup, procurement, sourcing, purchase, msf_audittrail, stock
 #: view:automated.import.job:0
 #: selection:automated.import.job,state:0
 #: selection:export.report.stopped.products,state:0
+=======
+#. modules: tender_flow, financing_contract, account_voucher, account_override, purchase_allocation_report, register_accounting, msf_accrual, account_msf, return_claim, res_currency_tables, procurement_request, stock_forecast, analytic, msf_doc_import, analytic_distribution, msf_order_date, account_payment, msf_homere_interface, msf_instance, purchase_override, specific_rules, kit, out_step, base, msf_budget, account_corrections, account, msf_outgoing, sale_override, sale, sales_followup, procurement, sourcing, purchase, msf_audittrail, stock, msf_tools
+#: view:automated.import.job:0
+#: selection:automated.import.job,state:0
+#: view:manual.import.job:0
+#: selection:manual.import.job,state:0
+>>>>>>> MERGE-SOURCE
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 #: view:account.invoice:0
@@ -9951,12 +9959,14 @@
 msgid "Destinations"
 msgstr "Destinations"
 
-#. module: msf_doc_import
+#. modules: msf_doc_import, msf_tools
+#: field:automated.import.job,file_to_import:0
+#: field:manual.import.job,file_to_import:0
 #: field:stock.partial.picking,file_to_import:0
 #: view:wizard.import.po:0
 #: field:wizard.import.po,file:0
 msgid "File to import"
-msgstr "File to import"
+msgstr "Fichier à importer"
 
 #. module: analytic_distribution
 #: code:addons/analytic_distribution/account_commitment.py:137
@@ -10094,7 +10104,9 @@
 msgid "System message"
 msgstr "Message système"
 
-#. modules: register_accounting, msf_field_access_rights, consumption_calculation, kit, analytic_distribution_invoice, msf_button_access_rights, msf_doc_import, tender_flow
+#. modules: register_accounting, msf_field_access_rights, consumption_calculation, kit, analytic_distribution_invoice, msf_button_access_rights, msf_doc_import, tender_flow, msf_tools
+#: field:automated.import.job,comment:0
+#: field:manual.import.job,comment:0
 #: field:account.invoice.line,inactive_error:0
 #: field:composition.item,inactive_error:0
 #: field:msf_button_access_rights.button_access_rule,comment:0
@@ -15410,7 +15422,11 @@
 msgid "Debit Note"
 msgstr "Note de débit"
 
-#. modules: product_nomenclature, process, financing_contract, product_asset, mission_stock, return_claim, account_mcdb, supplier_catalogue, unifield_setup, analytic, report_webkit, analytic_distribution, product, reason_types_moves, account_payment, msf_homere_interface, hr, consumption_calculation, msf_instance, kit, base, procurement_report, msf_budget, sales_followup, account, msf_outgoing, resource, documents_done, sale, procurement, sourcing, product_list, object_query, stock, msf_profile
+#. modules: product_nomenclature, process, financing_contract, product_asset, mission_stock, return_claim, account_mcdb, supplier_catalogue, unifield_setup, analytic, report_webkit, analytic_distribution, product, reason_types_moves, account_payment, msf_homere_interface, hr, consumption_calculation, msf_instance, kit, base, procurement_report, msf_budget, sales_followup, account, msf_outgoing, resource, documents_done, sale, procurement, sourcing, product_list, object_query, stock, msf_profile, msf_tools
+#: field:automated.import,name:0
+#: field:automated.import.function,name:0
+#: field:automated.import.job,name:0
+#: field:manual.import.job,name:0
 #: field:account.account,name:0
 #: field:account.account.template,name:0
 #: report:account.analytic.account.inverted.balance:0
@@ -21666,7 +21682,9 @@
 msgid "Flow Stop"
 msgstr "Flux d'Arrivée"
 
-#. modules: account, res_currency_functional, sale
+#. modules: account, res_currency_functional, sale, msf_tools
+#: view:automated.import.job:0
+#: view:manual.import.job:0
 #: view:account.fiscalyear:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -32299,7 +32317,11 @@
 msgid "heat sensitive and dangerous goods"
 msgstr "produits sensibles à la chaleur et des marchandises dangereuses"
 
-#. modules: sales_followup, purchase, sale, stock_forecast, procurement, sourcing
+#. modules: sales_followup, purchase, sale, stock_forecast, procurement, sourcing, msf_tools
+#: view:automated.import.job:0
+#: selection:automated.import.job,state:0
+#: view:manual.import.job:0
+#: selection:manual.import.job,state:0
 #: selection:procurement.order,state:0
 #: view:purchase.order:0
 #: selection:sale.order.line,state:0
@@ -38909,7 +38931,9 @@
 msgid "ID of the view defined in xml file"
 msgstr "Identité de la vue défini dans le fichier XML"
 
-#. modules: msf_doc_import, consumption_calculation, procurement_request
+#. modules: msf_doc_import, consumption_calculation, procurement_request, msf_tools
+#: view:automated.import.job:0
+#: view:manual.import.job:0
 #: view:wizard.import.fmc:0
 #: view:wizard.import.rac:0
 #: view:wizard.import.fo.line:0
@@ -43888,9 +43912,15 @@
 msgid "Average monthly consumption"
 msgstr "consommation mensuelle réelle"
 
+<<<<<<< TREE
 #. modules: account_override, msf_doc_import, account, consumption_calculation, msf_tools
 #: field:automated.import.job,state:0
 #: field:export.report.stopped.products,state:0
+=======
+#. modules: account_override, msf_doc_import, account, consumption_calculation , msf_tools
+#: field:automated.import.job,state:0
+#: field:manual.import.job,state:0
+>>>>>>> MERGE-SOURCE
 #: selection:account.journal.column,field:0
 #: report:addons/account_override/report/open_invoices_xls.mako:304
 #: field:real.average.consumption,state:0
@@ -61378,7 +61408,11 @@
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#. modules: msf_budget, purchase, account, msf_outgoing, account_payment, purchase_override, specific_rules, sale, sourcing, base, stock, msf_doc_import, return_claim, analytic_distribution, register_accounting
+#. modules: msf_budget, purchase, account, msf_outgoing, account_payment, purchase_override, specific_rules, sale, sourcing, base, stock, msf_doc_import, return_claim, analytic_distribution, register_accounting, msf_tools
+#: view:automated.import.job:0
+#: selection:automated.import.job,state:0
+#: view:manual.import.job:0
+#: selection:manual.import.job,state:0
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
 #: selection:account.subscription,state:0
@@ -74778,6 +74812,7 @@
 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
 
+<<<<<<< TREE
 #. module: procurement_request
 #: code:addons/procurement_request/procurement_request.py:553
 #, python-format
@@ -75713,3 +75748,140 @@
 msgid "There is no stopped products to report"
 msgstr "Il n'y a aucun produit stoppé à afficher"
 
+=======
+#. module: msf_tools
+#: field:automated.import,function_id:0
+#: field:manual.import.job,function_id:0
+msgid "Functionality"
+msgstr "Fonctionnalité"
+
+#. module: msf_tools
+#: field:automated.import.job,end_time:0
+#: field:manual.import.job,end_time:0
+msgid "End time"
+msgstr "Terminé à"
+
+#. module: msf_tools
+#: view:automated.import.job:0
+#: selection:automated.import.job,state:0
+#: view:manual.import.job:0
+#: selection:manual.import.job,state:0
+msgid "In progress"
+msgstr "En cours"
+
+#. module: msf_tools
+#: view:manual.import.job:0
+msgid "Status of the import"
+msgstr "Etat de l'import"
+
+#. module: msf_tools
+#: view:automated.import.job:0
+#: view:manual.import.job:0
+msgid "Import job report"
+msgstr "Rapport sur l'import"
+
+#. module: msf_tools
+#: view:automated.import:0
+#: field:automated.import.job,import_id:0
+#: field:manual.import.job,import_id:0
+msgid "Automated import"
+msgstr "Import automatique"
+
+#. module: msf_tools
+#: field:automated.import.job,nb_rejected_records:0
+#: field:manual.import.job,nb_rejected_records:0
+msgid "# of rejected records"
+msgstr "Nombre d'enregistrements rejetés"
+
+#. module: msf_tools
+#: field:automated.import.job,start_time:0
+#: field:manual.import.job,start_time:0
+msgid "Start time"
+msgstr "Débuté à"
+
+#. module: msf_tools
+#: view:automated.import.job:0
+#: view:manual.import.job:0
+msgid "Process import"
+msgstr "Importer"
+
+#. module: msf_tools
+#: view:automated.import.job:0
+#: model:ir.actions.act_window,name:msf_tools.automated_import_job_action
+#: model:ir.ui.menu,name:msf_tools.automated_import_job_menu
+#: view:manual.import.job:0
+msgid "Import job reports"
+msgstr "Importer le rapport"
+
+#. module: msf_tools
+#: field:automated.import.job,file_sum:0
+#: field:manual.import.job,file_sum:0
+msgid "Check sum"
+msgstr "Somme d'intégrité"
+
+#. module: msf_tools
+#: view:automated.import.job:0
+#: view:manual.import.job:0
+msgid "Import results"
+msgstr "Résultats de l'import"
+
+#. module: msf_tools
+#: view:manual.import.job:0
+msgid "Process in background"
+msgstr "Exécuter en tâche de fond"
+
+#. module: msf_tools
+#: view:automated.import.job:0
+#: view:manual.import.job:0
+msgid "Import job requests"
+msgstr "Importer une tâche"
+
+#. module: msf_tools
+#: field:automated.import.job,filename:0
+#: field:manual.import.job,filename:0
+msgid "Name of the file to import"
+msgstr "Nom du fichier à importer"
+
+#. module: msf_tools
+#: field:automated.import.job,nb_processed_records:0
+#: field:manual.import.job,nb_processed_records:0
+msgid "# of processed records"
+msgstr "Nombre d'enregistrements exécutés"
+
+#. module: msf_tools
+#: code:addons/msf_tools/automated_import_job.py:306
+#, python-format
+msgid "All entries have been rejected , bad file format ? See the import report in attachment for further informations"
+msgstr "Toutes les entrées ont été rejeté, le fichier est-il bien formaté ? Pour plus d'informations, vous pouvez consulter le rapport en attachement."
+
+#. module: msf_tools
+#: code:addons/msf_tools/automated_import_job.py:310
+#, python-format
+msgid "Some lines has been rejected, so we did not import anything. See the import report in attachment for further informations"
+msgstr "Des enregistrements ont été rejeté, nous n'avons rien importé. Pour plus d'informations, vous pouvez consulter le rapport en attachement."
+
+#. module: msf_tools
+#: code:addons/msf_tools/automated_import_job.py:271
+#, python-format
+msgid "The input file doesn't contain any record"
+msgstr "Le fichier ne contient aucun enregistrement"
+
+#. module: msf_tools
+#: model:ir.actions.act_window,name:msf_tools.manual_import_job_action
+#: model:ir.ui.menu,name:msf_tools.manual_import_job_menu
+msgid "Manual imports"
+msgstr "Import manuel"
+
+#. module: msf_tools
+#: view:automated.import:0
+#: model:ir.actions.act_window,name:msf_tools.automated_import_action
+#: model:ir.ui.menu,name:msf_tools.automated_import_menu
+msgid "Automated imports"
+msgstr "Import automatique"
+
+#. module: msf_tools
+#: code:addons/msf_tools/manual_import_job.py:63
+#, python-format
+msgid "You cannot delete an import job which is in progress"
+msgstr "Vous ne pouvez pas supprimer un import en cours"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_tools/__init__.py'
--- bin/addons/msf_tools/__init__.py	2016-10-26 16:06:31 +0000
+++ bin/addons/msf_tools/__init__.py	2016-11-22 13:43:46 +0000
@@ -23,4 +23,7 @@
 import automated_import_function
 import automated_import
 import automated_import_job
+<<<<<<< TREE
 import report
+=======
+import manual_import_job>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_tools/__openerp__.py'
--- bin/addons/msf_tools/__openerp__.py	2016-10-26 16:06:31 +0000
+++ bin/addons/msf_tools/__openerp__.py	2016-11-22 13:43:46 +0000
@@ -38,6 +38,7 @@
         'views/automated_import_view.xml',
         'views/automated_import_function_view.xml',
         'views/automated_import_job_view.xml',
+        'views/manual_import_job_view.xml',
         'security/ir.model.access.csv',
         'report/report_stopped_products_view.xml',
         'report/report_stopped_products_report.xml',

=== modified file 'bin/addons/msf_tools/automated_import_job.py'
--- bin/addons/msf_tools/automated_import_job.py	2016-11-18 09:45:12 +0000
+++ bin/addons/msf_tools/automated_import_job.py	2016-11-22 13:43:46 +0000
@@ -23,8 +23,11 @@
 import csv
 import time
 import shutil
+import pooler
 import base64
 import hashlib
+from tempfile import NamedTemporaryFile
+from tools import ustr
 
 from osv import osv
 from osv import fields
@@ -78,7 +81,10 @@
 
         res = {}
         for job in self.browse(cr, uid, ids, context=context):
-            res[job.id] = '%s - %s' % (job.import_id.function_id.name, job.start_time or _('Not started'))
+            if self._name == 'manual.import.job':
+                res[job.id] = '%s' % (job.start_time or _('Not started'))
+            else:                
+                res[job.id] = '%s - %s' % (job.import_id.function_id.name, job.start_time or _('Not started'))
 
         return res
 
@@ -161,11 +167,14 @@
         data_obj = self.pool.get('ir.model.data')
 
         if context is None:
-            context = []
+            context = {}
 
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        if context.get('import_in_bg'):
+            cr = pooler.get_db(cr.dbname).cursor()
+
         for job in self.browse(cr, uid, ids, context=context):
             nb_rejected = 0
             nb_processed = 0
@@ -175,10 +184,15 @@
             error = None
             data64 = None
             filename = False
+            
+            self.write(cr, uid, [job.id], {'state': 'in_progress'}, context=context)
+            if context.get('import_in_bg'):
+                cr.commit()
 
             try:
-                for path in [('src_path', 'r'), ('dest_path', 'w'), ('report_path', 'w')]:
-                    import_obj.path_is_accessible(job.import_id[path[0]], path[1])
+                if self._name != 'manual.import.job':
+                    for path in [('src_path', 'r'), ('dest_path', 'w'), ('report_path', 'w')]:
+                        import_obj.path_is_accessible(job.import_id[path[0]], path[1])
             except osv.except_osv as e:
                 error = str(e)
                 # In case of manual processing, raise the error
@@ -215,11 +229,9 @@
                     }, context=context)
                     continue
             else:
-                oldest_file = open(os.path.join(job.import_id.src_path, job.filename), 'wb+')
-                oldest_file.write(base64.decodestring(job.file_to_import))
-                oldest_file.close()
                 md5 = hashlib.md5(job.file_to_import).hexdigest()
 
+<<<<<<< TREE
                 if job.file_sum != md5:
                     if self.search_exist(cr, uid, [('file_sum', '=', md5), ('id', '!=', job.id)], context=context):
                         self.write(cr, uid, [job.id], {'file_sum': md5}, context=context)
@@ -235,13 +247,46 @@
                         }
 
                 oldest_file = os.path.join(job.import_id.src_path, job.filename)
+=======
+                if self._name != 'manual.import.job':
+                    oldest_file = open(os.path.join(job.import_id.src_path, job.filename), 'wb+')
+                    oldest_file.write(base64.decodestring(job.file_to_import))
+                    oldest_file.close()
+                    oldest_file = os.path.join(job.import_id.src_path, job.filename)
+
+                    if job.file_sum != md5:
+                        if self.search(cr, uid, [('file_sum', '=', md5), ('id', '!=', job.id)], limit=1, order='NO_ORDER', context=context):
+                            self.write(cr, uid, [job.id], {'file_sum': md5}, context=context)
+                            return {
+                                'type': 'ir.actions.act_window',
+                                'res_model': self._name,
+                                'res_id': ids[0],
+                                'view_type': 'form',
+                                'view_mode': 'form,tree',
+                                'target': 'new',
+                                'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'automated_import_job_file_view')[1]],
+                                'context': context,
+                            }
+
+                else:
+                    temp_file = NamedTemporaryFile('w', suffix='.xml')
+                    temp_file.write(base64.decodestring(job.file_to_import))
+                    temp_file.flush()
+                    oldest_file = temp_file.name # temp file path
+                    
+>>>>>>> MERGE-SOURCE
                 filename = job.filename
                 data64 = base64.encodestring(job.file_to_import)
 
             # Process import
+<<<<<<< TREE
             error_message = []
             state = 'done'
+=======
+            nb_processed, nb_rejected = 0, 0
+>>>>>>> MERGE-SOURCE
             try:
+<<<<<<< TREE
                 processed, rejected, headers = getattr(
                     self.pool.get(job.import_id.function_id.model_id.model),
                     job.import_id.function_id.method_to_call
@@ -256,6 +301,63 @@
                         line_message = _('Line %s: ' % resjected_line[0])
                         line_message += resjected_line[2]
                         error_message.append(line_message)
+=======
+                if self._name == 'manual.import.job':
+                    self.write(cr, uid, [job.id], {'state': 'in_progress'}, context=context)
+                    if context.get('import_in_bg'):
+                        cr.commit()
+                    processed, rejected, headers = getattr(
+                        self.pool.get(job.function_id.model_id.model),
+                        job.function_id.method_to_call
+                    )(cr, uid, oldest_file)
+
+                    # create a report that resume rejected lines, so user can
+                    # modify his input file according to errors :
+                    report_name = job.filename[0:job.filename.rfind('.')] + '.csv' if job.filename.rfind('.') != -1 else job.filename + '.csv'
+                    report_name = "report_" + report_name
+                    report_content = ""
+                    if rejected:
+                        temp_report = NamedTemporaryFile()
+                        csv_writer = csv.writer(temp_report, delimiter=',', quotechar='"', quoting=csv.QUOTE_ALL)
+                        headers_row = [_('Line number')] + headers + [_('Error')]
+                        csv_writer.writerow(headers_row)
+                        for pl in rejected:
+                            pl_row = [pl[0]] + pl[1] + [pl[2]]
+                            csv_writer.writerow(pl_row)
+                        temp_report.seek(0)
+                        report_content = temp_report.read()
+                        temp_report.close()
+                    else:
+                        report_content = _('All records have been successfully processed')
+
+                    self.pool.get('ir.attachment').create(cr, uid, {
+                        'name': report_name,
+                        'datas_fname': filename,
+                        'description': '%s Lines' % (rejected and _('Rejected') or _('Processed')),
+                        'res_model': self._name,
+                        'res_id': job.id,
+                        'datas': base64.encodestring(report_content), 
+                    })
+                    
+                    nb_processed, nb_rejected = len(processed), len(rejected)
+                    if nb_processed == 0 and nb_rejected == 0:
+                        raise Exception(_('The input file doesn\'t contain any record'))
+                    elif nb_processed == 0:
+                        raise Exception(_('All entries have been rejected , bad file format ? See the import report in attachment for further informations'))
+                    elif nb_rejected > 0:
+                        nb_rejected += nb_processed
+                        nb_processed = 0
+                        raise Exception(_('Some lines has been rejected, so we did not import anything. See the import report in attachment for further informations'))
+                else:
+                    processed, rejected, headers = getattr(
+                        self.pool.get(job.import_id.function_id.model_id.model),
+                        job.import_id.function_id.method_to_call
+                    )(cr, uid, oldest_file)
+                    if processed:
+                        nb_processed = self.generate_file_report(cr, uid, job, processed, headers)
+                    if rejected:
+                        nb_rejected = self.generate_file_report(cr, uid, job, rejected, headers, rejected=True)
+>>>>>>> MERGE-SOURCE
 
                 self.write(cr, uid, [job.id], {
                     'filename': filename,
@@ -272,18 +374,26 @@
                 self.write(cr, uid, [job.id], {
                     'filename': False,
                     'start_time': start_time,
+<<<<<<< TREE
                     'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
                     'nb_processed_records': 0,
                     'nb_rejected_records': 0,
                     'comment': str(e),
+=======
+                    'end_time': time.strftime('%Y-%m-%d'),
+                    'nb_processed_records': nb_processed,
+                    'nb_rejected_records': nb_rejected,
+                    'comment': ustr(e),
+>>>>>>> MERGE-SOURCE
                     'file_sum': md5,
                     'file_to_import': data64,
                     'state': 'error',
                 }, context=context)
             finally:
-                move_to_process_path(filename, job.import_id.src_path, job.import_id.dest_path)
+                if self._name != 'manual.import.job':
+                    move_to_process_path(filename, job.import_id.src_path, job.import_id.dest_path)
 
-        return {
+        res = {
             'type': 'ir.actions.act_window',
             'res_model': self._name,
             'res_id': ids[0],
@@ -293,6 +403,19 @@
             'context': context,
         }
 
+        if self._name == 'manual.import.job':
+            res.update({
+                'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'manual_import_job_form_view')[1]],
+                'target': 'same',
+            })
+
+        if context.get('import_in_bg'):
+            cr.commit()
+            cr.close(True)
+            return
+
+        return res
+
 
     def generate_file_report(self, cr, uid, job_brw, data_lines, headers, rejected=False):
         """
@@ -334,7 +457,7 @@
             'name': filename,
             'datas_fname': filename,
             'description': '%s Lines' % (rejected and _('Rejected') or _('Processed')),
-            'res_model': 'automated.import.job',
+            'res_model': self._name,
             'res_id': job_brw.id,
             'datas': base64.encodestring(csvfile.read())
         })

=== added file 'bin/addons/msf_tools/manual_import_job.py'
--- bin/addons/msf_tools/manual_import_job.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/manual_import_job.py	2016-11-22 13:43:46 +0000
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2016 TeMPO Consulting, MSF
+#
+#    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 osv
+from osv import fields
+import threading
+
+from tools.translate import _
+from automated_import_job import all_files_under, move_to_process_path
+
+
+class manual_import_job(osv.osv):
+    _name = 'manual.import.job'
+    _inherit = 'automated.import.job'
+
+    _columns = {
+        'import_id': fields.many2one(
+            'automated.import',
+            string='Automated import',
+            readonly=True,
+            required=False,
+        ),
+        'file_to_import': fields.binary(
+            string='File to import',
+            required=True,
+        ),
+        'function_id': fields.many2one(
+            'automated.import.function',
+            string='Functionality',
+            required=True,
+        ),
+    }
+
+    _order = "name desc"
+
+
+    def unlink(self, cr, uid, ids, context=None):
+        '''
+        method called when user wants to delete import
+        '''
+        # do not delete a job which is in progress:
+        for job_id in ids:
+            job_state = self.read(cr, uid, [job_id], ['state'], context=context)[0]['state']
+            if job_state == 'in_progress':
+                raise osv.except_osv(_('Error'), _('You cannot delete an import job which is in progress'))
+
+        return super(manual_import_job, self).unlink(cr, uid, ids, context=context)
+
+
+    def process_import_bg(self, cr, uid, ids, context=None):
+        """
+        Method called when user click on button 'import in background' in Manual imports
+        Create a new thread that process import in background
+        """
+        data_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
+
+        context.update({'import_in_bg': True})
+
+        cr.commit()
+        new_thread = threading.Thread(
+            target=self.process_import,
+            args=(cr, uid, ids, context)
+        )
+        new_thread.start()
+
+        res = {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'res_id': ids[0],
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'manual_import_job_info_view')[1]],
+            'target': 'same',
+            'context': context,
+        }
+
+        return res
+
+
+manual_import_job()
\ No newline at end of file

=== added file 'bin/addons/msf_tools/views/manual_import_job_view.xml'
--- bin/addons/msf_tools/views/manual_import_job_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/views/manual_import_job_view.xml	2016-11-22 13:43:46 +0000
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <record id="manual_import_job_search_view" model="ir.ui.view">
+            <field name="name">manual.import.job.search.view</field>
+            <field name="model">manual.import.job</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Import job requests">
+                    <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state', '=', 'draft')]" help="Draft jobs" /> 
+                    <filter icon="terp-gnome-cpu-frequency-applet+" string="In progress" name="in_progress" domain="[('state', '=', 'in_progress')]" help="In progress jobs" /> 
+                    <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state', '=', 'done')]" help="Done jobs" /> 
+                    <filter icon="terp-emblem-important" string="Exception" name="exceptions" domain="[('state', '=', 'error')]" help="Jobs with error" /> 
+                    <separator orientation="vertical" />
+                    <field name="name" />
+                    <field name="function_id" />
+                </search>
+            </field>
+        </record>
+
+        <record id="manual_import_job_tree_view" model="ir.ui.view">
+            <field name="name">manual.import.job.tree.view</field>
+            <field name="model">manual.import.job</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Import job reports">
+                    <field name="name" />
+                    <field name="function_id" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="manual_import_job_form_view" model="ir.ui.view">
+            <field name="name">manual.import.job.form.view</field>
+            <field name="model">manual.import.job</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import job report">
+                    <separator colspan="4" string="Import file" />
+                    <field name="file_to_import" filename="filename" required="1" />
+                    <field name="function_id" required="1" widget="selection" attrs="{'readonly': [('state', 'in', ['done', 'error'])]}" />
+                    <field name="filename" invisible="1" />
+                    <group colspan="4" states='done,error'>
+                        <separator colspan="4" string="Import results" />
+                        <field name="nb_processed_records" />
+                        <field name="nb_rejected_records" />
+                        <field name="start_time" />
+                        <field name="end_time" />
+                        <field name="comment" colspan="4" />
+                        <separator colspan="4" string="States" />
+                    </group>
+                    <field name="state" />
+                    <button name="process_import" type="object" states="draft" string="Process import" icon="gtk-execute" />
+                    <button name="process_import_bg" type="object" states="draft" string="Process in background" icon="gtk-execute" />
+                </form>
+            </field>
+        </record>
+
+        <record id="manual_import_job_info_view" model="ir.ui.view">
+            <field name="name">manual.import.job.info.view</field>
+            <field name="model">manual.import.job</field>
+            <field name="type">form</field>
+            <field name="priority" eval="99" />
+            <field name="arch" type="xml">
+                <form string="Status of the import" hide_new_button="1" hide_delete_button="1">
+                    <label> </label>                                                
+                    <group colspan="2" col="2">                                     
+                        <html>                                                      
+                            <div style="align: center">                             
+                                <p style="font-size:14px;align:center">             
+                                    Your import demand will be treated quickly.<br />
+                                </p>                                                
+                                <p style="font-size:14px;align:center">             
+                                    You can check the state of your import in menu TOOLS > Manual imports.<br />
+                                </p>                                                                                            
+                            </div>                                                  
+                        </html>                                                     
+                    </group>                                                        
+                    <label> </label>                                                
+                </form>
+            </field>
+        </record>
+
+        <record id="manual_import_job_action" model="ir.actions.act_window">
+            <field name="name">Manual imports</field>
+            <field name="res_model">manual.import.job</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="manual_import_job_menu"
+            action="manual_import_job_action"
+            parent="object_query.menu_preferences" />
+
+    </data>
+</openerp>