diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml
new file mode 100755
index 0000000000000000000000000000000000000000..96119beb326e4bd17d85215f28d19876281cfdad
--- /dev/null
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person/jump_to_opportunity.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_jump</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>jump_to_opportunity</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>20.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Sale Opportunity</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${portal_url}/opportunity_module/view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml
new file mode 100755
index 0000000000000000000000000000000000000000..eb710bcffee34e9cc794b80db3ac66981307dd47
--- /dev/null
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Person/jump_to_support_request.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_jump</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>jump_to_support_request</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>23.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Support Request</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${portal_url}/support_request_module/view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.catalog_keys.xml
new file mode 100755
index 0000000000000000000000000000000000000000..5c39c42c6e3e7048cd3a045aa8fc564bd855fc0d
--- /dev/null
+++ b/bt5/erp5_crm/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_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_source_organisation.xml
new file mode 100755
index 0000000000000000000000000000000000000000..f359328ee825fb292cd64640c35fb461e36e72d1
--- /dev/null
+++ b/bt5/erp5_crm/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_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.catalog_keys.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.catalog_keys.xml
new file mode 100755
index 0000000000000000000000000000000000000000..5c39c42c6e3e7048cd3a045aa8fc564bd855fc0d
--- /dev/null
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.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_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.xml b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.xml
new file mode 100755
index 0000000000000000000000000000000000000000..e83f809e825d6bf1d290043ce4790a46e029b8fb
--- /dev/null
+++ b/bt5/erp5_crm/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_related_translated_event_state.xml
@@ -0,0 +1,163 @@
+<?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>
+                          </dictionary>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <list>
+<string>table_0</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</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_translated_event_state</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>1000</int> </value>
+        </item>
+        <item>
+            <key> <string>src</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+<dtml-var table_0>.original_message = catalog.event_state\n
+ AND <dtml-var table_0>.message_context = "event_state"\n
+ AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
+
+]]></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_0>.original_message = catalog.event_state\n
+ AND <dtml-var table_0>.message_context = "event_state"\n
+ AND <dtml-var table_0>.language = <dtml-sqlvar "Localizer.get_selected_language()" type="string">
+
+]]></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_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml b/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml
new file mode 100755
index 0000000000000000000000000000000000000000..2bc2be94b0d5aac70ff4a0c97f0a2cc30f183e1e
--- /dev/null
+++ b/bt5/erp5_crm/CatalogRelatedKeyTemplateItem/related_key_list.xml
@@ -0,0 +1,4 @@
+<key_list>
+ <key>source_organisation_title | category,catalog/title/z_related_source_organisation</key>
+ <key>translated_event_state_title | translation/translated_message/z_related_translated_event_state</key>
+</key_list>
\ No newline at end of file
diff --git a/bt5/erp5_crm/CategoryTemplateItem/portal_categories/follow_up.xml b/bt5/erp5_crm/CategoryTemplateItem/portal_categories/follow_up.xml
new file mode 100755
index 0000000000000000000000000000000000000000..439b904665e59a35c10b816ab6683966feac977c
--- /dev/null
+++ b/bt5/erp5_crm/CategoryTemplateItem/portal_categories/follow_up.xml
@@ -0,0 +1,453 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5.Tool.Category</string>
+          <string>BaseCategory</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_properties</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>Local ID of the object in its enclosing container</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>id</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string></string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>uid</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string></string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>catalog_index</string> </key>
+                      <value>
+                        <tuple>
+                          <string>COUNT</string>
+                        </tuple>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>catalog_metadata</string> </key>
+                      <value> <int>1</int> </value>
+                  </item>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value> <string></string> </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string></string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>title</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value> <string></string> </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string></string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>description</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>text</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value> <int>0</int> </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>Determines if acquired value should be copied</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_copy_value</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>boolean</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value> <int>1</int> </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>Determines if the local value have priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_mask_value</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>boolean</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value> <int>0</int> </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>Determines if the acquired value should be appended</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_append_value</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>boolean</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value> <int>0</int> </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>Determines if the acquired value should be synced</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_sync_value</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>boolean</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>base_id</string> </key>
+                      <value> <string>acquisition_object_id</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value>
+                        <list/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>The default contained object id to look up</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_object_id_list</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>lines</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>base_id</string> </key>
+                      <value> <string>acquisition_base_category</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value>
+                        <list/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>The base categories to browse</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_base_category_list</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>tokens</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>base_id</string> </key>
+                      <value> <string>acquisition_portal_type</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value>
+                        <list/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>The portal types to browse</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_portal_type_list</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>multivalued</string> </key>
+                      <value> <int>1</int> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>tales</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>base_id</string> </key>
+                      <value> <string>fallback_base_category</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>default</string> </key>
+                      <value>
+                        <list/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>description</string> </key>
+                      <value> <string>another base category to get if everything else fails</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>fallback_base_category_list</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>mode</string> </key>
+                      <value> <string>w</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>tokens</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: []</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>follow_up</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.Length</string>
+          <string>Length</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml
index 46c1b6c2f357006feed7ff8dd82ea6859a23a992..d31f76f148fde241820fdcb9acc39cd48e88ac9b 100755
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_body.xml
@@ -136,7 +136,9 @@
                 </item>
                 <item>
                     <key> <string>default</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>description</string> </key>
@@ -283,4 +285,23 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.TALESField</string>
+          <string>TALESMethod</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.getEncodedBody(output_charset="utf-8")</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_translated_event_state_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_translated_event_state_title.xml
new file mode 100755
index 0000000000000000000000000000000000000000..20be6a271702a9fc58b1281deee8b325af6793db
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view/my_translated_event_state_title.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.Formulator.StandardFields</string>
+          <string>StringField</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_translated_event_state_title</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>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>20</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>State</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log
index 31fca10df59485cc6666e0c0665ffa03791dc8d2..d73158706dc6c2368b3f57baee8aeca0a538528b 100755
--- a/bt5/erp5_crm/bt/change_log
+++ b/bt5/erp5_crm/bt/change_log
@@ -1,3 +1,6 @@
+2006-03-03 kevin
+* Display an encoded UTF-8 body for Mail Message.
+
 2006-02-22 kevin
 * Fix bad default lisbox parameters.
 
diff --git a/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list b/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list
new file mode 100755
index 0000000000000000000000000000000000000000..95f9b441024f303aef29217af494a10eef355c5b
--- /dev/null
+++ b/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list
@@ -0,0 +1,12 @@
+Incoming Fax | edit_workflow
+Incoming Fax | event_workflow
+Incoming Letter | edit_workflow
+Incoming Letter | event_workflow
+Mail Message | edit_workflow
+Mail Message | event_workflow
+Phone Call | edit_workflow
+Phone Call | event_workflow
+Sale Opportunity | edit_workflow
+Sale Opportunity | sale_opportunity_workflow
+Support Request | edit_workflow
+Support Request | validation_workflow
\ No newline at end of file