This Exception prevents user to import BusinessTemplate with file_system property_sheets

(non migrated) into a portal with migrated property_sheets (ZODB).
output a warning message instead and continue
approved by arnaud.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43028 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/BusinessTemplate.py

@@ -3651,9 +3651,10 @@ class PropertySheetTemplateItem(DocumentTemplateItem,
       # otherwise it should not be needed anymore once the deletion
       # code of the filesystem Property Sheets is enabled
       if class_id in property_sheet_id_set:
-        raise RuntimeError('Conflict when migrating Property Sheet %s: ' \
-                           'already exists in portal_property_sheets' % \
-                           class_id)
+        warn('Conflict when migrating Property Sheet %s: ' \
+             'already exists in portal_property_sheets' % class_id,
+             UserWarning)
+        continue
 
       filesystem_property_sheet_path = \
           self._getFilesystemPropertySheetPath(class_id)