Merge lp:~jfb-tempo-consulting/unifield-server/US-5341 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2018-09-11 12:56:23 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2019-04-25 15:27:08 +0000
@@ -35,6 +35,51 @@
 import xml.etree.ElementTree as ET
 from service.web_services import report_spool
 
+class purchase_order_manual_export(osv.osv_memory):
+    _name = 'purchase.order.manual.export'
+
+    _columns = {
+        'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+
+    }
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        result = {'fields': {}, 'model': 'purchase.order.manual.export', 'type': 'form'}
+
+        msg = _('Manually run export of PO')
+
+        if self.pool.get('purchase.order').search_exist(cr, uid, [('id', '=', context.get('purchase_order')), ('auto_exported_ok', '=', True)], context=context):
+            msg = _('The PO was already exported, do you want to export it again ?')
+        result['arch'] = '''<form string="%(title)s">
+            <separator coslpan="4" string="%(msg)s" />
+            <button special="cancel" string="%(cancel)s" icon="gtk-cancel" colspan="2"/>
+            <button name="export_po" string="%(ok)s" icon="gtk-ok" colspan="2" type="object"/>
+            </form>''' % {
+            'title': msg,
+            'msg': msg,
+            'cancel': _('Cancel'),
+            'ok': _('OK'),
+        }
+        return result
+
+    def export_po(self, cr, uid, ids, context=None):
+        auto_job_ids = self.pool.get('automated.export').search(cr, uid, [('function_id.method_to_call', '=', 'auto_export_validated_purchase_order'), ('active', '=', True)], context=context)
+        if not auto_job_ids:
+            raise osv.except_osv(_('Warning'), _('The job to export PO is not active.'))
+
+        auto_job = self.pool.get('automated.export').browse(cr, uid, auto_job_ids[0], context=context)
+        wiz = self.browse(cr, uid, ids[0], context)
+
+
+        processed, rejected, trash = self.pool.get('purchase.order').auto_export_validated_purchase_order(cr, uid, auto_job, [wiz.purchase_id.id], context=context)
+        if not rejected:
+            self.log(cr, uid, wiz.purchase_id.id, _('PO %s successfully exported') % wiz.purchase_id.name)
+        else:
+            self.log(cr, uid, wiz.purchase_id.id, _('PO %s %d lines rejected') %  (wiz.purchase_id.name, len(rejected)))
+
+        return {'type': 'ir.actions.act_window_close'}
+
+purchase_order_manual_export()
 
 class purchase_order(osv.osv):
     _inherit = 'purchase.order'
@@ -73,6 +118,19 @@
 
         return res
 
+
+    def _can_be_auto_exported(self, cr, uid, ids, field_name, args, context=None):
+        ret = {}
+        for id in ids:
+            ret[id] = False
+
+        if not self.pool.get('automated.export').search_exist(cr, uid, [('function_id.method_to_call', '=', 'auto_export_validated_purchase_order'), ('active', '=', True)], context=context):
+            return ret
+
+        for x in self.search(cr, uid, [('id', 'in', ids), ('partner_type', '=', 'esc'), ('state', 'in', ['validated', 'validated_p'])], context=context):
+            ret[x] = True
+        return ret
+
     _columns = {
         'import_in_progress': fields.function(
             _get_import_progress,
@@ -83,12 +141,26 @@
         ),
         'import_filenames': fields.one2many('purchase.order.simu.import.file', 'order_id', string='Imported files', readonly=True),
         'auto_exported_ok': fields.boolean('PO exported to ESC'),
+        'can_be_auto_exported': fields.function(_can_be_auto_exported, method=True, type='boolean', string='Can be auto exported ?'),
     }
 
     _defaults = {
         'import_in_progress': lambda *a: False,
     }
 
+    def auto_export_manual(self, cr, uid, ids, context=None):
+        wiz_id = self.pool.get('purchase.order.manual.export').create(cr, uid, {'purchase_id': ids[0]}, context=context)
+        ctx = context.copy()
+        ctx['purchase_order'] = ids[0]
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_id': wiz_id,
+            'context': ctx,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_model': 'purchase.order.manual.export',
+        }
 
     def get_file_content(self, cr, uid, file_path, context=None):
         if context is None:
@@ -201,8 +273,8 @@
                     rejected.append( (key, values[key]) )
         else:
             values = self.pool.get('wizard.import.po.simulation.screen').get_values_from_xml(cr, uid, base64.encodestring(file_content), context=context)
-            header = [x.replace('_', ' ').title() for x in values.get(21)]
-            for key in sorted([k for k in values.keys() if k > 21]):
+            header = [x.replace('_', ' ').title() for x in values.get(23)]
+            for key in sorted([k for k in values.keys() if k > 23]):
                 if import_success:
                     processed.append( (key, values[key]) )
                 else:
@@ -291,18 +363,20 @@
         return res
 
 
-    def auto_export_validated_purchase_order(self, cr, uid, export_wiz, context=None):
+    def auto_export_validated_purchase_order(self, cr, uid, export_wiz, po_ids=False, context=None):
         '''
         Method called by obj automated.export
         '''
         if context is None:
             context = {}
 
-        po_ids = self.search(cr, uid, [
-            ('partner_type', '=', 'esc'),
-            ('state', 'in', ['validated', 'validated_p']),
-            ('auto_exported_ok', '=', False),
-        ], context= context)
+        # any change in domain must also be changed in _can_be_auto_exported
+        if not po_ids:
+            po_ids = self.search(cr, uid, [
+                ('partner_type', '=', 'esc'),
+                ('state', 'in', ['validated', 'validated_p']),
+                ('auto_exported_ok', '=', False),
+            ], context= context)
 
         if not po_ids:
             msg = _('No PO to export !')
@@ -387,6 +461,8 @@
 
         if 'import_in_progress' not in defaults:
             defaults.update({'import_in_progress': False})
+        if 'auto_exported_ok' not in defaults:
+            defaults.update({'auto_exported_ok': False})
 
         return super(purchase_order, self).copy(cr, uid, id, defaults, context=context)
 

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2019-02-11 09:38:43 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2019-04-25 15:27:08 +0000
@@ -1117,9 +1117,10 @@
 
         context['from_simu_screen'] = True
 
-        if simu_id.with_pack:
+        if simu_id.with_pack or context.get('do_not_import_with_thread'):
             cr.commit()
             if context.get('do_not_import_with_thread'):
+                # Auto VI IN import: do not process IN
                 self._import_with_thread(cr, uid, [partial_id], simu_id.id, context=context)
             else:
                 new_thread = threading.Thread(target=self._import_with_thread, args=(cr, uid, [partial_id], simu_id.id, context))

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-01-30 16:53:05 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-04-25 15:27:08 +0000
@@ -33,7 +33,6 @@
 
 from mx import DateTime
 
-
 # Server imports
 from osv import osv
 from osv import fields
@@ -268,6 +267,7 @@
                                            readonly=True),
         'simu_line_ids': fields.one2many('wizard.import.po.simulation.screen.line',
                                          'simu_id', string='Lines', readonly=True),
+        'ad_info': fields.text(string='New Header AD', readonly=1),
     }
 
     _defaults = {
@@ -488,19 +488,29 @@
                                  'message_esc1', 'message_esc2']
                 for line in field:
                     rec_lines.append(line)
+            elif field.attrib['name'] == 'analytic_distribution_id':
+                index += 1
+                values[index] = []
+                index += 1
+                ad_info = ['']
+                for ad_node in field:
+                    if ad_node.text:
+                        ad_info.append(ad_node.text)
+                values[index] = ad_info
 
         for line in rec_lines:
             index += 1
             values[index] = []
             for fl in line:
-                if fl.attrib['name'] in ad_field_names:
-                    continue
-                if not fl.getchildren():
+                if fl.attrib['name'] == 'analytic_distribution_id':
+                    for ad_node in fl:
+                        if ad_node.text:
+                            values[index].append(ad_node.text or '')
+                elif not fl.getchildren():
                     values[index].append(fl.text or '')
                 else:
                     for sfl in fl:
                         values[index].append(sfl.text or '')
-
         return values
 
 
@@ -528,6 +538,96 @@
 
         return values
 
