Merge lp:~dorian-kemps/unifield-server/US-4800 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-06-12 12:16:09 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-07-13 15:36:41 +0000
@@ -1390,13 +1390,16 @@
                     else:
                         errors.append(_('The import file is inconsistent. The matching line is not existing or was previously deleted'))
                 else:
-                    write_vals['type_change'] = 'del'
-                    if line.in_line_number:
-                        to_delete = self.search(cr, uid, [
-                            ('simu_id', '=', line.simu_id.id),
-                            ('in_line_number', '=', line.in_line_number),
-                        ], context=context)
-                        self.write(cr, uid, to_delete, {'type_change': 'del'}, context=context)
+                    if line.po_line_id.state in ('validated', 'validated_n'):
+                        write_vals['type_change'] = 'del'
+                        if line.in_line_number:
+                            to_delete = self.search(cr, uid, [
+                                ('simu_id', '=', line.simu_id.id),
+                                ('in_line_number', '=', line.in_line_number),
+                            ], context=context)
+                            self.write(cr, uid, to_delete, {'type_change': 'del'}, context=context)
+                    else:
+                        write_vals['type_change'] = 'ignore'
 
             if not line.in_line_number and not write_vals.get('imp_external_ref'):
                 errors.append(_('The line should have a Line no. or an Ext Ref.'))