From cca33e8d53d679071b5445b2e5933c68bd25fb84 Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Wed, 15 Mar 2006 13:41:13 +0000
Subject: [PATCH] added related keys

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6104 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_types/Agent/download.xml           |   4 +
 .../portal_types/Agent/history.xml            |   4 +
 .../portal_types/Agent/metadata.xml           |   4 +
 .../portal_types/Agent/view.xml               |   4 +
 ...elated_destination_person.catalog_keys.xml |  14 ++
 .../z_related_destination_person.xml          | 177 ++++++++++++++++++
 ...lated_source_organisation.catalog_keys.xml |  14 ++
 .../z_related_source_organisation.xml         | 177 ++++++++++++++++++
 .../z_related_source_person.catalog_keys.xml  |  14 ++
 .../erp5_mysql/z_related_source_person.xml    | 177 ++++++++++++++++++
 .../related_key_list.xml                      |   5 +
 .../portal_categories/group.xml               |  14 +-
 .../portal_categories/role.xml                |   2 +-
 .../portal_categories/role/internal.xml       | 123 ++++++++++++
 .../default_site_preference.xml               |   1 +
 bt5/erp5_base/bt/change_log                   |   3 +
 .../bt/template_catalog_method_id_list        |   3 +
 .../bt/template_catalog_related_key_list      |   3 +
 18 files changed, 734 insertions(+), 9 deletions(-)
 create mode 100755 bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.catalog_keys.xml
 create mode 100755 bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml
 create mode 100755 bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml
 create mode 100755 bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
 create mode 100755 bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.catalog_keys.xml
 create mode 100755 bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml
 create mode 100755 bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml

diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
index d330836405..2804403bee 100755
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/download.xml
@@ -44,6 +44,10 @@
             <key> <string>id</string> </key>
             <value> <string>download</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml
index 2e6965f167..8a72e4e09d 100755
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/history.xml
@@ -44,6 +44,10 @@
             <key> <string>id</string> </key>
             <value> <string>history</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml
index 65fccc7506..db21efb9f1 100755
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/metadata.xml
@@ -44,6 +44,10 @@
             <key> <string>id</string> </key>
             <value> <string>metadata</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
index 18814ae24c..0a90315c11 100755
--- a/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
+++ b/bt5/erp5_base/ActionTemplateItem/portal_types/Agent/view.xml
@@ -44,6 +44,10 @@
             <key> <string>id</string> </key>
             <value> <string>view</string> </value>
         </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>permissions</string> </key>
             <value>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.catalog_keys.xml
