fix MR conflict with hateoas script

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_guessGroupedLines.py

@@ -77,12 +77,10 @@ for (node, section, mirror_section, _), line_info_list in lines_per_node.items()
     continue
   total_price = sum([l['total_price'] for l in line_info_list])
   # get the currency rounding for this section
-  default_currency = None
   if section:
-    section_obj = portal.restrictedTraverse(section)
-    default_currency = section_obj.getPriceCurrencyValue()
-  if default_currency is not None:
-    total_price = round(total_price, default_currency.getQuantityPrecision())
+    default_currency = portal.restrictedTraverse(section).getPriceCurrencyValue()
+    if default_currency is not None:
+      total_price = round(total_price, default_currency.getQuantityPrecision())
   if total_price == 0 or allow_grouping_with_different_quantity:
     # we should include mirror node in the id_group, but this would reset
     # id generators and generate grouping references that were already used.

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_getThemeDict.py

@@ -38,7 +38,7 @@ if theme is not None:
     if len(theme_logo_list) > 0:
       theme_logo_dict = theme_logo_list[0]
 theme_dict = {}
-theme_logo_url = pref.getPreferredCorporateIdentityTemplateFallbackLogoRelativeUrl()
+theme_logo_url = pref.getPreferredCorporateIdentityTemplateFallbackLogoRelativeUrl() + "?format=png"
 
 theme_dict["theme"] = theme
 theme_dict["theme_logo_description"] = theme_logo_dict.get("description", blank)

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_viewAsReport.py

@@ -100,7 +100,7 @@ doc_content, report_override_doc_title, report_override_doc_subtitle = doc_repor
   format=doc_format,
   display_depth=doc_display_depth,
   display_detail=doc_display_detail,
-  display_header=doc_display_header or 1,
+  display_header=doc_display_header,
   display_comment=doc_display_comment,
   display_sandbox=doc_display_sandbox,
   display_embedded=doc_display_embedded,

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createImageOverview.py

@@ -25,11 +25,11 @@ def setFigureAnchor(my_counter, my_title, my_href):
   ])
 
 # XXX single quotes?
-figure_abbreviation = "FIG"
+figure_abbreviation = "Figure"
 match_href = 'src="(.*?)"'
 match_content = 'alt="(.*?)"'
 figure_list = []
-figure_count = 1
+figure_count = 0
 figure_doubles = {}
 
 for figure in re.findall('(<img.*?/>)', document_content or ''):

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_createTableOverview.py

@@ -45,7 +45,7 @@ def digestCaption(my_caption, my_caption_title, my_count, my_shift):
   return my_count
 
 # XXX single quotes?
-caption_abbreviation = "TBL"
+caption_abbreviation = "Table"
 caption_filler = ['<caption>', '</caption>', '<div class="ci-book-caption">','</div>']
 caption_list = []
 caption_count = 1

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_validateImage.py

@@ -17,7 +17,14 @@ from zExceptions import NotFound
 if img_string is None or img_string == "":
   return img_string
 
-img_src = re.findall("src=['\"](.*?)['\"]", img_string)[0]
+img_src = re.findall("src=['\"](.*?)['\"]", img_string)
+if not len(img_src):
+  return img_string # There is no image source, return as is
+img_src = img_src[0]
+
+if img_src.startswith('data:image/'):
+  return img_string
+
 img_type = None
 
 # START user ignoring guidelines:

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewAsLeaflet.py

