diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/assessment.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/assessment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01c1919b6add6efaf9de14635976f39fe1371be8
--- /dev/null
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/assessment.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>action_type/object_view</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </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>assessment</string> </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>Assessment</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python:"%s/%s" % (object_url, object.Event_getFollowUpAssessmentFormId())</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>python: object is not None and object.Event_hasFollowUpAssessmentForm()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/preview.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/preview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..79bd9c65c56a198fb507c94f28d3bc4c7f0ce5af
--- /dev/null
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/preview.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>action_type/object_view</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</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>preview</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>10.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Preview</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Event_viewPreview</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/related_events.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/related_events.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f764c6d6f9af5f7ea0ad72cb903d05770673243c
--- /dev/null
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/related_events.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>action_type/object_view</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</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>related_events</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>30.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Related Events</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Event_viewRelatedEventList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/view.xml b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..06ef176ab2519aa7830b1a723857008844ac225c
--- /dev/null
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Short%20Message/view.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>action_type/object_view</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</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>view</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>1.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>View</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/Event_view</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_crm/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index 999ba4b4169c2dc24aa38f2bf67465290a6baceb..c8089d4c912411bba915744dfe1a326bbbb62608 100644
--- a/bt5/erp5_crm/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_crm/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -9,6 +9,7 @@
<item>Mail Message</item>
<item>Note</item>
<item>Phone Call</item>
+ <item>Short Message</item>
<item>Site Message</item>
<item>Visit</item>
<item>Web Message</item>
diff --git a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Short%20Message.xml b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Short%20Message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7ec5801a143913510a41cf0e8b9c45f59e6189d3
--- /dev/null
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Short%20Message.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_property_domain_dict</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>acquire_local_roles</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>content_icon</string> </key>
+ <value> <string>event_icon.gif</string> </value>
+ </item>
+ <item>
+ <key> <string>content_meta_type</string> </key>
+ <value> <string>ERP5 Event</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>A Short Message is an event which keeps the information about incoming or outgoing SMS transmissions.</string> </value>
+ </item>
+ <item>
+ <key> <string>factory</string> </key>
+ <value> <string>addEvent</string> </value>
+ </item>
+ <item>
+ <key> <string>filter_content_types</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <tuple>
+ <string>delivery</string>
+ <string>event</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Short Message</string> </value>
+ </item>
+ <item>
+ <key> <string>init_script</string> </key>
+ <value> <string>Event_init</string> </value>
+ </item>
+ <item>
+ <key> <string>permission</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value> <string>Short Message</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>type_class</string> </key>
+ <value> <string>Event</string> </value>
+ </item>
+ <item>
+ <key> <string>type_mixin</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>short_title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 3980c02f2395d48a062c6259e688bfdeb2a44d26..8552db17a0c119c231315b6913a67f6fe4dfa12c 100644
--- a/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_crm/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -35,6 +35,10 @@
<type>Sale Opportunity</type>
<workflow>edit_workflow, pricing_interaction_workflow, sale_opportunity_workflow, ticket_interaction_workflow</workflow>
</chain>
+ <chain>
+ <type>Short Message</type>
+ <workflow>document_conversion_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow, pricing_interaction_workflow</workflow>
+ </chain>
<chain>
<type>Site Message</type>
<workflow>document_conversion_interaction_workflow, edit_workflow, event_interaction_workflow, event_workflow</workflow>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index 5f5c3898347d06e1786840245df578e6f9408c55..df2d2b6cee7f8de8a6bd944613e831192e343399 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-496
\ No newline at end of file
+497
\ No newline at end of file
diff --git a/bt5/erp5_crm/bt/template_action_path_list b/bt5/erp5_crm/bt/template_action_path_list
index 7cea0b0ceb54384a85b623f7d7986b0f9d17993d..0d57e872963bf56c053dfeb5534de903f3f0e9e4 100644
--- a/bt5/erp5_crm/bt/template_action_path_list
+++ b/bt5/erp5_crm/bt/template_action_path_list
@@ -54,6 +54,10 @@ Sale Opportunity | create_new_file
Sale Opportunity | document_list
Sale Opportunity | new_event
Sale Opportunity | view
+Short Message | assessment
+Short Message | preview
+Short Message | related_events
+Short Message | view
Site Message | assessment
Site Message | preview
Site Message | related_events
diff --git a/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list
index 6dd421c357821d50bad61df3efe3798ac0a17147..0092f3f2adeabb7f5810e0848af4210d6e03430c 100644
--- a/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_crm/bt/template_portal_type_allowed_content_type_list
@@ -5,6 +5,7 @@ Event Module | Letter
Event Module | Mail Message
Event Module | Note
Event Module | Phone Call
+Event Module | Short Message
Event Module | Site Message
Event Module | Visit
Event Module | Web Message
diff --git a/bt5/erp5_crm/bt/template_portal_type_id_list b/bt5/erp5_crm/bt/template_portal_type_id_list
index 6e5a4245f26f254665f686004881624ce454758c..0b2ebaac18100650ed2a9df00ae878ef177b1833 100644
--- a/bt5/erp5_crm/bt/template_portal_type_id_list
+++ b/bt5/erp5_crm/bt/template_portal_type_id_list
@@ -11,6 +11,7 @@ Note
Phone Call
Sale Opportunity
Sale Opportunity Module
+Short Message
Site Message
Support Request
Support Request Module
diff --git a/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list b/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list
index ff442bdd5ed86e33b4037fd239234723c4784703..038da41c643d6ab08c76ec209e7dd0b18ff02b79 100644
--- a/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_crm/bt/template_portal_type_workflow_chain_list
@@ -36,6 +36,11 @@ Sale Opportunity | edit_workflow
Sale Opportunity | pricing_interaction_workflow
Sale Opportunity | sale_opportunity_workflow
Sale Opportunity | ticket_interaction_workflow
+Short Message | document_conversion_interaction_workflow
+Short Message | edit_workflow
+Short Message | event_interaction_workflow
+Short Message | event_workflow
+Short Message | pricing_interaction_workflow
Site Message | document_conversion_interaction_workflow
Site Message | edit_workflow
Site Message | event_interaction_workflow