prevent multiple conversion with renderSimpleView too + minors fixes

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_renderSimpleView.py

@@ -2,6 +2,10 @@
 from Products.ERP5Type.Message import translateString
 portal = context.getPortalObject()
 request = portal.REQUEST
+report_format = request_form['format']
+if portal.portal_preferences.getPreferredDeferredReportStoredAsDocument():
+  request_form['format'] = None
+
 request.form.update(request_form)
 
 if skin_name and skin_name != 'None': # make_query serializes None as 'None'
@@ -31,4 +35,5 @@ with portal.Localizer.translationContext(localizer_language):
     user_name=user_name,
     subject=str(translateString(attachment_name.rsplit('.', 1)[0])),
     message='',
-    attachment_list=attachment_list)
+    attachment_list=attachment_list,
+    format=report_format)

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/ERP5Site_notifyReportComplete.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>user_name, subject, message, attachment_list, format=None</string> </value>
+            <value> <string>user_name, subject, message, attachment_list, format=""</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/SystemPreference_viewDeferredStyle.xml

@@ -114,7 +114,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Deferred Style Preferences</string> </value>
+            <value> <string>Deferred Style</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/SystemPreference_viewDeferredStyle/my_preferred_deferred_report_stored_as_document.xml

@@ -73,7 +73,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Deferred Report Stored As Document</string> </value>
+                    <value> <string>Deferred Report Stored as Document</string> </value>
                 </item>
               </dictionary>
             </value>