From c000de73dfa756bdc60364237ef9048054f62a50 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@nexedi.com>
Date: Fri, 27 Oct 2006 14:54:55 +0000
Subject: [PATCH] Add more category tree format examples. Update tips.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10991 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../category_import_tips.xml                  |   2 +-
 ...erp5_import_category_tree_examples.sxc.xml | 171 ++++++++++++++++++
 .../openoffice_category_file_template.sxc.xml | 162 -----------------
 product/ERP5/bootstrap/erp5_core/bt/revision  |   2 +-
 4 files changed, 173 insertions(+), 164 deletions(-)
 create mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc.xml
 delete mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/openoffice_category_file_template.sxc.xml

diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/category_import_tips.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/category_import_tips.xml
index e94bff6a45..3d523ba5d2 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/category_import_tips.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFileForm/category_import_tips.xml
@@ -201,7 +201,7 @@
                     <key> <string>default</string> </key>
                     <value> <string encoding="cdata"><![CDATA[
 
-<ul><li>An empty OpenOffice template is available at <a href="portal_skins/erp5_core/openoffice_category_file_template.sxc">/portal_skins/erp5_core/openoffice_category_file_template.sxc</a></li><li>Do not merge cells in the uploaded spreadsheet: this will confuse the parser and produce unpredictible results.</li><li>Do not use category IDs which are defined in Property Sheets as attribute IDs. Currently ERP5 is not able to make the difference between the a subobject ID and a property ID.</li><li>Even if this tool was designed to import OpenOffice v1.x documents, OASIS OpenDocument files are well parsed.</li></ul>
+<ul><li>An OpenOffice file is available at <a href="portal_skins/erp5_core/erp5_import_category_tree_examples.sxc">/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc</a> . It contain different examples of how to input a tree of categories.</li><li>Do not merge cells in the uploaded spreadsheet: this will confuse the parser and produce unpredictible results.</li><li>Do not use category IDs which are defined in Property Sheets as property. ERP5 is currently not able to make the difference between a subobject ID and a property ID. This bug must be fixed.</li><li>Even if this tool was designed to import OpenOffice v1.x documents, OASIS OpenDocument files seems to work as well.</li></ul>
 
 ]]></string> </value>
                 </item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc.xml
