[Erp5-report] r28177 - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 24 18:00:17 CEST 2009
Author: seb
Date: Fri Jul 24 18:00:14 2009
New Revision: 28177
URL: http://svn.erp5.org?rev=28177&view=rev
Log:
2009-07-24 Seb
* Make the monthly report going aroung 2 times faster by caching some parts of the domain tree
* Use getInventory API for search task lines, we still get objects in the zodb in order to
get properties like start_date and stop_date
* Use ERP5Report in order to have a report similar to other ones and ERP5 and make it
more appropriate for unit test
Added:
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportContext.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReport.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData/
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData/listbox.xml
Modified:
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog.xml
erp5/trunk/bt5/erp5_project/bt/revision
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml?rev=28177&r1=28176&r2=28177&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -77,16 +77,19 @@
\n
if depth == 0:\n
# Get start date and stop date from document\n
- start_date = here.getStartDate()\n
- stop_date = here.getStopDate()\n
+ from_date = request.get(\'from_date\')\n
+ at_date = request.get(\'at_date\')\n
current_month = None\n
- # We must initialize start_date at the beginning of the month\n
- current_date = start_date\n
- month_dict = {}\n
- while current_date < stop_date:\n
- if (current_date.year(), current_date.month()) not in month_dict:\n
- month_dict[(current_date.year(), current_date.month())] = 1\n
- current_date += 1\n
+ # We must initialize from_date at the beginning of the month\n
+ current_date = from_date\n
+ month_dict = request.form.get(\'month_dict\', None)\n
+ if month_dict is None:\n
+ month_dict = {}\n
+ while current_date < at_date:\n
+ if (current_date.year(), current_date.month()) not in month_dict:\n
+ month_dict[(current_date.year(), current_date.month())] = 1\n
+ current_date += 1\n
+ request.form[\'month_dict\'] = month_dict\n
\n
category_list = []\n
i = 1\n
@@ -203,8 +206,8 @@
<string>category_list</string>
<string>year</string>
<string>month</string>
- <string>start_date</string>
- <string>stop_date</string>
+ <string>from_date</string>
+ <string>at_date</string>
<string>current_month</string>
<string>current_date</string>
<string>month_dict</string>
Added: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportContext.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportContext.xml?rev=28177&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportContext.xml (added)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportContext.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -1,0 +1,132 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>context.log(\'object_dict\', object_dict)\n
+\n
+context = context.asContext(object_dict=object_dict,\n
+ summary_dict=summary_dict,\n
+ column_list=column_list)\n
+\n
+return context\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>object_dict, summary_dict, column_list, **kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>object_dict</string>
+ <string>summary_dict</string>
+ <string>column_list</string>
+ <string>kw</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Project_getMonthlyReportContext</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml?rev=28177&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml (added)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -1,0 +1,301 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+from Products.ZSQLCatalog.SQLCatalog import Query\n
+request = context.REQUEST\n
+\n
+object_dict = {}\n
+\n
+column_list= []\n
+worker_column_list = []\n
+\n
+# find all Tasks\n
+source_project_uid_list = [x.uid for x in context.portal_catalog(\n
+ relative_url=\'%s%%\' % context.getRelativeUrl())]\n
+\n
+from_date = request.get(\'from_date\', None)\n
+if from_date is None:\n
+ from_date = context.getStartDate()\n
+ request.set(\'from_date\',from_date)\n
+at_date = request.get(\'at_date\', None)\n
+if at_date is None:\n
+ at_date = context.getStopDate()\n
+ request.set(\'at_date\',at_date)\n
+simulation_state = request.get(\'simulation_state\', None)\n
+\n
+\n
+# We will use inventory API in order to find all quantities\n
+result_list = context.portal_simulation.getInventoryList(\n
+ simulation_state = simulation_state,\n
+ project_uid = source_project_uid_list,\n
+ from_date=from_date,\n
+ at_date=at_date)\n
+\n
+monthly_worker_quantity_dict = {} # Used to get quantity per month and per worker\n
+\n
+for task_line in result_list:\n
+ # initialize some variables\n
+ source = task_line.getSource()\n
+ if source is None:\n
+ # This should not happens, so display an error message\n
+ raise ValueError, context.Base_translateString(\\\n
+ "This task should have a source : ${task_relative_url}",\n
+ mapping = {\'task_relative_url\': task_line.getRelativeUrl()})\n
+ source_title = task_line.getSourceTitle()\n
+ start_date_task = task_line.getStartDate()\n
+ stop_date_task = task_line.getStopDate()\n
+ year_start_date = start_date_task.year()\n
+ month_start_date = start_date_task.month()\n
+ date_string = "%s-%s" % (year_start_date, month_start_date)\n
+ current_date = start_date_task\n
+ # We must initialize start_date at the beginning of the month\n
+ while current_date <= stop_date_task:\n
+ if date_string not in object_dict:\n
+ object_dict[date_string]={}\n
+ current_date += 1\n
+\n
+ # create a list with people who works on the task\n
+ current_column = (source, task_line.getSourceTitle())\n
+ if current_column not in worker_column_list:\n
+ worker_column_list.append(current_column)\n
+ project = task_line.getSourceProjectValue()\n
+ quantity = task_line.getQuantity()\n
+ project_relative_url = project.getRelativeUrl()\n
+ # diff in day between the begin and the end of the task\n
+ diff_day = stop_date_task - start_date_task + 1\n
+\n
+ def getNextMonthStart(date):\n
+ """\n
+ return the next month date of the param date\n
+ """\n
+ if date.month()==12:\n
+ return DateTime(date.year()+1, date.month(), 1)\n
+ else:\n
+ return DateTime(date.year(), date.month()+1, 1)\n
+\n
+ timekeeper = start_date_task\n
+ while timekeeper <= stop_date_task :\n
+ next_timekeeper = getNextMonthStart(timekeeper)\n
+ string_index = "%s-%s" % ( timekeeper.year(), timekeeper.month())\n
+ quantity_dict = object_dict.setdefault(string_index, {})\n
+ \n
+ worker_quantity_dict = monthly_worker_quantity_dict.setdefault(string_index, {})\n
+ \n
+ if not quantity_dict.has_key(project_relative_url):\n
+ temp_object = context.newContent(portal_type = \'Project Line\',\n
+ temp_object=1,\n
+ string_index = string_index,\n
+ category_list = [\'source_project/%s\' % project_relative_url])\n
+ quantity_dict[project_relative_url] = temp_object\n
+ current_temp_object = quantity_dict[project_relative_url]\n
+ current_month_quantity = (min(next_timekeeper,stop_date_task+1) - timekeeper )/ diff_day * quantity\n
+ object_quantity = current_month_quantity + current_temp_object.getProperty(source, 0)\n
+ worker_quantity_dict[source] = worker_quantity_dict.get(source, 0) + current_month_quantity\n
+ current_temp_object.setProperty(source, object_quantity)\n
+ timekeeper = next_timekeeper\n
+\n
+# Now build temp objects for quantity per month and per worker\n
+summary_dict = {}\n
+for string_index, worker_quantity_dict in monthly_worker_quantity_dict.items():\n
+ temp_object = context.newContent(portal_type = \'Project Line\',\n
+ temp_object=1,\n
+ string_index = string_index)\n
+ summary_dict[string_index] = temp_object\n
+ for source, quantity in worker_quantity_dict.items():\n
+ temp_object.setProperty(source, quantity)\n
+\n
+column_list.extend(worker_column_list)\n
+\n
+selection_name = \'project_monthly_report_selection\'\n
+context.portal_selections.setListboxDisplayMode(request, \'ReportTreeMode\',\n
+ selection_name=selection_name)\n
+\n
+result = []\n
+from Products.ERP5Form.Report import ReportSection\n
+param_dict = {}\n
+\n
+param_list = [object_dict, summary_dict, column_list]\n
+\n
+result.append(ReportSection(\n
+ path=context.getPhysicalPath(),\n
+ param_list=param_list,\n
+ method_id=\'Project_getMonthlyReportContext\',\n
+ listbox_display_mode=\'ReportTreeMode\',\n
+ form_id=\'Project_viewMonthlyReportData\'))\n
+return result\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>**kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>kw</string>
+ <string>Products.ZSQLCatalog.SQLCatalog</string>
+ <string>Query</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>request</string>
+ <string>object_dict</string>
+ <string>column_list</string>
+ <string>worker_column_list</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>x</string>
+ <string>source_project_uid_list</string>
+ <string>None</string>
+ <string>from_date</string>
+ <string>at_date</string>
+ <string>simulation_state</string>
+ <string>result_list</string>
+ <string>monthly_worker_quantity_dict</string>
+ <string>task_line</string>
+ <string>source</string>
+ <string>ValueError</string>
+ <string>source_title</string>
+ <string>start_date_task</string>
+ <string>stop_date_task</string>
+ <string>year_start_date</string>
+ <string>month_start_date</string>
+ <string>date_string</string>
+ <string>current_date</string>
+ <string>_write_</string>
+ <string>_inplacevar_</string>
+ <string>current_column</string>
+ <string>project</string>
+ <string>quantity</string>
+ <string>project_relative_url</string>
+ <string>diff_day</string>
+ <string>getNextMonthStart</string>
+ <string>timekeeper</string>
+ <string>next_timekeeper</string>
+ <string>string_index</string>
+ <string>quantity_dict</string>
+ <string>worker_quantity_dict</string>
+ <string>temp_object</string>
+ <string>_getitem_</string>
+ <string>current_temp_object</string>
+ <string>min</string>
+ <string>current_month_quantity</string>
+ <string>object_quantity</string>
+ <string>summary_dict</string>
+ <string>selection_name</string>
+ <string>result</string>
+ <string>Products.ERP5Form.Report</string>
+ <string>ReportSection</string>
+ <string>param_dict</string>
+ <string>param_list</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Project_getMonthlyReportSectionList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReport.xml?rev=28177&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReport.xml (added)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReport.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -1,0 +1,151 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ERP5Report" module="Products.ERP5Form.Report"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>edit_order</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>encoding</string> </key>
+ <value> <string>UTF-8</string> </value>
+ </item>
+ <item>
+ <key> <string>enctype</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <list>
+ <string>left</string>
+ <string>right</string>
+ <string>center</string>
+ <string>bottom</string>
+ <string>hidden</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>groups</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>bottom</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>center</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>left</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>right</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Project_viewMonthlyReport</string> </value>
+ </item>
+ <item>
+ <key> <string>method</string> </key>
+ <value> <string>POST</string> </value>
+ </item>
+ <item>
+ <key> <string>name</string> </key>
+ <value> <string>Project_viewMonthlyReport</string> </value>
+ </item>
+ <item>
+ <key> <string>pt</string> </key>
+ <value> <string>report_view</string> </value>
+ </item>
+ <item>
+ <key> <string>report_method</string> </key>
+ <value> <string>Project_getMonthlyReportSectionList</string> </value>
+ </item>
+ <item>
+ <key> <string>row_length</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>stored_encoding</string> </key>
+ <value> <string>UTF-8</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Project_viewMonthlyReport</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode_mode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>update_action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>update_action_title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData.xml?rev=28177&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData.xml (added)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -1,0 +1,151 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_objects</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value> <string>Project_getObjectDateDict</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>edit_order</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>encoding</string> </key>
+ <value> <string>UTF-8</string> </value>
+ </item>
+ <item>
+ <key> <string>enctype</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <list>
+ <string>left</string>
+ <string>right</string>
+ <string>center</string>
+ <string>bottom</string>
+ <string>hidden</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>groups</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>bottom</string> </key>
+ <value>
+ <list>
+ <string>listbox</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>center</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>left</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>right</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Project_viewMonthlyReportData</string> </value>
+ </item>
+ <item>
+ <key> <string>method</string> </key>
+ <value> <string>POST</string> </value>
+ </item>
+ <item>
+ <key> <string>name</string> </key>
+ <value> <string>Project_viewMonthlyReport</string> </value>
+ </item>
+ <item>
+ <key> <string>pt</string> </key>
+ <value> <string>form_dialog</string> </value>
+ </item>
+ <item>
+ <key> <string>row_length</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>stored_encoding</string> </key>
+ <value> <string>UTF-8</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Monthly Report</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode_mode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>update_action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData/listbox.xml?rev=28177&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData/listbox.xml (added)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMonthlyReportData/listbox.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -1,0 +1,543 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>all_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_root_list</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_tree</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>global_attributes</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>meta_types</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>portal_types</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>report_root_list</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>report_tree</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>search</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>search_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>select</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>sort</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>sort_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>stat_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>stat_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>all_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_root_list</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_tree</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>global_attributes</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>meta_types</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>portal_types</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>report_root_list</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>report_tree</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>search</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>search_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>select</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>sort</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>sort_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>stat_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>stat_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>all_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>title</string>
+ <string>Title</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>checked_permission</string>
+ <string>View</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_root_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>domain_tree</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>global_attributes</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>lines</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>list_action</string> </key>
+ <value> <string>list</string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>meta_types</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>portal_types</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>Task</string>
+ <string>Task</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>report_root_list</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>project_report_monthly_domain</string>
+ <string>Month</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>report_tree</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>search</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>search_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>select</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string>project_monthly_report_selection</string> </value>
+ </item>
+ <item>
+ <key> <string>sort</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>sort_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>stat_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>stat_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Monthly Report</string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.column_list</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>method_name</string> </key>
+ <value> <string>Project_getMonthlyObjectList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog.xml?rev=28177&r1=28176&r2=28177&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewODSMonthlyReportPrintDialog.xml [utf8] Fri Jul 24 18:00:14 2009
@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>action</string> </key>
- <value> <string>Project_printAsODSMonthly</string> </value>
+ <value> <string>Project_viewMonthlyReport</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -128,6 +128,10 @@
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>update_action_title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</pickle>
</record>
Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=28177&r1=28176&r2=28177&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Fri Jul 24 18:00:14 2009
@@ -1,1 +1,1 @@
-649
+655
More information about the Erp5-report
mailing list