+    def create_ad(self, cr, uid, ad_info, partner_type, currency_id, context):
+        ad_infos = tools.safe_eval(ad_info)
+        cc_lines = []
+        for ad_info in ad_infos:
+            info = ad_info.split('-')
+            cc_lines.append((0, 0, {
+                'partner_type': partner_type,
+                'destination_id': int(info[0]),
+                'analytic_id': int(info[1]),
+                'percentage': float(info[2]),
+                'currency_id': currency_id,
+            }
+            ))
+        distrib_id = self.pool.get('analytic.distribution').create(cr, uid, {'partner_type': partner_type, 'cost_center_lines': cc_lines}, context=context)
+        self.pool.get('analytic.distribution').create_funding_pool_lines(cr, uid, [distrib_id], context=context)
+        return distrib_id
+
+    def check_ad(self, cr, uid, values, existing_ad, product_id=False, po_type=False, cc_cache=None, context=None):
+        errors = []
+
+        if context is None:
+            context = {}
+        if cc_cache is None:
+            cc_cache = {}
+
+        cc_cache.setdefault('aa_ko', {'DEST': {}, 'OC': {}})
+        cc_cache.setdefault('aa_ok', {'DEST': {}, 'OC': {}})
+        existing_ad_set = set()
+        if existing_ad:
+            for cc_line in existing_ad.cost_center_lines:
+                existing_ad_set.add('%s-%s-%s'%(cc_line.destination_id.id, cc_line.analytic_id.id, round(cc_line.percentage,2)))
+        ad = []
+        if len(values) < 4 or len(values) % 4 != 0:
+            errors.append(_('Invalid AD format: %d columns found, multiple of 4 expected') % (len(values), ))
+        else:
+            idx = 0
+            sum_percent = 0
+            while idx < len(values):
+                if not values[idx]:
+                    break
+                try:
+                    percent = float(values[idx+2])
+                except TypeError:
+                    errors.append(_('%% in AD must be a number (value found %s), AD in file ignored') % (values[idx+2]))
+                    ad = []
+                    break
+                ad.append([values[idx], values[idx+1], percent])
+                sum_percent += percent
+                idx += 4
+        if ad and abs(100-sum_percent) > 0.001:
+            ad = []
+            errors.append(_('Sum of AD %% must be 100 (value found %s), AD in file ignored') % (sum_percent))
+
+        valid_ad = True
+        data_ad_set = set()
+        aa_ko = cc_cache['aa_ko']
+        aa_ok = cc_cache['aa_ok']
+
+        gl_account_id = False
+        if product_id:
+            product_record = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            gl_account_id = self.pool.get('purchase.order.line').get_distribution_account(cr, uid, product_record, False, po_type, context=None)
+
+        for ad_value in ad:
+            ad = {}
+            for x in [(0, 'DEST', _('Destination')), (1, 'OC', _('Cost Center'))]:
+                account = ad_value[x[0]].strip()
+                if account not in aa_ko[x[1]] and account not in aa_ok[x[1]]:
+                    dom = [('category', '=', x[1]), ('type','!=', 'view'), ('code', '=ilike', account), ('filter_active', '=', True)]
+                    if gl_account_id and x[1] == 'DEST':
+                        dom += [('destination_ids', '=', gl_account_id)]
+                    account_ids = self.pool.get('account.analytic.account').search(cr, uid, dom, context=context)
+                    if not account_ids:
+                        valid_ad = False
+                        aa_ko[x[1]][account] = True
+                        errors.append(_('%s %s not found or inactive , AD in file ignored') % (x[2], account))
+                    else:
+                        aa_ok[x[1]][account] = account_ids[0]
+                ad[x[1]] = aa_ok[x[1]].get(account)
+            if valid_ad:
+                data_ad_set.add('%s-%s-%s' % (ad['DEST'], ad['OC'], round(ad_value[2], 2)))
+
+        if valid_ad and existing_ad_set:
+            if data_ad_set != existing_ad_set:
+                errors.append(_('Already has a valid Analytical Distribution'))
+            else:
+                data_ad_set = set()
+
+        return errors, list(data_ad_set)
+
 
     '''
     Simulate routine
@@ -570,7 +670,7 @@
                 nb_file_header_lines = NB_OF_HEADER_LINES
                 nb_file_lines_columns = NB_LINES_COLUMNS
                 first_line_index = nb_file_header_lines + 1
-                if wiz.with_ad == 'yes' and wiz.filetype != 'xml':
+                if wiz.with_ad == 'yes':
                     nb_file_header_lines += 2
                     first_line_index += 2
 
@@ -799,6 +899,17 @@
                 # Line 20: Sourcing group
                 # Nothing to do
 
+                cc_cache = {}
+                # Line 22: AD
+                if values.get(22) and len(values[22]) > 1:
+                    errors, ad_info = self.check_ad(cr, uid, values[22][1:], wiz.order_id.analytic_distribution_id, cc_cache=cc_cache, context=context)
+                    if errors:
+                        values_header_errors.append(_('Line 22 of the file: Analytical Distribution ignored: \n - %s') % (" - \n".join(errors)))
+                    elif ad_info:
+                        header_values['ad_info'] = ad_info
+
+
+                    #header_values['ad'] = [(x[1], x[2], x[3]) for x in
                 '''
                 The header values have been imported, start the importation of
                 lines
@@ -884,7 +995,8 @@
                     if vals[4]:
                         qty = float(vals[4])
 
