[Erp5-report] r31885 seb - in /erp5/trunk: bt5/erp5_project/SkinTemplateItem/portal_skins/e...

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Jan 21 16:30:46 CET 2010


Author: seb
Date: Thu Jan 21 16:30:45 2010
New Revision: 31885

URL: http://svn.erp5.org?rev=31885&view=rev
Log:
* Add two more columns in the milestone report :
  outcome_description and description
* change milestone report script in order to select
  as much sql column as possible. This allows to
  benefit from optimisations tables
* add erp5_project_mysql_innodb_catalog business template
  in order to keep this report fast even if there is more
  data than before. This extra business template is optional
  to run the report, but it is adviced to use it when
  project reports are use intensively

Added:
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.catalog_keys.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.catalog_keys.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogResultTableTemplateItem/
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/categories_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/change_log
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/comment
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/copyright_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/dependency_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/description
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/license
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/maintainer_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/provision_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/publication_url
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/revision
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/short_title
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_action_path_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_base_category_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_datetime_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_full_text_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_keyword_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_local_role_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_method_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_multivalue_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_related_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_request_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_table_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_role_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_scriptable_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_topic_key_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_constraint_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_document_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_extension_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_format_version
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_local_role_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_local_roles_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_message_translation_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_module_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_path_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_allowed_content_type_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_base_category_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_hidden_content_type_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_property_sheet_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_role_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_roles_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_workflow_chain_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_preference_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_product_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_property_sheet_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_registered_skin_selection_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_role_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_site_property_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_skin_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_test_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_tool_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_business_template_workflow
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_tool
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_workflow_id_list
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/title
    erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/version
Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReport.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewMilestoneReport/listbox.xml
    erp5/trunk/bt5/erp5_project/bt/revision
    erp5/trunk/products/ERP5/tests/testMilestoneReporting.py

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReport.xml?rev=31885&r1=31884&r2=31885&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReport.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_generateMilestoneReport.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -93,9 +93,20 @@
 \n
 select_dict = {}\n
 select_dict[\'movement.stop_date\'] = None\n
-select_dict[\'catalog.title\'] = None\n
+select_dict[\'title\'] = None\n
+select_dict[\'description\'] = None\n
 select_dict[\'parent_title\'] = None\n
 milestone_list = []\n
+portal_catalog = portal.portal_catalog\n
+# Check for some extra properties that are not necessarly\n
+# in the catalog. We need by the way to check if\n
+# hasColumn exists, it is new and is not installed yet everywhere\n
+hasColumn = getattr(portal_catalog, \'hasColumn\', None)\n
+if hasColumn is not None:\n
+  for property in [\'outcome_description\']:\n
+    if hasColumn(property):\n
+      select_dict[property] = None\n
+\n
 if len(project_uid_list):\n
   milestone_list = [x for x in portal.portal_catalog(parent_uid=project_uid_list,\n
                        portal_type=\'Project Milestone\', select_dict=select_dict, **sql_kw)]\n
@@ -106,10 +117,11 @@
   # We wish to display the project only for the first milestone\n
   # of this project\n
   line_kw = {}\n
-  parent_title = milestone.parent_title\n
   line_kw[\'project_title\'] = milestone.parent_title\n
   line_kw[\'milestone_title\'] = milestone.title\n
   line_kw[\'stop_date\'] = getattr(milestone, \'stop_date\', None)\n
+  line_kw[\'milestone_description\'] = milestone.getProperty(\'description\')\n
+  line_kw[\'milestone_outcome_description\'] = milestone.getProperty(\'outcome_description\')\n
   listbox.append(line_kw)\n
 \n
 context.Base_updateDialogForm(listbox=listbox, empty_line_number=0)\n
@@ -186,10 +198,12 @@
                             <string>query_list</string>
                             <string>select_dict</string>
                             <string>milestone_list</string>
+                            <string>portal_catalog</string>
+                            <string>getattr</string>
+                            <string>hasColumn</string>
+                            <string>property</string>
                             <string>milestone</string>
                             <string>line_kw</string>
-                            <string>parent_title</string>
-                            <string>getattr</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewMilestoneReport/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewMilestoneReport/listbox.xml?rev=31885&r1=31884&r2=31885&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewMilestoneReport/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectModule_viewMilestoneReport/listbox.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -337,6 +337,14 @@
                         <tuple>
                           <string>milestone_title</string>
                           <string>Milestone</string>
+                        </tuple>
+                        <tuple>
+                          <string>milestone_description</string>
+                          <string>Description</string>
+                        </tuple>
+                        <tuple>
+                          <string>milestone_outcome_description</string>
+                          <string>Outcome</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=31885&r1=31884&r2=31885&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Thu Jan 21 16:30:45 2010
@@ -1,1 +1,1 @@
-726
+727

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.catalog_keys.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.catalog_keys.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,5 @@
+<catalog_method>
+ <item key="sql_clear_catalog" type="int">
+  <value>1</value>
+ </item>
+</catalog_method>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_drop_reporting_outcome.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,135 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <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/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <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></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>z0_drop_reporting_outcome</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>DROP TABLE IF EXISTS reporting_outcome</string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="__newobj__" module="copy_reg"/>
+                </klass>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
+                <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>DROP TABLE IF EXISTS reporting_outcome</string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.catalog_keys.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,13 @@
+<catalog_method>
+ <item key="sql_uncatalog_object" type="int">
+  <value>1</value>
+ </item>
+ <item key="_is_filtered_archive" type="int">
+  <value>1</value>
+ </item>
+ <item key="_filter_expression_archive" type="str">
+  <value>python: getattr(here, 'getOutcomeDescription', None) is not None</value>
+ </item>
+ <item key="_filter_type_archive" type="tuple">
+ </item>
+</catalog_method>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,154 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <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>uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <list>
+                            <string>uid</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>uid</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>z0_uncatalog_reporting_outcome</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[
+
+DELETE FROM reporting_outcome WHERE <dtml-sqltest uid op=eq type=int>\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="__newobj__" module="copy_reg"/>
+                </klass>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
+                <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[
+
+DELETE FROM reporting_outcome WHERE <dtml-sqltest uid op=eq type=int>\n
+
+
+]]></string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.catalog_keys.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,13 @@
+<catalog_method>
+ <item key="sql_catalog_object_list" type="int">
+  <value>1</value>
+ </item>
+ <item key="_is_filtered_archive" type="int">
+  <value>1</value>
+ </item>
+ <item key="_filter_expression_archive" type="str">
+  <value>python: getattr(here, 'getOutcomeDescription', None) is not None</value>
+ </item>
+ <item key="_filter_type_archive" type="tuple">
+ </item>
+</catalog_method>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,182 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <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>getOutcomeDescription</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <list>
+                            <string>getOutcomeDescription</string>
+                            <string>uid</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>getOutcomeDescription\r\n
+uid</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_catalog_reporting_outcome_list</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[
+
+REPLACE INTO\n
+  reporting_outcome\n
+  (`uid`, `outcome_description`)\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+  <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
+  <dtml-sqlvar expr="getOutcomeDescription[loop_item]" type="string" optional>\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="__newobj__" module="copy_reg"/>
+                </klass>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
+                <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[
+
+REPLACE INTO\n
+  reporting_outcome\n
+  (`uid`, `outcome_description`)\n
+VALUES\n
+<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
+(\n
+  <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
+  <dtml-sqlvar expr="getOutcomeDescription[loop_item]" type="string" optional>\n
+)\n
+<dtml-if sequence-end><dtml-else>,</dtml-if>\n
+</dtml-in>\n
+
+
+]]></string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.catalog_keys.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.catalog_keys.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.catalog_keys.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,5 @@
+<catalog_method>
+ <item key="sql_clear_catalog" type="int">
+  <value>1</value>
+ </item>
+</catalog_method>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_reporting_outcome.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,145 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <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/>
+                        </value>
+                    </item>
+                    <item>
+                        <key> <string>_keys</string> </key>
+                        <value>
+                          <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></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_create_reporting_outcome</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>CREATE TABLE reporting_outcome (\n
+  uid BIGINT UNSIGNED NOT NULL,\n
+  outcome_description VARCHAR(255),\n
+  PRIMARY KEY `uid` (`uid`)\n
+) TYPE=InnoDB; \n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>template</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="__newobj__" module="copy_reg"/>
+                </klass>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
+                <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>CREATE TABLE reporting_outcome (\n
+  uid BIGINT UNSIGNED NOT NULL,\n
+  outcome_description VARCHAR(255),\n
+  PRIMARY KEY `uid` (`uid`)\n
+) TYPE=InnoDB; \n
+</string> </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/CatalogResultTableTemplateItem/result_table_list.xml [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,3 @@
+<key_list>
+ <key>reporting_outcome</key>
+</key_list>

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/categories_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/categories_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/change_log?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/change_log (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/change_log [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,2 @@
+2010-01-21 Seb
+* Initial version

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/comment
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/comment?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/copyright_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/copyright_list?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/copyright_list (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/copyright_list [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+Copyright (c) 2010 Nexedi SA

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/dependency_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/dependency_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/description
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/description?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/description (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/description [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+This template provides mysql table for optimising project reporting

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/license
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/license?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/license (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/license [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+GPL

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/maintainer_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/maintainer_list?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/maintainer_list (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/maintainer_list [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+seb

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/provision_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/provision_list?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/provision_list (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/provision_list [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+erp5_project_catalog

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/publication_url
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/publication_url?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/publication_url (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/publication_url [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+None

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/revision?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/revision (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/revision [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+14

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/short_title
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/short_title?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/short_title (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/short_title [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+None

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_action_path_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_base_category_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_datetime_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_datetime_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_full_text_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_full_text_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_keyword_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_keyword_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_local_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_local_role_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_method_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_method_id_list?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_method_id_list (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_method_id_list [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,4 @@
+erp5_mysql_innodb/z0_drop_reporting_outcome
+erp5_mysql_innodb/z0_uncatalog_reporting_outcome
+erp5_mysql_innodb/z_catalog_reporting_outcome_list
+erp5_mysql_innodb/z_create_reporting_outcome

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_multivalue_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_multivalue_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_related_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_related_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_request_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_request_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_table_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_table_list?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_table_list (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_result_table_list [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+reporting_outcome

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_role_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_scriptable_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_scriptable_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_topic_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_catalog_topic_key_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_constraint_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_constraint_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_document_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_document_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_extension_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_extension_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_format_version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_format_version?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_format_version (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_format_version [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+1

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_local_role_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_local_roles_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_local_roles_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_message_translation_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_message_translation_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_module_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_module_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_path_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_allowed_content_type_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_base_category_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_hidden_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_hidden_content_type_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_property_sheet_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_property_sheet_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_role_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_roles_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_roles_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_portal_type_workflow_chain_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_preference_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_preference_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_product_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_product_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_property_sheet_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_property_sheet_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_registered_skin_selection_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_role_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_site_property_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_site_property_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_skin_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_skin_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_test_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_test_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_tool_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_tool_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_business_template_workflow
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_business_template_workflow?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_business_template_workflow (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_business_template_workflow [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+0

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_tool
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_tool?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_tool (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_update_tool [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+0

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_workflow_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/template_workflow_id_list?rev=31885&view=auto
==============================================================================
    (empty)

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/title
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/title?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/title (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/title [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+erp5_project_mysql_innodb_catalog

Added: erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/version?rev=31885&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/version (added)
+++ erp5/trunk/bt5/erp5_project_mysql_innodb_catalog/bt/version [utf8] Thu Jan 21 16:30:45 2010
@@ -1,0 +1,1 @@
+5.4.6

Modified: erp5/trunk/products/ERP5/tests/testMilestoneReporting.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testMilestoneReporting.py?rev=31885&r1=31884&r2=31885&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testMilestoneReporting.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testMilestoneReporting.py [utf8] Thu Jan 21 16:30:45 2010
@@ -31,18 +31,9 @@
 import transaction
 from DateTime import DateTime
 
-class TestMilestoneReporting(ERP5ReportTestCase):
-  """Test Milestone Reporting
-
-     This report is able to display all milestones from many projects,
-     it supports start and stop dates parameters
-  """
-  def getTitle(self):
-    return "Milestone Reporting"
-
-  def getBusinessTemplateList(self):
-    """Returns list of BT to be installed."""
-    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_project',)
+class MilestoneReportingMixin:
+
+  business_template_list = ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_project',)
 
   @reindex
   def _makeOneMilestone(self, project_title, **kw):
@@ -55,12 +46,17 @@
     else:
       project = project_module.newContent(portal_type='Project',
                   title=project_title)
-    task = project.newContent(portal_type='Project Milestone', **kw)
+    milestone = project.newContent(portal_type='Project Milestone', **kw)
+    return milestone
 
   def afterSetUp(self):
     """Setup the fixture.
     """
     self.portal = self.getPortal()
+    for module in (self.portal.project_module,):
+      module.manage_delObjects(list(module.objectIds()))
+    transaction.commit()
+    self.tic()
 
   def getDataLineLineListByCallingMilestoneReport(self,
       from_date=None, at_date=None):
@@ -80,18 +76,19 @@
     data_line_list = [l for l in line_list if l.isDataLine()]
     return data_line_list
 
-  def testMilestoneReport(self):
+  def checkMilestoneReport(self, optimised=False):
     """
     Check monthly report available on project
     """
     # Create Tasks
-    self._makeOneMilestone(
+    milestone = self._makeOneMilestone(
               project_title='Foo',
               title='Foo Milestone A',
               start_date=DateTime('2009/10/01'),
               stop_date=DateTime('2009/10/27'),
-              )
-
+              description='foo',
+              outcome_description='bar',
+              )
 
     # We should have this result
     # Project    Milestone         Stop Date
@@ -102,7 +99,24 @@
     self.checkLineProperties(data_line_list[0],
                              project_title='Foo',
                              milestone_title='Foo Milestone A',
-                             stop_date=DateTime('2009/10/27'))
+                             stop_date=DateTime('2009/10/27'),
+                             milestone_description='foo',
+                             milestone_outcome_description='bar')
+
+    # Change value in order to check if we get real objects
+    milestone.setOutcomeDescription('foobar')
+    data_line_list = self.getDataLineLineListByCallingMilestoneReport(
+        from_date=DateTime('2009/10/01'), at_date=DateTime('2009/10/31'))
+    if optimised:
+      # Check that we do not get real object
+      self.checkLineProperties(data_line_list[0],
+                               milestone_outcome_description='bar')
+    else:
+      # Check that we get real object
+      self.checkLineProperties(data_line_list[0],
+                               milestone_outcome_description='foobar')
+    # Put back previous value
+    milestone.setOutcomeDescription('bar')
 
     # Add other tasks, some of them in another project
     self._makeOneMilestone(
@@ -156,3 +170,33 @@
                              project_title='Foo',
                              milestone_title='Foo Milestone A',
                              stop_date=DateTime('2009/10/27'))
+
+class TestMilestoneReporting(MilestoneReportingMixin, ERP5ReportTestCase):
+  """Milestone Reporting
+
+     This report is able to display all milestones from many projects,
+     it supports start and stop dates parameters
+  """
+  def getTitle(self):
+    return "Milestone Reporting"
+
+  def getBusinessTemplateList(self):
+    """Returns list of BT to be installed."""
+    return self.business_template_list
+
+  def testMilestoneReport(self):
+    self.checkMilestoneReport()
+
+class TestOptimisedMilestoneReporting(MilestoneReportingMixin, ERP5ReportTestCase):
+  """Same as above, with additionnal business template adding extra
+     tables in order to do optimisations
+  """
+  def getTitle(self):
+    return "Optimised Milestone Reporting"
+
+  def getBusinessTemplateList(self):
+    """Returns list of BT to be installed."""
+    return self.business_template_list + ('erp5_project_mysql_innodb_catalog',)
+
+  def testMilestoneReport(self):
+    self.checkMilestoneReport(optimised=True)




More information about the Erp5-report mailing list