new file mode 100644
index 0000000000..730cbfa544
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/erp5_import_category_tree_examples.sxc.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>OFS.Image</string>
+          <string>File</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_EtagSupport__etag</string> </key>
+            <value> <string>ts61958570.92</string> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>erp5_import_category_tree_examples.sxc</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>application/vnd.sun.xml.calc</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="base64">UEsDBBQAAAAAAF1zWzVFvBOUHAAAABwAAAAIAAAAbWltZXR5cGVhcHBsaWNhdGlvbi92bmQuc3Vu
+LnhtbC5jYWxjUEsDBBQACAAIAF1zWzUAAAAAAAAAAAAAAAALAAAAY29udGVudC54bWztXN1XqzgQ
+f9+/IsvDfdhzKW2pH/Wqe9Teu+uuXj1H3Y+ne1JIW1YgnASs/e83QMFWC5TwIdS82EMyTGbmNwmT
+zJjjX58tEzwhQg1sn0i9TlcCyNawbtjTE+nh/pt8KP16+tPxz6Obi/t/b78CPJkYGjrSseZZyHZl
+Ddsu+wW3D+dXlxdAkhXlxkH2TUDWwWSqKKP7EQifR8u3ABtHUb5+l4AU8uvori6dHicxZzLa9Cjs
+PZFmruscKQpmw+CXYfrdblcJn6XlC9RdmOn0AUVE7qJnN5XaJ4iJ4TiDd0ARkesEzlOpfQJm84h+
+gmPq+XzemasBZW84HCr/3F0p3zCxYCzLs2nYj4n0QW9EanvWGJF0SaAL1+xCn6abmIcGfIpF1maQ
+pNsvoHixiKpnWETVI2Km7CxBwUPlmnUGf66vXsxHrFTmPkGsn0YMJ13ykESKvF8zIaUnEnUIgjqd
+IfTStTaVYo8O31fi5wlzbFlHmklPjwNbv7SA8NmGFnOvS+b/ZAI1BB4oIhKY4JBwAi3DXJxIn6CD
+6Zd1qrBNAit8HcPVmP2eIDECp1TSR72HM2zBt6OF7Z/Bn1Cj7jnGj5/BlacZOqTQpp9BOHDYAu5Y
+U9gQdZyxwU3wYBtsdUHg+q64nL8j8wm5hrZB1JWuFQ5hrzxFNiKGxgCcG5RmSaBswGzZBD2XGYQN
+IwcsYjCDv2uiargXj7MUMVgf2BJnepYtRW86hLkfcQ1EfZXGzL8e5TFi3sp4+KNFTMLX5Lmh+xOj
+2xkc9jUrkHZFgjRx+hWK0+/sDQ/ziaNWKI7aUdWc1hlUKM5Bp6v28omzVylY6mCQT5z9SsXp7x/k
+E+egUt/p94Z5xCFJE53g+SZZwgbWKc+QMZ25/mTeU1U2ZLqYHkUydlzDgqa8+rZLPLS9tC7cLG3U
+aLFIABHZgVMkh2+M0AR6prtJleDNI92gjgkXeSXRUNICiUwz6nEg8cPC4CFbnuibMF+aZoxNPY9A
+SUtkEYH8EFKGpjFlEQJ1g3AoJHvpkCn2iB/nToznwAksSKaGLZto4nvH0jMKaZa02jZPM9sPdM08
+uiUt3e+u2xsdlMQoYtkxxvri9DicVsHf5RQLRb6ALppisgB3TCJwTxCbtWH/qmL+DF/jsVwXN5AG
+McpyhGCbsCSlMkEOYqOxeH0YUeihwQK7brSksvWo/Qp4qhXwHGTy9L1ve357JfPbz0Svrx7w2oV9
+YzYM6n/tXsnH+G2SDgWEbLocOae3bK92rCwfjpXXr2/NMEvdwzfG20K4y1Fx0fov7O4N10Slchyh
+cDfJdpllGDHme4F1gy07sCzG2zij8moA5mX8bhdr8guP+Pm8KB7Lsw1/y18CxOqK08yQv1HOz3iN
+g4tdtuGOBPwM5jNDmwH/TA0aNkCsdeHODHtaVPSklbRBrpGGYLnecpDqLSwieVz8mMNFcXcZrLvL
+tc8Z/J2Tc8zixiNgCk34XFiyFnhD5oCpGJbrL/upY1FsQvKDLtguzCrdZe585uAuP/M1r2GbPRux
+CHQByhFzB/xHrdF/9tL9xyvhU/7abXLyXPMWf/ckPKRBHmIhonmk3O/RNQfP7cAU0JcI/ROyPVoq
+8H/l5ihgrx12BEkZ2+9XX4WvubmufRfGpoeWoYT4PDTIWSxIyl0icjMUK0TtoP/nOYaLCsdpa7j/
+wcFTQF//hgG6Hil3z3CXn6UAvnbgPQLLjgYf8rMUwNcOvI0c17NLOL9eQf47B88PA31zTheh6czg
+Dw3ZLvSIwRe8n/k8wEUhHv7+QTMxRdQNDojESWLzlglYhnuAM7EkNBvmcSkwnwuYmw2zQ/CzYXHO
+6dvwZb5Ff2fAbkpKGdo6wRbS84GZFcGdRVzBb/mzwmniXqu94oJWDvc6e0a3No17w0OuwG+vW3Ok
+mTTgassa24hjQoEh+I7B5ailZYaiJFCUBOYoCRQ1fLtew7dRZ1GFt7Mh0zZpTFFGt0MHXdsALorg
+KkL/3Te7W6Evatl2H2hRjtZm9ERNWXuxE4VhHw1xUd7VWuhEhVab0RNVVi0GT1RKtRg8UezU5DOg
+eCxRqLTTszQBZ1Fx1DK8ROlQw/ES1T8JilSEBlcqS5TvrLAvq3xnMKw5dkoaMGf5zuWozbeDZZen
+5CuJKbtkZ4sSm0FPlNhs4iVKbLZZCgclVw3GmhS5uuqjVdqkTu7aIotC10dx1he/e1VMfaYvdphR
+9K4mznONZhWxNAes9B0T58VInHumdys1aQscBW4h4oSEpygk26j9JhmV+34fTpPmr9RomUG5b84p
+sGy8b/lEa9YPzmtqar4Vpy2OXuACGE6L8hQftMyo/FercNqUoySgZSblv7SE06QcifqWmbTAdSCc
+NuXJnzfOqOlbwwIXbXBtDlNyKrFMDcuHtyXS4Po368IFJxno5cxyN272pJs8350UdZk8X6K6ZSbn
+uR+iMsMXyjjXbvjUxaPIXQ2c57dlp4KzUs+cGeKq8h/VpIL36g4vkgbMmQoO0mx1ZYN73RbcuCDS
+t29y+BzpW5FszYNqGZlPLhjXht3ZdGnWF4o/o8mV/F47j93ZNOg2RudOUxaLgD5IbnMrBEpOe6an
+pnc4c5kZBVeSXjxsgeZVZAHboDdfsq74BNvtDF+W1SvIxLXB2apJl7VB80qSWm1QvJLUUxsUryY/
+VLPm6fmhArmYYqHxB0zgVJw5acKMqitl0ShdK84SlKxr3f/TVd6pnzjqb9BRvw7ZL6SMAtpTRDc3
+g+hFMkVu2CRDXSeI0hPpE3Qw/fL2quewvXPeO8qguPym9rpqfHHx8vyQyjMEdUROpAk0KVrR6I3I
+Cp5MDA0djbG+eHnSseZZbCrLPkP2e/o/UEsHCFiB+ypcCAAAqpAAAFBLAwQUAAgACABdc1s1AAAA
+AAAAAAAAAAAACgAAAHN0eWxlcy54bWzdWG1v1DgQ/n6/IhckBFKzzm5F6ZbdVAcFga5ABa1099FN
+nKyFE0e2s9vy8X7P/ar7JTe2855sVsC9cEcR1J7H45lnxjOzuzq/S5mzJUJSnq3d+cx3HZKFPKJZ
+snZvrl95p+558MPqx4v3L65/vXrp8DimITmLeFikJFOeVPeMSOfq5vnlmxeO6yH0PifZe4OacZEg
+dHF94dj1RXnIgWsQevnOdVyrbhapyA1We3SDhZk8s8K1u1EqP0OIwy28uWXh+z6ya7c8YE5P4g2i
+gitypybRGlCD8e0B3QZRwSOBd5NoDQDGK3zMa/Rut5vtjg1yvlwu0S8fL9ErLlJc23LHaPZpL95I
+K2hWpLdETFuCFe7wIrfJmHJL4LY2OdxgMc2fQTSMHEcHGDmOKjA4u9nj4Cl6C0Lzz9vLhj6RTirX
+gNq/UNB82nILcavc77yWOmtjDhkbkZDJYGUIbHYcu85wCjnzJlNExDgkzo0kwnViboExTim7X7sP
+cc7lsy7K7rlOS29OVQikbLGgJtPQ9K3XeMNTPLzN7h85P+NQquecfzpyLouQRljiTB459mK743yE
+LbtRCX6Cy5lzk1EoGMR5+/Hb7XxN2JYoGo6Y2hK1NFipl5CMCBquXbmjUh6yAI3ErNyyNacyMiIx
+LlhZiSqlpT3mhXshYcyt4LmA9BGKQtGqzoc0xczLGYRSrt1Fx7IxlxnOkgInsB/b5Ah5kSkB9736
+MDjsYUlxNswpC6tUVaiMZ6SSlVrHRI32kKc5I3dN9vT01vIxzaNC4Ay45LkXUalwpuv5fLZ4EqYm
+KiOcBytbs8rS1QmEpe+d7/YCo0uYBbq94065SmnmUeAsAY0RTaiC0MyNCSO31TrCQgjojfdjRsz9
+k6spQ0rJljOsqG4dShR7zRvJmknDK2kieJGbxm20o1q9bl2BU3tnlkOv7tNbzipd3TyssK1cDP74
+7fdaY09JMCL4EionIzp4auaRMA597UEcQ732+557457/70i3zKQ4r59iFlFlWtUWs4I8evwwUc/W
+dZ7iPGdlCLxOHqP9AbQnh2G7sK+2H7lWkUT7D38gcvpsKcmxqOdCr3vveF6YWlYOglRhRsO6EkE4
+vCKLiIABCaQSQti8067UK9PLaDO/N91pR2iygfEBAhC1itgBtqzDi6/yuEtW8zRaIZzi+jXBkRk1
+/3KyDWnAcQL5FhLdkjp0GokneSF02Y/pXUOipJ91JzjRQ9aeqH0b36XT86/yumJs3OuIChLaR8ZU
+7bHgCutND+u0WrtLf2gs6o0c5RIXCpotDARedxbJdctNYTiHmtX2LU/n+weQnYACkCVeCgMaGCg8
+ddskxwYca7rcmHO69G1Kxv3Z0ydz6NRmH4sERIzEWtDdFCW8u3vLFbiltfTa/ZgRMefqnzIMppER
+q7oWoEEEDgdl8d8LipbcchHpj4j+zD89DVNHckYj54Fv/hhEjiP77QBA5qfVMRx+0p0wi6pi+SD0
+9U/NQgsBfTYhDdeNd99lUnw/rBxOSrS3hpQCC+xVlnJTa5rq6a2bvGHpsSELVrrWn+Xl/3JDiP0w
+EZyfn69Qf7PcyXuB770FHbiq3VEJAxpU7hgz2fk0yVXr9ivtSrnQVtthJphX97X2BiZUqjqcT5qA
+BjQeYvYDybmYJHYxILZsLCTRbUXb84VcO48sTlHF2hC7fjzgoXNTZ8u8md7tMIeQvSMJDDo1yDOj
+KLwTz9d/3WDxFM19/UXLSWmCRgVHTmUtmD4/OVucnD1Z1haPpU7XuH8tnxzUBprhPVgu20C79zfl
+HRp/6Gj8u9XgT1BLBwgqPNqhSwUAAAAWAABQSwMEFAAAAAAAXXNbNY5EDeS1AwAAtQMAAAgAAABt
+ZXRhLnhtbDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+CjwhRE9DVFlQRSBv
+ZmZpY2U6ZG9jdW1lbnQtbWV0YSBQVUJMSUMgIi0vL09wZW5PZmZpY2Uub3JnLy9EVEQgT2ZmaWNl
+RG9jdW1lbnQgMS4wLy9FTiIgIm9mZmljZS5kdGQiPjxvZmZpY2U6ZG9jdW1lbnQtbWV0YSB4bWxu
+czpvZmZpY2U9Imh0dHA6Ly9vcGVub2ZmaWNlLm9yZy8yMDAwL29mZmljZSIgeG1sbnM6eGxpbms9
+Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcv
+ZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6bWV0YT0iaHR0cDovL29wZW5vZmZpY2Uub3JnLzIwMDAv
+bWV0YSIgb2ZmaWNlOnZlcnNpb249IjEuMCI+PG9mZmljZTptZXRhPjxtZXRhOmdlbmVyYXRvcj5P
+cGVuT2ZmaWNlLm9yZyAxLjEuNSAoTGludXgpPC9tZXRhOmdlbmVyYXRvcj48IS0tNjQ1KEJ1aWxk
+Ojg5NTApLS0+PG1ldGE6Y3JlYXRpb24tZGF0ZT4yMDA2LTEwLTEzVDEyOjMyOjUyPC9tZXRhOmNy
+ZWF0aW9uLWRhdGU+PGRjOmRhdGU+MjAwNi0xMC0yN1QxNjoyNjo1OTwvZGM6ZGF0ZT48ZGM6bGFu
+Z3VhZ2U+ZnItRlI8L2RjOmxhbmd1YWdlPjxtZXRhOmVkaXRpbmctY3ljbGVzPjExPC9tZXRhOmVk
+aXRpbmctY3ljbGVzPjxtZXRhOmVkaXRpbmctZHVyYXRpb24+UFQzOE02UzwvbWV0YTplZGl0aW5n
+LWR1cmF0aW9uPjxtZXRhOnVzZXItZGVmaW5lZCBtZXRhOm5hbWU9IkluZm8gMSIvPjxtZXRhOnVz
+ZXItZGVmaW5lZCBtZXRhOm5hbWU9IkluZm8gMiIvPjxtZXRhOnVzZXItZGVmaW5lZCBtZXRhOm5h
+bWU9IkluZm8gMyIvPjxtZXRhOnVzZXItZGVmaW5lZCBtZXRhOm5hbWU9IkluZm8gNCIvPjxtZXRh
+OmRvY3VtZW50LXN0YXRpc3RpYyBtZXRhOnRhYmxlLWNvdW50PSI0IiBtZXRhOmNlbGwtY291bnQ9
+IjE4MCIvPjwvb2ZmaWNlOm1ldGE+PC9vZmZpY2U6ZG9jdW1lbnQtbWV0YT5QSwMEFAAIAAgAXXNb
+NQAAAAAAAAAAAAAAAAwAAABzZXR0aW5ncy54bWztWm1T4joU/n5/Bbdfd7QFlJUdZae8CsprC2q/
+pW2EaJrUJKXAr7+hhVVZcBXKzJ2d9gNMkpPnnJwkT05Oe/lz5uHMFDKOKLlSsqeakoHEoS4i4ytl
+aNZPLpSfpX8u/612K+ZDr5ahj4/IgT9c6gQeJOKEQyGkLM/0huXbZiWjnKhq14ekG8mdUjZW1apZ
+zcTl6qpbRipS1VpHySgx4KkrXKV0uRNdWkn4j7j5SpkI4f9QVSr10Fc9OU3T1LisrDrMMCLPv+TD
+MDwN85FstlgsqlHrWtSh5BGNP8DOqrGIsvbBO6/9sn1tcukyFl8BnyABveV4MqtqAjw5kimC4a9R
+Ktv6vJcfIY5sDHUGgUl9Zd0o5r5sREQoJe1S/R3kS8C38FEcB/kOuWKyDTpbPC+cHwx/DdF4stX0
+4vl57rPwJx7wTxBx4Qy6m6pguH2Soj5ywbL5ZwyGYdPdsJILJleAUlo2Zr9k6RJ0w04TSIf8ydD3
+XSpAwDGVtc1qxmQQfmIpVgLGKetRjoTcBfcJrpj3yA8JIl9ThhaUCIANHyPRpi7cnIgJZQesdcgE
+co6FvmH92kFJ7tW39h8BX3cEmsIIfQDIeId7Pr1V34Ov7U2Yv9awg13kciBusjy+Ri1TIaj3BeAt
+lR+z2h+pxBCApWSSkklKJimZJEcmmQ6VQUpKKSmlpJSSUsohlGIigWEaoKRskrJJyibv2WRXc5Rs
++ezER2mYHXmeXXHNwVvFYRRjG7CdqbbCxZ6JNotSz5Q4iW7yJegI4GATNc4KavsuCzCGy0zah+iF
+PcGNCQ2XCsoMguceg8sU7ga+TSmGgCilR4A53F+NBRmN7Oe7FAgWHIDfoeJY0A2GNnOcCSAvUSsU
+U7YBjelyU2VzhXwud15IYF6P4JVrwKXpgUcGNLyGwIXsOEqMCYRCcs8R0Ju8GwiMCDTmnk0xN+Dm
+EZGIEoMA36QDwAXcnOgkdlYM3OSrNwdH0zCAXM73znBRstueDLQJvzVmPBTeCGwXTRHfaX5C4NuN
+33fpxPD6DHFjTpwJowQt4B5EtGd8sHpttF2AQ/G5l4JxIWBgOblfeTuYnhl/2Zlxi8jz0HdlsLj7
+epVPj6P0OEqPo7/6OPqTJj0QtAKwE2BJFcnD9+SlVY6jIws77rPx5z0tKIrZ/L6XtliJ3MTBZorA
+BhwWzsqIADZXSsH49puqFT3Lw0/W0Mdu9XnWXuj/26efHfWHC79neZb/kBvdWPf987bZDreI3ul6
+W/411+Wyrk8M+V9z5Y/hFdGgUdceDH1WIeU5uDvXrPtm0cxZHrjrYMMbaV2ztmjr/tTxMLbJYOI2
+8NR+yvbtfEtzvLrv6v6TnS/71n272O77i4dcnVumNmtX9Rv7rj63cjiwGvUX976j2XejwK1q4W1V
+5+1KGFa8ztRuFOdWYxS6jXGx/dS/ca473Lq3sC3l3rTnlvb0TP1mWC/X+rli4DZGZ5Htfb9lk3LW
+rXe4ne8XRtetCTRr+rBRJ9ao40NvWOib/WjwA71aFJGXqqqqXuh33ZzBxuvy6nnjRRDL3xrf2011
+Os9vnYxWS63135R75YvnlzMZ1XwLXivL/UkLBsOmcb/SFwbWqowrNVw4++oSoOozWsz1cour256L
+33v0VFWP7KxFRbvxkl/Xr5+tmsqRQ74t+16/1jpR13HtvWxj9iLCMgfM1dXeDn/FoDW9l8s3OuEj
+y+q6ajuvTbXmtg5Xe9KY7+P5kENWBQIkT2OVCWDAkRxToZ7PIF/yfeIZrSa/gYzoHAHSC4gjArAl
+q5xIgghM4Sj+BLFLKpjyY4QOcfBZZ9Qzoed/dLocoETHWIbRS/pvUbsCiANxMje26Mal/vZhprrr
+M9PSf1BLBwj8KVOheAUAAA8rAABQSwMEFAAIAAgAXXNbNQAAAAAAAAAAAAAAABUAAABNRVRBLUlO
+Ri9tYW5pZmVzdC54bWyt0rFqwzAQBuC9T6Hebp/TqQQ7gcYpFNragzN0FPI5EciSsc4hfvuqg+NC
+sgS8SeLuu19w6fbSGnGm3mtnM1jFCQiyytXaHjM4VO/RK2w3T+lzXuyqn3IvWml1Q57X00GUh7fP
+j52ACLHoyBZNoxXFrj8i5lUuvqa6YCPuv0HA9BTXXEPAb80QyvrrNYMTc7dGdMF3s/+SJCucigIk
+ZqnRhiKy3I//ElOtZcRjRxnIrjNaSQ6/xrOtYz/YOAyNlTQK5pZmMCbqJJ8yQMCHJtxXSq146Mk/
+qjFdGEPA+6pylkPz3w8WdT2PhvzibEssl89KzGFpr2lTvFmrzS9QSwcIU8sTU/wAAADuAgAAUEsB
+AhQAFAAAAAAAXXNbNUW8E5QcAAAAHAAAAAgAAAAAAAAAAAAAAAAAAAAAAG1pbWV0eXBlUEsBAhQA
+FAAIAAgAXXNbNViB+ypcCAAAqpAAAAsAAAAAAAAAAAAAAAAAQgAAAGNvbnRlbnQueG1sUEsBAhQA
+FAAIAAgAXXNbNSo82qFLBQAAABYAAAoAAAAAAAAAAAAAAAAA1wgAAHN0eWxlcy54bWxQSwECFAAU
+AAAAAABdc1s1jkQN5LUDAAC1AwAACAAAAAAAAAAAAAAAAABaDgAAbWV0YS54bWxQSwECFAAUAAgA
+CABdc1s1/ClToXgFAAAPKwAADAAAAAAAAAAAAAAAAAA1EgAAc2V0dGluZ3MueG1sUEsBAhQAFAAI
+AAgAXXNbNVPLE1P8AAAA7gIAABUAAAAAAAAAAAAAAAAA5xcAAE1FVEEtSU5GL21hbmlmZXN0Lnht
+bFBLBQYAAAAABgAGAFoBAAAmGQAAAAA=</string> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <long>6806</long> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/openoffice_category_file_template.sxc.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/openoffice_category_file_template.sxc.xml
deleted file mode 100644
index 03f8e20ad8..0000000000
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/openoffice_category_file_template.sxc.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts17981032.26</string> </value>
-        </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>__name__</string> </key>
-            <value> <string>openoffice_category_file_template.sxc</string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>application/vnd.sun.xml.calc</string> </value>
-        </item>
-        <item>
-            <key> <string>data</string> </key>
-            <value> <string encoding="base64">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
-JbxJXXAJbikprXHfZ0TMufynDINtpMeqpgVeJwP7kzL57yVFcRZcROoLDn/kHx+HKSo4oxF64us/
-GpHjyHy3BZDxsT2Gw89qEmaRbZZPQl/9VFGoIWDOJmQb6613X2RRfDlR2V+U3s4eUjIMsNVZSqKS
-NDTTa5rcbusxKQtmqtef5OX/xZIQ8zIRnJ6ezrw2saTkrcS37oJKnB13tIAFDTp3jFnReI3ksqb9
-UrlSPiirzTITjK2+Gq1jghXViPmgCV4njPsi+4nkXAwGdtIJbDlYSKLGirLnnrFG3xicpJLVIeb5
-WScODU0Nkr4zLe2wh5CdKwksOhXI1aso3BPXV3+dwD/0/CP1NeFhaYJCBQfIWgumj789mRydjKeV
-xX2l0zTuX6sn5NWBenkPptM60ND+prrz+i+61/+bgeBPUEsHCL7AIJXQBQAAvhgAAFBLAwQUAAAA
-AABJc8Uy2iDZF+kDAADpAwAACAAAAG1ldGEueG1sPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGlu
-Zz0iVVRGLTgiPz4KPCFET0NUWVBFIG9mZmljZTpkb2N1bWVudC1tZXRhIFBVQkxJQyAiLS8vT3Bl
-bk9mZmljZS5vcmcvL0RURCBPZmZpY2VEb2N1bWVudCAxLjAvL0VOIiAib2ZmaWNlLmR0ZCI+PG9m
-ZmljZTpkb2N1bWVudC1tZXRhIHhtbG5zOm9mZmljZT0iaHR0cDovL29wZW5vZmZpY2Uub3JnLzIw
-MDAvb2ZmaWNlIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1s
-bnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczptZXRhPSJodHRw
-Oi8vb3Blbm9mZmljZS5vcmcvMjAwMC9tZXRhIiBvZmZpY2U6dmVyc2lvbj0iMS4wIj48b2ZmaWNl
-Om1ldGE+PG1ldGE6Z2VuZXJhdG9yPk9wZW5PZmZpY2Uub3JnIDEuMS40IChMaW51eCk8L21ldGE6
-Z2VuZXJhdG9yPjwhLS02NDUoQnVpbGQ6ODgyNCktLT48ZGM6dGl0bGU+RVJQNSBDYXRlZ29yeSBE
-ZWZpbml0aW9uIFRlbXBsYXRlPC9kYzp0aXRsZT48bWV0YTpjcmVhdGlvbi1kYXRlPjIwMDUtMDUt
-MTVUMTc6NTE6MDY8L21ldGE6Y3JlYXRpb24tZGF0ZT48ZGM6ZGF0ZT4yMDA1LTA2LTA1VDE0OjI2
-OjE5PC9kYzpkYXRlPjxkYzpsYW5ndWFnZT5mci1GUjwvZGM6bGFuZ3VhZ2U+PG1ldGE6ZWRpdGlu
-Zy1jeWNsZXM+NDwvbWV0YTplZGl0aW5nLWN5Y2xlcz48bWV0YTplZGl0aW5nLWR1cmF0aW9uPlBU
-NU0xOFM8L21ldGE6ZWRpdGluZy1kdXJhdGlvbj48bWV0YTp1c2VyLWRlZmluZWQgbWV0YTpuYW1l
-PSJJbmZvIDEiLz48bWV0YTp1c2VyLWRlZmluZWQgbWV0YTpuYW1lPSJJbmZvIDIiLz48bWV0YTp1
-c2VyLWRlZmluZWQgbWV0YTpuYW1lPSJJbmZvIDMiLz48bWV0YTp1c2VyLWRlZmluZWQgbWV0YTpu
-YW1lPSJJbmZvIDQiLz48bWV0YTpkb2N1bWVudC1zdGF0aXN0aWMgbWV0YTp0YWJsZS1jb3VudD0i
-MiIgbWV0YTpjZWxsLWNvdW50PSIyNiIvPjwvb2ZmaWNlOm1ldGE+PC9vZmZpY2U6ZG9jdW1lbnQt
-bWV0YT5QSwMEFAAIAAgASXPFMgAAAAAAAAAAAAAAAAwAAABzZXR0aW5ncy54bWztWm1z2jgQ/n6/
-gvPXm8SGvDR0knQk85qGBAMmMd+ErRgdsuSxZQz99SfZ0DYU0gTMzN0NmUmMvKtnn11Jq5XC9Zd5
-QEszHMWEsxutfGpoJcxc7hHm32j2oHFypX25/eP6z9qjOXC69RJ/eSEu/uxxNwkwEycxFkLqxqWu
-De/bZkk70fXHELPHTO+UR76u1wa1Ut6uLbuVpCFdrz9oJS0HPPWEp91eb0WXLFn8ORffaBMhws+6
-zqUd/sNOxTAMPW9ryw5zStj0u36apqfpWaZbrlareiZdqbqcvRD/Deyynqtoqxi8itp37ivKt9e5
-+hL4hAgcKH9Ky9cMBdKTGcHpdy+1TX1e6w9JTMYUgwijAQ+1lVAsQikkTGi3xrX+K8iHgO/xizgM
-8hPxxGQTdKV8Wb7aG76FiT/ZSP3T5cX5e+FPAhSeEObhOfbWTeF08yBlfeSEjRbvIYzTtrfGMhaR
-nAHarRKWP8RUga7xHCAZkN8Rfd0FohiXTCSwz6PFO+ahmUQxj7o8JkIugecCp8trZGcT8tnZbtAt
-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</string> </value>
-        </item>
-        <item>
-            <key> <string>precondition</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>size</string> </key>
-            <value> <long>6310</long> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 8bc6583717..d800886d9c 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-120
\ No newline at end of file
+123
\ No newline at end of file
-- 
2.30.9