Merge lp:~fabien-morin/unifield-server/fm-us-2619 into lp:unifield-server

[jftempo]

[Fabien MORIN (fabien-morin)]

On Monday 10 April 2017 14:54:10 you wrote:
> > + def get_excel_size_from_string(self, string):
> > + """Compute the string to get the size of it in a excel
> > + understandable value
> > + :param string: the str chain to get the excel size
> > + :return: A int instance
> > + """
> > + # this complex calculation is used to translate the
> > + # character len to an excel understandable len
> > + size = round(7*len(string)*(3/4.)+15)
>
> Please explain the heuristic here.

fixed here : http://bazaar.launchpad.net/~fabien-morin/unifield-server/fm-us-2619/revision/4318

--
Fabien MORIN
TeMPO Consulting
20, avenue de la Paix
67000 Strasbourg
France

http://www.tempo-consulting.fr
Tel : [phone]
Fax : [phone]

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_import.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_import.py	2017-02-28 16:07:39 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_import.py	2017-09-27 13:17:20 +0000
@@ -291,6 +291,9 @@
         if not context:
             context = {}
 
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         # Verify that an HQ journal exists
         journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'hq'),
                                                                         ('is_current_instance', '=', True)])
@@ -314,18 +317,20 @@
                 errors.append('Line %s, %s' % (line_index, _(msg)))
 
         # Browse all given wizard
-        for wiz in self.browse(cr, uid, ids):
-            if not wiz.file:
+        read_result = self.read(cr, uid, ids, ['file', 'filename'],
+                                context=context)
+        for wiz in read_result:
+            if not wiz['file']:
                 raise osv.except_osv(_('Error'), _('Nothing to import.'))
             # Decode file string
             fileobj = NamedTemporaryFile('w+')
-            fileobj.write(decodestring(wiz.file))
+            fileobj.write(decodestring(wiz['file']))
             # now we determine the file format
             fileobj.seek(0)
             # Read CSV file
             try:
                 reader = csv.reader(fileobj, delimiter=',', quotechar='"')
-                filename = wiz.filename or ""
+                filename = wiz['filename'] or ""
             except:
                 fileobj.close()
                 raise osv.except_osv(_('Error'), _('Problem to read given file.'))

=== modified file 'bin/addons/base/ir/ir_actions.py'
--- bin/addons/base/ir/ir_actions.py	2017-05-18 12:16:12 +0000
+++ bin/addons/base/ir/ir_actions.py	2017-09-27 13:17:20 +0000
@@ -150,7 +150,7 @@
     _name = 'ir.actions.act_window'
     _table = 'ir_act_window'
     _sequence = 'ir_actions_id_seq'
