diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml index 6378d000869fc3678877dbead8913abf0998e292..2c1f6f547d1802be8705506448c08542f4535b42 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateMonthDomain.xml @@ -239,6 +239,12 @@ return domain_list\n <key> <string>id</string> </key> <value> <string>Project_generateMonthDomain</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyObjectList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyObjectList.xml index c5119f6d1e5176acc4b2e982d85c97e9f80a7004..4998419cc52062680ef50938050dfd8f4d15f78d 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyObjectList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyObjectList.xml @@ -65,7 +65,10 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>object_domain = selection_report.asDomainItemDict()[\'project_report_monthly_domain\']\n + <value> <string># This script is called by each line of the domain in order to know if returned objects\n +#by the domain have the same property than returned objects\n +\n +object_domain = selection_report.asDomainItemDict()[\'project_report_monthly_domain\']\n object_dict = context.object_dict\n \n current_criterion = object_domain.getCriterionList()\n @@ -75,7 +78,6 @@ result_list = []\n if returned_object is not None:\n for k,v in returned_object.items():\n if object_domain.test(v, strict_membership=1):\n - context.log(\'show dict temp object\',v.showDict())\n result_list.append(v)\n \n return result_list\n @@ -168,6 +170,12 @@ return result_list\n <key> <string>id</string> </key> <value> <string>Project_getMonthlyObjectList</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_printAsODSMonthly.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_printAsODSMonthly.xml index 0a91042c4d98b2dfc5085bc43266029c44dc7317..cdd84c2ebe5b4e029812552554835ca8c40bd498 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_printAsODSMonthly.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_printAsODSMonthly.xml @@ -159,7 +159,7 @@ for task_line in task_line_list:\n object_quantity = current_month_quantity + current_temp_object.getProperty(source, 0)\n current_temp_object.setProperty(source, object_quantity)\n timekeeper = next_timekeeper\n - context.log(\'next_timekeeper\', next_timekeeper)\n +\n \n column_list.extend(worker_column_list)\n context = context.asContext(object_dict = object_dict,\n @@ -279,6 +279,12 @@ return context.Project_viewODSMonthlyReport()\n <key> <string>id</string> </key> <value> <string>Project_printAsODSMonthly</string> </value> </item> + <item> + <key> <string>uid</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>warnings</string> </key> <value> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index d21b6ea29b1029ae0afcb1ec259e56b82b3311ce..7dfce3516b5fa406a807fab6194df98c613e6aa8 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -591 \ No newline at end of file +594 \ No newline at end of file