Merge lp:~unifield-team/unifield-server/us-792-v2 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/ir/ir_translation.py'
--- bin/addons/base/ir/ir_translation.py	2016-01-25 10:54:33 +0000
+++ bin/addons/base/ir/ir_translation.py	2016-08-18 14:00:36 +0000
@@ -182,6 +182,7 @@
             return u''
         if isinstance(types, basestring):
             types = (types,)
+
         if source:
             query = """SELECT value
                        FROM ir_translation
 
=== modified file 'bin/addons/msf_doc_import/__openerp__.py'
--- bin/addons/msf_doc_import/__openerp__.py	2016-05-17 12:05:25 +0000
+++ bin/addons/msf_doc_import/__openerp__.py	2016-08-18 14:00:36 +0000
@@ -74,7 +74,8 @@
         'workflow/sale_workflow.xml',
         'workflow/tender_flow_workflow.xml',
         'workflow/procurement_request_workflow.xml',
-        'doc_import_report.xml'
+        'doc_import_report.xml',
+        'wizard/wizard_import_batch_view.xml',
     ],
     "demo_xml": [],
     "test": [
 
=== modified file 'bin/addons/msf_doc_import/doc_import_report.xml'
--- bin/addons/msf_doc_import/doc_import_report.xml	2014-01-15 10:47:43 +0000
+++ bin/addons/msf_doc_import/doc_import_report.xml	2016-08-18 14:00:36 +0000
@@ -34,5 +34,16 @@
             auto="False"
             string="PO Simulation screen" />
 
+        <report
+            id="report_wizard_import_generic_template"
+            model="abstract.wizard.import"
+            name="wizard.import.generic.template"
+            file="msf_doc_import/report/import_generic_template.mako"
+            report_type="webkit"
+            header="False"
+            menu="False"
+            auto="False"
+            string="Import Generic template" />
+
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_doc_import/report/__init__.py'
--- bin/addons/msf_doc_import/report/__init__.py	2014-01-15 10:47:43 +0000
+++ bin/addons/msf_doc_import/report/__init__.py	2016-08-18 14:00:36 +0000
@@ -22,3 +22,5 @@
 import in_simulation_screen_report_xls
 import po_simulation_screen_report
 import po_simulation_screen_report_xls
+
+import import_generic_template
 \ No newline at end of file
 
=== added file 'bin/addons/msf_doc_import/report/import_generic_template.mako'
--- bin/addons/msf_doc_import/report/import_generic_template.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/report/import_generic_template.mako	2016-08-18 14:00:36 +0000
@@ -0,0 +1,104 @@
+<?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="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">
+
+        % for col in data.get('header_columns', []):
+            <Column ss:AutoFitWidth="1" ss:Width="${col[2] or 70|x}" ss:StyleID="${col[1]|x}" />
+        % endfor
+
+            <Row>
+            % for col in data.get('header_columns', []):
+                <Cell ss:StyleID="header">
+                    <Data ss:Type="String">${col[0]}</Data>
+                </Cell>
+            % endfor
+            </Row>
+
+            <Row>
+            % for col in data.get('header_columns', []):
+                <Cell ss:StyleID="${col[1]|x}" />
+            % endfor
+            </Row>
+        </Table>
+        
+        <x:WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+            <ProtectScenarios>False</ProtectScenarios>
+            <EnableSelection>UnlockedCells</EnableSelection>
+            <AllowInsertRows />
+        </x:WorksheetOptions>
+
+    </ss:Worksheet>
+
+</Workbook>
 
=== added file 'bin/addons/msf_doc_import/report/import_generic_template.py'
--- bin/addons/msf_doc_import/report/import_generic_template.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/report/import_generic_template.py	2016-08-18 14:00:36 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 MSF, TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from report_webkit.webkit_report import XlsWebKitParser
+
+XlsWebKitParser(
+    'report.wizard.import.generic.template',
+    'abstract.wizard.import',
+    'addons/msf_doc_import/report/import_generic_template.mako',
+)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/addons/msf_doc_import/wizard/__init__.py'
--- bin/addons/msf_doc_import/wizard/__init__.py	2016-05-17 12:05:25 +0000
+++ bin/addons/msf_doc_import/wizard/__init__.py	2016-08-18 14:00:36 +0000
@@ -137,3 +137,6 @@
 import wizard_import_supplier_catalogue
 import wizard_po_simulation_screen
 import wizard_in_simulation_screen
+
+import abstract_wizard_import
+import wizard_import_batch
 
=== added file 'bin/addons/msf_doc_import/wizard/abstract_wizard_import.py'
--- bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/wizard/abstract_wizard_import.py	2016-08-18 14:00:36 +0000
@@ -0,0 +1,457 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 MSF, TeMPO Consulting.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import base64
+import string
+
+from mx import DateTime
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
+
+
+class UnifieldImportException(Exception):
+    pass
+
+
+class ImportHeader(object):
+    """
+    Class used to export Header template.
+    """
+    type_ok = ['String', 'Number', 'DateTime']
+
+    def __new__(cls, name, ftype='String', size=70, tech_name=None, required=False):
+        """
+        Initialize a header column for template export.
+        :param name: Name of the field
+        :param ftype: Type of the field
+        :param size: Displayed size on Excel file
+        :param tech_name: Technical name of the field to compute
+        :param required: Is the field should be set or not ?
+        """
+        if ftype not in ImportHeader.type_ok:
+            err_msg = _('''Defined type of header \'%s\' is not in the list of possible type: %s - Please contact
+your support team and give us this message.
+            ''') % (
+                name, ', '.join(t for t in ImportHeader.type_ok)
+            )
+            raise osv.except_osv(
+                _('Error'),
+                err_msg,
+            )
+
+        return _(name), ftype, size, tech_name, required
+
+    @classmethod
+    def get_date_from_str(cls, date_value):
+        """
+        Try to construct a date from a string and return a formatted string date
+        :param date_value: String value to compute
+        :return: A datetime instance or False
+        """
+        date_format = [
+            '%Y-%m-%d',
+            '%Y-%m/%d',
+            '%d-%m-%Y',
+            '%d/%m/%Y',
+            '%d-%b-%Y',
+            '%d/%b-%Y',
+        ]
+
+        d = False
+        for dformat in date_format:
+            try:
+                d = str(DateTime.strptime(date_value, dformat))
+            except ValueError:
+                continue
+
+        return d
+
+    @classmethod
+    def check_value(cls, header, value, vtype, context=None):
+        """
+        Check the value of the column according to header
+        :param header: Header used to check if value is required or not
+        :param value: Value to check
+        :param vtype: Type of the data given
+        :return: A tuple with the result of the check, the formatted value and the error message if any
+        """
+        if not value and header[4]:
+            return (-1, value, _('The column \'%s\' is required') % header[0])
+        elif not value:
+            return (0, value, None)
+        elif header[1] == 'String':
+            if vtype == 'str':
+                return (0, value, None)
+            else:
+                try:
+                    return (0, str(value), None)
+                except Exception as e:
+                    return (-1, value, e)
+        elif header[1] == 'DateTime':
+            if vtype == 'datetime':
+                return (0, value, None)
+            elif vtype == 'str':
+                d = ImportHeader.get_date_from_str(value)
+                if d:
+                    return (0, d, None)
+                else:
+                    return (-1, value, _('The date format was not correct'))
+            else:
+                return (-1, value, _('The date format was not correct'))
+        elif header[1] == 'Integer':
+            if vtype == 'number':
+                return (0, value, None)
+            else:
+                try:
+                    return (0, int(value), None)
+                except Exception as e:
+                    return (-1, value, e)
+        elif header[1] == 'Float':
+            if vtype == 'number':
+                return (0, value, None)
+            else:
+                try:
+                    return (0, float(value), None)
+                except Exception as e:
+                    return (-1, value, e)
+
+        return (0, value, None)
+
+
+class abstract_wizard_import(osv.osv_memory):
+    _name = 'abstract.wizard.import'
+    _description = 'Generic import wizard'
+    _auto = False
+    _order = 'start_date'
+
+    def _get_progression(self, cr, uid, ids, field_name, args, context=None):
+        """
+        Return the percentage of progression
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        res = {}
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            if wiz.state == 'done':
+                res[wiz.id] = 100.00
+            elif wiz.state == 'draft':
+                res[wiz.id] = 0.00
+            else:
+                res[wiz.id] = float(wiz.total_lines_imported) / float(wiz.total_lines_to_import) * 100
+
+        return res
+
+    _columns = {
+        'model_name': fields.char(
+            size=64,
+            string='Model to import',
+            required=True,
+            readonly=True,
+        ),
+        'parent_model_name': fields.char(
+            size=64,
+            string='Model of the parent',
+            readonly=True,
+            help="To go back to the parent when the window is closed",
+        ),
+        'parent_record_id': fields.integer(
+            string='ID of the parent record',
+            readonly=True,
+        ),
+        'template_file': fields.binary(
+            string='Template file',
+            readonly=True,
+        ),
+        'template_filename': fields.char(
+            size=64,
+            string='Template filename',
+            readonly=True,
+        ),
+        'import_file': fields.binary(
+            string='File to import',
+        ),
+        'info_message': fields.text(
+            string='Information',
+            readonly=True,
+        ),
+        'error_message': fields.text(
+            string='Errors',
+            readonly=True,
+        ),
+        'show_error': fields.boolean(
+            string='Show error message ?',
+            readonly=True,
+        ),
+        'warning_message': fields.text(
+            string='Warnings',
+            readonly=True,
+        ),
+        'show_warning': fields.boolean(
+            string='Show warning message ?',
+            readonly=True,
+        ),
+        'total_lines_to_import': fields.integer(
+            string='# of lines to import',
+            readonly=True,
+        ),
+        'total_lines_imported': fields.integer(
+            string='# of lines imported',
+            readonly=True,
+        ),
+        'progression': fields.function(
+            _get_progression,
+            method=True,
+            type='float',
+            digits=(16, 2),
+            string='Progression',
+            store=False,
+            readonly=False,
+        ),
+        'state': fields.selection(
+            selection=[
+                ('draft', 'Not started'),
+                ('progress', 'In progress'),
+                ('done', 'Done'),
+            ],
+            string='State',
+            readonly=True,
+        ),
+        'start_date': fields.datetime(
+            string='Start date',
+            readonly=True,
+        ),
+        'end_date': fields.datetime(
+            string='End date',
+            readonly=True,
+        ),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        Return default values for some fields
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param fields: Technical name of the fields on which system must put a default value
+        :param context: Context of the call
+        :return: A dictionary with field names as keys
+        """
+        res = super(abstract_wizard_import, self).default_get(cr, uid, fields, context=context)
+        res.update({
+            'total_lines_to_import': 0,
+            'total_lines_imported': 0,
+            'state': 'draft',
+            'info_message': _('Select a file to import and click on \'Run import\' button.'),
+        })
+        return res
+
+    def update(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'res_id': ids[0],
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'target': 'keep_same', # Just to keep reload of the page
+            'context': context,
+        }
+
+    def exists(self, cr, uid, ids, context=None):
+        if self._name != 'abstract.wizard.import':
+            return super(abstract_wizard_import, self).exists(cr, uid, ids, context=context)
+        return False
+
+    def _get_template_file_data(self, context=None):
+        """
+        Return values for the import template file report generation
+        """
+        return {
+            'model': self._name,
+            'model_name': self._description,
+            'header_columns': [],
+        }
+
+    def copy(self, cr, uid, old_id, defaults=None, context=None):
+        """
+        Don't allow copy method
+        """
+        raise osv.except_osv(
+            _('Not allowed'),
+            _('You cannot duplicate a %s document!') % self._description,
+        )
+
+    def download_template_file(self, cr, uid, ids, context=None):
+        """
+        Download the template file
+        """
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'wizard.import.generic.template',
+            'datas': self._get_template_file_data(context=context),
+        }
+
+    def run_import(self, cr, uid, ids, context=None):
+        raise osv.except_osv(
+            _('Error'),
+            _('No \'run_import\' action is defined for the object \'%s\'!') % self._name,
+        )
+
+    def check_utf8_encoding(self, import_file, base='base64'):
+        """
+        Check if the given file is an good UTF-8 file
+        """
+        if base == 'base64':
+            import_file = base64.decodestring(import_file)
+
+        try:
+            import_file.decode('utf-8')
+            return True
+        except UnicodeError:
+            return False
+
+    def read_file(self, wizard_brw, context=None):
+        """
+        Open the Spreadsheet XML file
+        :param wizard_brw: browse_record of an import wizard
+        :return: An iterator on the rows of the file
+        """
+        if not wizard_brw.import_file:
+            raise osv.except_osv(
+                _('Error'),
+                _('No file to import. Please select a file or download the template file and fill it.'),
+            )
+
+        if wizard_brw.state != 'draft':
+            raise osv.except_osv(
+                _('Error'),
+                _('Import can be run only on draft wizard.'),
+            )
+
+        if not self.check_utf8_encoding(wizard_brw.import_file):
+            raise osv.except_osv(
+                _('Error'),
+                _('The given file seems not to be encoding in UTF-8. Please check the encoding of the file and re-try.')
+            )
+
+        file_obj = SpreadsheetXML(xmlstring=base64.decodestring(wizard_brw.import_file))
+
+        file_obj.getNbRows()
+        # iterator on rows
+        return file_obj.getRows(), file_obj.getNbRows()
+
+    def check_headers(self, headers_row, headers_title, context=None):
+        """
+        Check if the header in the first row of the file are the same as the expected headers
+        :param headers_row: Row that contains the header on the Excel file
+        :param headers_title: List of expected headers
+        :return: True or raise an error
+        """
+        if len(headers_row) != len(headers_title):
+            raise osv.except_osv(
+                _('Error'),
+                _('The number of columns in the Excel file (%s) is different than the expected number '\
+                        'of columns (%s).\nColumns should be in this order: %s') % (
+                    len(headers_row),
+                    len(headers_title),
+                    '\n * '.join(h[0] for h in headers_title),
+                ),
+            )
+
+        errors = []
+        headers_title_up = [_(x[0]).upper() for x in headers_title]
+        headers_row_up = [_(headers_row[i].data).upper() for i in range(0, len(headers_row))]
+        for h_index, h in enumerate(headers_title_up):
+            if h not in headers_row_up:
+                errors.append(
+                    _('The column \'%s\' is not present in the file.') % _(headers_title[h_index][0])
+                )
+            elif headers_row_up[h_index] != h:
+                errors.append(
+                    _('The column \'%s\' of the Excel file should be \'%s\', not \'%s\'.') % (
+                        string.uppercase[h_index],
+                        _(headers_title[h_index][0]),
+                        _(headers_row[h_index]),
+                    )
+                )
+        if errors:
+            raise osv.except_osv(
+                _('Error'),
+                '\n'.join(err for err in errors),
+            )
+
+        return True
+
+    def check_error_and_format_row(self, wizard_id, row, headers, context=None):
+        """
+        Check if the required cells are set and if this the data are well formatted
+        :param wizard_id: ID of the import wizard
+        :param row: Row of the Excel file
+        :param headers: Required headers
+        :return: True
+        """
+        try:
+            line_content = row.cells
+        except ValueError as e:
+            return (-1, _('Line is empty'))
+
+        if len(line_content) > len(headers):
+            return (-1, _('Number of columns (%s) in the line are larger than expected (%s).') % (
+                len(line_content), len(headers)
+            ))
+
+        data = []
+        errors = []
+        for col_index, col_value in enumerate(line_content):
+            # 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])
+            if chk_res[0] < 0:
+                errors.append(chk_res[2])
+
+        return (len(errors) and -1 or 0, errors, data)
+
+    def get_product_by_default_code(self, cr, uid, default_code, context=None):
+        """
+        Return the ID of the product.product related to the default_code parameter
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param default_code: Code of the product to find
+        :param context: Context of the call
+        :return: The ID of the product.product
+        """
+        p_obj = self.pool.get('product.product')
+        p_ids = p_obj.search(cr, uid, [
+            ('default_code', '=', default_code),
+        ], limit=1, order='NO_ORDER', context=context)
+        if not p_ids:
+            raise UnifieldImportException(_('No product found for the code \'%s\'') % default_code)
+
+        return p_ids[0]
+
+abstract_wizard_import()
 \ No newline at end of file
 
=== added file 'bin/addons/msf_doc_import/wizard/wizard_import_batch.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_batch.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_batch.py	2016-08-18 14:00:36 +0000
@@ -0,0 +1,303 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 MSF, TeMPO Consulting.
+#
+#    This 7ogram is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+import time
+
+import pooler
+
+from osv import osv
+from tools.translate import _
+
+from msf_doc_import.wizard.abstract_wizard_import import ImportHeader
+from msf_doc_import.wizard.abstract_wizard_import import UnifieldImportException
+
+
+def get_import_batch_headers(context=None):
+    return [
+         ImportHeader(name=_('get_import_batch_headers_name'), ftype='String', size=80, tech_name='name', required=False),
+         ImportHeader(name=_('get_import_batch_headers_type'), ftype='String', size=80, tech_name='type', required=True),
+         ImportHeader(name=_('get_import_batch_headers_life_date'), ftype='DateTime', size=60, tech_name='life_date', required=True),
+         ImportHeader(name=_('get_import_batch_headers_product_code'), ftype='String', size=80, tech_name='product_id', required=True),
+         ImportHeader(name=_('get_import_batch_headers_product_desc'), ftype='String', size=120, required=True),
+    ]
+
+# Get header list and information
+header_index_by_name = {}
+for i, h in enumerate(get_import_batch_headers()):
+    header_index_by_name[h[3]] = i
+
+
+def get_cell(line_data, field):
+    cell_data = line_data[header_index_by_name[field]]
+    if cell_data:
+        return cell_data
+    return None
+
+
+class wizard_import_batch(osv.osv_memory):
+    _name = 'wizard.import.batch'
+    _description = 'Import batch numbers'
+    _inherit = 'abstract.wizard.import'
+    _auto = True
+
+    _defaults = {
+        'model_name': 'stock.production.lot',
+        'template_filename': 'Import_batch_number_tpl.csv',
+    }
+
+    def _get_template_file_data(self, context=None):
+        """
+        Return values for the import template file report generation
+        """
+        return {
+            'model': 'stock.production.lot',
+            'model_name': _('Batch numbers'),
+            'header_columns': get_import_batch_headers(context=context),
+        }
+
+    def run_import(self, cr, uid, ids, context=None):
+        """
+        Make checks on file to import and run the import in background.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of wizard.import.patch on which import should be made
+        :param context: Context of the call
+        :return: True
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        expected_headers = get_import_batch_headers(context=context)
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            rows, nb_rows = self.read_file(wiz, context=context)
+
+            head = rows.next()
+            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 tu 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()
+
+        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
+        """
+        prodlot_obj = self.pool.get('stock.production.lot')
+        product_obj = self.pool.get('product.product')
+        sequence_obj = self.pool.get('ir.sequence')
+
+        if context is None:
+            context = {}
+
+        cr = pooler.get_db(dbname).cursor()
+        nb_imported_lines = 0
+
+        # Manage errors
+        import_errors = {}
+
+        def save_error(errors):
+            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()
+        nb_lines_ok = 0
+        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)
+                continue
+
+            # Product
+            product_id = None
+            try:
+                product_id = self.get_product_by_default_code(cr, uid, get_cell(line_data, 'product_id'),
+                                                              context=context)
+            except UnifieldImportException as e:
+                save_error(e)
+
+            # Batch number type
+            batch_type = get_cell(line_data, 'type')
+            if batch_type.upper() not in (_('Standard').upper(), _('Internal').upper()):
+                save_error(
+                    _('The Type of the batch number should be \'Standard\' or \'Internal\''),
+                )
+                batch_type = None
+            elif batch_type.upper() == _('Standard').upper():
+                batch_type = 'standard'
+            elif batch_type.upper() == _('Internal').upper():
+                batch_type = 'internal'
+
+            # Go to next line if all base data are not set
+            if not (product_id and batch_type):
+                continue
+
+            # Make consistency checks
+            name = get_cell(line_data, 'name')
+            life_date = get_cell(line_data, 'life_date')
+            product_brw = product_obj.read(cr, uid, product_id, ['batch_management', 'perishable'], context=context)
+
+            if not product_brw['batch_management'] and not product_brw['perishable']:
+                save_error(
+                    _('You cannot create a batch number for a product that is not \'Perishable\''
+                      ' nor \'Batch mandatory\'')
+                )
+                continue
+            elif product_brw['batch_management'] and batch_type == 'internal':
+                save_error(
+                    _('You cannot create an \'Internal\' batch number for a \'Batch mandatory\' product')
+                )
+                continue
+            elif not product_brw['batch_management'] and product_brw['perishable'] and batch_type == 'standard':
+                save_error(
+                    _('You cannot create a \'Standard\' batch number for a non \'Batch mandatory\' product')
+                )
+                continue
+            elif product_brw['batch_management'] and not name:
+                save_error(
+                    _('For a \'Standard\' batch number, you have to define value in the \'Name\' column')
+                )
+                continue
+
+            # Check no duplicate
+            prodlot_domain = [
+                ('product_id', '=', product_id),
+                ('type', '=', batch_type),
+                ('life_date', '=', life_date),
+            ]
+            if product_brw['batch_management']:
+                prodlot_domain.append(('name', '=', name))
+
+            prodlot_id = prodlot_obj.search(cr, uid, prodlot_domain, limit=1, order='NO_ORDER', context=context)
+            if prodlot_id:
+                save_error(
+                    _('A batch number with the same parameters already exists in the system')
+                )
+                continue
+
+            if batch_type == 'internal':
+                if name:
+                    save_warnings(
+                        _('Name of the batch will be ignored because the batch is \'Internal\' so '
+                          'name is created by the system')
+                    )
+                name = sequence_obj.get(cr, uid, 'stock.lot.serial')
+
+            create_vals = {
+                'name': name,
+                'product_id': product_id,
+                'life_date': life_date,
+                'type': batch_type,
+            }
+            try:
+                prodlot_obj.create(cr, uid, create_vals, context=context)
+                nb_lines_ok += 1
+            except Exception as e:
+                save_error(e)
+                cr.rollback()
+
+            nb_imported_lines += 1
+            self.write(cr, uid, [import_brw.id], {'total_lines_imported': nb_imported_lines}, context=context)
+
+        warn_msg = ''
+        for lnum, warnings in import_warnings.iteritems():
+            for warn in warnings:
+                warn_msg += _('Line %s: %s') % (lnum, warn)
+                warn_msg += '\n'
+
+        err_msg = ''
+        for lnum, errors in import_errors.iteritems():
+            for err in errors:
+                err_msg += _('Line %s: %s') % (lnum, err)
+                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)),
+            import_brw.total_lines_to_import-1,
+            err_msg and _('without errors') or _('imported'),
+            nb_lines_ok,
+            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)
+
+        cr.commit()
+        cr.close()
+
+        return True
+
+wizard_import_batch()
 
=== added file 'bin/addons/msf_doc_import/wizard/wizard_import_batch_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_import_batch_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_batch_view.xml	2016-08-18 14:00:36 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="wizard_import_batch_tree_view" model="ir.ui.view">
+            <field name="name">Import Batch Numbers</field>
+            <field name="model">wizard.import.batch</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Import Batch Numbers" noteditable="True">
+                    <field name="start_date" />
+                    <field name="end_date" />
+                    <field name="progression" widget="progressbar" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_wizard_import_batch" model="ir.ui.view">
+            <field name="name">Import Batch Numbers</field>
+            <field name="model">wizard.import.batch</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Batch Number" hide_duplicate_button="1">
+                    <field name="show_error" invisible="1" />
+                    <field name="show_warning" invisible="1" />
+
+                    <group colspan="4" col="6">
+                        <label string="Select a file to import: " align="1.0" />
+                        <field name="import_file" nolabel="True" colspan="1" />
+                        <label colspan="2" string="" />
+                        <field name="start_date" />
+                        <newline />
+                        <label string="Or download a template: " align="1.0" />
+                        <button name="download_template_file" string="" icon="gtk-save" help="Download template file" type="object" />
+                        <label colspan="2" string="" />
+                        <field name="end_date" />
+                        <group colspan="6" col="4">
+                            <field name="state" />
+                            <field name="progression" widget="progressbar" />
+                        </group>
+                    </group>
+
+                    <separator colspan="4" string="Information" />
+                    <field name="info_message" colspan="4" nolabel="1" />
+
+                    <group colspan="4" attrs="{'invisible': [('state', '=', 'done')]}">
+                        <separator colspan="4" string="Actions" />
+                        <button name="run_import" type="object" string="Run import" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'draft')]}" />
+                        <button name="update" type="object" string="Update" icon="gtk-execute" attrs="{'invisible': [('state', '!=', 'progress')]}" />
+                    </group>
+
+                    <group colspan="4" attrs="{'invisible': [('show_warning', '=', False)]}">
+                        <separator colspan="4" string="Warning messages" />
+                        <field name="warning_message" nolabel="1" colspan="4" />
+                    </group>
+
+                    <group colspan="4" attrs="{'invisible': [('show_error', '=', False)]}">
+                        <separator colspan="4" string="Error messages" />
+                        <field name="error_message" nolabel="1" colspan="4" />
+                    </group>
+                </form>
+            </field>
+        </record>
+    
+        <act_window
+            name="Import Batch Numbers"
+            res_model="wizard.import.batch"
+            src_model="wizard.import.batch"
+            view_mode="tree,form"
+            target="current"
+            key2="False"
+            id="action_wizard_import_batch" />
+
+        <menuitem
+            action="action_wizard_import_batch"
+            sequence="5"
+            name="Import Batch Numbers"
+            parent="stock.menu_action_production_lot_form"
+            id="menu_action_wizard_import_batch" />
+
+    </data>
+</openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/en_MF.po'
--- bin/addons/msf_profile/i18n/en_MF.po	2013-01-31 13:07:22 +0000
+++ bin/addons/msf_profile/i18n/en_MF.po	2016-08-18 14:00:36 +0000
@@ -799,3 +799,33 @@
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
 msgstr "Delivery"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:36
+#, python-format
+msgid "get_import_batch_headers_name"
+msgstr "Batch number"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:37
+#, python-format
+msgid "get_import_batch_headers_product_code"
+msgstr "Product Code"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:38
+#, python-format
+msgid "get_import_batch_headers_product_desc"
+msgstr "Product Description"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:39
+#, python-format
+msgid "get_import_batch_headers_life_date"
+msgstr "Expiry date"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:40
+#, python-format
+msgid "get_import_batch_headers_type"
+msgstr "Type"
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-08-09 15:31:52 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-08-18 14:00:36 +0000
@@ -14574,6 +14574,8 @@
 #. modules: msf_doc_import, register_accounting
 #: field:msf.doc.import.accounting,progression:0
 #: field:wizard.register.import,progression:0
+#: field:abstract.wizard.import,progression:0
+#: field:wizard.import.batch,progression:0
 msgid "Progression"
 msgstr "Progression"
 
@@ -23497,6 +23499,54 @@
 #: code:addons/purchase_msf/purchase_msf.py:55
 #: code:addons/purchase_msf/purchase_msf.py:87
 #: field:stock.move,inactive_error:0
+#: code:addons/msf_doc_import/account.py:72
+#: code:addons/msf_doc_import/account.py:201
+#: code:addons/msf_doc_import/account.py:234
+#: code:addons/msf_doc_import/account.py:480
+#: code:addons/msf_doc_import/stock_picking.py:60
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:60
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:296
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:321
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:327
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:333
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:352
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:379
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:77
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:254
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:258
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:785
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:788
+#: code:addons/msf_doc_import/wizard/wizard_delete_lines.py:78
+#: code:addons/msf_doc_import/wizard/wizard_delete_lines.py:612
+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:140
+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:157
+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:141
+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:154
+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:165
+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:174
+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:183
+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:81
+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:162
+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:170
+#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:164
+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:145
+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:153
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:263
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:270
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:275
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:341
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:346
+#: selection:msf.doc.import.accounting,state:0
+#: field:purchase.import.xml.line,error_list:0
+#: field:purchase.line.import.xml.line,error_list:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:tender.line,inactive_error:0
+#: selection:wizard.import.in.line.simulation.screen,type_change:0
+#: selection:wizard.import.in.simulation.screen,state:0
+#: selection:wizard.import.po.simulation.screen,state:0
+#: selection:wizard.import.po.simulation.screen.line,type_change:0
+#: selection:wizard.simu.import.po.line,change_type:0
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -31105,6 +31155,16 @@
 #: model:ir.ui.menu,name:sync_client.update_menu
 #: view:sync.client.update_entity:0
 #: view:wizard.register.import:0
+#: view:wizard.import.auto.supply.line:0
+#: view:wizard.import.batch:0
+#: view:wizard.import.in.simulation.screen:0
+#: view:wizard.import.order.cycle.line:0
+#: view:wizard.import.pick.line:0
+#: view:wizard.import.po.simulation.screen:0
+#: view:wizard.import.product.list:0
+#: view:wizard.import.stock.warehouse.orderpoint.line:0
+#: view:wizard.import.supplier.catalogue:0
+#: view:wizard.import.threshold.value.line:0
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -40101,16 +40161,20 @@
 msgid "End Period"
 msgstr "Période de fin"
 
-#. module: account
+#. modules: account, msf_doc_import
 #: report:pl.account.horizontal:0
 #: report:pl.account:0
+#: field:abstract.wizard.import,start_date:0
+#: field:wizard.import.batch,start_date:0
 #, python-format
 msgid "Start Date"
 msgstr "Date de début"
 
-#. module: account
+#. modules: account, msf_doc_import
 #: report:pl.account.horizontal:0
 #: report:pl.account:0
+#: field:abstract.wizard.import,end_date:0
+#: field:wizard.import.batch,end_date:0
 #, python-format
 msgid "End Date"
 msgstr "Date de fin"
@@ -43796,6 +43860,17 @@
 #: field:real.average.consumption,state:0
 #: field:msf.doc.import.accounting,state:0
 #: field:wizard.import.po,state:0
+#: field:abstract.wizard.import,state:0
+#: field:wizard.import.auto.supply.line,state:0
+#: field:wizard.import.batch,state:0
+#: field:wizard.import.in.simulation.screen,state:0
+#: field:wizard.import.order.cycle.line,state:0
+#: field:wizard.import.pick.line,state:0
+#: field:wizard.import.po.simulation.screen,state:0
+#: field:wizard.import.product.list,state:0
+#: field:wizard.import.stock.warehouse.orderpoint.line,state:0
+#: field:wizard.import.supplier.catalogue,state:0
+#: field:wizard.import.threshold.value.line,state:0
 msgid "State"
 msgstr "État"
 
@@ -54493,6 +54568,54 @@
 #: code:addons/register_accounting/wizard/wizard_register_import.py:258
 #: code:addons/register_accounting/wizard/wizard_register_import.py:265
 #: selection:wizard.register.import,state:0
+#: code:addons/msf_doc_import/account.py:72
+#: code:addons/msf_doc_import/account.py:201
+#: code:addons/msf_doc_import/account.py:234
+#: code:addons/msf_doc_import/account.py:480
+#: code:addons/msf_doc_import/stock_picking.py:60
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:60
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:296
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:321
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:327
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:333
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:352
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:379
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:77
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:254
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:258
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:785
+#: code:addons/msf_doc_import/wizard/stock_partial_picking.py:788
+#: code:addons/msf_doc_import/wizard/wizard_delete_lines.py:78
+#: code:addons/msf_doc_import/wizard/wizard_delete_lines.py:612
+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:140
+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:157
+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:141
+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:154
+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:165
+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:174
+#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:183
+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:81
+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:162
+#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:170
+#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:164
+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:145
+#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:153
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:263
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:270
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:275
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:341
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:346
+#: selection:msf.doc.import.accounting,state:0
+#: field:purchase.import.xml.line,error_list:0
+#: field:purchase.line.import.xml.line,error_list:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:tender.line,inactive_error:0
+#: selection:wizard.import.in.line.simulation.screen,type_change:0
+#: selection:wizard.import.in.simulation.screen,state:0
+#: selection:wizard.import.po.simulation.screen,state:0
+#: selection:wizard.import.po.simulation.screen.line,type_change:0
+#: selection:wizard.simu.import.po.line,change_type:0
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -61471,6 +61594,13 @@
 msgid "Information"
 msgstr "Information"
 
+#. module: msf_doc_import
+#: field:abstract.wizard.import,info_message:0
+#: view:wizard.import.batch:0
+#: field:wizard.import.batch,info_message:0
+msgid "Information"
+msgstr "Informations"
+
 #. module: base
 #: code:addons/base/module/wizard/base_language_install.py:55
 #, python-format
@@ -64599,6 +64729,11 @@
 #: field:wizard.import.stock.warehouse.orderpoint.line,file:0
 #: view:wizard.import.threshold.value.line:0
 #: field:wizard.import.threshold.value.line,file:0
+#: field:abstract.wizard.import,import_file:0
+#: field:wizard.import.batch,import_file:0
+#: field:wizard.import.in.simulation.screen,file_to_import:0
+#: view:wizard.import.supplier.catalogue:0
+#: field:wizard.import.supplier.catalogue,file:0
 msgid "File to import"
 msgstr "Fichier à importer"
 
@@ -73821,6 +73956,7 @@
 #, python-format
 msgid "Not Created"
 msgstr "Non Créé"
+<<<<<<< TREE
 
 #. module: account
 #: code:addons/account/wizard/account_subscription_generate.py:0
@@ -73859,3 +73995,427 @@
 #, python-format
 msgid "PatchFailed: A script during upgrade has failed. Synchronization is forbidden. Please contact your administrator"
 msgstr "PatchFailed: Un script a échoué pendant la mise à jour. La synchronizsation est désactivée. Veuillez contacter votre administrateur"
+=======
+
+#. module: msf_doc_import
+#: model:ir.actions.act_window,name:msf_doc_import.action_wizard_import_batch
+#: model:ir.ui.menu,name:msf_doc_import.menu_action_wizard_import_batch
+#: view:wizard.import.batch:0
+msgid "Import Batch Numbers"
+msgstr "Importer Numéros de Lot"
+
+#. module: msf_doc_import
+#: view:wizard.import.batch:0
+msgid "Select a file to import: "
+msgstr "Sélectionnez un fichier à importer: "
+
+#. module: msf_doc_import
+#: view:wizard.import.batch:0
+msgid "Or download a template: "
+msgstr "Ou téléchargez le modèle: "
+
+#. module: msf_doc_import
+#: view:wizard.import.batch:0
+msgid "Run import"
+msgstr "Démarrer l'import"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:336
+#, python-format
+msgid "No file to import. Please select a file or download the template file and fill it."
+msgstr "Aucun fichier à importer. Veuillez sélectionner un fichier ou télécharger le modèle et le remplir."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:168
+#, python-format
+msgid "The Type of the batch number should be 'Standard' or 'Internal'"
+msgstr "Le type du numéro de lot doit être 'Standard' ou 'Interne'"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:171
+#, python-format
+msgid "Standard"
+msgstr "Standard"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:166
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:173
+#, python-format
+msgid "Internal"
+msgstr "Interne"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:187
+#, python-format
+msgid "You cannot create a batch number for a product that is not 'Perishable' nor 'Batch mandatory'"
+msgstr "Vous ne pouvez pas créer un numéro de lot pour un produit dont le numéro de lot ni la date d'expiration ne sont obligatoires"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:192
+#, python-format
+msgid "You cannot create an 'Internal' batch number for a 'Batch mandatory' product"
+msgstr "Vous ne pouvez pas créer un numéro de lot 'Interne' pour un produit dont le numéro de lot n'est pas obligatoire"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:197
+#, python-format
+msgid "You cannot create a 'Standard' batch number for a non 'Batch mandatory' product"
+msgstr "Vous ne pouvez pas créer un numéro de lot 'Standard' pour un produit dont le numéro de lot n'est pas obligatoire"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:202
+#, python-format
+msgid "For a 'Standard' batch number, you have to define value in the 'Name' column"
+msgstr "Pour un numéro de lot 'Standard', vous devez définir une valeur dans la colonne 'Nom'"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1147
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1222
+#, python-format
+msgid "A batch is defined on the imported file but the product doesn't require batch number - Batch ignored"
+msgstr "Un numéro de lot est défini dans le fichier importé mais le produit ne requiert pas de numéro de lot - Numéro de lot ignoré"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:225
+#, python-format
+msgid "Name of the batch will be ignored because the batch is 'Internal' so name is created by the system"
+msgstr "Le nom du numéro de lot sera ignoré car le numéro de lot est 'Interne' danc le nom est créé par le système"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:218
+#, python-format
+msgid "A batch number with the same parameters already exists in the system"
+msgstr "Un numéro de lot avec les mêmes paramèters existe déjà dans le système"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:258
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:264
+#, python-format
+msgid "Line %s: %s"
+msgstr "Ligne %s : %s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:54
+#, python-format
+msgid "Defined type of header '%s' is not in the list of possible type: %s - Please contact\n"
+"your support team and give us this message.\n"
+"            "
+msgstr "Le type d'en-tête \'%s\' n'est pas dans la liste des types possibles : %s - Veuillez contacter\n"
+"votre équipe de support et leur indiquer ce message.\n"
+"            "
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:100
+#, python-format
+msgid "The column '%s' is required"
+msgstr "La colonne '%s' est obligatoire"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:120
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:122
+#, python-format
+msgid "The date format was not correct"
+msgstr "Le format de date n'est pas correct"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,model_name:0
+#: field:wizard.import.batch,model_name:0
+msgid "Model to import"
+msgstr "Modèle à importer"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,parent_model_name:0
+#: field:wizard.import.batch,parent_model_name:0
+msgid "Model of the parent"
+msgstr "Nodèle du parent"
+
+#. module: msf_doc_import
+#: help:abstract.wizard.import,parent_model_name:0
+#: help:wizard.import.batch,parent_model_name:0
+msgid "To go back to the parent when the window is closed"
+msgstr "Pour revenir au parent quand la fenêtre est fermée"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,parent_record_id:0
+#: field:wizard.import.batch,parent_record_id:0
+msgid "ID of the parent record"
+msgstr "ID de l'enregistrement parent"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,template_file:0
+#: field:wizard.import.batch,template_file:0
+msgid "Template file"
+msgstr "Fichier modèle"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,template_filename:0
+#: field:wizard.import.batch,template_filename:0
+msgid "Template filename"
+msgstr "Nom du fichier modèle"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,error_message:0
+#: field:msf.doc.import.accounting,error_ids:0
+#: field:wizard.import.batch,error_message:0
+msgid "Errors"
+msgstr "Erreurs"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,warning_message:0
+#: field:wizard.import.batch,warning_message:0
+msgid "Warnings"
+msgstr "Avertissements"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,total_lines_to_import:0
+#: field:wizard.import.batch,total_lines_to_import:0
+msgid "# of lines to import"
+msgstr "# de ligens à importer"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,total_lines_imported:0
+#: field:wizard.import.batch,total_lines_imported:0
+msgid "# of lines imported"
+msgstr "# de lignes importées"
+
+#. module: msf_doc_import
+#: selection:abstract.wizard.import,state:0
+#: selection:wizard.import.batch,state:0
+msgid "Not started"
+msgstr "Non démarré"
+
+#. module: msf_doc_import
+#: selection:wizard.import.auto.supply.line,state:0
+#: selection:wizard.import.order.cycle.line,state:0
+#: selection:wizard.import.pick.line,state:0
+#: selection:wizard.import.product.list,state:0
+#: selection:wizard.import.stock.warehouse.orderpoint.line,state:0
+#: selection:wizard.import.supplier.catalogue,state:0
+#: selection:wizard.import.threshold.value.line,state:0
+msgid "In Progress"
+msgstr "En cours"
+
+#. module: msf_doc_import
+#: selection:abstract.wizard.import,state:0
+#: selection:wizard.import.auto.supply.line,state:0
+#: selection:wizard.import.batch,state:0
+#: selection:wizard.import.in.simulation.screen,state:0
+#: selection:wizard.import.order.cycle.line,state:0
+#: selection:wizard.import.pick.line,state:0
+#: selection:wizard.import.po.simulation.screen,state:0
+#: selection:wizard.import.product.list,state:0
+#: selection:wizard.import.stock.warehouse.orderpoint.line,state:0
+#: selection:wizard.import.supplier.catalogue,state:0
+#: selection:wizard.import.threshold.value.line,state:0
+msgid "Done"
+msgstr "Terminé"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:280
+#, python-format
+msgid "Not allowed"
+msgstr "Non autorisé"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:281
+#, python-format
+msgid "You cannot duplicate a %s document!"
+msgstr "Vous ne pouvez pas dupliquer un document %s !"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:297
+#, python-format
+msgid "No 'run_import' action is defined for the object '%s'!"
+msgstr "Aucune action 'run_import' n'est définie pour l'objet '%s'!"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:328
+#, 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é'"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:334
+#, python-format
+msgid "The given file seems not to be encoding in UTF-8. Please check the encoding of the file and re-try."
+msgstr "Le fichier donnée ne semble pas être encodé en UTF-8. Veuillez vérifier l'encodage du fichie et réessayez."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:396
+#, python-format
+msgid "Line is empty"
+msgstr "La ligne est vide"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:399
+#, python-format
+msgid "Number of columns (%s) in the line are larger than expected (%s)."
+msgstr "Le nombre de colonnes (%s) de la ligne est plus grand qu'attendu (%s)."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:428
+#, python-format
+msgid "No product found for the code '%s'"
+msgstr "Aucun produit trouvé pour le code '%s'"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:36
+#, python-format
+msgid "get_import_batch_headers_name"
+msgstr "Numéro de lot"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:37
+#, python-format
+msgid "get_import_batch_headers_product_code"
+msgstr "Code du produit"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:38
+#, python-format
+msgid "get_import_batch_headers_product_desc"
+msgstr "Description du produit"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:39
+#, python-format
+msgid "get_import_batch_headers_life_date"
+msgstr "Date d'expiration"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:40
+#, python-format
+msgid "get_import_batch_headers_type"
+msgstr "Type"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:285
+#, 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"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:37
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:54
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:57
+#: field:wizard.simu.import.po.line,import_product_code:0
+#: field:wizard.simu.import.po.line,initial_product_code:0
+#, python-format
+msgid "Product Code"
+msgstr "Code du produit"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:38
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:55
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:58
+#: field:wizard.simu.import.po.line,import_product_name:0
+#: field:wizard.simu.import.po.line,initial_product_name:0
+#, python-format
+msgid "Product Description"
+msgstr "Description du produit"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:39
+#, python-format
+msgid "Life Date"
+msgstr "Date d'expiration"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:40
+#, python-format
+msgid "Type"
+msgstr "Type"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,show_error:0
+#: field:wizard.import.batch,show_error:0
+msgid "Show error message ?"
+msgstr "Voir les messages d'erreurs ?"
+
+#. module: msf_doc_import
+#: field:abstract.wizard.import,show_warning:0
+#: field:wizard.import.batch,show_warning:0
+msgid "Show warning message ?"
+msgstr "Voir les avertissements ?"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:260
+#, python-format
+msgid "Select a file to import and click on 'Run import' button."
+msgstr "Sélectionnez un fichier à importer et cliquez sur le bouton 'Démarrer l'import'."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:276
+#, python-format
+msgid "imported"
+msgstr "importées"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:276
+#, python-format
+msgid "without errors"
+msgstr "sans erreurs"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:269
+#, python-format
+msgid "Processing of file completed in %s second(s)!\n"
+"- Total lines to import: %s\n"
+"- Total lines %s: %s %s\n"
+"- Total lines with errors: %s %s\n"
+"%s\n"
+"        "
+msgstr "Traitement du fichier terminé en %s seconde(s) !\n"
+"- Nombre de lignes à importer : %s\n"
+"- Nombre de lignes %s : %s %s\n"
+"- Nombre de lignes avec erreurs : %s %s\n"
+"%s\n"
+"        "
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:279
+#, python-format
+msgid "(%s line(s) with warning - see warning messages below)"
+msgstr "(%s ligne(s) avec des avertissements - voir les avertissements ci-dessous)"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:283
+#, python-format
+msgid "(see error messages below)"
+msgstr "(voir les erreurs ci-dessous)"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:234
+#, python-format
+msgid "Name of the batch will be ignored because the batch is 'Internal' so name is created by the system"
+msgstr "Le nom du batch sera ignoré car le batch est 'Interne' donc son nom sera créé par le système"
+
+#. module: msf_doc_import
+#: view:wizard.import.batch:0
+msgid "Warning messages"
+msgstr "Messages d'avertissement"
+
+#. module: msf_doc_import
+#: view:wizard.import.batch:0
+msgid "Error messages"
+msgstr "Messages d'erreur"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_import_batch.py:104
+#, 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 tu 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"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:385
+#, python-format
+msgid "The column '%s' of the Excel file should be '%s', not '%s'."
+msgstr "La colonne '%s' du fichier Excel doit être '%s', pas '%s'."
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/abstract_wizard_import.py:381
+#, python-format
+msgid "The column '%s' is not present in the file."
+msgstr "La colonne '%s' n'est pas présente dans le fichier."
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-08-03 16:06:05 +0000
+++ bin/addons/purchase_override/purchase.py	2016-08-18 14:00:36 +0000
@@ -2617,8 +2617,8 @@
                                             help='Header level dates has to be populated by default with the possibility of manual updates'),
         'name': fields.function(_get_name, method=True, type='char', string='Name', store=False),
     }
+    def create(self, cr, uid, vals, context=None):
 
-    def create(self, cr, uid, vals, context=None):
         '''
         Set the line number to 0
         '''
 
=== modified file 'bin/addons/report_webkit/webkit_report.py'
--- bin/addons/report_webkit/webkit_report.py	2016-02-16 15:18:57 +0000
+++ bin/addons/report_webkit/webkit_report.py	2016-08-18 14:00:36 +0000
@@ -41,7 +41,9 @@
 import netsvc
 import pooler
 from report_helper import WebKitHelper
-from report.report_sxw import report_sxw, report_rml, _int_format, _float_format, _date_format, _dttime_format, browse_record_list
+from report.report_sxw import report_sxw, report_rml, _int_format, \
+                              _float_format, _date_format, _dttime_format, browse_record_list, \
+                              rml_parse
 import addons
 import tools
 from tools.translate import _
@@ -412,3 +414,18 @@
         if not result:
             return (False,False)
         return result
+
+
+class XlsWebKitParser(WebKitParser):
+    def __init__(self, name, table, rml=False, parser=rml_parse, header='external', store=False):
+        WebKitParser.__init__(self, name, table, rml=rml, parser=parser, header=header, store=store)
+
+    def create_single_pdf(self, cr, uid, ids, data, report_xml, context=None):
+        report_xml.webkit_debug = 1
+        report_xml.header = " "
+        report_xml.webkit_header.html = "${_debug or ''|n}"
+        return super(XlsWebKitParser, self).create_single_pdf(cr, uid, ids, data, report_xml, context)
+
+    def create(self, cr, uid, ids, data, context=None):
+        a = super(XlsWebKitParser, self).create(cr, uid, ids, data, context)
+        return (a[0], 'xls')
 
=== modified file 'bin/addons/spreadsheet_xml/spreadsheet_xml.py'
--- bin/addons/spreadsheet_xml/spreadsheet_xml.py	2014-11-05 08:06:06 +0000
+++ bin/addons/spreadsheet_xml/spreadsheet_xml.py	2016-08-18 14:00:36 +0000
@@ -130,6 +130,9 @@
             ret.append(self.get(wb, 'Name'))
         return ret
 
+    def getNbRows(self,worksheet=1):
+        return len(self.xmlobj.xpath('//ss:Worksheet[%d]/ss:Table[1]/ss:Row' % (worksheet,), **self.xa))
+
     def getRows(self,worksheet=1):
         table = self.xmlobj.xpath('//ss:Worksheet[%d]/ss:Table[1]'%(worksheet, ), **self.xa)
         return SpreadsheetRow(table[0].getiterator(etree.QName(self.defaultns, 'Row')))