-    _order = 'name'
+    _order = 'name, id'
     _replace_exported_fields = {
         'groups_txt': [
             (['groups_id', 'Groups'], 10)

=== modified file 'bin/addons/import_data/import_data.py'
--- bin/addons/import_data/import_data.py	2016-05-24 08:44:23 +0000
+++ bin/addons/import_data/import_data.py	2017-09-27 13:17:20 +0000
@@ -46,7 +46,10 @@
 
         if data.get('parent_id', False):
             n_obj = self.pool.get('product.nomenclature')
-            parent_ids = n_obj.search(cr, uid, [('msfid', '=', data['parent_id'])], limit=1)
+            if isinstance(data['parent_id'], (int, long)):
+                parent_ids = [data['parent_id']]
+            else:
+                parent_ids = n_obj.search(cr, uid, [('msfid', '=', data['parent_id'])], limit=1)
             if parent_ids:
                 parent_id = parent_ids[0]
 

=== modified file 'bin/addons/msf_budget/wizard/wizard_budget_import.py'
--- bin/addons/msf_budget/wizard/wizard_budget_import.py	2015-08-06 14:08:20 +0000
+++ bin/addons/msf_budget/wizard/wizard_budget_import.py	2017-09-27 13:17:20 +0000
@@ -216,6 +216,9 @@
         if context is None:
             context = {}
 
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         # Prepare some values
         budgets_2be_approved = {}
         tool_obj = self.pool.get('msf.budget.tools')

=== modified file 'bin/addons/msf_doc_import/__init__.py'
--- bin/addons/msf_doc_import/__init__.py	2016-05-17 12:05:25 +0000
+++ bin/addons/msf_doc_import/__init__.py	2017-09-27 13:17:20 +0000
@@ -54,3 +54,4 @@
 import product_list
 import supplier_catalogue
 import report
+import msf_import_export

=== modified file 'bin/addons/msf_doc_import/__openerp__.py'
--- bin/addons/msf_doc_import/__openerp__.py	2017-05-22 16:04:34 +0000
+++ bin/addons/msf_doc_import/__openerp__.py	2017-09-27 13:17:20 +0000
@@ -51,6 +51,7 @@
         'view/stock_picking_import_lines_view.xml',
         'view/replenishment_rules_view.xml',
         'view/supplier_catalogue_view.xml',
+        'view/msf_import_export_view.xml',
         'wizard/wizard_import_po_line_view.xml',
         'wizard/wizard_import_fo_line.xml',
         'wizard/wizard_import_tender_line.xml',

=== modified file 'bin/addons/msf_doc_import/doc_import_report.xml'
--- bin/addons/msf_doc_import/doc_import_report.xml	2016-07-27 08:54:22 +0000
+++ bin/addons/msf_doc_import/doc_import_report.xml	2017-09-27 13:17:20 +0000
@@ -45,5 +45,16 @@
             auto="False"
             string="Import Generic template" />
 
+        <report
+            id="wizard_export_generic"
+            model="msf.import.export"
+            name="wizard.export.generic"
+            file="msf_doc_import/report/export_generic.mako"
+            report_type="webkit"
+            header="False"
+            menu="False"
+            auto="False"
+            string="Generic Export" />
+
     </data>
 </openerp>

=== added file 'bin/addons/msf_doc_import/msf_import_export.py'
--- bin/addons/msf_doc_import/msf_import_export.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/msf_import_export.py	2017-09-27 13:17:20 +0000
@@ -0,0 +1,853 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2017 MSF, TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import base64
+import time
+import threading
+import logging
+
+import pooler
+import tools
+
+from osv import fields
+from osv import osv
+from tools.translate import _
+
+from tempfile import TemporaryFile
+from lxml import etree
+from lxml.etree import XMLSyntaxError
+
+from msf_doc_import.wizard.abstract_wizard_import import ImportHeader
+from msf_doc_import.msf_import_export_conf import MODEL_DICT
+from msf_doc_import.msf_import_export_conf import MODEL_DATA_DICT
+
+MIN_COLUMN_SIZE = 40
+MAX_COLUMN_SIZE = 400
+
+MODEL_HEADER_NOT_CHECKED = ['user.access.configurator', 'hr.employee', 'hq.entries', 'msf.budget']
+
+class msf_import_export(osv.osv_memory):
+    _name = 'msf.import.export'
+    _description = 'MSF Import Export'
+    _inherit = 'abstract.wizard.import'
+
+    def _get_model_list(self, cr, uid, context=None):
+        """The list of available model depend on the menu entry selected
+        """
+        if context is None:
+            context = {}
+        domain_type = None
+        if 'domain_type' in context:
+            domain_type = context['domain_type']
+        result_list = [(key, _(value['name'])) for key, value in MODEL_DICT.items() if value['domain_type'] == domain_type]
+        return [('', '')] + sorted(result_list, key=lambda a: a[0])
+
+    _columns = {
+        'display_file_import': fields.boolean('File Import'),
+        'display_file_export': fields.boolean('File Export'),
+        'model_list_selection': fields.selection(selection=_get_model_list, string='Object to Import/Export', required=True),
+        'import_file': fields.binary('File to import .xml'),
+        'hide_download_3_entries': fields.boolean('Hide export 3 entries button'),
+        'hide_download_all_entries': fields.boolean('Hide export all entries button'),
+        'display_import_buttons': fields.boolean('Display import buttons'),
+        'csv_button': fields.boolean('Import from CSV'),
+    }
+
+    _default = {
+        'display_file_import': lambda *a: False,
+        'display_file_export': lambda *a: False,
+        'hide_download_3_entries': lambda *a: False,
+        'hide_download_all_entries': lambda *a: False,
+        'display_import_buttons': lambda *a: False,
+        'csv_button': lambda *a: False,
+    }
+
+    def get_filename(self, cr, uid, model, selection, template_only=False, context=None):
+        """Generate a filename for the import/export
+        """
+        model_obj = self.pool.get(model)
+        file_name = _(MODEL_DICT[selection]['name'])
+        file_name = file_name.replace(' ', '_')
+        if template_only:
+            file_name = _('%s_Import_Template') % file_name
+        else:
+            file_name = _('%s_Export_%s') % (file_name, time.strftime('%Y%m%d'))
+        return file_name
+
+    def generic_download(self, cr, uid, ids, template_only=False,
+            nb_lines=None, context=None):
+        """Mutualise the code of all download buttons in one place
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        wiz = self.browse(cr, uid, ids[0])
+        selection = wiz.model_list_selection
+        model = MODEL_DICT[selection]['model']
+        if selection not in MODEL_DATA_DICT:
+            raise osv.except_osv(_('Error'),
+                    _('Selection \'%s\' not found. '
+                    'Please contact the support team.') % (selection))
+
+        if 'header_list' not in MODEL_DATA_DICT[selection]:
+            raise osv.except_osv(_('Error'),
+                    _('The header_list for report \'%s\' is not'
+                    ' defined. Please contact the support team.') % (selection))
+        fields = MODEL_DATA_DICT[selection]['header_list']
+        domain = MODEL_DICT[selection].get('domain', [])
+        context['translate_selection_field'] = True
+        data = {
+            'model': model,
+            'fields': fields,
+            'nb_lines': nb_lines,
+            'template_only': template_only,
+            'domain': domain,
+            'target_filename': self.get_filename(cr, uid, model, selection, template_only),
+        }
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'wizard.export.generic',
+            'datas': data,
+            'context': context,
+        }
+
+    def download_all_entries_file(self, cr, uid, ids, context=None):
+        """Download a template filled with all datas of the modele
+        """
+        return self.generic_download(cr, uid, ids, context=context)
+
+    def download_3_entries_file(self, cr, uid, ids, context=None):
+        """Download a template filled with the first 3 lines of data
+        """
+        return self.generic_download(cr, uid, ids, nb_lines=3, context=context)
+
+    def download_template_file(self, cr, uid, ids, context=None):
+        """Download the template file (without any data)
+        """
+        return self.generic_download(cr, uid, ids, template_only=True,
+                context=context)
+
+    def get_excel_size_from_string(self, string):
+        """Compute the string to get the size of it in a excel
+        understandable value
+        :param string: the str chain to get the excel size
+        :return: A int instance
+        """
+        # this calculation is used to translate the
+        # character len to an excel understandable len
+
+        max_digit_width = 7  # For Calabri 11 which is the font used in our reports
+        conversion_factor = 3/4.  # to convert from pixel to points
+        padding = 15
+
+        # this formule partially come from readings here:
+        # http://stackoverflow.com/questions/4577546/calculating-height-width-and-ysplit-xsplit-for-open-xml-spreadsheets?answertab=votes#tab-top
+        size = round(max_digit_width*len(string)*conversion_factor+padding)
+
+        # set a max and min len for the columns to avoid ridiculus column size
+        size = min(size, MAX_COLUMN_SIZE)
+        size = max(size, MIN_COLUMN_SIZE)
+        return size
+
+    def get_child_field(self, cr, uid, field, model, fields_get_dict,
+            context=None):
+        if context is None:
+            context = {}
+        if '.' in field:
+            model_obj = self.pool.get(model)
+            if model not in fields_get_dict:
+                fields_get_res = model_obj.fields_get(cr, uid, context=context)
+                fields_get_dict[model] = fields_get_res
+            else:
+                fields_get_res = fields_get_dict[model]
+
+
+            child_field = field.split('.')[0]
+            rest = '.'.join(field.split('.')[1:])
+            if child_field == 'id':
+                return field, model
+
+            if child_field not in fields_get_res:
+                raise osv.except_osv(_('Error'),
+                        _('field \'%s\' not found for model \'%s\'. Please contact the support team.')
+                        % (child_field, model))
+
+            #if child and child !='id' and fields_get_res[child_field].get('relation'):
+            child_model = fields_get_res[child_field]['relation']
+            if child_model not in fields_get_dict:
+                model_obj = self.pool.get(child_model)
+                fields_get_res = model_obj.fields_get(cr, uid, context=context)
+                fields_get_dict[child_model] = fields_get_res
+            return self.get_child_field(cr, uid, rest, child_model, fields_get_dict,
+                    context=context)
+        else:
+            return field, model
+
+    def _get_headers(self, cr, uid, model, selection=None, field_list=None, rows=None, context=None):
+        """Generate a list of ImportHeader objects using the data that retived
+        from the field name.
+        :param model: Model of the object imported/exported
+        :param selection: requried to get the list of fields to compose the header
+        :param field_list: if known, the list of the fields to display in the
+        header can be passed
+        :param rows: Data rows to export. In case of export, the size of the
+        columns matter and can be determinied according to the data string length
+        :param context: Context of the call, this is particularly important to
+        get the language for tranlsating the fields.
+        :return: A list of ImportHeader
+        """
+        if context is None:
+            context = {}
+        headers = []
+        if not field_list:
+            field_list = MODEL_DATA_DICT[selection]['header_list']
+        model_obj = self.pool.get(model)
+
+        fields_get_dict = {}  # keep fields_get result in cache
+        fields_get_dict[model] = model_obj.fields_get(cr, uid, context=context)
+
+        for field_index, field in enumerate(field_list):
+            res = {'tech_name': field}
+            if selection and field in MODEL_DATA_DICT[selection]['required_field_list']:
+                res['required'] = True
+            child_field, child_model = self.get_child_field(cr, uid, field, model,
+                    fields_get_dict, context=context)
+            first_part = field.split('.')[0]
+            if child_field == 'id':
+                res['name'] = '%s / XMLID' % fields_get_dict[model][first_part]['string']
+            elif first_part not in fields_get_dict[model]:
+                raise osv.except_osv(_('Error'),
+                        _('field \'%s\' not found for model \'%s\'. Please contact the support team.')
+                        % (first_part, model))
+            elif first_part != child_field:
+                if child_field not in fields_get_dict[child_model]:
+                    raise osv.except_osv(_('Error'),
+                            _('field \'%s\' not found for model \'%s\'. Please contact the support team.')
+                            % (child_field, child_model))
+                res['name'] = '%s / %s' % (fields_get_dict[model][first_part]['string'],
+                        fields_get_dict[child_model][child_field]['string'])
+            else:
+                res['name'] = fields_get_dict[model][first_part]['string']
+
+
+            if child_field == 'id':
+                field_type == 'String'
+            else:
+                field_type = fields_get_dict[child_model][child_field]['type']
+            if field_type == 'boolean':
+                res['ftype'] = 'Boolean'
+            elif field_type == 'float':
+                res['ftype'] = 'Float'
+            elif field_type == 'integer':
+                res['ftype'] = 'Number'
+            else:
+                res['ftype'] = 'String'
+
+            if not rows:
+                # if no data passed, set the column size with the size of the header name
+                res['size'] = self.get_excel_size_from_string(res['name'])
+            else:
+                # automatically set the width of the column by searching for the
+                # biggest string in this column
+                all_cells_chain = [tools.ustr(x[field_index]) for x in rows]
+                res['size'] = MIN_COLUMN_SIZE
+                if all_cells_chain:
+                    longest_chain = max(all_cells_chain, key=len)
+                    if longest_chain:
+                        res['size'] = self.get_excel_size_from_string(longest_chain)
+            headers.append(ImportHeader(**res))
+        return headers
+
+    def domain_type_change(self, cr, uid, ids, model_list_selection, context=None):
+        """When the type of object to import/export change, change the buttons
+        to display or not according to the new object model
+        """
+        if context is None:
+            context = {}
+        result = {'value': {}}
+        result['value']['display_file_import'] = True
+        result['value']['display_file_export'] = True
+        if model_list_selection:
+            if model_list_selection and model_list_selection in MODEL_DATA_DICT:
+                hide_export = MODEL_DATA_DICT[model_list_selection].get('hide_export', False)
+                result['value']['display_file_export'] = not hide_export
+                hide_3 = MODEL_DATA_DICT[model_list_selection].get('hide_download_3_entries', False)
+                result['value']['hide_download_3_entries'] = hide_3
+                hide_all = MODEL_DATA_DICT[model_list_selection].get('hide_download_all_entries', False)
+                result['value']['hide_download_all_entries'] = hide_all
+                csv_button = MODEL_DATA_DICT[model_list_selection].get('csv_button', False)
+                result['value']['csv_button'] = csv_button
+            else:
+                result['value']['hide_download_3_entries'] = False
+                result['value']['hide_download_all_entries'] = False
+        return result
+
+    def file_change(self, cr, uid, obj_id, import_file, context=None):
+        """Display the import button only if a file as been selected
+        """
+        if context is None:
+            context = {}
+        result = {'value': {'display_import_buttons': False}}
+        if import_file:
+            result['value']['display_import_buttons'] = True
+        return result
+
+    def check_xml_syntax(self, cr, uid, xml_string, context=None):
+        """Try to parse the xml file and raise if there is an error
+        """
+        try:
+            file_dom = etree.fromstring(xml_string)
+        except XMLSyntaxError as e:
+            raise osv.except_osv(_('Error'), _('File structure is incorrect, '
+                'please correct. You may generate a template with the File '
+                'export functionality.'))
+
+    def test_import(self, cr, uid, ids, context=None):
+        """Warn if file structure is correct
+        """
+        if self.check_import(cr, uid, ids, context=context):
+            raise osv.except_osv(_('Info'), _('File structure is correct.'))
+
+    def check_import(self, cr, uid, ids, context=None):
+        """Verify that a file has been selected and all columns expected are
+        present
+        """
+        obj = self.read(cr, uid, ids[0])
+        if not obj['import_file']:
+            raise osv.except_osv(_('Error'), _('Nothing to import.'))
+        fileobj = TemporaryFile('w+')
+        try:
+            for wiz in self.browse(cr, uid, ids, context=context):
+                selection = wiz.model_list_selection
+                model = MODEL_DICT[selection]['model']
+                if model in MODEL_HEADER_NOT_CHECKED:
+                    continue
+                xml_string = base64.decodestring(obj['import_file'])
+                self.check_xml_syntax(cr, uid, xml_string, context=context)
+                rows, nb_rows = self.read_file(wiz, context=context)
+                head = rows.next()
+                self.check_missing_columns(cr, uid, wiz, head, context=context)
+        finally:
+            fileobj.close()
+        return True
+
+    def excel_col(self, col):
+        """Covert column number (1,2,...26,27,28...) to excel-style column label
+        letters (A,B,..Z,AA,AB,...)."""
+        quot, rem = divmod(col-1,26)
+        return self.excel_col(quot) + chr(rem+ord('A')) if col!=0 else ''
+
+    def check_missing_columns(self, cr, uid, wizard_brw, head, context=None):
+        """Check that the column names in the file match the expected property
+        names, raise if any column is missing.
+        """
+        selection = wizard_brw.model_list_selection
+        model = MODEL_DICT[selection]['model']
+        model_obj = self.pool.get(model)
+        header_columns = [head[i].data for i in range(0, len(head))]
+        missing_columns = []
+        field_list = MODEL_DATA_DICT[selection]['header_list']
+
+        fields_get_dict = {}  # keep fields_get result in cache
+        fields_get_dict[model] = model_obj.fields_get(cr, uid, context=context)
+        fields_get_res = model_obj.fields_get(cr, uid,
+                [x.split('.')[0] for x in field_list], context=context)
+        if len(field_list) != len(header_columns):
+            raise osv.except_osv(_('Info'), _('The number of column is not same ' \
+                'than expected (get %s, expected %s). Check your import file and ' \
+                'the Object to import/export.') % (len(header_columns), len(field_list)))
+
+        for field_index, field in enumerate(field_list):
+            child_field, child_model = self.get_child_field(cr, uid, field, model,
+                    fields_get_dict, context=context)
+            first_part = field.split('.')[0]
+            if child_field == 'id':
+                column_name = '%s / XMLID' % fields_get_dict[model][first_part]['string']
+            elif first_part not in fields_get_dict[model]:
+                raise osv.except_osv(_('Error'),
+                        _('field \'%s\' not found for model \'%s\'. Please contact the support team.')
+                        % (first_part, model))
+            elif first_part != child_field:
+                if child_field not in fields_get_dict[child_model]:
+                    raise osv.except_osv(_('Error'),
+                            _('field \'%s\' not found for model \'%s\'. Please contact the support team.')
+                            % (child_field, child_model))
+                column_name = '%s / %s' % (fields_get_dict[model][first_part]['string'],
+                        fields_get_dict[child_model][child_field]['string'])
+            else:
+                column_name = fields_get_dict[model][first_part]['string']
+
+            if column_name.upper() != header_columns[field_index].upper():
+                missing_columns.append(_('Column %s: get \'%s\' expected \'%s\'.')
+                        % (self.excel_col(field_index+1), header_columns[field_index], column_name))
+        if missing_columns and model not in MODEL_HEADER_NOT_CHECKED:
+            raise osv.except_osv(_('Info'), _('The following columns '
+                'are missing in the imported file:\n%s') % ',\n'.join(missing_columns))
+
+    def import_csv(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            selection = wiz.model_list_selection
+            model = MODEL_DICT[selection]['model']
+
+            if model == 'hq.entries':
+                hq_import = self.pool.get('hq.entries.import')
+                vals = {'file': wiz.import_file}
+                wizard_id = hq_import.create(cr, uid, vals, context=context)
+                self.write(cr, uid, [wiz.id], {
+                    'state': 'progress',
+                    'start_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'info_message': _('Import in progress in the specific wizard.'),
+                }, context=context)
+                res = hq_import.button_validate(cr, uid, wizard_id,
+                        context=context)
+            elif model == 'msf.budget':
+                budget_import = self.pool.get('wizard.budget.import')
+                vals = {'import_file': wiz.import_file}
+                wizard_id = budget_import.create(cr, uid, vals, context=context)
+                res = budget_import.button_import(cr, uid, wizard_id,
+                        context=context)
+
+            else:
+                raise osv.except_osv(_('Error'),
+                    _('The model \'%s\' is not made to be imported in CSV file.\n'
+                        'Please contact the support team.') % (model))
+            self.write(cr, uid, [wiz.id], {
+                'state': 'done',
+                'start_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'info_message': _('Import has been done via the specific wizard. The latter had to give information on the import.'),
+            }, context=context)
+            return res
+
+    def import_xml(self, cr, uid, ids, context=None):
+        """Create a thread to import the data after import checking
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        self.check_import(cr, uid, ids, context=context)
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            rows, nb_rows = self.read_file(wiz, context=context)
+            head = rows.next()
+            selection = wiz.model_list_selection
+            model = MODEL_DICT[selection]['model']
+
+            if model == 'user.access.configurator':
+                # special case handling for this one
+                model_obj = self.pool.get(model)
+                wizard_id = model_obj.create(cr, uid, {}, context)
+                model_obj.write(cr, uid, [wizard_id], {'file_to_import_uac':
+                    wiz.import_file}, context=context)
+                return model_obj.do_process_uac(cr, uid, [wizard_id], context=context)
+
+            expected_headers = self._get_headers(cr, uid, model, selection=selection, context=context)
+            if model not in MODEL_HEADER_NOT_CHECKED:
+                self.check_headers(head, expected_headers, context=context)
+
+            self.write(cr, uid, [wiz.id], {
+                'total_lines_to_import': nb_rows,
+                'state': 'progress',
+                'start_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'info_message': _('Import in progress, please leave this window open and press the button \'Update\' '
+                                  'to show the progression of the import. Otherwise, you can continue to use Unifield'),
+            }, context=context)
+            wiz.total_lines_to_import = nb_rows
+
+            thread = threading.Thread(
+                target=self.bg_import,
+                args=(cr.dbname, uid, wiz, expected_headers, rows, context),
+            )
+            thread.start()
+            # for now we don't want background but foreground
+            # in case background is needed, just set a value to wait time
+            wait_time = None
+            thread.join(wait_time)
+        return True
+
+    def bg_import(self, dbname, uid, import_brw, headers, rows, context=None):
+        """
+        Run the import of lines in background
+        :param dbname: Name of the database
+        :param uid: ID of the res.users that calls this method
+        :param import_brw: browse_record of a wizard.import.batch
+        :param headers: List of expected headers
+        :param rows: Iterator on file rows
+        :param context: Context of the call
+        :return: True
+        """
+        if context is None:
+            context = {}
+        cr = pooler.get_db(dbname).cursor()
+        model = MODEL_DICT[import_brw.model_list_selection]['model']
+        impobj = self.pool.get(model)
+
+        import_data_obj = self.pool.get('import_data')
+        prod_nomenclature_obj = self.pool.get('product.nomenclature')
+
+        # Manage errors
+        import_errors = {}
+
+        def save_error(errors, row_index):
+            if not isinstance(errors, list):
+                errors = [errors]
+            import_errors.setdefault(row_index+2, [])
+            import_errors[row_index+2].extend(errors)
+
+        # Manage warnings
+        import_warnings = {}
+
+        def save_warnings(warnings):
+            if not isinstance(warnings, list):
+                warnings = [warnings]
+            import_warnings.setdefault(row_index+2, [])
+            import_warnings[row_index+2].extend(warnings)
+
+        start_time = time.time()
+
+        if model == 'product.product':
+            # Create the cache
+            if not hasattr(self, '_cache'):
+                self._cache = {}
+            self._cache.setdefault(dbname, {})
+
+            if not hasattr(prod_nomenclature_obj, '_cache'):
+                prod_nomenclature_obj._cache = {}
+            prod_nomenclature_obj._cache.setdefault(dbname, {})
+
+            # Clear the cache
+            self._cache[dbname] = {'product.nomenclature': {'name': {}, 'complete_name': {}},
+                                   'product.uom': {'name': {}},
+                                   'product.asset.type': {'name': {}},
+                                   'product.international.status': {'name': {}},
+                                   }
+            # Product nomenclature
+            cr.execute('SELECT name, id FROM product_nomenclature;')
+            for nv in cr.dictfetchall():
+                self._cache[dbname]['product.nomenclature']['name'].update({nv['name']: nv['id']})
+            # Product category
+            cr.execute('SELECT id, family_id FROM product_category;')
+            for pc in cr.dictfetchall():
+                prod_nomenclature_obj._cache[dbname].update({pc['family_id']: pc['id']})
+            # Product nomenclature complete name
+            cr.execute('''SELECT id, name FROM
+(
+(SELECT
+    n0.id, n0.name AS name
+FROM product_nomenclature n0
+WHERE n0.level = 0)
+UNION
+(SELECT n1.id, n0.name ||' | '|| n1.name AS name
+FROM product_nomenclature n1
+  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
+WHERE n1.level = 1)
+UNION
+(SELECT n2.id, n0.name ||' | '|| n1.name ||' | '|| n2.name AS name
+FROM product_nomenclature n1
+  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
+  LEFT JOIN product_nomenclature n2 ON n2.parent_id = n1.id
+WHERE n2.level = 2)
+UNION
+(SELECT n3.id, n0.name ||' | '|| n1.name ||' | '|| n2.name ||' | '|| n3.name AS name
+FROM product_nomenclature n1
+  LEFT JOIN product_nomenclature n0 ON n1.parent_id = n0.id
+  LEFT JOIN product_nomenclature n2 ON n2.parent_id = n1.id
+  LEFT JOIN product_nomenclature n3 ON n3.parent_id = n2.id
+WHERE n3.level = 3)
+) AS cn''')
+            for cnv in cr.dictfetchall():
+                self._cache[dbname]['product.nomenclature']['complete_name'].update({cnv['name']: cnv['id']})
+            # Product UoM
+            cr.execute('SELECT name, id FROM product_uom;')
+            for uv in cr.dictfetchall():
+                self._cache[dbname]['product.uom']['name'].update({uv['name']: uv['id']})
+            # Asset type
+            cr.execute('SELECT name, id FROM product_asset_type;')
+            for av in cr.dictfetchall():
+                self._cache[dbname]['product.asset.type']['name'].update({av['name']: av['id']})
+            # International status
+            cr.execute('SELECT name, id FROM product_international_status;')
+            for iv in cr.dictfetchall():
+                self._cache[dbname]['product.international.status']['name'].update({iv['name']: iv['id']})
+
+        fields_def = impobj.fields_get(cr, uid, context=context)
+        i = 0
+
+        def _get_obj(header, value, fields_def):
+            list_obj = header.split('.')
+            relation = fields_def[list_obj[0]]['relation']
+            if impobj._name == 'product.product' and value in self._cache.get(dbname, {}).get(relation, {}).get(list_obj[1], {}):
+                return self._cache[dbname][relation][list_obj[1]][value]
+            new_obj = self.pool.get(relation)
+            if list_obj[1] == 'id':
+                imd_obj = self.pool.get('ir.model.data')
+
+                if '.' in value:
+                    module, xml_id = value.rsplit('.', 1)
+                else:
+                    module, xml_id = model, value
+                record_id = imd_obj._get_id(cr, uid, module, xml_id)
+                ir_model_data = imd_obj.read(cr, uid, [record_id], ['res_id'])
+                if not ir_model_data:
+                    raise ValueError('No references to %s.%s' % (module, xml_id))
+                newids = [ir_model_data[0]['res_id']]
+            else:
+                newids = new_obj.search(cr, uid, [(list_obj[1], '=', value)], limit=1)
+            if not newids:
+                # no obj
+                raise osv.except_osv(_('Warning !'), _('%s \'%s\' does not exist') % (new_obj._description, value,))
+
+            if impobj._name == 'product.product':
+                self._cache[dbname].setdefault(relation, {})
+                self._cache[dbname][relation].setdefault(list_obj[1], {})
+                self._cache[dbname][relation][list_obj[1]][value] = newids[0]
+            return newids[0]
+
+        def process_data(field, value, fields_def):
+            if value is None or field not in fields_def:
+                return
+            if '.' not in field:
+                if fields_def[field]['type'] == 'selection':
+                    if impobj == 'product.product' and self._cache[dbname].get('product.product.%s.%s' % (field, value), False):
+                        value = self._cache[dbname]['product.product.%s.%s' % (field, value)]
+                    else:
+                        for key, val in fields_def[field]['selection']:
+                            if value.lower() in [tools.ustr(key).lower(), tools.ustr(val).lower()]:
+                                value = key
+                                if impobj == 'product.product':
+                                    self._cache[dbname].setdefault('product.product.%s' % field, {})
+                                    self._cache[dbname]['product.product.%s.%s' % (field, value)] = key
+                                break
+                return value
+
+            else:
+                if fields_def[field.split('.')[0]]['type'] in 'many2one':
+                    return _get_obj(field, value, fields_def)
+
+            raise osv.except_osv(_('Warning !'), _('%s does not exist')%(value,))
+
+        i = 1
+        nb_error = 0
+        nb_succes = 0
+        nb_update_success = 0
+        col_datas = {}
+        nb_imported_lines = 0
+        header_codes = [x[3] for x in headers]
+        if import_data_obj.pre_hook.get(impobj._name):
+            # for headers mod.
+            col_datas = import_data_obj.pre_hook[impobj._name](impobj, cr, uid, header_codes, {}, col_datas)
+
+        for row_index, row in enumerate(rows):
+            res, errors, line_data = self.check_error_and_format_row(import_brw.id, row, headers, context=context)
+            if res < 0:
+                save_error(errors, row_index)
+                continue
+
+            if all(not x for x in line_data):
+                save_warnings(
+                    _('Line seemed empty, so this line was ignored')
+                )
+                continue
+
+            newo2m = False
+            delimiter = False
+            o2mdatas = {}
+            i += 1
+            data = {}
+            try:
+                if model == 'hq.entries':
+                    hq_entries_obj = self.pool.get('hq.entries.import')
+                    hq_entries_obj.update_hq_entries(cr, uid, line_data, context=context)
+                    continue
+
+                n = 0
+                line_ok = True
+                if import_data_obj.pre_hook.get(impobj._name):
+                    import_data_obj.pre_hook[impobj._name](impobj, cr, uid, header_codes, line_data, col_datas)
+
+                for n, h in enumerate(header_codes):
+                    if isinstance(line_data[n], basestring):
+                        line_data[n] = line_data[n].rstrip()
+
+                    # UFTP-327
+                    # if required reject cells with exceeded field length
+                    if 'import_data_field_max_size' in context:
+                        if h in context['import_data_field_max_size']:
+                            max_size = context['import_data_field_max_size'][h]
+                            if len(line_data[n]) > max_size:
+                                msg_tpl = "field '%s' value exceed field length of %d"
+                                msg = msg_tpl % (h , max_size, )
+                                logging.getLogger('import data').info(
+                                    'Error %s'% (msg, ))
+                                cr.rollback()
+                                error = "Line %s, row: %s, %s" % (i, n, msg, )
+                                save_error(error, row_index)
+                                nb_error += 1
+                                line_ok = False
+                                break
+
+                    if newo2m and ('.' not in h or h.split('.')[0] != newo2m or h.split('.')[1] == delimiter):
+                        data.setdefault(newo2m, []).append((0, 0, o2mdatas.copy()))
+                        o2mdatas = {}
+                        delimiter = False
+                        newo2m = False
+                    if '.' not in h:
+                        # type datetime, date, bool, int, float
+                        value = process_data(h, line_data[n], fields_def)
+                        if value is not None:
+                            data[h] = value
+                    else:
+                        points = h.split('.')
+                        if row[n] and fields_def[points[0]]['type'] == 'one2many':
+                            newo2m = points[0]
+                            delimiter = points[1]
+                            new_fields_def = self.pool.get(fields_def[newo2m]['relation']).fields_get(cr, uid, context=context)
+                            o2mdatas[points[1]] = process_data('.'.join(points[1:]), line_data[n], new_fields_def)
+                        elif fields_def[points[0]]['type'] == 'many2one':
+                            if not line_data[n]:
+                                data[points[0]] = False
+                            elif line_data[n]:
+                                data[points[0]] = _get_obj(h, line_data[n], fields_def) or False
+                        elif fields_def[points[0]]['type'] == 'many2many' and line_data[n]:
+                            data.setdefault(points[0], []).append((4, _get_obj(h, line_data[n], fields_def)))
+                if not line_ok:
+                    continue
+                if newo2m and o2mdatas:
+                    data.setdefault(newo2m, []).append((0, 0, o2mdatas.copy()))
+
+                if import_data_obj.post_hook.get(impobj._name):
+                    import_data_obj.post_hook[impobj._name](impobj, cr, uid, data, line_data, header_codes)
+
+                # Search if an object already exist. If not, create it.
+                ids_to_update = []
+
+                if impobj._name == 'product.product':
+                    # Allow to update the product, use xmlid_code or default_code
+                    if 'xmlid_code' in data:
+                        ids_to_update = impobj.search(cr, uid, [('xmlid_code',
+                            '=', data['xmlid_code'])], order='NO_ORDER')
+                    if 'default_code' in data:
+                        ids_to_update = impobj.search(cr, uid, [('default_code',
+                            '=', data['default_code'])], order='NO_ORDER')
+                elif impobj._name == 'product.nomenclature':
+                    ids_to_update = impobj.search(cr, uid, [('msfid', '=',
+                        data['msfid'])], order='NO_ORDER')
+                elif impobj._name == 'product.category':
+                    ids_to_update = impobj.search(cr, uid, [('msfid', '=',
+                        data['msfid'])], order='NO_ORDER')
+
+                if ids_to_update:
+                    #UF-2170: remove the standard price value from the list for update product case
+                    if 'standard_price' in data:
+                        del data['standard_price']
+                    impobj.write(cr, uid, ids_to_update, data)
+                    nb_update_success += 1
+
+                else:
+                    impobj.create(cr, uid, data, context={'from_import_menu': True})
+                    nb_succes += 1
+            except osv.except_osv, e:
+                logging.getLogger('import data').info('Error %s' % e.value)
+                cr.rollback()
+                save_error(e.value, row_index)
+                nb_error += 1
+            except Exception, e:
+                cr.rollback()
+                logging.getLogger('import data').info('Error %s' % e)
+                save_error(e, row_index)
+                nb_error += 1
+            else:
+                nb_imported_lines += 1
+
+            self.write(cr, uid, [import_brw.id], {'total_lines_imported': nb_imported_lines}, context=context)
+
+        warn_msg = ''
+        for line_number in sorted(import_warnings.keys()):
+            warnings = import_warnings[line_number]
+            for warn in warnings:
+                warn_msg += _('Line %s: %s') % (line, warn)
+                if not warn_msg.endswith('\n'):
+                    warn_msg += '\n'
+
+        err_msg = ''
+        for line_number in sorted(import_errors.keys()):
+            errors = import_errors[line_number]
+            for err in errors:
+                err_msg += _('Line %s: %s') % (line_number, err)
+                if not err_msg.endswith('\n'):
+                    err_msg += '\n'
+
+        if err_msg:
+            cr.rollback()
+
+        info_msg = _('''Processing of file completed in %s second(s)!
+- Total lines to import: %s
+- Total lines %s: %s %s
+- Total lines with errors: %s %s
+%s
+        ''') % (
+            str(round(time.time() - start_time, 1)),
+            import_brw.total_lines_to_import-1,
+            err_msg and _('without errors') or _('imported'),
+            nb_imported_lines,
+            warn_msg and _('(%s line(s) with warning - see warning messages below)') % (
+                len(import_warnings.keys()) or '',
+            ),
+            err_msg and len(import_errors.keys()) or 0,
+            err_msg and _('(see error messages below)'),
+            err_msg and _("no data will be imported until all the error messages are corrected") or '',
+        )
+
+        self.write(cr, uid, [import_brw.id], {
+            'error_message': err_msg,
+            'show_error': err_msg and True or False,
+            'warning_message': warn_msg,
+            'show_warning': warn_msg and True or False,
+            'info_message': info_msg,
+            'state': 'done',
+            'end_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        }, context=context)
+
+        if import_data_obj.post_load_hook.get(impobj._name):
+            import_data_obj.post_load_hook[impobj._name](impobj, cr, uid)
+
+        if impobj == 'product.product':
+            # Clear the cache
+            self._cache[dbname] = {}
+            prod_nomenclature_obj._cache[dbname] = {}
+
+
+        cr.commit()
+        cr.close()
+
+        return True
+
+msf_import_export()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_doc_import/msf_import_export_conf.py'
--- bin/addons/msf_doc_import/msf_import_export_conf.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/msf_import_export_conf.py	2017-09-27 13:17:20 +0000
@@ -0,0 +1,579 @@
+# encoding: utf-8
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2017 MSF, TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from tools.translate import _
+
+MODEL_DICT = {
+    # SUPPLY
+    'products': {
+        'name': 'Products',
+        'domain_type': 'supply',
+        'model': 'product.product',
+    },
+    'product_nomenclature': {
+        'name': 'Product Nomenclature',
+        'domain_type': 'supply',
+        'model': 'product.nomenclature',
+    },
+    'product_category': {
+        'name': 'Product Categories',
+        'domain_type': 'supply',
+        'model': 'product.category',
+    },
+    'product_list': {
+        'name': 'Products Lists',
+        'domain_type': 'supply',
+        'model': 'product.list',
+    },
+    'product_list_line': {
+        'name': 'Products Lists Lines',
+        'domain_type': 'supply',
+        'model': 'product.list.line',
+    },
+    'suppliers': {
+        'name': 'Suppliers',
+        'domain_type': 'supply',
+        'model': 'res.partner',
+        'domain': [('supplier', '=', True)],
+        },
+    'supplier_catalogues': {
+        'name': 'Supplier Catalogues',
+        'domain_type': 'supply',
+        'model': 'supplier.catalogue',
+    },
+    'supplier_catalogues_lines': {
+        'name': 'Supplier Catalogue Lines',
+        'domain_type': 'supply',
+        'model': 'supplier.catalogue.line',
+    },
+
+
+    # FINANCE
+    'gl_accounts': {
+        'name': 'GL Accounts',
+        'domain_type': 'finance',
+        'model': 'account.account'
+    },
+    'gl_journals': {
+        'name': 'GL Journals',
+        'domain_type': 'finance',
+        'model': 'account.journal'
+    },
+    'analytic_accounts': {
+        'name': 'Analytic Accounts',
+        'domain_type': 'finance',
+        'model': 'account.analytic.account'
+    },
+    'analytic_journals': {
+        'name': 'Analytic Journals',
+        'domain_type': 'finance',
+        'model': 'account.analytic.journal'
+    },
+    'employees': {
+        'name': 'Employees',
+        'domain_type': 'finance',
+        'model': 'hr.employee'
+    },
+    'hq_entries': {
+        'name': 'HQ Entries',
+        'domain_type': 'finance',
+        'model': 'hq.entries'
+    },
+    'currency_rate': {
+        'name': 'Currencies Rates',
+        'domain_type': 'finance',
+        'model': 'res.currency.rate'
+    },
+    'budget': {
+        'name': 'Budget',
+        'domain_type': 'finance',
+        'model': 'msf.budget'
+    },
+
+
+    # NON FUNCTIONNAL
+    'user_groups': {
+        'name': 'User Groups',
+        'domain_type': 'non_functionnal',
+        'model': 'res.groups'
+    },
+    'user_access': {
+        'name': 'User Access',
+        'domain_type': 'non_functionnal',
+        'model': 'user.access.configurator'
+    },
+    'record_rules': {
+        'name': 'Record Rules',
+        'domain_type': 'non_functionnal',
+        'model': 'ir.rule'
+    },
+    'access_control_list': {
+        'name': 'Access Controls List',
+        'domain_type': 'non_functionnal',
+        'model': 'ir.model.access'
+    },
+    'field_access_rules': {
+        'name': 'Field Access Rules',
+        'domain_type': 'non_functionnal',
+        'model': 'msf_field_access_rights.field_access_rule'
+    },
+    'field_access_rule_lines': {
+        'name': 'Field Access Rule Lines',
+        'domain_type': 'non_functionnal',
+        'model': 'msf_field_access_rights.field_access_rule_line'
+    },
+    'button_access_rules': {
+        'name': 'Button Access Rules',
+        'domain_type': 'non_functionnal',
+        'model': 'msf_button_access_rights.button_access_rule'
+    },
+    'window_actions': {
+        'name': 'Window Actions',
+        'domain_type': 'non_functionnal',
+        'model': 'ir.actions.act_window'
+    },
+}
+
+MODEL_DATA_DICT = {
+    # SUPPLY
+    'products': {
+        'header_list': [
+            'default_code',
+            'name',
+            'xmlid_code',
+            'old_code',
+            'type',
+            'transport_ok',
+            'subtype',
+            'asset_type_id.name',
+            'procure_method',
+            'supply_method',
+            'standard_price',
+            'volume',
+            'weight',
+            'international_status.name',
+            'state.name',
+            'active',
+            'perishable',
+            'batch_management',
+            'uom_id.name',
+            'uom_po_id.name',
+            'nomen_manda_0.name',
+            'nomen_manda_1.name',
+            'nomen_manda_2.name',
+            'nomen_manda_3.name',
+            'life_time',
+            'use_time',
+            'short_shelf_life',
+            'alert_time',
+            'heat_sensitive_item.code',
+            'cold_chain',
+            'sterilized',
+            'single_use',
+            'narcotic',
+            'justification_code_id.code',
+            'controlled_substance',
+            'closed_article',
+            'restricted_country',
+            'country_restriction',
+            'dangerous_goods',
+            'un_code',
+            'criticism',
+            'abc_class',
+            'product_catalog_path',
+            'description',
+            'description2',
+            'description_sale',
+            'description_purchase',
+            'procure_delay',
+            'property_account_income.code',
+            'property_account_expense.code',
+        ],
+        'required_field_list': [
+            'name',
+            'international_status.name',
+            'nomen_manda_0.name',
+            'nomen_manda_1.name',
+            'nomen_manda_2.name',
+            'nomen_manda_3.name',
+        ],
+        'hide_download_all_entries': True,
+    },
+    'product_nomenclature': {
+        'header_list': [
+            'level',
+            'name',
+            'type',
+            'parent_id.msfid',
+            'msfid',
+        ],
+        'required_field_list': [
+            'level',
+            'name',
+        ],
+        'hide_download_3_entries': True,
+        'hide_download_all_entries': True,
+    },
+    'product_category': {
+        'header_list': [
+            'type',
+            'property_account_expense_categ',
+            'property_account_income_categ',
+            'name',
+            'property_stock_journal',
+            'donation_expense_account',
+            'family_id',
+            'msfid',
+        ],
+        'required_field_list': [
+            'name',
+            'family_id',
+            'msfid',
+        ],
+    },
+    'product_list': {
+        'header_list': [
+            'name',
+            'type',
+            'creator',
+            'ref',
+        ],
+        'required_field_list': [
+            'name',
+            'type',
+            'creator',
+        ],
+    },
+    'product_list_line': {
+        'header_list': [
+            'list_id.name',
+            'ref',
+            'name',
+            'comment',
+        ],
+        'required_field_list': [
+            'ref',
+            'name',
+        ],
+    },
+    'suppliers': {
+        'header_list': [
+            'address.type',
+            'address.city',
+            'address.name',
+            'address.street',
+            'address.zip',
+            'address.country_id.name',
+            'address.email',
+            'property_account_payable.code',
+            'property_account_receivable.code',
+            'name',
+            'lang',
+            'partner_type',
+            'customer',
+            'supplier',
+            'property_product_pricelist_purchase.currency_id',
+            'property_product_pricelist.currency_id',
+        ],
+        'required_field_list': [
+            'property_account_payable.code',
+            'property_account_receivable.code',
+            'name',
+        ],
+    },
+    'supplier_catalogues': {
+        'header_list': [
+            'name',
+            'period_from',
+            'period_to',
+            'currency_id.name',
+            'partner_id.name',
+        ],
+        'required_field_list': [
+            'name',
+            'currency_id.name',
+            'partner_id.name',
+        ],
+    },
+    'supplier_catalogues_lines': {
+        'header_list': [
+            'catalogue_id.name',
+            'product_id.code',
+            'product_id.name',
+            'line_uom_id.name',
+            'min_qty',
+            'unit_price',
+            'rounding',
+            'min_order_qty',
+            'comment',
+        ],
+        'required_field_list': [
+            'catalogue_id.name',
+            'product_id.code',
+            'line_uom_id.name',
+            'min_qty',
+            'unit_price',
+        ],
+    },
+
+
+    # FINANCE
+    'gl_accounts': {
+        'header_list': [
+            'user_type.name',
+            'accrual_account',
+            'activation_date',
+            'code',
+            'default_destination_id.id',
+            'inactivation_date',
+            'type',
+            'name',
+            'note',
+            'type_for_register',
+            'reconcile',
+            'parent_id.code',
+            'is_not_hq_correctible',
+            'shrink_entries_for_hq',
+            'currency_revaluation',
+        ],
+        'required_field_list': [
+            'user_type.name',
+            'activation_date',
+            'code',
+            'type',
+            'name',
+            'type_for_register',
+        ],
+    },
+    'gl_journals': {
+        'header_list': [
+            'code',
+            'currency.name',
+            'default_credit_account_id.code',
+            'default_debit_account_id.code',
+            'name',
+            'type',
+            'analytic_journal_id.name',
+        ],
+        'required_field_list': [
+            'code',
+            'name',
+            'type',
+            'analytic_journal_id.name',
+        ],
+    },
+    'analytic_accounts': {
+        'header_list': [
+            'name',
+            'code',
+            'category',
+            'parent_id.code',
+            'type',
+            'date_start',
+        ],
+        'required_field_list': [
+            'name',
+            'code',
+            'category',
+            'parent_id.code',
+            'date_start',
+        ],
+    },
+    'analytic_journals': {
+        'header_list': [
+            'active',
+            'code',
+            'name',
+            'type',
+        ],
+        'required_field_list': [
+            'code',
+            'name',
+            'type',
+        ],
+    },
+    'employees': {
+        'header_list': [
+            'name',
+            'identification_id',
+            'active',
+        ],
+        'required_field_list': [
+            'name',
+            'identification_id',
+        ],
+        'hide_export': True,
+    },
+    'hq_entries': {
+        'header_list': [
+            'name',
+            'ref',
+            'document_date',
+            'date',
+            'account_id',
+            'partner_txt',
+            'amount',
+            'currency_id.name',
+            'destination_id',
+            'cost_center_id',
+            'analytic_id',
+            'free_1_id',
+            'free_2_id',
+        ],
+        'required_field_list': [
+            'name',
+            'account_id',
+            'currency_id.name',
+            'destination_id',
+            'analytic_id',
+        ],
+        'csv_button': True,
+        'hide_export': True,
+    },
+    'currency_rate': {
+        'header_list': [
+            'name',
+            'currency_id.name',
+            'rate',
+        ],
+        'required_field_list': [
+            'name',
+            'rate',
+            'currency_id.name',
+        ],
+    },
+    'budget': {
+        'header_list': [],
+        'required_field_list': [],
+        'csv_button': True,
+        'hide_export': True,
+    },
+
+
+    # NON FUNCTIONNAL
+    'user_groups': {
+        'header_list': [
+            'name',
+        ],
+        'required_field_list': [
+            'name',
+        ],
+    },
+    'user_access': {
+        'header_list': [
+        ],
+        'required_field_list': [
+        ],
+        'hide_export': True,
+    },
+    'record_rules': {
+        'header_list': [
+            'model_id.model',
+            'name',
+            'global',
+            'domain_force',
+            'perm_read',
+            'perm_write',
+            'perm_create',
+            'perm_unlink',
+        ],
+        'required_field_list': [
+            'model_id.model',
+            'name',
+        ],
+    },
+    'access_control_list': {
+        'header_list': [
+            'name',
+            'model_id.model',
+            'group_id.name',
+            'perm_read',
+            'perm_write',
+            'perm_create',
+            'perm_unlink',
+        ],
+        'required_field_list': [
+            'name',
+            'model_id.model',
+        ],
+    },
+    'field_access_rules': {
+        'header_list': [
+            'name',
+            'model_id.model',
+            'instance_level',
+            'domain_text',
+            'status',
+        ],
+        'required_field_list': [
+            'name',
+            'model_id.model',
+            'instance_level',
+        ],
+    },
+    'field_access_rule_lines': {
+        'header_list': [
+            'field_access_rule.name',
+            'field_access_rule_model_id',
+            'field.name',
+            'field_name',
+            'write_access',
+            'value_not_synchronized_on_create',
+            'value_not_synchronized_on_write',
+        ],
+        'required_field_list': [
+            'field_access_rule',
+            'field',
+        ],
+    },
+    'button_access_rules': {
+        'header_list': [
+            'model_id.model',
+            'view_id.name',
+            'label',
+            'name',
+            'group_names',
+            'type',
+        ],
+        'required_field_list': [
+            'model_id.model',
+            'view_id.name',
+            'name',
+        ],
+    },
+    'window_actions': {
+        'header_list': [
+            'name',
+            'res_model',
+            'view_type',
+            'view_id.name',
+            'domain',
+            'groups_id',
+        ],
+        'required_field_list': [
+            'name',
+            'res_model',
+            'view_type',
+        ],
+    },
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_doc_import/report/export_generic.mako'
--- bin/addons/msf_doc_import/report/export_generic.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/report/export_generic.mako	2017-09-27 13:17:20 +0000
@@ -0,0 +1,137 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+
+    <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+        <Author>MSFUser</Author>
+        <LastAuthor>MSFUser</LastAuthor>
+        <Created>2012-06-18T15:46:09Z</Created>
+        <Company>Medecins Sans Frontieres</Company>
+        <Version>11.9999</Version>
+    </DocumentProperties>
+
+    <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+        <WindowHeight>13170</WindowHeight>
+        <WindowWidth>19020</WindowWidth>
+        <WindowTopX>120</WindowTopX>
+        <WindowTopY>60</WindowTopY>
+        <ProtectStructure>False</ProtectStructure>
+        <ProtectWindows>False</ProtectWindows>
+    </ExcelWorkbook>
+
+    <Styles>
+        <Style ss:ID="header">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+            <Font ss:Bold="1" ss:Color="#000000" />
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <Protection />
+        </Style>
+        <Style ss:ID="String">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <Protection ss:Protected="0" />
+        </Style>
+        <Style ss:ID="Boolean">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <Protection ss:Protected="0" />
+        </Style>
+        <Style ss:ID="Float">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <NumberFormat ss:Format="Fixed" />
+            <Protection ss:Protected="0" />
+        </Style>
+        <Style ss:ID="Number">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <NumberFormat ss:Format="Fixed" />
+            <Protection ss:Protected="0" />
+        </Style>
+        <Style ss:ID="DateTime">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+                <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+                <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+                <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+                <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+            </Borders>
+            <NumberFormat ss:Format="Short Date" />
+            <Protection ss:Protected="0" />
+        </Style>
+    </Styles>
+
+    <ss:Worksheet ss:Name="${data.get('model_name', _('Sheet 1'))|x}" ss:Protected="0">
+
+        <Table x:FullColumns="1" x:FullRows="1">
+
+            <% rows = getRows(data['model'], data['fields'], data.get('nb_lines'), data.get('domain'), data.get('template_only', False), data['context']) %>
+            <% headers = getHeaders(data['model'], data['fields'], rows, data['context']) %>
+            % for col in headers:
+            <Column ss:AutoFitWidth="1" ss:Width="${col[2] or 70|x}" ss:StyleID="${col[1]|x}" />
+            % endfor
+
+            <Row>
+            % for col in headers:
+                <Cell ss:StyleID="header">
+                    <Data ss:Type="String">${col[0]|x}</Data>
+                </Cell>
+            % endfor
+            </Row>
+
+            % if not data.get('template_only', False):
+            % for row in rows:
+            <Row>
+                % for index, cell in enumerate(row):
+                <Cell ss:StyleID="${headers[index][1]|x}">
+                    % if headers[index][1] == 'String' and not cell:
+                        <Data ss:Type="String"></Data>
+                    % else:
+                        <Data ss:Type="String">${cell|x}</Data>
+                    % endif
+                </Cell>
+                % endfor
+            </Row>
+            % endfor
+            % endif
+        </Table>
+
+        <x:WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+            <ProtectScenarios>False</ProtectScenarios>
+            <EnableSelection>UnlockedCells</EnableSelection>
+            <AllowInsertRows />
+        </x:WorksheetOptions>
+
+    </ss:Worksheet>
+
+</Workbook>

=== modified file 'bin/addons/msf_doc_import/report/import_generic_template.mako'
--- bin/addons/msf_doc_import/report/import_generic_template.mako	2016-08-15 11:49:05 +0000
+++ bin/addons/msf_doc_import/report/import_generic_template.mako	2017-09-27 13:17:20 +0000
@@ -46,6 +46,27 @@
             </Borders>
             <Protection ss:Protected="0" />
         </Style>
+        <Style ss:ID="Boolean">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <Protection ss:Protected="0" />
+        </Style>
+        <Style ss:ID="Float">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+            <Borders>
+              <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+              <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+            </Borders>
+            <NumberFormat ss:Format="Fixed" />
+            <Protection ss:Protected="0" />
+        </Style>
         <Style ss:ID="Number">
             <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
             <Borders>

=== modified file 'bin/addons/msf_doc_import/report/import_generic_template.py'
--- bin/addons/msf_doc_import/report/import_generic_template.py	2016-07-27 09:38:38 +0000
+++ bin/addons/msf_doc_import/report/import_generic_template.py	2017-09-27 13:17:20 +0000
@@ -19,12 +19,64 @@
 #
 ##############################################################################
 
+from report import report_sxw
 from report_webkit.webkit_report import XlsWebKitParser
 
+
 XlsWebKitParser(
     'report.wizard.import.generic.template',
     'abstract.wizard.import',
     'addons/msf_doc_import/report/import_generic_template.mako',
 )
 
+
+class report_generic_export_parser(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context=None):
+        super(report_generic_export_parser, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'getHeaders': self.getHeaders,
+            'getRows': self.getRows,
+        })
+        return
+
+    def getHeaders(self, model, field_list, rows, context=None):
+        '''
+        get the column names of the table. Set the type of the column and the
+        size of it.
+        '''
+        import_export_obj = self.pool.get('msf.import.export')
+        return import_export_obj._get_headers(self.cr, self.uid, model,
+                selection=None, field_list=field_list, rows=rows, context=context)
+
+    def getRows(self, model, fields, nb_lines=None, domain=None,
+            template_only=False, context=None):
+        """
+        Return list of lines from given generic export
+        """
+        if context is None:
+            context={}
+        if template_only:
+            return []
+        if not domain:
+            domain = []
+        rows = []
+        counter = 0
+        chunk_size = 100
+        model_obj = self.pool.get(model)
+        ids = model_obj.search(self.cr, self.uid, domain, limit=nb_lines)
+        fields = [x.replace('.', '/') for x in fields]
+        for i in range(0, len(ids), chunk_size):
+            ids_chunk = ids[i:i + chunk_size]
+            counter += len(ids_chunk)
+            context['translate_selection_field'] = True
+            rows.extend(model_obj.export_data(self.cr, self.uid, ids_chunk, fields, context=context)['datas'])
+        return rows
+
+XlsWebKitParser(
+    'report.wizard.export.generic',
+    'msf.import.export',
+    'addons/msf_doc_import/report/export_generic.mako',
+    parser=report_generic_export_parser,
+)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_doc_import/view/msf_import_export_view.xml'
--- bin/addons/msf_doc_import/view/msf_import_export_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/view/msf_import_export_view.xml	2017-09-27 13:17:20 +0000
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+<data>
+
+    <record id="msf_import_export_view" model="ir.ui.view">
+        <field name="name">msf.import.export.view</field>
+        <field name="model">msf.import.export</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Import / Export">
+                <group>
+                    <field name="display_file_import" invisible="1" />
+                    <field name="display_file_export" invisible="1" />
+                    <field name="csv_button" invisible="1" />
+                    <field name="state" invisible="1" />
+                    <field name='model_list_selection' on_change="domain_type_change(model_list_selection)" />
+                </group>
+                <group col="4" colspan="4">
+                    <field name="hide_download_3_entries" invisible="1" />
+                    <field name="hide_download_all_entries" invisible="1" />
+                    <group colspan="2" col="2" name="file_import" attrs="{'invisible':[('display_file_import', '=', False)]}">
+                        <separator string="File Import" colspan="2"/>
+                        <field name="display_import_buttons" invisible="1" />
+                        <field name="import_file" colspan="4" on_change="file_change(import_file)"/>
+                        <button name="test_import" string="Test file" type="object" icon="gtk-ok" colspan="4" attrs="{'invisible':[('display_import_buttons', '=', False)]}" />
+                        <button name="import_xml" string="Run import" type="object" icon="gtk-execute" colspan="4" attrs="{'invisible': ['|', '|', ('display_import_buttons', '=', False), ('state', '!=', 'draft'), ('csv_button', '=', True)]}" />
+                        <button name="import_csv" string="Run import" type="object" icon="gtk-execute" colspan="4" attrs="{'invisible': ['|', '|', ('display_import_buttons', '=', False), ('state', '!=', 'draft'), ('csv_button', '=', False)]}" />
+                        <separator colspan="4" string="Information" />
+                        <field name="info_message" colspan="4" nolabel="1" />
+                    </group>
+                    <group colspan="2" col="2" name="file_export">
+                        <separator string="File Export" colspan="2"/>
+                        <group attrs="{'invisible':[('display_file_export', '=', False)]}">
+                            <button name="download_template_file" string="Export empty template" icon="gtk-save" help="Download template file" type="object" />
+                            <button name="download_3_entries_file" string="Export first 3 entries" type="object" icon="gtk-save" colspan="4" attrs="{'invisible':[('hide_download_3_entries', '=', True)]}"/>
+                            <button name="download_all_entries_file" string="Export all data" type="object" icon="gtk-save" colspan="4" attrs="{'invisible':[('hide_download_all_entries', '=', True)]}"/>
+                        </group>
+                    </group>
+                    <group colspan="4" attrs="{'invisible': [('show_warning', '=', False)]}">
+                        <separator colspan="4" string="Warning messages" />
+                        <field name="warning_message" nolabel="1" colspan="4" widget="full_text"/>
+                    </group>
+
+                    <group colspan="4" attrs="{'invisible': [('show_error', '=', False)]}">
+                        <separator colspan="4" string="Error messages" />
+                        <field name="error_message" nolabel="1" colspan="4" widget="full_text"/>
+                    </group>
+                </group>
+            </form>
+        </field>
+    </record>
+
+
+    <record id="msf_import_export_supply_action" model="ir.actions.act_window">
+        <field name="name">Supply</field>
+        <field name="res_model">msf.import.export</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">current</field>
+        <field name="context">{'domain_type': 'supply'}</field>
+    </record>
+
+    <record id="msf_import_export_finance_action" model="ir.actions.act_window">
+        <field name="name">Finance</field>
+        <field name="res_model">msf.import.export</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">current</field>
+        <field name="context">{'domain_type': 'finance'}</field>
+    </record>
+
+    <record id="msf_import_export_non_functional_action" model="ir.actions.act_window">
+        <field name="name">Non Functional</field>
+        <field name="res_model">msf.import.export</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">current</field>
+        <field name="context">{'domain_type': 'non_functionnal'}</field>
+    </record>
+
+    <menuitem id="msf_import_export_menu"
+              name="Import / Export"
+              parent="object_query.menu_preferences" />
+
+    <menuitem id="msf_import_export_supply_menu"
+              parent="msf_import_export_menu"
+              action="msf_import_export_supply_action" />
+
+    <menuitem id="msf_import_export_finance_menu"
+              parent="msf_import_export_menu"
+              action="msf_import_export_finance_action" />
+
+    <menuitem id="msf_import_export_non_functional_menu"
+              parent="msf_import_export_menu"
+              action="msf_import_export_non_functional_action" />
+
+
+</data>
+</openerp>

=== modified file 'bin/addons/msf_doc_import/wizard/abstract_wizard_import.py'
--- bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2017-03-20 09:49:38 +0000
+++ bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2017-09-27 13:17:20 +0000
@@ -39,7 +39,7 @@
     """
     Class used to export Header template.
     """
-    type_ok = ['String', 'Number', 'DateTime']
+    type_ok = ['String', 'Number', 'DateTime', 'Boolean', 'Float']
 
     def __new__(cls, name, ftype='String', size=70, tech_name=None, required=False):
         """
@@ -71,12 +71,12 @@
         :return: A datetime instance or False
         """
         # US:2527: accept only one format, reject other
-        date_format = [
+        accepted_date_format = [
             '%d/%m/%Y',
         ]
 
         d = False
-        for dformat in date_format:
+        for dformat in accepted_date_format:
             try:
                 d = DateTime.strptime(date_value, dformat)
                 d = d.strftime('%Y-%m-%d %H:%M:%S')
@@ -130,9 +130,24 @@
                 return (0, value, None)
             else:
                 try:
+                    if isinstance(value, basestring):
+                        value = value.rstrip().replace(',', '.')
                     return (0, float(value), None)
                 except Exception as e:
                     return (-1, value, e)
+        elif header[1] == 'Boolean':
+            if isinstance(value, bool):
+                pass
+            elif value.upper() in ('T', 'TRUE', '1'):
+                value = True
+            else:
+                value = False
+        elif header[1] == 'Number':
+            if vtype =='int':
+                try:
+                    return (0, int(value), None)
+                except Exception as e:
+                    return (-1, value, e)
 
         return (0, value, None)
 
@@ -429,9 +444,19 @@
                 len(line_content), len(headers)
             ))
 
+        # if the last comlumn(s) is(are) empty, line_content do not contain
+        # this column: len(line_content) is equal to len(headers) - number of
+        # empty columns at the end
+        if len(line_content) < len(headers):
+            # add None instead of the missing column
+            line_content += [None for x in range((len(headers) - len(line_content)))]
+
         data = []
         errors = []
         for col_index, col_value in enumerate(line_content):
+            if col_value is None:
+                data.append(None)
+                continue
             # Check data values according to expected type
             chk_res = ImportHeader.check_value(headers[col_index], col_value.data, col_value.type, context=context)
             data.append(chk_res[1])

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-09-08 15:57:28 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-09-27 13:17:20 +0000
@@ -4544,13 +4544,14 @@
 msgid "Contact Titles"
 msgstr "Titre/Position Contact"
 
-#. module: msf_button_access_rights
+#. modules: msf_button_access_rights, msf_doc_import
 #: model:ir.actions.act_window,name:msf_button_access_rights.button_access_rule_list
 #: model:ir.ui.menu,name:msf_button_access_rights.msf_button_access_rules
 #: view:ir.ui.view:0
 #: field:ir.ui.view,button_access_rules_ref:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:124
 msgid "Button Access Rules"
-msgstr "Button Access Rules"
+msgstr "Règles d'Accès de bouton"
 
 #. module: stock
 #: code:addons/stock/stock.py:1091
@@ -7005,11 +7006,6 @@
 msgid "MSF Codification"
 msgstr "Codification MSF"
 
-#. module: product_list
-#: view:product.list.line:0
-msgid "Products"
-msgstr "Products"
-
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more."
@@ -13296,12 +13292,6 @@
 msgid "Destinations"
 msgstr "Destinations"
 
-#. module: import_data
-#: selection:import_category,object:0
-#: selection:import_nomenclature,object:0
-msgid "Product Nomenclature"
-msgstr "Product Nomenclature"
-
 #. module: analytic_distribution
 #: code:addons/analytic_distribution/account_commitment.py:166
 #, python-format
@@ -15965,6 +15955,47 @@
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
+#. modules: msf_doc_import, msf_supply_doc_export
+#: code:addons/msf_doc_import/wizard/__init__.py:68
+#: code:addons/msf_doc_import/wizard/__init__.py:73
+#: code:addons/msf_doc_import/wizard/__init__.py:78
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:65
+#: report:addons/msf_supply_doc_export/report/report_real_composition_kit_xls.mako:71
+#, python-format
+msgid "Expiry Date"
+msgstr "Date d'expiration"
+
+#. modules: account, msf_outgoing, register_accounting, account_override, purchase_compare_rfq, msf_doc_import, return_claim, analytic_distribution
+#: code:addons/account/report/account_general_ledger.py:550
+#: view:account.chart:0
+#: field:account.chart,currency_id:0
+#: view:account.analytic.chart:0
+#: field:account.analytic.chart,currency_id:0
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:63
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:70
+#: field:wizard.import.po.simulation.screen,in_currency:0
+#: field:wizard.import.po.simulation.screen.line,imp_currency:0
+#: field:wizard.import.po.simulation.screen.line,in_currency:0
+#: field:wizard.simu.import.po.line,currency_id:0
+#: field:wizard.simu.import.po.line,initial_currency:0
+#: field:create.picking.move.processor,currency:0
+#: field:internal.move.processor,currency:0
+#: field:outgoing.delivery.move.processor,currency:0
+#: field:ppl.move.processor,currency:0
+#: field:return.ppl.move.processor,currency:0
+#: field:stock.move.in.processor,currency:0
+#: field:stock.move.processor,currency:0
+#: field:validate.move.processor,currency:0
+#: field:wizard.compare.rfq,currency_id:0
+#: field:account.direct.invoice.wizard,currency_id:0
+#: field:wizard.account.invoice,fake_currency_id:0
+#: field:wizard.account.invoice,virtual_currency_id:0
+#: field:claim.product.line,price_currency_claim_product_line:0
+#: field:claim.product.line,price_unit_claim_product_line:0
+#, python-format
+msgid "Currency"
+msgstr "Devise"
+
 #. module: sale
 #: help:sale.order.line,delay:0
 msgid "Number of days between the order confirmation the shipping of the products to the customer"
@@ -17377,6 +17408,7 @@
 
 #. module: msf_doc_import
 #: view:wizard.import.batch:0
+#: view:msf.import.export:0
 msgid "Warning messages"
 msgstr "Messages d'avertissement"
 
@@ -20661,9 +20693,11 @@
 msgid "IN update OUT"
 msgstr "IN update OUT"
 
-#. module: import_data
+#. modules: import_data, msf_doc_import
 #: code:addons/import_data/import_data.py:317
 #: code:addons/import_data/import_data.py:356
+#: code:addons/msf_doc_import/msf_import_export.py:499
+#: code:addons/msf_doc_import/msf_import_export.py:528
 #, python-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
@@ -24759,11 +24793,12 @@
 msgid "This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore."
 msgstr "Cet assistant validera toutes les écritures comptables pour un journal particulier et une période. Une fois validées, les écritures comptables ne peuvent plus être modifiées."
 
-#. module: msf_field_access_rights
+#. modules: msf_field_access_rights, msf_doc_import
 #: model:ir.actions.act_window,name:msf_field_access_rights.field_access_rules_list
 #: model:ir.ui.menu,name:msf_field_access_rights.msf_field_access_rules
+#: code:addons/msf_doc_import/msf_import_export_conf.py:114
 msgid "Field Access Rules"
-msgstr "Field Access Rules"
+msgstr "Règles d'Accès au Champs"
 
 #. modules: account, msf_outgoing, finance, sync_client, register_accounting, account_override, sourcing, sync_so, res_currency_functional, analytic_distribution
 #: code:addons/account/report/account_general_ledger.py:252
@@ -25725,9 +25760,10 @@
 msgid "No Period found on Invoice!"
 msgstr "Pas de Période indiquée sur la Facture!"
 
-#. module: supplier_catalogue
+#. modules: supplier_catalogue, msf_doc_import
 #: model:ir.actions.act_window,name:supplier_catalogue.action_supplier_catalogue_line_list
 #: view:supplier.catalogue.line:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:53
 msgid "Supplier catalogue lines"
 msgstr "Lignes Catalogue Fournisseur"
 
@@ -25857,6 +25893,7 @@
 
 #. module: msf_doc_import
 #: view:wizard.import.batch:0
+#: view:msf.import.export:0
 msgid "Run import"
 msgstr "Démarrer l'import"
 
@@ -29743,7 +29780,13 @@
 msgid "Total amount this customer owes you."
 msgstr "Montant Total Dû par ce Client."
 
-#. modules: tender_flow, msf_partner, account, product, base, useability_dashboard_and_menu
+#. modules: consumption_calculation, stock_override
+#: report:addons/consumption_calculation/report/report_monthly_consumption_xls.mako:70
+#: field:export.report.stock.move,name:0
+msgid "Generated on"
+msgstr "Generated on"
+
+#. modules: tender_flow, msf_partner, account, product, base, useability_dashboard_and_menu, msf_doc_import
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 #: model:ir.actions.act_window,name:base.action_partner_supplier_form
@@ -29755,6 +29798,7 @@
 #: view:tender:0
 #: field:tender,supplier_ids:0
 #: model:ir.ui.menu,name:useability_dashboard_and_menu.menu_supplier
+#: code:addons/msf_doc_import/msf_import_export_conf.py:42
 msgid "Suppliers"
 msgstr "Fournisseurs"
 
@@ -30275,11 +30319,6 @@
 msgid "Line %s. No info about given account: %s"
 msgstr "Line %s. No info about given account: %s"
 
-#. module: account_hq_entries
-#: model:ir.module.module,shortdesc:account_hq_entries.module_meta_information
-msgid "HQ Entries"
-msgstr "HQ Entries"
-
 #. module: msf_budget
 #: view:wizard.budget.summary.export:0
 msgid "Budget Summary PDF Export"
@@ -30894,6 +30933,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:308
+#: code:addons/msf_doc_import/msf_import_export.py:688
 #, python-format
 msgid "(%s line(s) with warning - see warning messages below)"
 msgstr "(%s ligne(s) avec des avertissements - voir les avertissements ci-dessous)"
@@ -32587,6 +32627,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:313
+#: code:addons/msf_doc_import/msf_import_export.py:693
 #, python-format
 msgid "no data will be imported until all the error messages are corrected"
 msgstr "aucune donnée ne sera importée tant que toutes les erreurs ne seront pas corrigées"
@@ -35506,6 +35547,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:298
+#: code:addons/msf_doc_import/msf_import_export.py:678
 #, python-format
 msgid "Processing of file completed in %s second(s)!\n"
 "- Total lines to import: %s\n"
@@ -36767,8 +36809,11 @@
 msgid "Move state"
 msgstr "Statut de la transaction "
 
-#. module: procurement_auto
+#. modules: procurement_auto, procurement, msf_doc_import
 #: field:stock.warehouse.automatic.supply.line,supply_id:0
+#: field:stock.warehouse.orderpoint.line,supply_id:0
+#: model:ir.actions.act_window,name:msf_doc_import.msf_import_export_supply_action
+#: model:ir.ui.menu,name:msf_doc_import.msf_import_export_supply_menu
 msgid "Supply"
 msgstr "Approvisionnement"
 
@@ -40027,12 +40072,14 @@
 msgid "DP execute"
 msgstr "DP execute"
 
-#. modules: msf_instance, sync_so, account_hq_entries
+#. modules: msf_instance, sync_so, account_hq_entries, account_hq_entries, msf_doc_import
 #: model:ir.actions.act_window,name:account_hq_entries.action_hq_entries_tree
 #: model:ir.model,name:account_hq_entries.model_hq_entries
 #: model:ir.ui.menu,name:account_hq_entries.menu_hq_entries
 #: view:res.company:0
 #: model:ir.model,name:sync_so.model_hq_entries
+#: model:ir.module.module,shortdesc:account_hq_entries.module_meta_information
+#: code:addons/msf_doc_import/msf_import_export_conf.py:81
 msgid "HQ Entries"
 msgstr "Ecritures HQ"
 
@@ -42744,6 +42791,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:306
+#: code:addons/msf_doc_import/msf_import_export.py:686
 #, python-format
 msgid "imported"
 msgstr "importées"
@@ -42986,6 +43034,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:306
+#: code:addons/msf_doc_import/msf_import_export.py:686
 #, python-format
 msgid "without errors"
 msgstr "sans erreurs"
@@ -48145,7 +48194,8 @@
 msgid "Report can not be edited due to missing FX rates in specific currency table %s"
 msgstr "Report can not be edited due to missing FX rates in specific currency table %s"
 
-#. module: base
+#. modules: base, msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:86
 #: model:ir.actions.act_window,name:base.ir_access_act
 #: model:ir.ui.menu,name:base.menu_ir_access_act
 msgid "Access Controls List"
@@ -50484,7 +50534,7 @@
 msgid "Followup lines"
 msgstr "Suivi des Lignes"
 
-#. modules: msf_budget, account, financing_contract, analytic_distribution
+#. modules: msf_budget, account, financing_contract, analytic_distribution, msf_doc_import
 #: view:account.analytic.account:0
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 #: view:account.analytic.account:0
@@ -50492,6 +50542,7 @@
 #: model:ir.ui.menu,name:financing_contract.menu_action_account_analytic_account_form
 #: view:account.analytic.account:0
 #: model:ir.ui.menu,name:msf_budget.menu_action_account_analytic_account_budget_form
+#: code:addons/msf_doc_import/msf_import_export_conf.py:66
 msgid "Analytic Accounts"
 msgstr "Comptes Analytiques"
 
@@ -50610,7 +50661,7 @@
 msgid "Read Access"
 msgstr "Accès Lecture"
 
-#. modules: product_nomenclature, import_data, product_asset, kit
+#. modules: product_nomenclature, import_data, product_asset, kit, msf_doc_import
 #: selection:import_data,object:0
 #: selection:import_product,object:0
 #: selection:update_product,object:0
@@ -50618,6 +50669,9 @@
 #: field:product.asset,nomenclature_description:0
 #: model:ir.model,name:product_nomenclature.model_product_nomenclature
 #: view:product.nomenclature:0
+#: selection:import_category,object:0
+#: selection:import_nomenclature,object:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:32
 msgid "Product Nomenclature"
 msgstr "Nomenclature du Produit"
 
@@ -51151,7 +51205,7 @@
 #: code:addons/msf_outgoing/wizard/validate_picking_processor.py:75
 #, python-format
 msgid "Line %s: %s"
-msgstr "Ligne %s: %s"
+msgstr "Ligne %s : %s"
 
 #. module: account_override
 #: help:account.move.line,journal_type:0
@@ -52986,11 +53040,6 @@
 msgid "Included Fields"
 msgstr "Champs Inclus"
 
-#. module: kit
-#: view:kit.mass.import:0
-msgid "Error messages"
-msgstr "Error messages"
-
 #. module: msf_partner
 #: view:res.partner:0
 msgid "Customer LT"
@@ -56414,13 +56463,14 @@
 msgid "Choose Fiscal Year"
 msgstr "Choisir l'Exercice Comptable "
 
-#. module: msf_field_access_rights
+#. modules: msf_field_access_rights, msf_doc_import
 #: model:ir.actions.act_window,name:msf_field_access_rights.field_access_rule_line_list
 #: model:ir.ui.menu,name:msf_field_access_rights.field_access_rule_line_list_menu
 #: view:msf_field_access_rights.field_access_rule:0
 #: field:msf_field_access_rights.field_access_rule,field_access_rule_line_ids:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:119
 msgid "Field Access Rule Lines"
-msgstr "Field Access Rule Lines"
+msgstr "Lignes de Règle d'Accès au Champs"
 
 #. module: analytic_distribution
 #: field:analytic.distribution.wizard,fp_line_ids:0
@@ -56584,11 +56634,12 @@
 msgid "Manually corrected"
 msgstr "Manually corrected"
 
-#. modules: account, account_mcdb
+#. modules: account, account_mcdb, msf_doc_import
 #: view:account.analytic.journal:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 #: view:account.mcdb:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:71
 msgid "Analytic Journals"
 msgstr "Journaux analytiques"
 
@@ -56652,8 +56703,10 @@
 msgid "In days"
 msgstr "En jours."
 
-#. module: msf_doc_import
+#. modules: msf_doc_import, kit
+#: view:kit.mass.import:0
 #: view:wizard.import.batch:0
+#: view:msf.import.export:0
 msgid "Error messages"
 msgstr "Messages d'erreur"
 
@@ -57560,9 +57613,10 @@
 msgid "Action to Trigger"
 msgstr "Action à Déclencher"
 
-#. module: base
+#. modules: base, msf_doc_import
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
+#: code:addons/msf_doc_import/msf_import_export_conf.py:129
 msgid "Window Actions"
 msgstr "Fenêtre Actions"
 
@@ -58838,11 +58892,6 @@
 msgid "Specific partner"
 msgstr "Partenaire spécifique"
 
-#. module: procurement
-#: field:stock.warehouse.orderpoint.line,supply_id:0
-msgid "Supply"
-msgstr "Supply"
-
 #. module: sale_override
 #: view:sale.order.line:0
 msgid "This button shouldn't be use from form view. Please use the red cross on list view."
@@ -60862,6 +60911,7 @@
 #: selection:wizard.import.batch,state:0
 #: view:automated.import.job:0
 #: selection:automated.import.job,state:0
+#: selection:msf.import.export,state:0
 #, python-format
 msgid "In progress"
 msgstr "En cours"
@@ -61119,9 +61169,10 @@
 msgid "%y - Year without century [00,99]."
 msgstr "%y - Année sans le siècle  (00 à 99)."
 
-#. module: base
+#. modules: base, msf_doc_import
 #: model:ir.actions.act_window,name:base.action_rule
 #: model:ir.ui.menu,name:base.menu_action_rule
+#: code:addons/msf_doc_import/msf_import_export_conf.py:104
 msgid "Record Rules"
 msgstr "Règles d´Enregistrement"
 
@@ -61450,6 +61501,7 @@
 #: code:addons/sale_override/sale.py:364
 #: code:addons/sale_override/sale.py:365
 #: code:addons/sale_override/sale.py:366
+#: selection:msf.import.export,state:0
 #, python-format
 msgid "Not started"
 msgstr "Non démarré"
@@ -61984,6 +62036,32 @@
 msgid "Nothing to import"
 msgstr "Rien à importer"
 
+#. modules: msf_budget, msf_homere_interface, supplier_catalogue, consumption_calculation, account_hq_entries, msf_doc_import, analytic_distribution, msf_doc_import, register_accounting
+#: code:addons/account_hq_entries/wizard/hq_entries_import.py:319
+#: code:addons/analytic_distribution/wizard/import_commitment_wizard.py:72
+#: code:addons/consumption_calculation/wizard/wizard_import_fmc.py:87
+#: code:addons/consumption_calculation/wizard/wizard_import_rac.py:85
+#: code:addons/msf_budget/wizard/wizard_budget_import.py:240
+#: code:addons/msf_doc_import/composition_kit.py:86
+#: code:addons/msf_doc_import/composition_kit.py:181
+#: code:addons/msf_doc_import/initial_stock_inventory.py:92
+#: code:addons/msf_doc_import/initial_stock_inventory.py:600
+#: code:addons/msf_doc_import/stock_cost_reevaluation.py:51
+#: code:addons/msf_doc_import/tender.py:98
+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:88
+#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:164
+#: code:addons/msf_homere_interface/wizard/hr_payroll_employee_import.py:584
+#: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:479
+#: code:addons/supplier_catalogue/supplier_catalogue.py:590
+#: code:addons/supplier_catalogue/wizard/catalogue_import_lines.py:45
+#: code:addons/msf_doc_import/account.py:196
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:254
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:785
+#: code:addons/register_accounting/wizard/wizard_register_import.py:255
+#, python-format
+msgid "Nothing to import."
+msgstr "Rien à importer"
+
 #. module: account_mcdb
 #: selection:account.mcdb,currency_choice:0
 msgid "Booking"
@@ -62406,6 +62484,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:106
+#: code:addons/msf_doc_import/msf_import_export.py:364
 #, python-format
 msgid "Import in progress, please leave this window open and press the button 'Update' to show the progression of the import. Otherwise, you can continue to use Unifield"
 msgstr "Traitement en cours, veuillez laisser cette fenêtre ouverte et cliquez sur le bouton 'Mettre à jour' pour voir la progression de l'import. Sinon, vous pouvez continuer d'utiliser Unifield"
@@ -67248,6 +67327,8 @@
 #: field:threshold.value,line_ids:0
 #: field:threshold.value,product_ids:0
 #: view:restrictive.country.setup:0
+#: view:product.list.line:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:27
 #, python-format
 msgid "Products"
 msgstr "Produits"
@@ -68849,6 +68930,8 @@
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:286
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:292
+#: code:addons/msf_doc_import/msf_import_export.py:666
+#: code:addons/msf_doc_import/msf_import_export.py:672
 #, python-format
 msgid "Line %s: %s"
 msgstr "Ligne %s : %s"
@@ -79938,6 +80021,7 @@
 #: field:automated.import.job,state:0
 #: field:export.report.inconsistencies,state:0
 #: field:export.report.stopped.products,state:0
+#: field:msf.import.export,state:0
 #: field:wizard.import.invoice.line,state:0
 msgid "State"
 msgstr "État"
@@ -80596,6 +80680,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:170
+#: code:addons/msf_doc_import/msf_import_export.py:549
 #, python-format
 msgid "Line seemed empty, so this line was ignored"
 msgstr "La ligne semblait vide, donc cette ligne a été ignorée"
@@ -80655,7 +80740,7 @@
 msgid "Send a test email"
 msgstr "Send a test email"
 
-#. modules: tender_flow, product_nomenclature, product_asset, account_override, purchase_allocation_report, register_accounting, product_expiry, procurement_cycle, return_claim, supplier_catalogue, import_data, stock_schedule, unifield_setup, stock_forecast, stock_batch_recall, order_types, msf_doc_import, purchase_followup, product, stock_override, service_purchasing, consumption_calculation, purchase_override, specific_rules, kit, sale_override, product_list, product_manufacturer, procurement_report, threshold_value, purchase, account, msf_outgoing, stock_move_tracking, product_attributes, procurement_auto, sale, transport_mgmt, procurement, sourcing, msf_audittrail, purchase_msf, stock, sync_so
+#. modules: tender_flow, product_nomenclature, product_asset, account_override, purchase_allocation_report, register_accounting, product_expiry, procurement_cycle, return_claim, supplier_catalogue, import_data, stock_schedule, unifield_setup, stock_forecast, stock_batch_recall, order_types, msf_doc_import, purchase_followup, product, stock_override, service_purchasing, consumption_calculation, purchase_override, specific_rules, kit, sale_override, product_list, product_manufacturer, procurement_report, threshold_value, purchase, account, msf_outgoing, stock_move_tracking, product_attributes, procurement_auto, sale, transport_mgmt, procurement, sourcing, msf_audittrail, purchase_msf, stock, sync_so, base
 #: field:account.analytic.line,product_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,product_id:0
@@ -80809,6 +80894,47 @@
 #: field:threshold.value.line,product_id:0
 #: model:ir.model,name:transport_mgmt.model_product_product
 #: model:ir.model,name:unifield_setup.model_product_product
+#: report:allocation.invoices.report:0
+#: selection:res.request,ref_doc1:0
+#: selection:res.request,ref_doc2:0
+#: field:product.history.consumption.product,product_id:0
+#: selection:import_category,object:0
+#: selection:import_nomenclature,object:0
+#: report:kit.report:0
+#: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:149
+#: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:158
+#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:230
+#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:241
+#: report:po.simulation.screen:0
+#: field:product.product.import.line.qty,product_id:0
+#: field:wizard.import.in.line.simulation.screen,imp_product_id:0
+#: field:wizard.import.in.line.simulation.screen,move_product_id:0
+#: field:wizard.import.po.simulation.screen.line,imp_product_id:0
+#: field:wizard.import.po.simulation.screen.line,in_product_id:0
+#: view:create.picking.move.processor:0
+#: field:create.picking.move.processor,product_id:0
+#: view:internal.move.processor:0
+#: field:internal.move.processor,product_id:0
+#: view:outgoing.delivery.move.processor:0
+#: field:outgoing.delivery.move.processor,product_id:0
+#: view:ppl.move.processor:0
+#: field:ppl.move.processor,product_id:0
+#: view:return.ppl.move.processor:0
+#: field:return.ppl.move.processor,product_id:0
+#: view:stock.move.in.processor:0
+#: field:stock.move.in.processor,product_id:0
+#: view:stock.move.processor:0
+#: field:stock.move.processor,product_id:0
+#: view:validate.move.processor:0
+#: field:validate.move.processor,product_id:0
+#: field:stock.warehouse.orderpoint.line,product_id:0
+#: view:product.where.used:0
+#: field:product.where.used,product_id:0
+#: field:standard.price.track.changes,product_id:0
+#: field:account.direct.invoice.wizard.line,product_id:0
+#: field:unconsistent.stock.report.line,product_id:0
+#: view:stock.card.wizard:0
+#: field:stock.card.wizard,product_id:0
 msgid "Product"
 msgstr "Produit"
 
@@ -80902,7 +81028,7 @@
 msgid "Select a supplier"
 msgstr "Sélectionner un fournisseur"
 
-#. modules: msf_budget, purchase, account, msf_outgoing, account_payment, purchase_override, specific_rules, sale, base, register_accounting, msf_doc_import, return_claim, stock, analytic_distribution, msf_homere_interface
+#. modules: msf_budget, purchase, account, msf_outgoing, account_payment, purchase_override, specific_rules, sale, base, register_accounting, msf_doc_import, return_claim, stock, analytic_distribution, delivery_mechanism, sales_followup, sync_client, tender_flow, sale_override, msf_tools, mission_stock, msf_homere_interface
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
 #: selection:account.subscription,state:0
@@ -80947,6 +81073,30 @@
 #: selection:stock.inventory,state:0
 #: view:stock.move:0
 #: view:stock.picking:0
+#: code:addons/delivery_mechanism/delivery_mechanism.py:1295
+#: code:addons/delivery_mechanism/delivery_mechanism.py:1315
+#: code:addons/delivery_mechanism/delivery_mechanism.py:1343
+#: code:addons/delivery_mechanism/delivery_mechanism.py:1388
+#: code:addons/mission_stock/wizard/mission_stock_wizard.py:48
+#: code:addons/mission_stock/wizard/mission_stock_wizard.py:56
+#: code:addons/msf_outgoing/msf_outgoing.py:3197
+#: view:automated.import.job:0
+#: selection:automated.import.job,state:0
+#: code:addons/sale_override/sale.py:176
+#: code:addons/sale_override/sale.py:371
+#: code:addons/sale_override/sale.py:372
+#: code:addons/sale_override/sale.py:377
+#: code:addons/sale_override/sale.py:378
+#: code:addons/sale_override/sale.py:1483
+#: code:addons/sale_override/sale.py:2035
+#: code:addons/sale_override/sale.py:2244
+#: code:addons/sale_override/sale.py:2506
+#: code:addons/sale_override/sale.py:2578
+#: view:sale.order.sourcing.progress:0
+#: selection:sale.followup.multi.wizard,state:0
+#: selection:sync.monitor,state:0
+#: selection:tender.line,line_state:0
+#: selection:msf.import.export,state:0
 #: selection:wizard.import.invoice.line,state:0
 #: selection:hr.payroll.validation,state:0
 msgid "Done"
@@ -83695,6 +83845,7 @@
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:312
+#: code:addons/msf_doc_import/msf_import_export.py:692
 #, python-format
 msgid "(see error messages below)"
 msgstr "(voir les erreurs ci-dessous)"
@@ -84421,7 +84572,7 @@
 #: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:354
 #, python-format
 msgid "Import can be run only on draft wizard."
-msgstr "L'important ne peut être effectué que sur des assistants en état 'Non démarré'"
+msgstr "L'importation ne peut être effectuée que sur des assistants en état 'Non démarré'"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -91108,6 +91259,7 @@
 #: field:local.transport.cost.report,func_currency_id:0
 #: field:local.transport.cost.report,transport_currency_id:0
 #: field:purchase.order,transport_currency_id:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:86
 #: report:allocation.invoices.report:0
 #: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:238
 #: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:245
@@ -92693,51 +92845,6 @@
 msgid "Patches marked as 'not-installed' must have an emission date"
 msgstr "Patches marked as 'not-installed' must have an emission date"
 
-#. modules: register_accounting, msf_outgoing, product_attributes, import_data, stock_override, consumption_calculation, specific_rules, kit, account_override, procurement, base, msf_doc_import
-#: report:allocation.invoices.report:0
-#: selection:res.request,ref_doc1:0
-#: selection:res.request,ref_doc2:0
-#: field:product.history.consumption.product,product_id:0
-#: selection:import_category,object:0
-#: selection:import_nomenclature,object:0
-#: report:kit.report:0
-#: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:149
-#: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:158
-#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:230
-#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:241
-#: report:po.simulation.screen:0
-#: field:product.product.import.line.qty,product_id:0
-#: field:wizard.import.in.line.simulation.screen,imp_product_id:0
-#: field:wizard.import.in.line.simulation.screen,move_product_id:0
-#: field:wizard.import.po.simulation.screen.line,imp_product_id:0
-#: field:wizard.import.po.simulation.screen.line,in_product_id:0
-#: view:create.picking.move.processor:0
-#: field:create.picking.move.processor,product_id:0
-#: view:internal.move.processor:0
-#: field:internal.move.processor,product_id:0
-#: view:outgoing.delivery.move.processor:0
-#: field:outgoing.delivery.move.processor,product_id:0
-#: view:ppl.move.processor:0
-#: field:ppl.move.processor,product_id:0
-#: view:return.ppl.move.processor:0
-#: field:return.ppl.move.processor,product_id:0
-#: view:stock.move.in.processor:0
-#: field:stock.move.in.processor,product_id:0
-#: view:stock.move.processor:0
-#: field:stock.move.processor,product_id:0
-#: view:validate.move.processor:0
-#: field:validate.move.processor,product_id:0
-#: field:stock.warehouse.orderpoint.line,product_id:0
-#: view:product.where.used:0
-#: field:product.where.used,product_id:0
-#: field:standard.price.track.changes,product_id:0
-#: field:account.direct.invoice.wizard.line,product_id:0
-#: field:unconsistent.stock.report.line,product_id:0
-#: view:stock.card.wizard:0
-#: field:stock.card.wizard,product_id:0
-msgid "Product"
-msgstr "Product"
-
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "Content and styling"
@@ -92870,7 +92977,7 @@
 msgid "SQL Constraint"
 msgstr "Contrainte SQL"
 
-#. modules: hr, base, msf_homere_interface
+#. modules: hr, base, msf_homere_interface, msf_doc_import
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 #: view:hr.employee:0
 #: field:hr.job,employee_ids:0
@@ -92880,6 +92987,7 @@
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 #: view:hr.employee:0
+#: code:addons/msf_doc_import/msf_import_export_conf.py:76
 msgid "Employees"
 msgstr "Employé(e)s"
 
@@ -95260,11 +95368,11 @@
 msgid "GRAND TOTAL"
 msgstr "GRAND TOTAL"
 
-#. module: msf_field_access_rights
+#. module: msf_field_access_right
 #: model:ir.model,name:msf_field_access_rights.model_msf_field_access_rights_field_access_rule_line
 #: view:msf_field_access_rights.field_access_rule_line:0
 msgid "Field Access Rule Line"
-msgstr "Field Access Rule Line"
+msgstr "Ligne de Règle d'Accès au Champs"
 
 #. module: account_mcdb
 #: view:account.mcdb:0
@@ -98029,6 +98137,166 @@
 msgid "Article must be used only in a properly designed programme, need a more detailed description."
 msgstr "L'article doit être uniquement utilisé dans un programme correctement construit, à besoin d'une description plus détaillée."
 
+#. module: msf_doc_import
+#: model:ir.actions.report.xml,name:msf_doc_import.wizard_export_generic
+msgid "Generic Export"
+msgstr "Export Générique"
+
+#. module: msf_doc_import
+#: field:msf.import.export,model_list_selection:0
+msgid "Object to Import/Export"
+msgstr "Objet à Importer/Exporter"
+
+#. module: msf_doc_import
+#: field:msf.import.export,import_file:0
+msgid "File to import .xml"
+msgstr "Fichier à importer .xml"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:93
+#, python-format
+msgid "%s_Import_Template"
+msgstr "%s_Modèle_d_import"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:198
+#: code:addons/msf_doc_import/msf_import_export.py:322
+#, python-format
+msgid "field '%s' not found for model '%s'. Please contact the support team."
+msgstr "champ '%s' non trouvé pour le modèle '%s'. Veuillez contacter l'équipe support."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:112
+#, python-format
+msgid "Selection '%s' not found. Please contact the support team."
+msgstr "Sélection '%s' non trouvée. Veuillez contacter l'équipe support."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:117
+#, python-format
+msgid "The header_list for report '%s' is not defined. Please contact the support team."
+msgstr "La liste des entêtes pour le rapport '%s' n'est pas définie. Veuillez contacter l'équipe support."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:264
+#, python-format
+msgid "File structure is incorrect, please correct. You may generate a template with the File export functionality."
+msgstr "La structure du fichier est incorrecte, veuillez corriger. Vous pouvez générer un modèle avec la fonctionnalité d'exportation de modèle."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:272
+#, python-format
+msgid "File structure is correct."
+msgstr "La structure du fichier est correcte."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:325
+#, python-format
+msgid "Column %s: get '%s' expected '%s'."
+msgstr "Colonne %s: reçu '%s' attendu '%s'."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:328
+#, python-format
+msgid "The following columns are missing in the imported file:\n"
+"%s"
+msgstr "Les colonnes suivantes sont manquantes dans le fichier importé :\n"
+"%s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:37
+#, python-format
+msgid "Product Categories"
+msgstr "Catégories Produit"
+
+#. module: msf_doc_import
+#: model:ir.actions.act_window,name:msf_doc_import.msf_import_export_non_functional_action
+#: model:ir.ui.menu,name:msf_doc_import.msf_import_export_non_functional_menu
+msgid "Non Functional"
+msgstr "Non Functionnel"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:48
+#, python-format
+msgid "Supplier Catalogues"
+msgstr "Catalogues Fournisseur"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+#: field:msf.import.export,display_file_import:0
+msgid "File Import"
+msgstr "Import Fichier"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+#: field:msf.import.export,display_file_export:0
+msgid "File Export"
+msgstr "Export Fichier"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+msgid "Export empty template"
+msgstr "Exporter un modèle vide"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+msgid "Export first 3 entries"
+msgstr "Exporter les 3 premières entrées"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+msgid "Export all data"
+msgstr "Exporter toutes les données"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:56
+#, python-format
+msgid "GL Accounts"
+msgstr "Comptes"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:61
+#, python-format
+msgid "GL Journals"
+msgstr "Journaux"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+msgid "Test file"
+msgstr "Tester le fichier"
+
+#. module: msf_doc_import
+#: view:msf.import.export:0
+#: view:wizard.import.batch:0
+msgid "Download template file"
+msgstr "Télécharger un fichier modèle"
+
+#. module: msf_homere_interface
+#: code:addons/msf_homere_interface/hr.py:137
+#, python-format
+msgid "Some employees have the same unique code: %s"
+msgstr "Certains employés ont le même code unique : %s"
+
+#. modules: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:86
+msgid "Currency"
+msgstr "Devise"
+
+#. modules: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:99
+msgid "User Access"
+msgstr "Accès utilisateur"
+
+#. modules: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:99
+msgid "User Groups"
+msgstr "Groupes utilisateur"
+
+#. modules: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export_conf.py:99
+msgid "Currencies Rates"
+msgstr "Taux des Devises"
+
 #. module: account
 #: code:addons/account/report/common_report_header.py:136
 #, python-format
@@ -98661,6 +98929,37 @@
 msgid "Warning, you have removed header value source location! The lines will be re-set to have 'Other Supplier' as the source location. Please check this is correct!"
 msgstr "Attention, vous avez supprimé la zone source d'en-tête! La zone source des lignes va être réinitialisée avec la valeur 'Autre Fournisseur'. Merci de vérifier leur cohérence!"
 
+#. module: msf_doc_import
+#: field:msf.import.export,csv_button:0
+msgid "Import from CSV"
+msgstr "Importer depuis un fichier CSV"
+
+#. module: msf_doc_import
+#: field:msf.import.export,display_import_buttons:0
+msgid "Display import buttons"
+msgstr "Afficher les boutons d'import"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:415
+#: code:addons/msf_doc_import/msf_import_export.py:429
+#, python-format
+msgid "Import in progress in the specific wizard."
+msgstr "Import en cours dans l'assistant spécifique."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:434
+#, python-format
+msgid "The model '%s' is not made to be imported in CSV file.\n"
+"Please contact the support team."
+msgstr "Le model '%s' n'est pas fait pour être imorté en fichier CSV.\n"
+"Veuillez contacter léquipe support."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:439
+#, python-format
+msgid "Import has been done via the specific wizard. The latter had to give information on the import."
+msgstr "L'import à été fait via l'assistant spécifique. Ce dernier à dû donnner les information concernant l'import."
+
 #. module: account_override
 #: code:addons/account_override/account.py:524
 #, python-format

=== modified file 'bin/addons/product_nomenclature/product_nomenclature.py'
--- bin/addons/product_nomenclature/product_nomenclature.py	2017-05-29 14:06:25 +0000
+++ bin/addons/product_nomenclature/product_nomenclature.py	2017-09-27 13:17:20 +0000
@@ -821,7 +821,7 @@
          4. duplication from GUI: the default code XXX is saved, then modify in the write
         '''
         # The first 2 cases: dup of default_code/xmlid_code not allow
-        if context.get('from_import_menu') or context.get('sync_update_execution', False):
+        if context.get('sync_update_execution', False):
             if not default_code or not vals.get('xmlid_code', False):
                 raise Exception, "Problem creating product: Missing xmlid_code/default_code in the data"
         if not vals.get('xmlid_code'):

=== modified file 'bin/addons/res_currency_tables/wizard/import_currencies.py'
--- bin/addons/res_currency_tables/wizard/import_currencies.py	2017-03-17 13:33:26 +0000
+++ bin/addons/res_currency_tables/wizard/import_currencies.py	2017-09-27 13:17:20 +0000
@@ -92,6 +92,10 @@
         # Some checks
         if context is None:
             context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         # Prepare some values
         currency_obj = self.pool.get('res.currency')
         currency_rate_obj = self.pool.get('res.currency.rate')

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2017-08-18 14:26:52 +0000
+++ bin/osv/orm.py	2017-09-27 13:17:20 +0000
@@ -675,10 +675,18 @@
                         elif f[i] in self._inherit_fields.keys():
                             cols = selection_field(self._inherits)
                         if cols and cols._type == 'selection' and not sync_context:
-                            sel_list = cols.selection
-                            if r and type(sel_list) == type([]):
-                                r = [x[1] for x in sel_list if r==x[0]]
-                                r = r and r[0] or False
+                            # if requested, translate the fields.selection values
+                            translated_selection = False
+                            if context.get('translate_selection_field', False) and r and f:
+                                fields_get_res = self.fields_get(cr, uid, f, context=context)
+                                if f[0] in fields_get_res and 'selection' in fields_get_res[f[0]]:
+                                    r = dict(fields_get_res[f[0]]['selection'])[r]
+                                    translated_selection = True
+                            if not translated_selection:
+                                sel_list = cols.selection
+                                if r and type(sel_list) == type([]):
+                                    r = [x[1] for x in sel_list if r==x[0]]
+                                    r = r and r[0] or False
                     if not r:
                         if f[i] in self._columns:
                             r = check_type(self._columns[f[i]]._type)