2006-02-22 kevin

* Fix bad default lisbox parameters. * Update Licence and Copyright. 2006-06-02 Jerome * add missing 'follow_up' base category. * improve 'Respond' feature in event workflow * make filtering work in Event Module + other small UI fixes. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5789 20353a03-c40f-0410-a6d1-a30d3c3de9de

2006-02-22 kevin
* Fix bad default lisbox parameters. * Update Licence and Copyright. 2006-06-02 Jerome * add missing 'follow_up' base category. * improve 'Respond' feature in event workflow * make filtering work in Event Module + other small UI fixes. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5789 20353a03-c40f-0410-a6d1-a30d3c3de9de
37c9f6ee · Kevin Deldycke · ee00cdf2 · 37c9f6ee · 37c9f6ee · 37c9f6ee
Commit 37c9f6ee authored Feb 22, 2006 by Kevin Deldycke
57 changed files
--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/print_pdf.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/print_pdf.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Event%20Module/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/history.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/history.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/metadata.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/metadata.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Fax/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/history.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/history.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/metadata.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/metadata.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Incoming%20Letter/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/history.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/history.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/metadata.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/metadata.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Mail%20Message/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/history.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/history.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/metadata.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/metadata.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Phone%20Call/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity%20Module/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/history.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/history.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/metadata.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/metadata.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Sale%20Opportunity/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/history.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/history.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/metadata.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/metadata.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/print.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/print.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/view.xml
+++ b/bt5/erp5_crm/ActionTemplateItem/portal_types/Support%20Request/view.xml
@@ -4,8 +4,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.patches.ActionInformation</string>
-          <string>PatchedActionInformation</string>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_crm/ModuleTemplateItem/event_module.xml
+++ b/bt5/erp5_crm/ModuleTemplateItem/event_module.xml
@@ -550,10 +550,6 @@
   <name>Manage Transient Object Container</name>
   <role>Manager</role>
  </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-   <role>Manager</role>
-  </permission>
  <permission>
   <name>Manage Vocabulary</name>
   <role>Manager</role>

--- a/bt5/erp5_crm/ModuleTemplateItem/sale_opportunity_module.xml
+++ b/bt5/erp5_crm/ModuleTemplateItem/sale_opportunity_module.xml
@@ -400,9 +400,6 @@
  <permission>
   <name>Manage Transient Object Container</name>
  </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
  <permission>
   <name>Manage Vocabulary</name>
  </permission>

--- a/bt5/erp5_crm/ModuleTemplateItem/support_request_module.xml
+++ b/bt5/erp5_crm/ModuleTemplateItem/support_request_module.xml
@@ -400,9 +400,6 @@
  <permission>
   <name>Manage Transient Object Container</name>
  </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
  <permission>
   <name>Manage Vocabulary</name>
  </permission>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Event%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Event%20Module.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Incoming%20Fax.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Incoming%20Fax.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>acquire_local_roles</string> </key>
            <value> <int>1</int> </value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Incoming%20Letter.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Incoming%20Letter.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Mail%20Message.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Mail%20Message.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Phone%20Call.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Phone%20Call.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>acquire_local_roles</string> </key>
            <value> <int>1</int> </value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity%20Module.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Sale%20Opportunity.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request%20Module.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request%20Module.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request.xml
+++ b/bt5/erp5_crm/PortalTypeTemplateItem/portal_types/Support%20Request.xml
@@ -30,6 +30,12 @@
              <none/>
            </value>
        </item>
+        <item>
+            <key> <string>_roles</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
        <item>
            <key> <string>allowed_content_types</string> </key>
            <value>

--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
@@ -334,7 +334,7 @@
                    <value>
                      <list>
                        <tuple>
-                          <string>Type</string>
+                          <string>translated_portal_type</string>
                          <string>Type</string>
                        </tuple>
                        <tuple>
@@ -346,11 +346,11 @@
                          <string>Date</string>
                        </tuple>
                        <tuple>
-                          <string>getSourceOrganisationTitle</string>
+                          <string>source_organisation_title</string>
                          <string>Organisation</string>
                        </tuple>
                        <tuple>
-                          <string>event_state</string>
+                          <string>translated_event_state_title</string>
                          <string>State</string>
                        </tuple>
                      </list>
@@ -495,7 +495,24 @@
                <item>
                    <key> <string>search_columns</string> </key>
                    <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>translated_portal_type</string>
+                          <string>Type</string>
+                        </tuple>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>source_organisation_title</string>
+                          <string>Organisation</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_event_state_title</string>
+                          <string>State</string>
+                        </tuple>
+                      </list>
                    </value>
                </item>
                <item>

