diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_callTaskReport.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_callTaskReport.xml index a55b06ba9e0622f047adc0e7a1e5bbbae765cb3f..4ca07b932963d063049697a301e582affae1b8dc 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_callTaskReport.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_callTaskReport.xml @@ -94,6 +94,12 @@ return form_report()\n <none/> </value> </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>_params</string> </key> <value> <string>form_id=\'\', target_language=\'\', print_mode=\'\', **kw</string> </value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml index a2939ebb58d3aa744250f87b256d75a498bb2fc1..0fbf1abc56e6844a03e373d2b6f01fbad0a30d40 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml @@ -65,19 +65,38 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>source_project_uid_list = [x.uid for x in context.portal_catalog(\n + <value> <string encoding="cdata"><![CDATA[ + +source_project_uid_list = [x.uid for x in context.portal_catalog(\n relative_url=\'%s%%\' % context.getRelativeUrl())]\n \n +from Products.ZSQLCatalog.SQLCatalog import Query\n +\n +sql_kw = {}\n +if kw.has_key(\'from_date\') and kw[\'from_date\'] is not None:\n + query_kw = {\'delivery.start_date\' : kw[\'from_date\'],\n + \'range\' : \'min\'}\n + sql_kw[\'delivery.start_date\'] = Query(**query_kw)\n +if kw.has_key(\'at_date\') and kw[\'at_date\'] is not None:\n + query_kw = {\'delivery.stop_date\' : kw[\'at_date\'],\n + \'range\' : \'ngt\'}\n + sql_kw[\'delivery.stop_date\'] = Query(**query_kw)\n +if kw.has_key(\'simulation_state\') and len(kw[\'simulation_state\']) > 0 :\n + sql_kw[\'simulation_state\'] = kw[\'simulation_state\']\n +\n task_list = [x.getObject() for x in \\\n context.portal_catalog(selection=selection, selection_report=selection_report, \n portal_type=\'Task\',\n - source_project_uid = source_project_uid_list)]\n + source_project_uid = source_project_uid_list,\n + **sql_kw)]\n task_line_list = []\n for task in task_list:\n task_line_list.extend(task.contentValues(portal_type=\'Task Line\'))\n \n return task_line_list\n -</string> </value> + + +]]></string> </value> </item> <item> <key> <string>_code</string> </key> @@ -129,6 +148,15 @@ return task_line_list\n <string>context</string> <string>x</string> <string>source_project_uid_list</string> + <string>Products.ZSQLCatalog.SQLCatalog</string> + <string>Query</string> + <string>sql_kw</string> + <string>_getitem_</string> + <string>None</string> + <string>query_kw</string> + <string>_apply_</string> + <string>_write_</string> + <string>len</string> <string>task_list</string> <string>task_line_list</string> <string>task</string> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 2e790af68a8c3683ef466009ea9cea14a1ee2e46..430faa64e76e7478e4653bc318c717b548aa76e8 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -510 \ No newline at end of file +511 \ No newline at end of file