Merge types to new standard

Use Embebed File not Image
Add property sheet to Credential Update
Update portal types

bt5/erp5_credential/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -20,8 +20,8 @@
   <item>Address</item>
   <item>Credential Question</item>
   <item>Email</item>
+  <item>Embedded File</item>
   <item>Fax</item>
-  <item>Image</item>
   <item>Telephone</item>
  </portal_type>
  <portal_type id="Credential Update Module">

bt5/erp5_credential/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml

@@ -14,8 +14,8 @@
   <item>Address</item>
   <item>Credential Question</item>
   <item>Email</item>
+  <item>Embedded File</item>
   <item>Fax</item>
-  <item>Image</item>
   <item>Telephone</item>
  </portal_type>
  <portal_type id="Person">

bt5/erp5_credential/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -7,6 +7,7 @@
   <item>CredentialRequest</item>
  </portal_type>
  <portal_type id="Credential Update">
+  <item>CredentialRequest</item>
   <item>DefaultImage</item>
  </portal_type>
  <portal_type id="Person">

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Question.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -55,6 +55,10 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Base Type</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>XMLObject</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
@@ -66,7 +70,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -83,7 +89,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Recovery%20Module.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Recovery.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -91,6 +91,10 @@
             <key> <string>product</string> </key>
             <value> <string>ERP5Type</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CredentialRecovery</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
@@ -153,7 +157,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -170,7 +176,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Request%20Module.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Request.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -105,6 +105,12 @@
             <key> <string>type_class</string> </key>
             <value> <string>CredentialRequest</string> </value>
         </item>
+        <item>
+            <key> <string>type_interface</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>type_mixin</string> </key>
             <value>
@@ -173,7 +179,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -190,7 +198,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -207,7 +217,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Update%20Module.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_credential/PortalTypeTemplateItem/portal_types/Credential%20Update.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -97,6 +97,22 @@
             <key> <string>product</string> </key>
             <value> <string>ERP5Type</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CredentialRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>type_interface</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_mixin</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
@@ -159,7 +175,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -176,7 +194,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialUpdate_copyDefaultImage.xml

@@ -78,7 +78,7 @@ if new_default_image is not None:\n
   updated_item = context.getDestinationDecisionValue()\n
   default_image = updated_item.getDefaultImageValue()\n
   if default_image is None:\n
-    default_image = updated_item.newContent(portal_type="Image",id="default_image")\n
+    default_image = updated_item.newContent(portal_type="Embedded File",id="default_image")\n
   \n
   image_mapping = (\n
     # (credential image, item image)\n

bt5/erp5_credential/bt/revision

-333
+334
\ No newline at end of file

bt5/erp5_credential/bt/template_portal_type_allowed_content_type_list

@@ -11,7 +11,7 @@ Credential Update Module | Credential Update
 Credential Update | Address
 Credential Update | Credential Question
 Credential Update | Email
+Credential Update | Embedded File
 Credential Update | Fax
-Credential Update | Image
 Credential Update | Telephone
 Person | Credential Question
\ No newline at end of file

bt5/erp5_credential/bt/template_portal_type_hidden_content_type_list

@@ -8,7 +8,7 @@ Credential Request | Telephone
 Credential Update | Address
 Credential Update | Credential Question
 Credential Update | Email
+Credential Update | Embedded File
 Credential Update | Fax
-Credential Update | Image
 Credential Update | Telephone
 Person | Credential Question
\ No newline at end of file

bt5/erp5_credential/bt/template_portal_type_property_sheet_list

 Credential Question | CredentialQuestion
 Credential Request | CredentialOrganisationProperties
 Credential Request | CredentialRequest
+Credential Update | CredentialRequest
 Credential Update | DefaultImage
 Person | DefaultCredentialQuestion
\ No newline at end of file