--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MailMessage_view.xml
@@ -105,9 +105,8 @@
                      <list>
                        <string>my_source_person_title</string>
                        <string>my_source_organisation_title</string>
-                        <string>my_follow_up</string>
                        <string>my_default_follow_up_title</string>
-                        <string>my_simulation_state</string>
+                        <string>my_translated_event_state_title</string>
                      </list>
                    </value>
                </item>

--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityList/listbox.xml
@@ -378,20 +378,7 @@
                <item>
                    <key> <string>default_params</string> </key>
                    <value>
-                      <list>
-                        <tuple>
-                          <string>title</string>
-                          <string encoding="base64">Jyc=</string>
-                        </tuple>
-                        <tuple>
-                          <string>sale_state</string>
-                          <string encoding="base64">Jyc=</string>
-                        </tuple>
-                        <tuple>
-                          <string>description</string>
-                          <string encoding="base64">Jyc=</string>
-                        </tuple>
-                      </list>
+                      <list/>
                    </value>
                </item>
                <item>

--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestList/listbox.xml
@@ -370,20 +370,7 @@
                <item>
                    <key> <string>default_params</string> </key>
                    <value>
-                      <list>
-                        <tuple>
-                          <string>title</string>
-                          <string encoding="base64">Jyc=</string>
-                        </tuple>
-                        <tuple>
-                          <string>sale_state</string>
-                          <string encoding="base64">Jyc=</string>
-                        </tuple>
-                        <tuple>
-                          <string>description</string>
-                          <string encoding="base64">Jyc=</string>
-                        </tuple>
-                      </list>
+                      <list/>
                    </value>
                </item>
                <item>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow.xml
@@ -50,7 +50,7 @@
        </item>
        <item>
            <key> <string>state_var</string> </key>
-            <value> <string>simulation_state</string> </value>
+            <value> <string>event_state</string> </value>
        </item>
        <item>
            <key> <string>title</string> </key>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond.xml
@@ -32,7 +32,7 @@
        </item>
        <item>
            <key> <string>after_script_name</string> </key>
-            <value> <string>Event_replyMailMessage</string> </value>
+            <value> <string></string> </value>
        </item>
        <item>
            <key> <string>description</string> </key>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond_action.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/respond_action.xml
@@ -60,7 +60,7 @@
        </item>
        <item>
            <key> <string>script_name</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Event_replyMailMessage</string> </value>
        </item>
        <item>
            <key> <string>title</string> </key>

--- a/bt5/erp5_crm/bt/change_log
+++ b/bt5/erp5_crm/bt/change_log
+2006-02-22 kevin
+* Fix bad default lisbox parameters.
+
+2006-06-02 Jerome
+* add missing 'follow_up' base category.
+* improve 'Respond' feature in event workflow
+* make filtering work in Event Module + other small UI fixes.
+
 2005-11-11 Romain
 * Correct naming convention.


--- a/bt5/erp5_crm/bt/copyright_list
+++ b/bt5/erp5_crm/bt/copyright_list
+Copyright (c) 2005-2006 Nexedi SARL
\ No newline at end of file
--- a/bt5/erp5_crm/bt/description
+++ b/bt5/erp5_crm/bt/description
-ERP5 CRM provides ...
\ No newline at end of file
+ERP5 CRM provides ...
+
+FIXME: email address are not catalogged, so the CMFMailIn doesn't work
\ No newline at end of file
--- a/bt5/erp5_crm/bt/license
+++ b/bt5/erp5_crm/bt/license
+GPL
\ No newline at end of file
--- a/bt5/erp5_crm/bt/template_action_path_list
+++ b/bt5/erp5_crm/bt/template_action_path_list
@@ -12,6 +12,8 @@ Mail Message | history
 Mail Message | metadata
 Mail Message | print
 Mail Message | view
+Person | jump_to_opportunity
+Person | jump_to_support_request
 Phone Call | history
 Phone Call | metadata
 Phone Call | print

--- a/bt5/erp5_crm/bt/template_base_category_list
+++ b/bt5/erp5_crm/bt/template_base_category_list
-client
\ No newline at end of file
+client
+follow_up
\ No newline at end of file
--- a/bt5/erp5_crm/bt/template_catalog_method_id_list
+++ b/bt5/erp5_crm/bt/template_catalog_method_id_list
+erp5_mysql/z_related_source_organisation
+erp5_mysql/z_related_translated_event_state
\ No newline at end of file
--- a/bt5/erp5_crm/bt/template_catalog_related_key_list
+++ b/bt5/erp5_crm/bt/template_catalog_related_key_list
+translated_event_state_title | translation/translated_message/z_related_translated_event_state
+source_organisation_title | category,catalog/title/z_related_source_organisation
\ No newline at end of file