-                    file_lines[x] = (line_number, product_id, uom_id, qty, ext_ref)
+                    # AD on line
+                    file_lines[x] = (line_number, product_id, uom_id, qty, ext_ref, vals[20:])
 
                 '''
                 Get the best matching line :
@@ -992,7 +1104,7 @@
                                                        'percent_completed': percent_completed}, context=context)
                         vals = values.get(file_line[0], [])
                         if file_line[1] == 'match':
-                            err_msg = wl_obj.import_line(cr, uid, po_line, vals, context=context)
+                            err_msg = wl_obj.import_line(cr, uid, po_line, vals, cc_cache, context=context)
                             if file_line[0] in not_ok_file_lines:
                                 wl_obj.write(cr, uid, [po_line], {'type_change': 'error', 'error_msg': not_ok_file_lines[file_line[0]]}, context=context)
                         elif file_line[1] == 'split':
@@ -1002,7 +1114,7 @@
                                                      'parent_line_id': po_line,
                                                      'imp_dcd': False,
                                                      'po_line_id': False}, context=context)
-                            err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, context=context)
+                            err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, cc_cache, context=context)
                             if file_line[0] in not_ok_file_lines:
                                 wl_obj.write(cr, uid, [new_wl_id], {'type_change': 'error', 'error_msg': not_ok_file_lines[file_line[0]]}, context=context)
                         # Commit modifications
@@ -1028,7 +1140,7 @@
                                                         'in_line_number': values.get(po_line, [])[0] and int(values.get(po_line, [])[0]) or False,
                                                         'in_ext_ref': values.get(po_line, [])[1] or False,
                                                         'simu_id': wiz.id}, context=context)
-                    err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, context=context)
+                    err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, cc_cache, context=context)
                     if po_line in not_ok_file_lines:
                         wl_obj.write(cr, uid, [new_wl_id], {'type_change': 'error', 'error_msg': not_ok_file_lines[po_line]}, context=context)
 
@@ -1154,17 +1266,14 @@
                 w_vals = {'state': 'import_progress',}
                 self.write(cr, uid, [wiz.id], w_vals, context=context)
 
-                """
-                UFTP-59: import PO header
-                20/Mar/14 2:51 PM was asked to import only:
-                1)Supplier Ref, 2) RTS date, 3) Shipment date
-                just uncomment the 3 other fields if asked later
-                """
                 po_vals = {
                     'partner_ref': wiz.imp_supplier_ref or wiz.in_supplier_ref,
                     'ready_to_ship_date': wiz.imp_ready_to_ship_date or wiz.in_ready_to_ship_date,
                     'shipment_date': wiz.imp_shipment_date or wiz.in_shipment_date,
                 }
+                if wiz.ad_info:
+                    po_vals['analytic_distribution_id'] = self.create_ad(cr, uid, wiz.ad_info, wiz.order_id.partner_id.partner_type, wiz.order_id.currency_id.id, context)
+
                 self.pool.get('purchase.order').write(cr, uid, [wiz.order_id.id], po_vals, context=context)
 
                 lines = [x.id for x in wiz.simu_line_ids]
@@ -1266,17 +1375,21 @@
                     if not line.chg_text and (line.imp_product_id or (not line.imp_product_id and line.in_comment)) \
                             and price_change:
                         res[line.id]['chg_text'] += _('\nPRICE')
+                    if not line.chg_text and line.ad_info:
+                        res[line.id]['chg_text'] += _('\nAD')
                     drd_change = not(res[line.id]['in_drd'] == line.imp_drd)
                     dcd_change = not(res[line.id]['in_dcd'] == line.imp_dcd)
                     to_delete = line.imp_comment == '[DELETE]'
                     if to_delete:
                         delete_line_numbers.add(line.in_line_number)
 
-                    if line.simu_id.state != 'draft' and (prod_change or qty_change or price_change or drd_change or dcd_change or to_delete):
+                    if line.simu_id.state != 'draft' and (prod_change or qty_change or price_change or drd_change or dcd_change or to_delete or line.ad_info):
                         res[line.id]['change_ok'] = True
                 elif line.type_change == 'del':
                     res[line.id]['imp_discrepancy'] = -(line.in_qty*line.in_price)
             else:
+                if line.ad_info:
+                    res[line.id]['chg_text'] = "%s%s" % (line.chg_text, _("\nAD"))
                 res[line.id]['imp_discrepancy'] = line.imp_qty*line.imp_price
                 if line.imp_uom:
                     res[line.id]['in_uom'] = line.imp_uom.id
@@ -1379,6 +1492,7 @@
                                           readonly=True),
         'chg_text': fields.function(_get_line_info, method=True, multi='line', type='char', size=216, string='CHG',
                                     readonly=True, store=True),
+        'ad_info': fields.text(string='New AD', readonly=True),
     }
 
     def get_error_msg(self, cr, uid, ids, context=None):
@@ -1394,7 +1508,7 @@
 
         return True
 
-    def import_line(self, cr, uid, ids, values, context=None):
+    def import_line(self, cr, uid, ids, values, cc_cache, context=None):
         '''
         Write the line with the values
         '''
@@ -1472,6 +1586,17 @@
                     if not prod_id:
                         write_vals['type_change'] = 'error'
 
+            write_vals['ad_info'] = False
+            if not write_vals.get('type_change') and len(values) > 20:
+                existing_ad = line.po_line_id and line.po_line_id.analytic_distribution_id or line.simu_id.order_id.analytic_distribution_id
+                if line.po_line_id.analytic_distribution_state != 'valid':
+                    existing_ad = False
+                errors_ad, ad_info = self.pool.get('wizard.import.po.simulation.screen').check_ad(cr, uid, values[20:], existing_ad, product_id=write_vals.get('imp_product_id'), po_type=line.simu_id.order_id.order_type,cc_cache=cc_cache, context=context)
+                if errors_ad:
+                    errors += errors_ad
+                elif ad_info:
+                    write_vals['ad_info'] = ad_info
+
             # Qty
             err_msg = _('Incorrect float value for field \'Product Qty\'')
             try:
@@ -1668,7 +1793,33 @@
 
             if line.type_change == 'del' and line.po_line_id:
                 wf_service.trg_validate(uid, 'purchase.order.line', line.po_line_id.id, 'cancel', cr)
-            elif line.type_change == 'split' and line.parent_line_id:
+                simu_obj.write(cr, uid, [line.simu_id.id], {'percent_completed': percent_completed}, context=context)
+                cr.commit()
+                continue
+
+            line_vals = {
+                'product_id': line.imp_product_id.id,
+                'product_uom': line.imp_uom.id,
+                'price_unit': line.imp_price,
+                'product_qty': line.imp_qty,
+            }
+            if line.imp_drd:
+                line_vals['date_planned'] = line.imp_drd
+            if line.imp_project_ref:
+                line_vals['project_ref'] = line.imp_project_ref
+            if line.imp_origin:
+                line_vals['origin'] = line.imp_origin
+            if line.imp_external_ref:
+                line_vals['external_ref'] = line.imp_external_ref
+            if line.imp_dcd:
+                line_vals['confirmed_delivery_date'] = line.imp_dcd
+            if line.imp_stock_take_date:
+                line_vals['stock_take_date'] = line.imp_stock_take_date,
+
+            if line.ad_info:
+                line_vals['analytic_distribution_id'] = simu_obj.create_ad(cr, uid, line.ad_info, line.simu_id.order_id.partner_id.partner_type, line.simu_id.order_id.currency_id.id, context)
+
+            if line.type_change == 'split' and line.parent_line_id:
                 # Call the split line wizard
                 po_line_id = False
                 if line.parent_line_id and line.parent_line_id.po_line_id:
@@ -1699,36 +1850,19 @@
                     if not new_product_split and not new_po_line_id:
                         continue  # split line has failed or case not to be done
 
-                    line_vals = {'product_uom': line.imp_uom.id,
-                                 'product_id': line.imp_product_id.id,
-                                 'price_unit': line.imp_price,
-                                 'is_line_split': True,
-                                 }
-                    if line.imp_drd:
-                        line_vals['date_planned'] = line.imp_drd
-                    if line.imp_project_ref:
-                        line_vals['project_ref'] = line.imp_project_ref
-                    if line.imp_origin:
-                        line_vals['origin'] = line.imp_origin
-                    if line.imp_external_ref:
-                        line_vals['external_ref'] = line.imp_external_ref
-                    if line.imp_stock_take_date:
-                        line_vals['stock_take_date'] = line.imp_stock_take_date,
-
-                    # UF-2537 after split reinject import qty computed in
-                    # simu for import consistency versus simu
-                    # (or set qty of a new product split line)
-                    line_vals['product_qty'] = line.imp_qty
+                    line_vals['is_line_split'] = True
 
                     if new_product_split:
                         line_vals.update({
                             'order_id': line.simu_id.order_id.id,
                             'line_number': line.in_line_number,
-                            'confirmed_delivery_date': line.imp_dcd or False,
                             'esc_confirmed': True if line.imp_dcd else False,
                             'original_line_id': line.parent_line_id.po_line_id.id,
                         })
-                        if line.parent_line_id.po_line_id.analytic_distribution_id:
+                        if 'confirmed_delivery_date' not in line_vals:
+                            line_vals['confirmed_delivery_date'] = False
+
+                        if not line_vals.get('analytic_distribution_id') and line.parent_line_id.po_line_id.analytic_distribution_id:
                             line_vals.update({
                                 'analytic_distribution_id': self.pool.get('analytic.distribution').copy(cr, uid, line.parent_line_id.po_line_id.analytic_distribution_id.id, {}, context=context),
                             })
@@ -1740,7 +1874,6 @@
                             line_obj.update_fo_lines(cr, uid, line.parent_line_id.po_line_id.id, context=context)
                     else:
                         if line.imp_dcd:
-                            line_vals['confirmed_delivery_date'] = line.imp_dcd
                             line_vals['esc_confirmed'] = line.esc_conf
                         line_obj.write(cr, uid, [new_po_line_id], line_vals,
                                        context=context)
@@ -1750,11 +1883,8 @@
                     # note: if total qty of splited lines is > to original qty
                     # the original line qty was truncated in term of qty
                     # (never be greater than line.parent_line_id.in_qty)
-                    line_vals = {
-                        'product_qty': line.parent_line_id.imp_qty,
-                    }
                     line_obj.write(cr, uid, [line.parent_line_id.po_line_id.id],
-                                   line_vals, context=context)
+                                   {'product_qty': line.parent_line_id.imp_qty}, context=context)
 
                     job_comment = context.get('job_comment', [])
                     job_comment.append({
@@ -1764,26 +1894,15 @@
                     })
                     context['job_comment'] = job_comment
             elif line.type_change == 'new':
-                line_vals = {'order_id': line.simu_id.order_id.id,
-                             'product_id': line.imp_product_id.id,
-                             'product_uom': line.imp_uom.id,
-                             'price_unit': line.imp_price,
-                             'product_qty': line.imp_qty,
-                             'date_planned': line.imp_drd or line.simu_id.order_id.delivery_requested_date,
-                             'set_as_validated_n': True,
-                             'display_sync_ref': True,
-                             'created_by_vi_import': True,
-                             }
-                if line.imp_stock_take_date:
-                    line_vals['stock_take_date'] = line.imp_stock_take_date,
-                if line.imp_dcd:
-                    line_vals['confirmed_delivery_date'] = line.imp_dcd
-                if line.imp_project_ref:
-                    line_vals['project_ref'] = line.imp_project_ref
-                if line.imp_origin:
-                    line_vals['origin'] = line.imp_origin
-                if line.imp_external_ref:
-                    line_vals['external_ref'] = line.imp_external_ref
+                line_vals.update({
+                    'order_id': line.simu_id.order_id.id,
+                    'set_as_validated_n': True,
+                    'display_sync_ref': True,
+                    'created_by_vi_import': True,
+                })
+                if not line_vals.get('date_planned'):
+                    line_vals['date_planned'] = line.simu_id.order_id.delivery_requested_date
+
                 if line.esc_conf:
                     line_vals['esc_confirmed'] = line.esc_conf
                 new_line_id = line_obj.create(cr, uid, line_vals, context=context)
@@ -1796,21 +1915,6 @@
                 })
                 context['job_comment'] = job_comment
             elif line.po_line_id:
-                line_vals = {'product_id': line.imp_product_id.id,
-                             'product_uom': line.imp_uom.id,
-                             'price_unit': line.imp_price,
-                             'product_qty': line.imp_qty,
-                             }
-                if line.imp_drd:
-                    line_vals['date_planned'] = line.imp_drd
-                if line.imp_dcd:
-                    line_vals['confirmed_delivery_date'] = line.imp_dcd
-                if line.imp_project_ref:
-                    line_vals['project_ref'] = line.imp_project_ref
-                if line.imp_origin:
-                    line_vals['origin'] = line.imp_origin
-                if line.imp_external_ref:
-                    line_vals['external_ref'] = line.imp_external_ref
                 if line.esc_conf:
                     line_vals['esc_confirmed'] = line.esc_conf
                 if context.get('auto_import_ok') and line.simu_id.order_id.stock_take_date:
@@ -1818,7 +1922,6 @@
 
                 line_obj.write(cr, uid, [line.po_line_id.id], line_vals, context=context)
             simu_obj.write(cr, uid, [line.simu_id.id], {'percent_completed': percent_completed}, context=context)
-            # Commit modifications
             cr.commit()
 
         if ids:

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2018-08-14 13:52:14 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2019-04-25 15:27:08 +0000
@@ -54,6 +54,7 @@
                             <field name="in_shipment_date" />
                             <field name="imp_shipment_date" nolabel="1" />
                             <label> </label>
+                            <field name="ad_info" widget="boolean" />
                             <group colspan="4" string="Header notes">
                                  <field name="imp_notes" colspan="4" nolabel="1" />
                             </group>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-04-08 09:30:07 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-04-25 15:27:08 +0000
@@ -13212,6 +13212,7 @@
 
 #. module: msf_tools
 #: code:addons/msf_tools/automated_import.py:204
+#: code:addons/msf_tools/automated_export.py:197
 #, python-format
 msgid "Unable to connect with given login and password"
 msgstr "Impossible de se connecter avec le login/mot de passe donné"
@@ -31708,6 +31709,8 @@
 #: field:wizard.import.threshold.value.line,data:0
 #: field:wizard.import.threshold.value.line,filename:0
 #: field:internal.request.import,error_filename:0
+#: field:wizard.import.ppl.to.create.ship,data:0
+#: field:wizard.import.ppl.to.create.ship,filename:0
 msgid "Lines with errors"
 msgstr "Lignes avec des erreurs"
 
@@ -37894,6 +37897,7 @@
 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:658
 #: report:empty.picking.ticket:0
 #: report:picking.ticket:0
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:71
 #, python-format
 msgid "Date"
 msgstr "Date"
@@ -39269,7 +39273,7 @@
 msgid "Is inactive for destination given in context"
 msgstr "Is inactive for destination given in context"
 
-#. modules: sales_followup, account, account_payment, documents_done, consumption_calculation, sale, specific_rules, transport_mgmt, account_override, purchase_allocation_report, product_list, tender_flow, msf_doc_import, stock, product_attributes
+#. modules: sales_followup, account, account_payment, documents_done, consumption_calculation, sale, specific_rules, transport_mgmt, account_override, purchase_allocation_report, product_list, tender_flow, msf_doc_import, stock, product_attributes, purchase
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 #: report:allocation.invoices.report:0
@@ -39293,6 +39297,7 @@
 #: selection:account.journal.column,field:0
 #: code:addons/product_attributes/product_attributes.py:908
 #: field:product.product,uf_create_date:0
+#: field:purchase.order.line,create_date:0
 #, python-format
 msgid "Creation date"
 msgstr "Date de création"
@@ -59229,6 +59234,7 @@
 #: code:addons/msf_instance/msf_instance.py:768
 #: code:addons/msf_instance/msf_instance.py:775
 #: code:addons/product/product.py:771
+#: code:addons/msf_doc_import/purchase_order.py:68
 #, python-format
 msgid "Warning"
 msgstr "Avertissement"
@@ -62165,6 +62171,13 @@
 msgid "Not able to connect to FTP server at location %s"
 msgstr "Impossible de se connecter au serveur FTP à l'adresse %s"
 
+#. module: msf_tools
+#: code:addons/msf_tools/automated_export.py:192
+#: code:addons/msf_tools/automated_import.py:199
+#, python-format
+msgid "Not able to connect to SFTP server at location %s"
+msgstr "Impossible de se connecter au serveur SFTP à l'adresse %s"
+
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/check_line.py:397
 #, python-format
@@ -64386,6 +64399,7 @@
 #: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:443
 #: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:250
 #: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:267
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:505
 #, python-format
 msgid "Nothing to import"
 msgstr "Rien à importer"
@@ -66830,6 +66844,7 @@
 #: field:wizard.import.ir.line,import_error_ok:0
 #: field:wizard.import.po.line,import_error_ok:0
 #: field:wizard.import.tender.line,import_error_ok:0
+#: field:wizard.import.ppl.to.create.ship,import_error_ok:0
 msgid "Error at import"
 msgstr "Erreur lors de l'import"
 
@@ -74643,6 +74658,11 @@
 #: code:addons/sale/wizard/internal_request_import.py:166
 #: code:addons/msf_outgoing/wizard/create_picking_processor.py:55
 #: selection:internal.request.import,state:0
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:98
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:119
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:129
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:392
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:517
 #, python-format, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -82207,6 +82227,7 @@
 #: field:account.invoice.line,cost_center_id:0
 #: code:addons/register_accounting/wizard/wizard_register_import.py:570
 #: report:addons/account/report/free_allocation_report.mako:205
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:606
 #, python-format
 msgid "Cost Center"
 msgstr "Centre de Coût"
@@ -84319,6 +84340,7 @@
 #: field:account.analytic.line,purchase_order_id:0
 #: selection:procurement.request.sourcing.document,linked_model:0
 #: report:addons/stock/report/stock_reception_report_xls.mako:227
+#: field:purchase.order.manual.export,purchase_id:0
 msgid "Purchase Order"
 msgstr "Bon de Commande"
 
@@ -87629,8 +87651,9 @@
 msgid "Display analytic periods?"
 msgstr "Display analytic periods?"
 
-#. module: sale
+#. module: sale, purchase
 #: field:sale.order,date_confirm:0
+#: field:purchase.order.line,confirmation_date:0
 msgid "Confirmation Date"
 msgstr "Date de Confirmation"
 
@@ -94178,9 +94201,10 @@
 msgid "Real project amount (value)"
 msgstr "Montant réel projet (valeur)"
 
-#. module: msf_outgoing
+#. module: msf_outgoing, msf_doc_import
 #: code:addons/msf_outgoing/wizard/picking_processor.py:820
 #: code:addons/msf_outgoing/wizard/ppl_processor.py:779
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:130
 #, python-format
 msgid "No line to split !"
 msgstr "Pas de ligne à diviser!"
@@ -96457,6 +96481,7 @@
 #: view:sync.client.message_to_send:0
 #: report:addons/account/report/free_allocation_report.mako:202
 #: report:addons/stock_override/report/report_stock_move_xls.mako:143
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:606
 #, python-format
 msgid "Destination"
 msgstr "Destination"
@@ -98080,6 +98105,7 @@
 #: view:stock.move.cancel.wizard:0
 #: view:stock.picking.cancel.wizard:0
 #: view:wizard.pick.import:0
+#: code:addons/msf_doc_import/purchase_order.py:60
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -98752,7 +98778,7 @@
 msgid "Removal date"
 msgstr "Date de Retrait"
 
-#. modules: msf_budget, sync_client, res_currency_tables, financing_contract, msf_homere_interface, msf_instance, export_import_lang
+#. modules: msf_budget, sync_client, res_currency_tables, financing_contract, msf_homere_interface, msf_instance, export_import_lang, msf_doc_import
 #: view:base.language.export:0
 #: view:base.language.import:0
 #: view:msf.language.import:0
@@ -98763,6 +98789,7 @@
 #: view:confirm.import.currencies:0
 #: view:warning.import.currencies:0
 #: code:addons/sync_client/backup.py:124
+#: code:addons/msf_doc_import/purchase_order.py:61
 #, python-format
 msgid "OK"
 msgstr "OK"
@@ -105336,6 +105363,7 @@
 msgstr "\n"
 "                                        Attention: Les lignes suivantes ont des qté ou des montants sur plus de 15 chiffres. Veuillez vérifier la qté et le prix unitaire pour éviter des pertes d'information:\n"
 "                                    "
+<<<<<<< TREE
 
 #. module: msf_homere_interface
 #: code:addons/msf_homere_interface/wizard/hr_payroll_import.py:580
@@ -105388,3 +105416,109 @@
 #, python-format
 msgid "Product %s, BN: %s not enough stock to process quantity %s %s (stock level: %s)"
 msgstr "Produit %s, Lot: %s, pas assez de stock pour traiter la qantité %s %s (quantité en stock: %s)"
+=======
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1379
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1392
+#, python-format
+msgid "\n"
+"AD"
+msgstr "\n"
+"DA"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:584
+#, python-format
+msgid "%% in AD must be a number (value found %s), AD in file ignored"
+msgstr "%% de la DA doit être un nombre (valeur trouvé %s), DA du fichier ignorée"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:616
+#, python-format
+msgid "%s %s not found or inactive , AD in file ignored"
+msgstr "%s %s non trouvé ou inactif, DA du fichier ignoré"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1542
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1550
+#, python-format
+msgid "A batch number 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 d'import mais le produit ne nécessite de pas lot - Numéro de Lot ignoré"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:625
+#, python-format
+msgid "Already has a valid Analytical Distribution"
+msgstr "Possède déjà une DA valide"
+
+#. module: msf_doc_import
+#: field:purchase.order,can_be_auto_exported:0
+msgid "Can be auto exported ?"
+msgstr "Peut être auto exporté ?"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:574
+#, python-format
+msgid "Invalid AD format: %d columns found, multiple of 4 expected"
+msgstr "Format DA invalide: %d colonnes trouvés, une multiple de 4 est attendu"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:907
+#, python-format
+msgid "Line 22 of the file: Analytical Distribution ignored: \n"
+" - %s"
+msgstr "Ligne 22 du fichier: DA ignorée: \n"
+" - %s"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/purchase_order.py:49
+#, python-format
+msgid "Manually run export of PO"
+msgstr "Exécuter manuellement l'export du BdC"
+
+#. module: msf_doc_import
+#: field:wizard.import.po.simulation.screen.line,ad_info:0
+msgid "New AD"
+msgstr "Nouvelle AD"
+
+#. module: msf_doc_import
+#: field:wizard.import.po.simulation.screen,ad_info:0
+msgid "New Header AD"
+msgstr "Nouvelle DA en en-tête"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/purchase_order.py:78
+#, python-format
+msgid "PO %s %d lines rejected"
+msgstr "BdC %s %d lignes rejetées"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/purchase_order.py:76
+#, python-format
+msgid "PO %s successfully exported"
+msgstr "BdC %s exporté avec succès"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Run PO export job"
+msgstr "Exécuter la tâche d'export du BdC"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:592
+#, python-format
+msgid "Sum of AD %% must be 100 (value found %s), AD in file ignored"
+msgstr "La somme des %% de la DA doit être de 100 (valeur du fichier %s), DA du fichier ignorée"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/purchase_order.py:52
+#, python-format
+msgid "The PO was already exported, do you want to export it again ?"
+msgstr "Le BdC a déjà été exporté, voulez le ré-exporter ?"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/purchase_order.py:68
+#, python-format
+msgid "The job to export PO is not active."
+msgstr "La tâche d'export du PO n'est pas active."
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_tools/automated_export.py'
--- bin/addons/msf_tools/automated_export.py	2018-06-08 09:33:50 +0000
+++ bin/addons/msf_tools/automated_export.py	2019-04-25 15:27:08 +0000
@@ -219,7 +219,7 @@
                 sftp = pysftp.Connection(obj.ftp_url, username=obj.ftp_login, password=obj.ftp_password, cnopts=cnopts)
             except:
                 self.infolog(cr, uid, _('%s :: SFTP connection failed') % obj.name)
-                raise osv.except_osv(_('Error'), _('Not able to connect to FTP server at location %s') % obj.ftp_url)
+                raise osv.except_osv(_('Error'), _('Not able to connect to SFTP server at location %s') % obj.ftp_url)
 
         if not context.get('no_raise_if_ok'):
             raise osv.except_osv(_('Info'), _('Connection succeeded'))

=== modified file 'bin/addons/msf_tools/automated_export_job.py'
--- bin/addons/msf_tools/automated_export_job.py	2018-07-16 16:08:08 +0000
+++ bin/addons/msf_tools/automated_export_job.py	2019-04-25 15:27:08 +0000
@@ -29,12 +29,12 @@
 from osv import fields
 
 from tools.translate import _
-
+import logging
 
 
 class automated_export_job(osv.osv):
     _name = 'automated.export.job'
-
+    logger = logging.getLogger('automated.export.job')
     def _get_name(self, cr, uid, ids, field_name, args, context=None):
         """
         Build the name of the job by using the function_id and the date and time
@@ -136,17 +136,17 @@
 
             ftp_connec = None
             sftp = None
-            context.update({'no_raise_if_ok': True})
-            if job.export_id.ftp_ok and job.export_id.ftp_protocol == 'ftp':
-                ftp_connec = self.pool.get('automated.export').ftp_test_connection(cr, uid, job.export_id.id, context=context)
-            elif job.export_id.ftp_ok and job.export_id.ftp_protocol == 'sftp':
-                sftp = self.pool.get('automated.export').sftp_test_connection(cr, uid, job.export_id.id, context=context)
-            context.pop('no_raise_if_ok')
+            try:
+                context.update({'no_raise_if_ok': True})
+                if job.export_id.ftp_ok and job.export_id.ftp_protocol == 'ftp':
+                    ftp_connec = self.pool.get('automated.export').ftp_test_connection(cr, uid, job.export_id.id, context=context)
+                elif job.export_id.ftp_ok and job.export_id.ftp_protocol == 'sftp':
+                    sftp = self.pool.get('automated.export').sftp_test_connection(cr, uid, job.export_id.id, context=context)
+                context.pop('no_raise_if_ok')
+                # Process export
+                error_message = []
+                state = 'done'
 
-            # Process export
-            error_message = []
-            state = 'done'
-            try:
                 processed, rejected, headers = getattr(
                     self.pool.get(job.export_id.function_id.model_id.model),
                     job.export_id.function_id.method_to_call
@@ -175,6 +175,7 @@
                     'state': state,
                 }, context=context)
             except Exception as e:
+                self.logger.error('Unable to process export Job %s (%s)' % (job.id, job.name), exc_info=True)
                 self.write(cr, uid, [job.id], {
                     'start_time': start_time,
                     'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),

=== modified file 'bin/addons/msf_tools/automated_import.py'
--- bin/addons/msf_tools/automated_import.py	2019-02-05 10:58:40 +0000
+++ bin/addons/msf_tools/automated_import.py	2019-04-25 15:27:08 +0000
@@ -224,7 +224,7 @@
                 sftp = pysftp.Connection(obj.ftp_url, username=obj.ftp_login, password=obj.ftp_password, cnopts=cnopts)
             except:
                 self.infolog(cr, uid, _('%s :: SFTP connection failed') % obj.name)
-                raise osv.except_osv(_('Error'), _('Not able to connect to FTP server at location %s') % obj.ftp_url)
+                raise osv.except_osv(_('Error'), _('Not able to connect to SFTP server at location %s') % obj.ftp_url)
 
         if not context.get('no_raise_if_ok'):
             raise osv.except_osv(_('Info'), _('Connection succeeded'))

=== modified file 'bin/addons/msf_tools/automated_import_job.py'
--- bin/addons/msf_tools/automated_import_job.py	2019-02-05 13:34:53 +0000
+++ bin/addons/msf_tools/automated_import_job.py	2019-04-25 15:27:08 +0000
@@ -38,59 +38,27 @@
 from StringIO import StringIO
 from mission_stock.mission_stock import UnicodeWriter
 
+from threading import RLock
 
-def all_files_under(path, startswith=False):
+def all_files_under(path, startswith=False, already=None):
     """
     Iterates through all files that are under the given path.
     :param path: Path on which we want to iterate
     """
-    res = []
+    if already is None:
+        already = []
+
     for cur_path, dirnames, filenames in os.walk(path):
         if startswith:
             filenames = [fn for fn in filenames if fn.startswith(startswith)]
-        res.extend([os.path.join(cur_path, fn) for fn in filenames])
-        break # don't parse children
-    return res
-
-def get_oldest_filename(job, ftp_connec=None, sftp=None, already=None):
-    '''
-    Get the oldest file in local or on FTP server
-    '''
-    if already is None:
-        already = []
-    logging.getLogger('automated.import').info(_('Getting the oldest file at location %s') % job.import_id.src_path)
-    if not job.import_id.ftp_source_ok:
-        return min(all_files_under(job.import_id.src_path, job.import_id.function_id.startswith), key=os.path.getmtime)
-    elif job.import_id.ftp_protocol == 'ftp':
-        files = []
-        ftp_connec.dir(job.import_id.src_path, files.append)
-        file_names = []
-        for file in files:
-            if file.startswith('d'): # directory
-                continue
-            if job.import_id.function_id.startswith and not file.split(' ')[-1].startswith(job.import_id.function_id.startswith):
-                continue
-            file_names.append( posixpath.join(job.import_id.src_path, file.split(' ')[-1]) )
         res = []
-        for file in file_names:
-            if file not in already:
-                dt = ftp_connec.sendcmd('MDTM %s' % file).split(' ')[-1]
-                dt = time.strptime(dt, '%Y%m%d%H%M%S') # '20180228170748'
-                res.append((dt, file))
-        return min(res, key=lambda x:x[1])[1] if res else False
-    elif job.import_id.ftp_protocol == 'sftp':
-        latest = 0
-        latestfile = False
-        with sftp.cd(job.import_id.src_path):
-            for fileattr in sftp.listdir_attr():
-                if sftp.isfile(fileattr.filename) and fileattr.st_mtime > latest:
-                    if job.import_id.function_id.startswith and not fileattr.filename.startswith(job.import_id.function_id.startswith):
-                        continue
-                    posix_name = posixpath.join(job.import_id.src_path, fileattr.filename)
-                    if posix_name not in already:
-                        latest = fileattr.st_mtime
-                        latestfile = posix_name
-        return latestfile
+        for fn in filenames:
+            full_name = os.path.join(cur_path, fn)
+            if full_name not in already:
+                res.append((os.stat(full_name).st_ctime, full_name))
+        return res
+    return []
+
 
 
 def get_file_content(file, from_ftp=False, ftp_connec=None, sftp=None):
@@ -191,7 +159,10 @@
 
 class automated_import_job(osv.osv):
     _name = 'automated.import.job'
+    _order = 'id desc'
 
+    _processing = {}
+    _lock = RLock()
     def _get_name(self, cr, uid, ids, field_name, args, context=None):
         """
         Build the name of the job by using the function_id and the date and time
@@ -215,6 +186,22 @@
 
         return res
 
+    def is_processing_filename(self, filename):
+        with self._lock:
+            if filename not in self._processing:
+                self._processing[filename] = True
+                return False
+            logging.getLogger('automated.import').info(_('Ignore already processing %s') % filename)
+            return True
+
+    def end_processing_filename(self, filename):
+        with self._lock:
+            try:
+                del(self._processing[filename])
+            except KeyError:
+                pass
+
+
     _columns = {
         'name': fields.function(
             _get_name,
@@ -279,7 +266,47 @@
         'state': lambda *a: 'draft',
     }
 
-    _order = 'id desc'
+
+    def get_oldest_filename(self, job, ftp_connec=None, sftp=None, already=None):
+        '''
+        Get the oldest file in local or on FTP server
+        '''
+        if already is None:
+            already = []
+        logging.getLogger('automated.import').info(_('Getting the oldest file at location %s') % job.import_id.src_path)
+
+        res = []
+        if not job.import_id.ftp_source_ok:
+            res = all_files_under(job.import_id.src_path, job.import_id.function_id.startswith, already)
+        elif job.import_id.ftp_protocol == 'ftp':
+            files = []
+            ftp_connec.dir(job.import_id.src_path, files.append)
+            file_names = []
+            for file in files:
+                if file.startswith('d'): # directory
+                    continue
+                if job.import_id.function_id.startswith and not file.split(' ')[-1].startswith(job.import_id.function_id.startswith):
+                    continue
+                file_names.append( posixpath.join(job.import_id.src_path, file.split(' ')[-1]) )
+            for file in file_names:
+                if file not in already:
+                    dt = ftp_connec.sendcmd('MDTM %s' % file).split(' ')[-1]
+                    dt = time.strptime(dt, '%Y%m%d%H%M%S') # '20180228170748'
+                    res.append((dt, file))
+
+        elif job.import_id.ftp_protocol == 'sftp':
+            with sftp.cd(job.import_id.src_path):
+                for fileattr in sftp.listdir_attr():
+                    if sftp.isfile(fileattr.filename):
+                        if job.import_id.function_id.startswith and not fileattr.filename.startswith(job.import_id.function_id.startswith):
+                            continue
+                        posix_name = posixpath.join(job.import_id.src_path, fileattr.filename)
+                        if posix_name not in already:
+                            res.append((fileattr.st_mtime, posix_name))
+        for x in sorted(res, key=lambda x:x[0]):
+            if not self.is_processing_filename(x[1]):
+                return x[1]
+        return False
 
     def manual_process_import(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
@@ -332,10 +359,20 @@
             ftp_connec = None
             sftp = None
             context.update({'no_raise_if_ok': True, 'auto_import_ok': True})
-            if import_data.ftp_ok and import_data.ftp_protocol == 'ftp':
-                ftp_connec = self.pool.get('automated.import').ftp_test_connection(cr, uid, import_data.id, context=context)
-            elif import_data.ftp_ok and import_data.ftp_protocol == 'sftp':
-                sftp = self.pool.get('automated.import').sftp_test_connection(cr, uid, import_data.id, context=context)
+            try:
+                if import_data.ftp_ok and import_data.ftp_protocol == 'ftp':
+                    ftp_connec = self.pool.get('automated.import').ftp_test_connection(cr, uid, import_data.id, context=context)
+                elif import_data.ftp_ok and import_data.ftp_protocol == 'sftp':
+                    sftp = self.pool.get('automated.import').sftp_test_connection(cr, uid, import_data.id, context=context)
+            except Exception, e:
+                if job.id:
+                    if isinstance(e, osv.except_osv):
+                        msg = e.value
+                    else:
+                        msg = e
+                    self.write(cr, uid, job_id, {'state': 'error', 'end_time': time.strftime('%Y-%m-%d %H:%M:%S'), 'start_time': start_time, 'comment': tools.ustr(msg)}, context=context)
+                    cr.commit()
+                raise
 
             try:
                 for path in [('src_path', 'r', 'ftp_source_ok'), ('dest_path', 'w', 'ftp_dest_ok'), ('dest_path_failure', 'w', 'ftp_dest_fail_ok'), ('report_path', 'w', 'ftp_report_ok')]:
@@ -348,168 +385,176 @@
                 if job.file_to_import:
                     raise e
 
-            if not job.file_to_import:
+            try:
+                oldest_file = False
+                orig_file_name = False
+                if not job.file_to_import:
+                    try:
+                        oldest_file = self.get_oldest_filename(job, ftp_connec, sftp, already_done)
+                        orig_file_name = oldest_file
+                        already_done.append(oldest_file)
+                        if not oldest_file:
+                            raise ValueError()
+                        filename = os.path.split(oldest_file)[1]
+                        file_content = get_file_content(oldest_file, import_data.ftp_source_ok, ftp_connec, sftp)
+                        md5 = hashlib.md5(file_content).hexdigest()
+                        data64 = base64.encodestring(file_content)
+                    except ValueError:
+                        no_file = True
+                    except Exception as e:
+                        no_file = True
+                        error = tools.ustr(traceback.format_exc())
+
+                    if not error:
+                        if no_file:
+                            if not prev_job_id:
+                                error = _('No file to import in %s !') % import_data.src_path
+                            else:
+                                # files already processed in previous loop: delete the in_progress job
+                                self.unlink(cr, 1, [job_id], context=context)
+                                job_id = prev_job_id
+                                break
+
+                        elif md5 and self.search_exist(cr, uid, [('import_id', '=', import_data.id), ('file_sum', '=', md5)], context=context):
+                            error = _('A file with same checksum has been already imported !')
+                            move_to_process_path(import_data, ftp_connec, sftp, filename, success=False)
+                            self.infolog(cr, uid, _('%s :: Import file (%s) moved to destination path') % (import_data.name, filename))
+
+                    if error:
+                        self.infolog(cr, uid, '%s :: %s' % (import_data.name , error))
+                        self.write(cr, uid, [job.id], {
+                            'filename': filename,
+                            'file_to_import': data64,
+                            'start_time': start_time,
+                            'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
+                            'nb_processed_records': 0,
+                            'nb_rejected_records': 0,
+                            'comment': error,
+                            'file_sum': md5,
+                            'state': 'done' if no_file else 'error',
+                        }, context=context)
+                        continue
+                else: # file to import given
+                    no_file = True
+                    if job.import_id.ftp_source_ok:
+                        raise osv.except_osv(_('Error'), _('You cannot manually select a file to import if given source path is set on FTP server'))
+                    oldest_file = open(os.path.join(job.import_id.src_path, job.filename), 'wb+')
+                    oldest_file.write(base64.decodestring(job.file_to_import))
+                    oldest_file.close()
+                    md5 = hashlib.md5(job.file_to_import).hexdigest()
+
+                    if job.file_sum != md5:
+                        if self.search_exist(cr, uid, [('file_sum', '=', md5), ('id', '!=', job.id)], context=context):
+                            self.write(cr, uid, [job.id], {'file_sum': md5}, context=context)
+                            return {
+                                'type': 'ir.actions.act_window',
+                                'res_model': self._name,
+                                'res_id': job_id,
+                                'view_type': 'form',
+                                'view_mode': 'form,tree',
+                                'target': 'new',
+                                'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'automated_import_job_file_view')[1]],
+                                'context': context,
+                            }
+
+                    oldest_file = os.path.join(job.import_id.src_path, job.filename)
+                    filename = job.filename
+                    data64 = base64.encodestring(job.file_to_import)
+
+                # Process import
+                error_message = []
+                state = 'done'
                 try:
-                    oldest_file = get_oldest_filename(job, ftp_connec, sftp, already_done)
-                    already_done.append(oldest_file)
-                    if not oldest_file:
-                        raise ValueError()
-                    filename = os.path.split(oldest_file)[1]
-                    md5 = hashlib.md5(get_file_content(oldest_file, import_data.ftp_source_ok, ftp_connec, sftp)).hexdigest()
-                    data64 = base64.encodestring(get_file_content(oldest_file, import_data.ftp_source_ok, ftp_connec, sftp))
-                except ValueError:
-                    no_file = True
+                    if import_data.ftp_source_ok and import_data.ftp_protocol == 'ftp':
+                        prefix = '%s_' % filename.split('.')[0]
+                        suffix = '.xls' if self.pool.get('stock.picking').get_import_filetype(cr, uid, filename) == 'excel' else '.xml'
+                        temp_file = tempfile.NamedTemporaryFile(delete=False, prefix=prefix, suffix=suffix)
+                        ftp_connec.retrbinary('RETR %s' % oldest_file, temp_file.write)
+                        temp_file.close()
+                        oldest_file = temp_file.name
+                    elif import_data.ftp_source_ok and import_data.ftp_protocol == 'sftp':
+                        tmp_dest_path = os.path.join(tempfile.gettempdir(), filename)
+                        sftp.get(oldest_file, tmp_dest_path)
+                        oldest_file = tmp_dest_path
+
+                    processed, rejected, headers = getattr(
+                        self.pool.get(import_data.function_id.model_id.model),
+                        import_data.function_id.method_to_call
+                    )(cr, uid, oldest_file, context=context)
+                    if processed:
+                        nb_processed += self.generate_file_report(cr, uid, job, processed, headers, ftp_connec=ftp_connec, sftp=sftp)
+
+                    if rejected:
+                        nb_rejected += self.generate_file_report(cr, uid, job, rejected, headers, rejected=True, ftp_connec=ftp_connec, sftp=sftp)
+                        state = 'error'
+                        for resjected_line in rejected:
+                            line_message = ''
+                            if resjected_line[0]:
+                                line_message = _('Line %s: ') % resjected_line[0]
+                            line_message += resjected_line[2]
+                            error_message.append(line_message)
+
+                    if context.get('rejected_confirmation'):
+                        nb_rejected += context.get('rejected_confirmation')
+                        state = 'error'
+
+                    self.infolog(cr, uid, _('%s :: Import job done with %s records processed and %s rejected') % (import_data.name, len(processed), nb_rejected))
+
+                    if import_data.function_id.model_id.model == 'purchase.order':
+                        po_id = self.pool.get('purchase.order').get_po_id_from_file(cr, uid, oldest_file, context=context)
+                        if po_id and (nb_processed or nb_rejected):
+                            po_name = self.pool.get('purchase.order').read(cr, uid, po_id, ['name'], context=context)['name']
+                            nb_total_pol = self.pool.get('purchase.order.line').search(cr, uid, [('order_id', '=', po_id)], count=True, context=context)
+                            msg = _('%s: ') % po_name
+                            if nb_processed:
+                                msg += _('%s out of %s lines have been updated') % (nb_processed, nb_total_pol)
+                                if nb_rejected:
+                                    msg += _(' and ')
+                            if nb_rejected:
+                                msg += _('%s out of %s lines have been rejected') % (nb_rejected, nb_total_pol)
+                            if nb_processed or nb_rejected:
+                                self.pool.get('purchase.order').log(cr, uid, po_id, msg)
+
+                    if context.get('job_comment'):
+                        for msg_dict in context['job_comment']:
+                            self.pool.get(msg_dict['res_model']).log(cr, uid, msg_dict['res_id'], msg_dict['msg'])
+                            error_message.append(msg_dict['msg'])
+
+                    self.write(cr, uid, [job.id], {
+                        'filename': filename,
+                        'start_time': start_time,
+                        'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
+                        'nb_processed_records': nb_processed,
+                        'nb_rejected_records': nb_rejected,
+                        'comment': '\n'.join(error_message),
+                        'file_sum': md5,
+                        'file_to_import': data64,
+                        'state': state,
+                    }, context=context)
+                    is_success = True if not rejected else False
+                    move_to_process_path(import_data, ftp_connec, sftp, filename, success=is_success)
+                    self.infolog(cr, uid, _('%s :: Import file (%s) moved to destination path') % (import_data.name, filename))
+                    cr.commit()
                 except Exception as e:
-                    no_file = True
-                    error = tools.ustr(traceback.format_exc())
-
-                if not error:
-                    if no_file:
-                        if not prev_job_id:
-                            error = _('No file to import in %s !') % import_data.src_path
-                        else:
-                            # files already processed in previous loop: delete the in_progress job
-                            self.unlink(cr, 1, [job_id], context=context)
-                            job_id = prev_job_id
-                            break
-
-                    elif md5 and self.search_exist(cr, uid, [('import_id', '=', import_data.id), ('file_sum', '=', md5)], context=context):
-                        error = _('A file with same checksum has been already imported !')
-                        move_to_process_path(import_data, ftp_connec, sftp, filename, success=False)
-                        self.infolog(cr, uid, _('%s :: Import file (%s) moved to destination path') % (import_data.name, filename))
-
-                if error:
-                    self.infolog(cr, uid, '%s :: %s' % (import_data.name , error))
+                    cr.rollback()
+                    trace_b = tools.ustr(traceback.format_exc())
+                    self.infolog(cr, uid, '%s :: %s' % (import_data.name, trace_b))
                     self.write(cr, uid, [job.id], {
-                        'filename': filename,
-                        'file_to_import': data64,
+                        'filename': False,
                         'start_time': start_time,
                         'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
                         'nb_processed_records': 0,
                         'nb_rejected_records': 0,
-                        'comment': error,
+                        'comment': trace_b,
                         'file_sum': md5,
-                        'state': 'done' if no_file else 'error',
+                        'file_to_import': data64,
+                        'state': 'error',
                     }, context=context)
-                    continue
-            else: # file to import given
-                no_file = True
-                if job.import_id.ftp_source_ok:
-                    raise osv.except_osv(_('Error'), _('You cannot manually select a file to import if given source path is set on FTP server'))
-                oldest_file = open(os.path.join(job.import_id.src_path, job.filename), 'wb+')
-                oldest_file.write(base64.decodestring(job.file_to_import))
-                oldest_file.close()
-                md5 = hashlib.md5(job.file_to_import).hexdigest()
-
-                if job.file_sum != md5:
-                    if self.search_exist(cr, uid, [('file_sum', '=', md5), ('id', '!=', job.id)], context=context):
-                        self.write(cr, uid, [job.id], {'file_sum': md5}, context=context)
-                        return {
-                            'type': 'ir.actions.act_window',
-                            'res_model': self._name,
-                            'res_id': job_id,
-                            'view_type': 'form',
-                            'view_mode': 'form,tree',
-                            'target': 'new',
-                            'view_id': [data_obj.get_object_reference(cr, uid, 'msf_tools', 'automated_import_job_file_view')[1]],
-                            'context': context,
-                        }
-
-                oldest_file = os.path.join(job.import_id.src_path, job.filename)
-                filename = job.filename
-                data64 = base64.encodestring(job.file_to_import)
-
-            # Process import
-            error_message = []
-            state = 'done'
-            try:
-                if import_data.ftp_source_ok and import_data.ftp_protocol == 'ftp':
-                    prefix = '%s_' % filename.split('.')[0]
-                    suffix = '.xls' if self.pool.get('stock.picking').get_import_filetype(cr, uid, filename) == 'excel' else '.xml'
-                    temp_file = tempfile.NamedTemporaryFile(delete=False, prefix=prefix, suffix=suffix)
-                    ftp_connec.retrbinary('RETR %s' % oldest_file, temp_file.write)
-                    temp_file.close()
-                    oldest_file = temp_file.name
-                elif import_data.ftp_source_ok and import_data.ftp_protocol == 'sftp':
-                    tmp_dest_path = os.path.join(tempfile.gettempdir(), filename)
-                    sftp.get(oldest_file, tmp_dest_path)
-                    oldest_file = tmp_dest_path
-
-                processed, rejected, headers = getattr(
-                    self.pool.get(import_data.function_id.model_id.model),
-                    import_data.function_id.method_to_call
-                )(cr, uid, oldest_file, context=context)
-                if processed:
-                    nb_processed += self.generate_file_report(cr, uid, job, processed, headers, ftp_connec=ftp_connec, sftp=sftp)
-
-                if rejected:
-                    nb_rejected += self.generate_file_report(cr, uid, job, rejected, headers, rejected=True, ftp_connec=ftp_connec, sftp=sftp)
-                    state = 'error'
-                    for resjected_line in rejected:
-                        line_message = ''
-                        if resjected_line[0]:
-                            line_message = _('Line %s: ') % resjected_line[0]
-                        line_message += resjected_line[2]
-                        error_message.append(line_message)
-
-                if context.get('rejected_confirmation'):
-                    nb_rejected += context.get('rejected_confirmation')
-                    state = 'error'
-
-                self.infolog(cr, uid, _('%s :: Import job done with %s records processed and %s rejected') % (import_data.name, len(processed), nb_rejected))
-
-                if import_data.function_id.model_id.model == 'purchase.order':
-                    po_id = self.pool.get('purchase.order').get_po_id_from_file(cr, uid, oldest_file, context=context)
-                    if po_id and (nb_processed or nb_rejected):
-                        po_name = self.pool.get('purchase.order').read(cr, uid, po_id, ['name'], context=context)['name']
-                        nb_total_pol = self.pool.get('purchase.order.line').search(cr, uid, [('order_id', '=', po_id)], count=True, context=context)
-                        msg = _('%s: ') % po_name
-                        if nb_processed:
-                            msg += _('%s out of %s lines have been updated') % (nb_processed, nb_total_pol)
-                            if nb_rejected:
-                                msg += _(' and ')
-                        if nb_rejected:
-                            msg += _('%s out of %s lines have been rejected') % (nb_rejected, nb_total_pol)
-                        if nb_processed or nb_rejected:
-                            self.pool.get('purchase.order').log(cr, uid, po_id, msg)
-
-                if context.get('job_comment'):
-                    for msg_dict in context['job_comment']:
-                        self.pool.get(msg_dict['res_model']).log(cr, uid, msg_dict['res_id'], msg_dict['msg'])
-                        error_message.append(msg_dict['msg'])
-
-                self.write(cr, uid, [job.id], {
-                    'filename': filename,
-                    'start_time': start_time,
-                    'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
-                    'nb_processed_records': nb_processed,
-                    'nb_rejected_records': nb_rejected,
-                    'comment': '\n'.join(error_message),
-                    'file_sum': md5,
-                    'file_to_import': data64,
-                    'state': state,
-                }, context=context)
-                is_success = True if not rejected else False
-                move_to_process_path(import_data, ftp_connec, sftp, filename, success=is_success)
-                self.infolog(cr, uid, _('%s :: Import file (%s) moved to destination path') % (import_data.name, filename))
-                cr.commit()
-            except Exception as e:
-                cr.rollback()
-                trace_b = tools.ustr(traceback.format_exc())
-                self.infolog(cr, uid, '%s :: %s' % (import_data.name, trace_b))
-                self.write(cr, uid, [job.id], {
-                    'filename': False,
-                    'start_time': start_time,
-                    'end_time': time.strftime('%Y-%m-%d %H:%M:%S'),
-                    'nb_processed_records': 0,
-                    'nb_rejected_records': 0,
-                    'comment': trace_b,
-                    'file_sum': md5,
-                    'file_to_import': data64,
-                    'state': 'error',
-                }, context=context)
-                move_to_process_path(import_data, ftp_connec, sftp, filename, success=False)
-                self.infolog(cr, uid, _('%s :: Import file (%s) moved to destination path') % (import_data.name, filename))
+                    move_to_process_path(import_data, ftp_connec, sftp, filename, success=False)
+                    self.infolog(cr, uid, _('%s :: Import file (%s) moved to destination path') % (import_data.name, filename))
+            finally:
+                if orig_file_name:
+                    self.end_processing_filename(orig_file_name)
 
         if 'row' in context:
             # causing LmF when running job manually

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2019-03-29 18:03:01 +0000
+++ bin/addons/purchase/purchase_order_line.py	2019-04-25 15:27:08 +0000
@@ -368,6 +368,38 @@
             res[pol['id']] = "%s%s"%(d_state, pol['have_analytic_distribution_from_header'] and _(" (from header)") or "")
         return res
 
+    def get_distribution_account(self, cr, uid, product_record, nomen_record, po_type, product_cache=None, categ_cache=None, context=None):
+        if product_cache is None:
+            product_cache = {}
+        if categ_cache is None:
+            categ_cache = {}
+
+        a = False
+        # To my mind there is 4 cases for a PO line (because of 2 criteria that affect account: "PO is inkind or not" and "line have a product or a nomenclature"):
+        # - PO is an inkind donation AND PO line have a product: take donation expense account on product OR on product category, else raise an error
+        # - PO is NOT inkind and PO line have a product: take product expense account OR category expense account
+        # - PO is inkind but not PO Line product => this should not happens ! Should be raise an error but return False (if not we could'nt write a PO line)
+        # - other case: take expense account on family that's attached to nomenclature
+        if product_record and po_type =='in_kind':
+            a = product_record.donation_expense_account and product_record.donation_expense_account.id or False
+            if not a:
+                a = product_record.categ_id.donation_expense_account and product_record.categ_id.donation_expense_account.id or False
+        elif product_record:
+            if product_record.product_tmpl_id in product_cache:
+                a = product_cache[product_record.product_tmpl_id]
+            else:
+                a = product_record.product_tmpl_id.property_account_expense.id or False
+                product_cache[product_record.product_tmpl_id] = a
+            if not a:
+                if product_record.categ_id in categ_cache:
+                    a = categ_cache[product_record.categ_id]
+                else:
+                    a = product_record.categ_id.property_account_expense_categ.id or False
+                    categ_cache[product_record.categ_id] = a
+        else:
+            a = nomen_record and nomen_record.category_id and nomen_record.category_id.property_account_expense_categ and nomen_record.category_id.property_account_expense_categ.id or False
+        return a
+
     def _get_distribution_account(self, cr, uid, ids, name, arg, context=None):
         """
         Get account for given lines regarding:
@@ -384,36 +416,7 @@
         categ_dict = {}
         for line in self.browse(cr, uid, ids):
             # Prepare some values
-            res[line.id] = False
-            a = False
-            # Check if PO is inkind
-            is_inkind = False
-            if line.order_id and line.order_id.order_type == 'in_kind':
-                is_inkind = True
-            # To my mind there is 4 cases for a PO line (because of 2 criteria that affect account: "PO is inkind or not" and "line have a product or a nomenclature"):
-            # - PO is an inkind donation AND PO line have a product: take donation expense account on product OR on product category, else raise an error
-            # - PO is NOT inkind and PO line have a product: take product expense account OR category expense account
-            # - PO is inkind but not PO Line product => this should not happens ! Should be raise an error but return False (if not we could'nt write a PO line)
-            # - other case: take expense account on family that's attached to nomenclature
-            if line.product_id and is_inkind:
-                a = line.product_id.donation_expense_account and line.product_id.donation_expense_account.id or False
-                if not a:
-                    a = line.product_id.categ_id.donation_expense_account and line.product_id.categ_id.donation_expense_account.id or False
-            elif line.product_id:
-                if line.product_id.product_tmpl_id in product_tmpl_dict:
-                    a = product_tmpl_dict[line.product_id.product_tmpl_id]
-                else:
-                    a = line.product_id.product_tmpl_id.property_account_expense.id or False
-                    product_tmpl_dict[line.product_id.product_tmpl_id] = a
-                if not a:
-                    if line.product_id.categ_id in categ_dict:
-                        a = categ_dict[line.product_id.categ_id]
-                    else:
-                        a = line.product_id.categ_id.property_account_expense_categ.id or False
-                        categ_dict[line.product_id.categ_id] = a
-            else:
-                a = line.nomen_manda_2 and line.nomen_manda_2.category_id and line.nomen_manda_2.category_id.property_account_expense_categ and line.nomen_manda_2.category_id.property_account_expense_categ.id or False
-            res[line.id] = a
+            res[line.id] = self.get_distribution_account(cr, uid, line.product_id, line.nomen_manda_2, line.order_id.order_type, product_cache=product_tmpl_dict, categ_cache=categ_dict, context=None)
         return res
 
     def _get_product_info(self, cr, uid, ids, field_name=None, arg=None, context=None):

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-02-27 14:15:35 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-04-25 15:27:08 +0000
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" groups="group_purchase_manager,group_purchase_user" web_icon="images/purchases.png" web_icon_hover="images/purchases-hover.png"/>
+        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" web_icon="images/purchases.png" web_icon_hover="images/purchases-hover.png"/>
         <menuitem id="menu_procurement_management" name="Purchase Management" parent="base.menu_purchase_root" sequence="1"/>
-        <menuitem id="menu_purchase_config_purchase" name="Configuration" groups="group_purchase_manager" parent="base.menu_purchase_root" sequence="100"/>
+        <menuitem id="menu_purchase_config_purchase" name="Configuration" parent="base.menu_purchase_root" sequence="100"/>
         <menuitem id="menu_purchase_config_pricelist" name="Pricelists" parent="menu_purchase_config_purchase" sequence="50"/>
         <menuitem action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase" parent="menu_purchase_config_pricelist" sequence="20"/>
         <menuitem action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase" parent="menu_purchase_config_pricelist" sequence="10"/>
-        <menuitem action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type" parent="menu_purchase_config_pricelist" sequence="2" groups="base.group_extended"/>
+        <menuitem action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type" parent="menu_purchase_config_pricelist" sequence="2" />
         <menuitem id="menu_product_in_config_purchase" name="Product" parent="menu_purchase_config_purchase" sequence="30"/>
         <menuitem action="product.product_category_action_form" id="menu_product_category_config_purchase" parent="purchase.menu_product_in_config_purchase" sequence="10"/>
         <menuitem id="menu_purchase_unit_measure_purchase" name="Units of Measure" parent="purchase.menu_product_in_config_purchase" sequence="20"/>
@@ -45,7 +45,7 @@
 
         <!--Inventory control-->
         <menuitem id="menu_procurement_management_inventory" name="Receive Products" parent="base.menu_purchase_root" sequence="4"/>
-        <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory" name="Incoming Shipments" sequence="9" groups="base.group_extended"/>
+        <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory" name="Incoming Shipments" sequence="9" />
         <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move" parent="menu_procurement_management_inventory" sequence="11"/>
 
         <!--Invoice control-->
@@ -364,8 +364,12 @@
                             </field>
                         </page>
                         <page string="Notes">
+                            <group colspan="4" col="6">
                             <field name="import_in_progress" readonly="1" invisible="0"/>
                             <field name="auto_exported_ok" readonly="1"/>
+                            <field name="can_be_auto_exported" invisible="1" />
+                            <button name="auto_export_manual" string="Run PO export job" attrs="{'invisible': [('can_be_auto_exported', '!=', True)]}" type="object" icon="terp-camera_test" colspan="2"/>
+                            </group>
                             <field colspan="4" name="notes" nolabel="1"/>
                             <separator colspan="4" string="Message ESC"/>
                             <field name="message_esc" colspan="4" nolabel="1" readonly="1" attrs="{'invisible': [('partner_type', '!=', 'esc')]}"/>

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2019-03-04 11:09:31 +0000
+++ bin/addons/purchase/purchase_workflow.py	2019-04-25 15:27:08 +0000
@@ -657,10 +657,10 @@
                 raise osv.except_osv(_('Error'), _('Line %s: Please choose a product before confirming the line') % pol.line_number)
 
             if pol.order_type != 'direct' and not pol.from_synchro_return_goods:
-                # create incoming shipment (IN):
+                # create incoming shipment (IN):
                 in_id = self.pool.get('stock.picking').search(cr, uid, [
                     ('purchase_id', '=', pol.order_id.id),
-                    ('state', 'not in', ['done', 'cancel', 'shipped']),
+                    ('state', 'not in', ['done', 'cancel', 'shipped', 'updated', 'import']),
                     ('type', '=', 'in'),
                 ])
                 created = False