Merge lp:~jfb-tempo-consulting/unifield-server/us-5014 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-08-21 13:13:08 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2018-09-04 12:11:55 +0000
@@ -1425,13 +1425,14 @@
         for line in self.browse(cr, uid, ids, context=context):
             write_vals = {}
 
-            if line.po_line_id.state in ('confirmed', 'done', 'cancel', 'cancel_r'):
-                write_vals['type_change'] = 'error'
-                errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
-
             # Comment
             write_vals['imp_comment'] = values[15] and values[15].strip()
 
+            if line.po_line_id.state in ('confirmed', 'done') or ( line.po_line_id.state in  ('cancel', 'cancel_r') and write_vals['imp_comment'] != '[DELETE]'):
+                write_vals['type_change'] = 'error'
+                errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
+
+
             # External Ref.
             write_vals['imp_external_ref'] = values[1]
             pol_ids = None