@@ -85,7 +85,7 @@ if leaflet_theme.get("theme").lower() == leaflet_theme.get("theme_logo_descripti
 leaflet_recycle_url = "template_images/recycle.png"
 leaflet_css = ''.join([
   'html .ci-leaflet #left-summary:before {',
-    'background: url("%s") center no-repeat;' % (leaflet_theme.get("enhanced_logo_url")),
+    'background: url("%s") center no-repeat;' % (leaflet_theme.get("theme_logo_url")),
     'background-size: contain;',
   '}'
 ])

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/book.css.css

@@ -159,9 +159,6 @@
 .ci-book tr {
   page-break-inside: avoid;
 }
-.ci-book img {
-  page-break-after: avoid;
-}
 .ci-book section:not(:last-child) {
   page-break-after: always;
   page-break-inside: always;
@@ -427,7 +424,7 @@
 /* opinionated align for content tables, overwrite in html if required */
 .ci-book table:not(.ci-book-header):not(.ci-book-footer):not(.ci-book-table) tbody td,
 .ci-book table:not(.ci-book-header):not(.ci-book-footer):not(.ci-book-table) tbody th {
-  text-align: left;
+  text-align: center;
 }
 /*
 .ci-book table:not(.ci-book-header):not(.ci-book-footer):not(.ci-book-table) tbody tr td:first-child,
@@ -744,11 +741,17 @@
   margin: 0 auto 0;
   padding-top: 20px;
   max-width: 240mm;
+  page-break-after: avoid;
+  width: 50%;
 }
+.ci-book .ci-book-img > img ~ span {
+  margin-left: 3cm;
+}
+
 .ci-book .ci-book-img + span {
-  text-align: center;
-  display: block;
+  margin-left: 3cm;
 }
+
 .ci-book table caption,
 .ci-book .ci-book-caption {
   text-align: center;

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/book.pdf.css.css

@@ -158,9 +158,7 @@
 .ci-book pre {
   page-break-inside: avoid;
 }
-.ci-book img {
-  page-break-after: avoid;
-}
+
 .ci-book section:not(:last-child) {
   page-break-after: always;
   page-break-inside: always;
@@ -431,7 +429,7 @@
 /* opinionated align for content tables, overwrite in html if required */
 .ci-book table:not(.ci-book-header):not(.ci-book-footer):not(.ci-book-table) tbody td,
 .ci-book table:not(.ci-book-header):not(.ci-book-footer):not(.ci-book-table) tbody th {
-  text-align: left;
+  text-align: center;
 }
 /*
 .ci-book table:not(.ci-book-header):not(.ci-book-footer):not(.ci-book-table) tbody tr td:first-child,
@@ -748,10 +746,15 @@
   margin: 0 auto 0;
   padding-top: 20px;
   max-width: 240mm;
+  page-break-after: avoid;
+  width: 50%;
+}
+.ci-book .ci-book-img > img ~ span {
+  margin-left: 3cm;
 }
+
 .ci-book .ci-book-img + span {
-  text-align: center;
-  display: block;
+  margin-left: 3cm;
 }
 .ci-book table caption,
 .ci-book .ci-book-caption {

bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/template_css/leaflet.pdf.css.css

@@ -14,12 +14,7 @@ html{
 .ci-leaflet #left-summary .title,
 .ci-leaflet p.ci-leaflet-source-header,
 .ci-leaflet p.ci-leaflet-sheet-header {
-  font-size: 28px; 
-}
-.ci-leaflet h2,
-.ci-leaflet #main-content .summary,
-.ci-leaflet #legalese .bottom {
-  font-size: 18px;
+  font-size: 28px;
 }
 .ci-leaflet p,
 .ci-leaflet li,
@@ -32,12 +27,20 @@ html{
 .ci-leaflet-footer div {
   font-size: 14px;
 }
-.ci-leaflet #legalese p,
-.ci-leaflet #legalese span,
 .ci-leaflet #left-summary .excerpt,
 .ci-leaflet #main-content .left-icon .excerpt {
   font-size: 11px;
 }
+.ci-leaflet #legalese p,
+.ci-leaflet #legalese span {
+  font-size: 13px;
+  line-height: 14px;
+}
+.ci-leaflet h2,
+.ci-leaflet #main-content .summary,
+.ci-leaflet #legalese .bottom span {
+  font-size: 18px;
+}
 /* === font style === */
 .ci-leaflet #main-content .summary {
   font-style: italic;
@@ -127,12 +130,12 @@ html{
   box-sizing: border-box;
 }
 .ci-leaflet #left-summary {
-  width: 28%;
+  width: 30%;
   position: absolute;
   left: 5mm;
   top: 0;
-  padding-left: 10mm;
-  padding-right: 10mm;
+  padding-left: 12mm;
+  padding-right: 12mm;
   margin-top: 10mm;
   margin-bottom: 10mm;
   -webkit-box-sizing: border-box;
@@ -152,7 +155,7 @@ html{
 .ci-leaflet #left-summary .title {
   padding-top: 2mm;
   border-top: 2px solid #a1a1a1;
-} 
+}
 
 /* === fullwidth === */
 .ci-leaflet .ci-leaflet-body-fullwidth #left-summary,
@@ -178,19 +181,27 @@ html{
 .ci-leaflet #left-summary:before {
   content: "";
   display: block;
-  background-size: 60%;
+  background-size: 40%;
   background-position: center;
-  width: 100%;
+  width: 70%;
+  margin: 0 auto;
+  text-align: center;
   height: 50mm;
+  /*
+  background-size: contain;
+  max-width: 12em;
+  text-align: center;
+  margin: 0 auto;
+  */
 }
 .ci-leaflet #main-content {
-  width: 63%;
+  width: 61%;
   display: inline-block;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   padding-right: 0;
-  padding-left: 1%; /* to align with <h1>*/
+  padding-left: 3%; /* to align with <h1>*/
   text-align: justify;
   text-align-last: left;
   vertical-align: bottom;
@@ -233,14 +244,16 @@ html{
 
 /* === legalse === */
 .ci-leaflet #legalese {
-  width: 28%;
+  width: 30%;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   display: inline-block;
   vertical-align: bottom;
-  margin:0;
+  margin: 0;
   padding: 1em;
+  padding-left: 2em;
+  padding-right: 2em;
   text-align: left;
   text-align: justify;
   text-align-last: left;
@@ -251,8 +264,7 @@ html{
 }
 .ci-leaflet #legalese .bottom {
   margin: 0;
-  padding: 3mm 0;
-  padding-left: 12mm;
+  padding: 2mm 0;
   display:block;
   border-bottom: 2px solid #a1a1a1;
   -webkit-box-sizing: border-box;
@@ -260,6 +272,7 @@ html{
   box-sizing: border-box;
 }
 .ci-leaflet #legalese .bottom img {
-  max-height: 1em;
+  max-height: 2em;
+  margin-left: 3em;
   vertical-align: middle;
 }

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_book_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950729.85</string> </value>
+            <value> <string>ts54903482.86</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>4bfc2552cadf568a4fac05ad5ea9fd3f</string> </value>
+            <value> <string>c739543af97027ffc227ef112bc6236a</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>108180</int> </value>
+            <value> <int>86631</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_book_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950753.99</string> </value>
+            <value> <string>ts54903565.35</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>4f1a0d16414a4f29976970048cab16ec</string> </value>
+            <value> <string>74204127b6b543a3c30af243e58f4832</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>180307</int> </value>
+            <value> <int>179809</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_book_input_004_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts28818185.46</string> </value>
+            <value> <string>ts54903478.94</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>2a62c7336be2e26f88121148d3753af5</string> </value>
+            <value> <string>d808d07425237a7066e2ecfec4a81990</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>86624</int> </value>
+            <value> <int>110010</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_leaflet_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950954.73</string> </value>
+            <value> <string>ts54903497.16</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>4d609cca5a42c9e95c281de46ae2049f</string> </value>
+            <value> <string>fe42803669cc0012dba0ef9b0cecd929</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>115074</int> </value>
+            <value> <int>119347</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_leaflet_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950975.16</string> </value>
+            <value> <string>ts54903493.62</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>bf241b0cfed1e71947dbb920796084f7</string> </value>
+            <value> <string>a8cf37a1600ba147c6685323661e971e</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>118540</int> </value>
+            <value> <int>122342</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_leaflet_input_003_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950993.69</string> </value>
+            <value> <string>ts54903490.1</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>aa66df6af2a67a876b3254003ca11f55</string> </value>
+            <value> <string>8b156621ecfcc09e66bc09d02e105f88</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>115068</int> </value>
+            <value> <int>119346</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951144.88</string> </value>
+            <value> <string>ts54903513.36</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>c044f0bc599d83547b91b878f12643d6</string> </value>
+            <value> <string>75593fe109a26166b0ebf2bcb3b069a9</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>19155</int> </value>
+            <value> <int>19595</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951160.16</string> </value>
+            <value> <string>ts54903506.5</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>2941d0ae9969d740a111ddcc62f688e4</string> </value>
+            <value> <string>0362b57544419b5df959f7cfc03d3629</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>19887</int> </value>
+            <value> <int>20326</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_003_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951174.41</string> </value>
+            <value> <string>ts54903511.23</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>d4c50e14d1064a40714e0a82b400e09a</string> </value>
+            <value> <string>865b8a0a716cf0a654d8a41978cb7a4a</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>20212</int> </value>
+            <value> <int>20213</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_004_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951208.4</string> </value>
+            <value> <string>ts54903508.96</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>f0c49148ba9244d1bbba411302b256aa</string> </value>
+            <value> <string>ba072b9735e4294f1a9e093398ae7ab6</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>24753</int> </value>
+            <value> <int>25188</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_005_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951394.93</string> </value>
+            <value> <string>ts54903502.3</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>4428e0301e3e21c695aa0576e55245e0</string> </value>
+            <value> <string>c3c5f095c98032af5dc780ed06fc6e13</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>12176</int> </value>
+            <value> <int>12618</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_letter_input_006_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951419.82</string> </value>
+            <value> <string>ts54903504.35</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>fff5b9974a245dba62f09c6f27f641ae</string> </value>
+            <value> <string>a7b08e9fe998168cb24e49045cdf3b36</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>12241</int> </value>
+            <value> <int>12623</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_release_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951312.42</string> </value>
+            <value> <string>ts54903522.37</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>b311e13aebe00e66ed9b90a475a615f5</string> </value>
+            <value> <string>fbae738cafbcfb65cf027172a8ff599d</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>113303</int> </value>
+            <value> <int>105551</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_release_input_002_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37951333.1</string> </value>
+            <value> <string>ts54903519.48</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>af0fd8bc81a94b859f20af8e413d7a70</string> </value>
+            <value> <string>b76f1874c2bd6acb7490521702be2444</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>109913</int> </value>
+            <value> <int>105701</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_slideshow_input_001_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950506.8</string> </value>
+            <value> <string>ts54903528.08</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>5f25cd0f43a49e15e603c5762696c120</string> </value>
+            <value> <string>27d32ba587320d6f3829b7b87f8c0812</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>375468</int> </value>
+            <value> <int>359334</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_slideshow_input_002_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950562.66</string> </value>
+            <value> <string>ts54903532.11</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>d486cf9d9b2e51371e2c43abd54d465a</string> </value>
+            <value> <string>48cda1c32604969df5b46450d562f529</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>377616</int> </value>
+            <value> <int>361477</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_slideshow_input_003_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950594.73</string> </value>
+            <value> <string>ts54903550.14</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>94dea255972bf4c598e5a7720c1cd89a</string> </value>
+            <value> <string>0ab98fd53592d92c464f68d121c1d569</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>380515</int> </value>
+            <value> <int>360944</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_slideshow_input_004_en_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950535.94</string> </value>
+            <value> <string>ts54903536.15</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>6944a887889bc89a79f81e78f80cdbf7</string> </value>
+            <value> <string>c8f317156a64e68d2d8a2ae8ba2d3f71</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>377473</int> </value>
+            <value> <int>361336</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/document_module/template_test_slideshow_input_005_de_pdf.xml

@@ -39,7 +39,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts37950625.11</string> </value>
+            <value> <string>ts54903540.77</string> </value>
         </item>
         <item>
             <key> <string>_Modify_portal_content_Permission</string> </key>
@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>57d8e62e74b969d47c0f86545d727a3d</string> </value>
+            <value> <string>cf4a042aefaec207715debcdd97954c9</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>680293</int> </value>
+            <value> <int>664185</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_book_input_page_7_004_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>dc8e1bd03ed52c87d66f9d7ac064a0f6</string> </value>
+            <value> <string>0e006c3ef64b92cb0e1f39174a11a289</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -117,6 +117,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>subject</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Template Test Book Page</string> </value>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_leaflet_input_page_0_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>0e800001641ac82a9a5fd63baab1dc2d</string> </value>
+            <value> <string>d54ad51a0ba28613fa76172e94e63320</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -115,6 +115,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>subject</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Template Test Leaflet Page</string> </value>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_leaflet_input_page_0_003_de_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>ccba69bf87b246e121f39ce620848fd9</string> </value>
+            <value> <string>ab4099494e42dcc867b4edae911e6508</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_leaflet_input_page_1_001_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>d5dd6b63f57af426048526c7aaa5ad8e</string> </value>
+            <value> <string>1f28039d404adc23142342f7d6654364</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_letter_input_page_0_001_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>4a2023a4fc147bbfd05f53237a4ddc5d</string> </value>
+            <value> <string>b913ec7475eea77fbefb35c036cebbbe</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_letter_input_page_0_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>23217fa0e6181e4b918260bb5acd7216</string> </value>
+            <value> <string>5f80228e63ac26e2586e4cc78468bc17</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_letter_input_page_0_003_en_bmp.xml

@@ -77,9 +77,15 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>cb52258daf05320138a087f0ebe5cb2f</string> </value>
+            <value> <string>1aafde18d3f372c35d8e3cfe51d2319e</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -115,6 +121,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>subject</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Template Test Letter Page</string> </value>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_letter_input_page_0_005_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>053f64abd059a82cbfef28544d6113c5</string> </value>
+            <value> <string>aa56c9f7299d735b06905653c793d36b</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_letter_input_page_0_006_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>c9bdfa8789030e8c31003c9abfcdd828</string> </value>
+            <value> <string>06fa5da6d1f0a78902331664e1303cb2</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_letter_input_page_1_004_de_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>20b3b2ca75000a5bbe07ae64f3cdbfb4</string> </value>
+            <value> <string>83ef45d6c99d6276850e7cf404671d8d</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_001_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>5c01f2bac0d7f674b0fe882dcc887c58</string> </value>
+            <value> <string>2626ba4fdccf0499328802854e04749b</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_002_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>412bf7046b9fdeb3db9cfb5bc3dc5f17</string> </value>
+            <value> <string>16c650c82a9cebef9f17ede26bd37293</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_003_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>68efdd2b8ade6b40137293564331b54b</string> </value>
+            <value> <string>4fdffce4a737f10572cc3ee4edec0104</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -115,6 +115,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>subject</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Template Test Slideshow Slide</string> </value>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_6_004_en_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>b663eec882823e2c8df1c55e77bf9510</string> </value>
+            <value> <string>5edba256634945c2c7333e4578694be0</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_slideshow_input_slide_7_005_de_bmp.xml

@@ -79,7 +79,7 @@
         </item>
         <item>
             <key> <string>content_md5</string> </key>
-            <value> <string>f0e5019456acc85045ef585730bb0e4d</string> </value>
+            <value> <string>f29b9d0d4b12ced7af0d67a0495487db</string> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_book_output_expected_002_en_html.html

@@ -388,14 +388,14 @@
           
             
             <tr>
-              <td width="10%"><a id="FIG-2"></a><span>FIG-2</span></td>
+              <td width="10%"><a id="Figure-1"></a><span>Figure-1</span></td>
               <td width="90%"
                   style="text-align: left; vertical-align: top">Reach</td>
             </tr>
             
             
             <tr>
-              <td width="10%"><a id="FIG-3"></a><span>FIG-3</span></td>
+              <td width="10%"><a id="Figure-2"></a><span>Figure-2</span></td>
               <td width="90%"
                   style="text-align: left; vertical-align: top">Caption for this image</td>
             </tr>
@@ -416,14 +416,14 @@
           
             
               <tr>
-                <td width="10%"><a id="TBL-1"></a><span>TBL-1</span></td>
+                <td width="10%"><a id="Table-1"></a><span>Table-1</span></td>
                 <td width="90%"
                     style="text-align: left; vertical-align: top">Table description</td>
               </tr>
             
             
               <tr>
-                <td width="10%"><a id="TBL-1"></a><span>TBL-1</span></td>
+                <td width="10%"><a id="Table-1"></a><span>Table-1</span></td>
                 <td width="90%"
                     style="text-align: left; vertical-align: top">Table description</td>
               </tr>
@@ -493,9 +493,9 @@ which should not be touched.
 <p>Some more references to include in the overall tables
 [<a href="#AD-2" title="Gnu">AD-2</a>], as well another image.
 </p>
-<a href="#FIG-2"></a><p class="ci-book-img" style="text-align:center"><img src="Template.Test.Illustration.Reach?format=png&amp;display=medium" alt="Reach" /></p><span>FIG-2 - Reach</span>
+<a href="#Figure-1"></a><p class="ci-book-img" style="text-align:center"><img src="Template.Test.Illustration.Reach?format=png&amp;display=medium" alt="Reach" /></p><span>Figure-1 - Reach</span>
 <p>Another example of an image and a table of data</p>
-<a href="#FIG-3"></a><p class="ci-book-img" style="text-align:center"><img src="Template.Test.Image.Office?format=png&amp;display=medium" alt="Caption for this image" /></p><span>FIG-3 - Caption for this image</span>
+<a href="#Figure-2"></a><p class="ci-book-img" style="text-align:center"><img src="Template.Test.Image.Office?format=png&amp;display=medium" alt="Caption for this image" /></p><span>Figure-2 - Caption for this image</span>
 <p>Another example of an image and a table of data</p>
 <table>
   	<thead>
@@ -517,7 +517,7 @@ which should not be touched.
   			<td>More description</td>
   		</tr>
   	</tbody>
-  	<a href="#TBL-1"></a><caption>TBL-1 - Table description</caption>
+  	<a href="#Table-1"></a><caption>Table-1 - Table description</caption>
   </table>
   <p>There is more</p>
   <table>
@@ -540,7 +540,7 @@ which should not be touched.
   			<td style="text-align: center">More description</td>
   		</tr>
   	</tbody>
-  	<a href="#TBL-1"></a><caption>TBL-1 - Table description</caption>
+  	<a href="#Table-1"></a><caption>Table-1 - Table description</caption>
   </table>
 <p>Another example of an image and a table of data. And another link to an external
   web page, this time Google [<a href="#AD-3" title="Google Website">AD-3</a>], to

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_001_en_html.html

@@ -11,7 +11,7 @@
           href="template_themes/themes.css?portal_skin=Leaflet" />
     <link rel="stylesheet" href="template_css/leaflet.css" />
     
-      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("None") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("image_module/template_test_image_logo_png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
+      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
     
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
@@ -203,7 +203,7 @@
 	      
 	      <div class="ci-leaflet-footer-image-wrapper">
           <img alt="Logo"
-               src="image_module/template_test_image_logo_png?display=thumbnail" />
+               src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
         </div>
 	      
 	    </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_002_en_html.html

@@ -11,7 +11,7 @@
           href="template_themes/themes.css?portal_skin=Leaflet" />
     <link rel="stylesheet" href="template_css/leaflet.css" />
     
-      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("None") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("organisation_module/template_test_association/default_image?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
+      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("organisation_module/template_test_association/default_image?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
     
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_leaflet_output_expected_003_de_html.html

@@ -11,7 +11,7 @@
           href="template_themes/themes.css?portal_skin=Leaflet" />
     <link rel="stylesheet" href="template_css/leaflet.css" />
     
-      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("None") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("image_module/template_test_image_logo_png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
+      <style type="text/css">html .ci-leaflet #left-summary:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}html .ci-leaflet #legalese:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;content: "";display: block;height: 60px;}</style>
     
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
@@ -203,7 +203,7 @@
 	      
 	      <div class="ci-leaflet-footer-image-wrapper">
           <img alt="Logo"
-               src="image_module/template_test_image_logo_png?display=thumbnail" />
+               src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail" />
         </div>
 	      
 	    </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_001_en_html.html

@@ -15,7 +15,7 @@
     <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo">
-  		      <img src="image_module/template_test_image_logo_png?display=thumbnail"
+  		      <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
                alt="" />
             <span></span>
           </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_002_en_html.html

@@ -15,7 +15,7 @@
     <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo">
-  		      <img src="image_module/template_test_image_logo_png?display=thumbnail"
+  		      <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
                alt="" />
             <span></span>
           </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_letter_output_expected_004_de_html.html

@@ -15,7 +15,7 @@
     <div class="ci-letter-header">
 		  <div class="ci-letter-bar">
 		    <div class="ci-letter-bar-logo">
-  		      <img src="image_module/template_test_image_logo_png?display=thumbnail"
+  		      <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
                alt="" />
             <span></span>
           </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_release_output_expected_001_en_html.html

@@ -11,7 +11,7 @@
           href="template_themes/themes.css?portal_skin=Release" />
     <link rel="stylesheet" href="template_css/release.css" />
     
-      <style type="text/css">html .ci-press-release .ci-press-release-logo:before {background: url("image_module/template_test_image_logo_png") center no-repeat;background-size: contain;}</style>
+      <style type="text/css">html .ci-press-release .ci-press-release-logo:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}</style>
     
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
@@ -158,7 +158,7 @@
         
           <div class="ci-press-release-footer-image-wrapper">
             <img alt="Logo"
-                 src="image_module/template_test_image_logo_png" />
+                 src="image_module/template_test_image_logo_png?format=png" />
           </div>
 	      
       </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_release_output_expected_002_de_html.html

@@ -11,7 +11,7 @@
           href="template_themes/themes.css?portal_skin=Release" />
     <link rel="stylesheet" href="template_css/release.css" />
     
-      <style type="text/css">html .ci-press-release .ci-press-release-logo:before {background: url("image_module/template_test_image_logo_png") center no-repeat;background-size: contain;}</style>
+      <style type="text/css">html .ci-press-release .ci-press-release-logo:before {background: url("image_module/template_test_image_logo_png?format=png") center no-repeat;background-size: contain;}</style>
     
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
@@ -67,7 +67,7 @@
         
           <div class="ci-press-release-footer-image-wrapper">
             <img alt="Logo"
-                 src="image_module/template_test_image_logo_png" />
+                 src="image_module/template_test_image_logo_png?format=png" />
           </div>
 	      
       </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_001_en_html.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet"
           href="template_themes/themes.css?portal_skin=Slide" />
     <link rel="stylesheet" href="template_css/slide.css" />
-    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?display=medium") center no-repeat;}</style>
+    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?format=png&display=medium") center no-repeat;}</style>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};
@@ -37,7 +37,7 @@
     <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
 	      <div class="ci-slideshow-footer-image-wrapper">
-          <img src="image_module/template_test_image_logo_png?display=thumbnail"
+          <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
                alt="logo" />
         </div>
 	    </div>

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_002_en_html.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet"
           href="template_themes/themes.css?portal_skin=Slide" />
     <link rel="stylesheet" href="template_css/slide.css" />
-    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?display=medium") center no-repeat;}</style>
+    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?format=png&display=medium") center no-repeat;}</style>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};

bt5/erp5_corporate_identity_test/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_003_en_html.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet"
           href="template_themes/themes.css?portal_skin=Slide" />
     <link rel="stylesheet" href="template_css/slide.css" />
-    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?display=medium") center no-repeat;}</style>
+    <style type="text/css">.ci-slideshow-intro.present:not(.slide-background):before {content: "";background: #FFF url("image_module/template_test_image_logo_png?format=png&display=medium") center no-repeat;}</style>
     <script type="text/javascript">
       function setPlaceholdersWithUrlParameters() {
         var vars={};
@@ -37,7 +37,7 @@
     <div class="ci-slideshow-footer">
 	    <div class="ci-slideshow-container-left">
 	      <div class="ci-slideshow-footer-image-wrapper">
-          <img src="image_module/template_test_image_logo_png?display=thumbnail"
+          <img src="image_module/template_test_image_logo_png?format=png&amp;display=thumbnail"
                alt="logo" />
         </div>
 	    </div>

bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalRestrictedJsonStyle.py

+from erp5.component.test.testHalJsonStyle import ERP5HALJSONStyleSkinsMixin, simulate, changeSkin, do_fake_request
+
+class TestHalRestricted(ERP5HALJSONStyleSkinsMixin):
+
+  @simulate('Base_getRequestUrl', '*args, **kwargs',
+      'return "http://example.org/bar"')
+  @simulate('Base_getRequestHeader', '*args, **kwargs',
+            'return "application/hal+json"')
+  @changeSkin('HalRestricted')
+  def test_mode_root(self):
+    fake_request = do_fake_request("GET")
+    self.logout()
+    result = self.portal.web_site_module.hateoas.ERP5Document_getHateoas(REQUEST=fake_request)
+    self.assertEquals(fake_request.RESPONSE.status, 401)
+    self.assertEquals(fake_request.RESPONSE.getHeader('WWW-Authenticate'),
+      'X-Delegate uri="%s/connection/login_form{?came_from}"' % self.portal.web_site_module.hateoas.absolute_url()
+    )
+
+  @simulate('Base_getRequestUrl', '*args, **kwargs',
+      'return "http://example.org/bar"')
+  @simulate('Base_getRequestHeader', '*args, **kwargs',
+            'return "application/hal+json"')
+  @changeSkin('HalRestricted')
+  def test_mode_traverse(self):
+    document_relative_url = self._makeDocument().getRelativeUrl()
+    fake_request = do_fake_request("GET")
+    self.logout()
+    result = self.portal.web_site_module.hateoas.ERP5Document_getHateoas(REQUEST=fake_request, mode="traverse", relative_url=document_relative_url)
+    self.assertEquals(fake_request.RESPONSE.status, 401)
+    self.assertEquals(fake_request.RESPONSE.getHeader('WWW-Authenticate'),
+      'X-Delegate uri="%s/connection/login_form{?came_from}"' % self.portal.web_site_module.hateoas.absolute_url()
+    )
+
+  @simulate('Base_getRequestUrl', '*args, **kwargs',
+      'return "http://example.org/bar"')
+  @simulate('Base_getRequestHeader', '*args, **kwargs',
+            'return "application/hal+json"')
+  @changeSkin('HalRestricted')
+  def test_mode_search(self):
+    fake_request = do_fake_request("GET")
+    self.logout()
+    result = self.portal.web_site_module.hateoas.ERP5Document_getHateoas(REQUEST=fake_request, mode="search")
+    self.assertEquals(fake_request.RESPONSE.status, 401)
+    self.assertEquals(fake_request.RESPONSE.getHeader('WWW-Authenticate'),
+      'X-Delegate uri="%s/connection/login_form{?came_from}"' % self.portal.web_site_module.hateoas.absolute_url()
+    )
+
+  @simulate('Base_getRequestUrl', '*args, **kwargs',
+      'return "http://example.org/bar"')
+  @simulate('Base_getRequestHeader', '*args, **kwargs',
+            'return "application/hal+json"')
+  @changeSkin('HalRestricted')
+  def test_mode_worklist(self):
+    fake_request = do_fake_request("GET")
+    self.logout()
+    result = self.portal.web_site_module.hateoas.ERP5Document_getHateoas(REQUEST=fake_request, mode="worklist")
+    self.assertEquals(fake_request.RESPONSE.status, 401)
+    self.assertEquals(fake_request.RESPONSE.getHeader('WWW-Authenticate'),
+      'X-Delegate uri="%s/connection/login_form{?came_from}"' % self.portal.web_site_module.hateoas.absolute_url()
+    )

bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalRestrictedJsonStyle.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_recorded_property_dict</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testHalRestrictedJsonStyle</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testHalRestrictedJsonStyle</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_hal_json_style/bt/template_test_id_list

-test.erp5.testHalJsonStyle
\ No newline at end of file
+test.erp5.testHalJsonStyle
+test.erp5.testHalRestrictedJsonStyle
\ No newline at end of file

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_mergeDeliveryList.xml → bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DeliveryModule_mergeDeliveryList.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Delivery_mergeDeliveryList</string> </value>
+            <value> <string>DeliveryModule_mergeDeliveryList</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_cleanDeliveryAfterMerge.py

+context.cancel()

bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_cleanDeliveryAfterMerge.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Delivery_cleanDeliveryAfterMerge</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>