diff --git a/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_assignment_role_property.xml b/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_assignment_role_property.xml
deleted file mode 100644
index dd731c46957ab4b9c0cb8b0386c5e6a56ba8f7cb..0000000000000000000000000000000000000000
--- a/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_assignment_role_property.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="Standard Property" module="erp5.portal_type"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_local_properties</string> </key>
- <value>
- <tuple>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>mode</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>string</string> </value>
- </item>
- </dictionary>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>categories</string> </key>
- <value>
- <tuple>
- <string>elementary_type/lines</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>preferred_credential_assignment_role_property</string> </value>
- </item>
- <item>
- <key> <string>mode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Standard Property</string> </value>
- </item>
- <item>
- <key> <string>preference</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>property_default</string> </key>
- <value> <string>python: []</string> </value>
- </item>
- <item>
- <key> <string>write_permission</string> </key>
- <value> <string>Manage properties</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_assignment_function_property.xml b/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_subscription_assignment_category_property.xml
similarity index 90%
rename from bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_assignment_function_property.xml
rename to bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_subscription_assignment_category_property.xml
index f2afa2b7f70ca278f7156773343af30dc0a7ca65..15543352c44ef24bcf5c7006bb37f0d5f0c5fb71 100644
--- a/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_assignment_function_property.xml
+++ b/bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_subscription_assignment_category_property.xml
@@ -33,13 +33,11 @@
</item>
<item>
<key> <string>description</string> </key>
- <value>
- <none/>
- </value>
+ <value> <string>Defines base categories axes in components variations</string> </value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>preferred_credential_assignment_function_property</string> </value>
+ <value> <string>preferred_subscription_assignment_category_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
index 47fee1898d4a3e847d3821414f20b04ee6ccae9d..64bd5aef3d48140356e63e02194d660d3901b122 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
@@ -87,8 +87,7 @@
<string>my_preferred_person_credential_update_automatic_approval</string>
<string>my_preferred_credential_assignment_duration</string>
<string>my_preferred_login_and_password_notifier</string>
- <string>my_preferred_credential_assignment_role_list</string>
- <string>my_preferred_credential_assignment_function_list</string>
+ <string>my_preferred_subscription_assignment_category_list</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_function_list.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_function_list.xml
deleted file mode 100644
index fb50cbec762bc43edf3557c3e339839b7703b053..0000000000000000000000000000000000000000
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_function_list.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>delegated_list</string> </key>
- <value>
- <list>
- <string>items</string>
- <string>size</string>
- <string>title</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_preferred_credential_assignment_function_list</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string>my_multi_list_field</string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <int>7</int> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string>Click to edit the target</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Assignment Function</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: filter(lambda x: x[0] != "", getattr(context.portal_categories["function"], context.portal_preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\'))</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_role_list.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_subscription_assignment_category_list.xml
similarity index 71%
rename from bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_role_list.xml
rename to bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_subscription_assignment_category_list.xml
index ac96468dc115bea32a80e5000de1c88474fcd232..3744e9fc827181fef7a62346ece93f29940221ef 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_role_list.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_subscription_assignment_category_list.xml
@@ -10,14 +10,14 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>items</string>
<string>title</string>
+ <string>width</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>my_preferred_credential_assignment_role_list</string> </value>
+ <value> <string>my_preferred_subscription_assignment_category_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
@@ -61,20 +61,10 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -84,25 +74,23 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_multi_list_field</string> </value>
+ <value> <string>my_lines_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <list/>
- </value>
- </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Assignment Role</string> </value>
+ <value> <string>Category List for Credential Requests</string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <int>20</int> </value>
</item>
</dictionary>
</value>
@@ -110,17 +98,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>python: map(lambda x: (x,x), context.portal_categories.role.objectIds())</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision
index d35d5f782448e98ccbcb1fa8e162c079cc627e52..6ffe0d0bf6ccb6246fd343665efe0b19df8b2e8b 100644
--- a/bt5/erp5_credential/bt/revision
+++ b/bt5/erp5_credential/bt/revision
@@ -1 +1 @@
-347
\ No newline at end of file
+348
\ No newline at end of file