new file mode 100755
index 0000000000..5c39c42c6e
--- /dev/null
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.catalog_keys.xml
@@ -0,0 +1,14 @@
+<catalog_method>
+ <item key="_is_catalog_list_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_uncatalog_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_clear_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_filtered_archive" type="int">
+  <value>0</value>
+ </item>
+</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml
new file mode 100755
index 0000000000..9a2c6fe13f
--- /dev/null
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_destination_person.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ZSQLMethods.SQL</string>
+          <string>SQL</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_arg</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_data</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>table_0</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>table_1</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <list>
+<string>table_0</string>
+<string>table_1</string>
+                          </list>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>allow_simple_one_argument_traversal</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>arguments_src</string> </key>
+            <value> <string>table_0\r\n
+table_1</string> </value>
+        </item>
+        <item>
+            <key> <string>cache_time_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>class_file_</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>class_name_</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>connection_hook</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>connection_id</string> </key>
+            <value> <string>erp5_sql_connection</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>z_related_destination_person</string> </value>
+        </item>
+        <item>
+            <key> <string>max_cache_</string> </key>
+            <value> <int>100</int> </value>
+        </item>
+        <item>
+            <key> <string>max_rows_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>src</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
+AND <dtml-var table_0>.uid = catalog.uid\n
+AND <dtml-var table_1>.portal_type = \'Person\'\n
+\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </klass>
+                <none/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>__name__</string> </key>
+                        <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_vars</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>globals</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>raw</string> </key>
+                        <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">\n
+AND <dtml-var table_0>.uid = catalog.uid\n
+AND <dtml-var table_1>.portal_type = \'Person\'\n
+\n
+
+
+]]></string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml
new file mode 100755
index 0000000000..5c39c42c6e
--- /dev/null
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml
@@ -0,0 +1,14 @@
+<catalog_method>
+ <item key="_is_catalog_list_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_uncatalog_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_clear_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_filtered_archive" type="int">
+  <value>0</value>
+ </item>
+</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
new file mode 100755
index 0000000000..f359328ee8
--- /dev/null
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ZSQLMethods.SQL</string>
+          <string>SQL</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_arg</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_data</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>table_0</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>table_1</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <list>
+<string>table_0</string>
+<string>table_1</string>
+                          </list>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>allow_simple_one_argument_traversal</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>arguments_src</string> </key>
+            <value> <string>table_0\r\n
+table_1</string> </value>
+        </item>
+        <item>
+            <key> <string>cache_time_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>class_file_</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>class_name_</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>connection_hook</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>connection_id</string> </key>
+            <value> <string>erp5_sql_connection</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>z_related_source_organisation</string> </value>
+        </item>
+        <item>
+            <key> <string>max_cache_</string> </key>
+            <value> <int>100</int> </value>
+        </item>
+        <item>
+            <key> <string>max_rows_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>src</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
+AND <dtml-var table_0>.uid = catalog.uid\n
+AND <dtml-var table_1>.portal_type = \'Organisation\'\n
+\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </klass>
+                <none/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>__name__</string> </key>
+                        <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_vars</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>globals</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>raw</string> </key>
+                        <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
+AND <dtml-var table_0>.uid = catalog.uid\n
+AND <dtml-var table_1>.portal_type = \'Organisation\'\n
+\n
+
+
+]]></string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.catalog_keys.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.catalog_keys.xml
new file mode 100755
index 0000000000..5c39c42c6e
--- /dev/null
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.catalog_keys.xml
@@ -0,0 +1,14 @@
+<catalog_method>
+ <item key="_is_catalog_list_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_uncatalog_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_clear_method_archive" type="int">
+  <value>0</value>
+ </item>
+ <item key="_is_filtered_archive" type="int">
+  <value>0</value>
+ </item>
+</catalog_method>
\ No newline at end of file
diff --git a/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml
new file mode 100755
index 0000000000..c49a1abc3e
--- /dev/null
+++ b/bt5/erp5_base/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_person.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ZSQLMethods.SQL</string>
+          <string>SQL</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_arg</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_data</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>table_0</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>table_1</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <list>
+<string>table_0</string>
+<string>table_1</string>
+                          </list>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>allow_simple_one_argument_traversal</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>arguments_src</string> </key>
+            <value> <string>table_0\r\n
+table_1</string> </value>
+        </item>
+        <item>
+            <key> <string>cache_time_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>class_file_</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>class_name_</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>connection_hook</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>connection_id</string> </key>
+            <value> <string>erp5_sql_connection</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>z_related_source_person</string> </value>
+        </item>
+        <item>
+            <key> <string>max_cache_</string> </key>
+            <value> <int>100</int> </value>
+        </item>
+        <item>
+            <key> <string>max_rows_</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>src</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
+AND <dtml-var table_0>.uid = catalog.uid\n
+AND <dtml-var table_1>.portal_type = \'Person\'\n
+\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </klass>
+                <none/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>__name__</string> </key>
+                        <value> <string encoding="cdata"><![CDATA[
+
+<string>
+
+]]></string> </value>
+                    </item>
+                    <item>
+                        <key> <string>_vars</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>globals</string> </key>
+                        <value>
+                          <dictionary/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>raw</string> </key>
+                        <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid\n
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">\n
+AND <dtml-var table_0>.uid = catalog.uid\n
+AND <dtml-var table_1>.portal_type = \'Person\'\n
+\n
+
+
+]]></string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml b/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml
new file mode 100755
index 0000000000..80b93cb1d6
--- /dev/null
+++ b/bt5/erp5_base/CatalogRelatedKeyTemplateItem/related_key_list.xml
@@ -0,0 +1,5 @@
+<key_list>
+ <key>destination_person_title | category,catalog/title/z_related_destination_person</key>
+ <key>source_organisation_title | category,catalog/title/z_related_source_organisation</key>
+ <key>source_person_title | category,catalog/title/z_related_source_person</key>
+</key_list>
\ No newline at end of file
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
index 7cd7c8612d..530fe19100 100755
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
@@ -346,7 +346,9 @@
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>subordination</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -365,7 +367,7 @@
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: []</string> </value>
+            <value> <string>python: [\'Career\', \'Organisation\', \'Person\']</string> </value>
         </item>
         <item>
             <key> <string>acquisition_sync_value</string> </key>
@@ -393,9 +395,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Group define the corporate group and the business unit structure. Group is acquired through careers and subordination.</string> </value>
         </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
@@ -409,9 +409,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Group</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
index 55b92dd723..1d93eecf8e 100755
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
@@ -401,7 +401,7 @@
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: [\'Organisation\']</string> </value>
+            <value> <string>python: [\'Career\', \'Organisation\']</string> </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type_list</string> </key>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml b/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml
index de421c8202..c99ef46047 100755
--- a/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_categories/role/internal.xml
@@ -42,6 +42,12 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>codification</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>internal</string> </value>
@@ -367,6 +373,123 @@
                               </value>
                           </item>
                         </dictionary>
+                        <dictionary>
+                          <item>
+                              <key> <string>action</string> </key>
+                              <value> <string>\'edit\'</string> </value>
+                          </item>
+                          <item>
+                              <key> <string>actor</string> </key>
+                              <value> <string>jp</string> </value>
+                          </item>
+                          <item>
+                              <key> <string>comment</string> </key>
+                              <value> <string></string> </value>
+                          </item>
+                          <item>
+                              <key> <string>state</string> </key>
+                              <value> <string>current</string> </value>
+                          </item>
+                          <item>
+                              <key> <string>time</string> </key>
+                              <value>
+                                <object>
+                                  <klass> <reference id="5.1"/> </klass>
+                                  <tuple>
+                                    <none/>
+                                  </tuple>
+                                  <state>
+                                    <dictionary>
+                                      <item>
+                                          <key> <string>_aday</string> </key>
+                                          <value> <string>Wed</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_amon</string> </key>
+                                          <value> <string>Mar</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_d</string> </key>
+                                          <value> <float>38417.8542372</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_day</string> </key>
+                                          <value> <int>8</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_dayoffset</string> </key>
+                                          <value> <int>3</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_fday</string> </key>
+                                          <value> <string>Wednesday</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_fmon</string> </key>
+                                          <value> <string>March</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_hour</string> </key>
+                                          <value> <int>15</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_millis</string> </key>
+                                          <value> <long>1141849806091</long> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_minute</string> </key>
+                                          <value> <int>30</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_month</string> </key>
+                                          <value> <int>3</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_nearsec</string> </key>
+                                          <value> <float>6.0</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pday</string> </key>
+                                          <value> <string>Wed.</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pm</string> </key>
+                                          <value> <string>pm</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pmhour</string> </key>
+                                          <value> <int>3</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_pmon</string> </key>
+                                          <value> <string>Mar.</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_second</string> </key>
+                                          <value> <float>6.091</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_t</string> </key>
+                                          <value> <float>1141849806.09</float> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_tz</string> </key>
+                                          <value> <string>US/Eastern</string> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>_year</string> </key>
+                                          <value> <int>2006</int> </value>
+                                      </item>
+                                      <item>
+                                          <key> <string>time</string> </key>
+                                          <value> <float>0.854237164356</float> </value>
+                                      </item>
+                                    </dictionary>
+                                  </state>
+                                </object>
+                              </value>
+                          </item>
+                        </dictionary>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_base/PathTemplateItem/portal_preferences/default_site_preference.xml b/bt5/erp5_base/PathTemplateItem/portal_preferences/default_site_preference.xml
index 7c53a7b429..a42358041b 100755
--- a/bt5/erp5_base/PathTemplateItem/portal_preferences/default_site_preference.xml
+++ b/bt5/erp5_base/PathTemplateItem/portal_preferences/default_site_preference.xml
@@ -35,6 +35,7 @@
             <value>
               <tuple>
                 <string>Manager</string>
+                <string>Member</string>
                 <string>Owner</string>
               </tuple>
             </value>
diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log
index 2fc6289b2b..ddf1eaf8f2 100755
--- a/bt5/erp5_base/bt/change_log
+++ b/bt5/erp5_base/bt/change_log
@@ -1,3 +1,6 @@
+2006-03-14 Seb
+* Added related keys about person and organisation
+
 2006-03-03 aurel
 * add view to import and view signature of agent
 
diff --git a/bt5/erp5_base/bt/template_catalog_method_id_list b/bt5/erp5_base/bt/template_catalog_method_id_list
index e69de29bb2..05a201eb87 100755
--- a/bt5/erp5_base/bt/template_catalog_method_id_list
+++ b/bt5/erp5_base/bt/template_catalog_method_id_list
@@ -0,0 +1,3 @@
+erp5_mysql/z_related_destination_person
+erp5_mysql/z_related_source_organisation
+erp5_mysql/z_related_source_person
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_catalog_related_key_list b/bt5/erp5_base/bt/template_catalog_related_key_list
index e69de29bb2..d35af24cde 100755
--- a/bt5/erp5_base/bt/template_catalog_related_key_list
+++ b/bt5/erp5_base/bt/template_catalog_related_key_list
@@ -0,0 +1,3 @@
+source_organisation_title | category,catalog/title/z_related_source_organisation
+source_person_title | category,catalog/title/z_related_source_person
+destination_person_title | category,catalog/title/z_related_destination_person
\ No newline at end of file
-- 
2.30.9