[Erp5-report] r17096 - in /erp5/trunk/bt5/erp5_project: PathTemplateItem/portal_deliveries/...

[nobody at svn.erp5.org]

Author: romain
Date: Mon Oct 22 16:55:38 2007
New Revision: 17096

URL: http://svn.erp5.org?rev=17096&view=rev
Log:
task_report_builder should group by source_project on Task Report level.
Copy description from Task.

Modified:
    erp5/trunk/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml?rev=17096&r1=17095&r2=17096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml (original)
+++ erp5/trunk/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml Mon Oct 22 16:55:38 2007
@@ -37,6 +37,12 @@
             </value>
         </item>
         <item>
+            <key> <string>comment</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>delivery_after_generation_script_id</string> </key>
             <value> <string>TaskReport_copyOrderPropertiesAndNotifyAssignee</string> </value>
         </item>
@@ -69,6 +75,7 @@
                 <string>DateMovementGroup</string>
                 <string>SectionPathMovementGroup</string>
                 <string>PathMovementGroup</string>
+                <string>SourceProjectMovementGroup</string>
               </tuple>
             </value>
         </item>
@@ -77,7 +84,6 @@
             <value>
               <tuple>
                 <string>ResourceMovementGroup</string>
-                <string>SourceProjectMovementGroup</string>
                 <string>TitleMovementGroup</string>
                 <string>BaseVariantMovementGroup</string>
                 <string>RequirementMovementGroup</string>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.xml?rev=17096&r1=17095&r2=17096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.xml Mon Oct 22 16:55:38 2007
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -76,22 +79,12 @@
 if packing_list.getSimulationState() == \'draft\':\n
   packing_list.edit(\n
     comment=related_order.getComment(),\n
+    description = related_order.getDescription(),\n
     delivery_mode=related_order.getDeliveryMode(),\n
     incoterm=related_order.getIncoterm(),\n
     source_administration_value=related_order.getSourceAdministrationValue(),\n
     title=related_order.getTitle()\n
   )\n
-\n
-  # Copy Source Project only if all Task Report Lines share the same value.\n
-  marker = source_project_value = []\n
-  for packing_list_line in packing_list.contentValues(filter={\'portal_type\': \'Task Report Line\'}):\n
-    if source_project_value is marker:\n
-      source_project_value = packing_list_line.getSourceProjectValue()\n
-    elif source_project_value != packing_list_line.getSourceProjectValue():\n
-      source_project_value = marker\n
-      break\n
-  if source_project_value is not marker:\n
-    packing_list.setSourceProjectValue(source_project_value)\n
 \n
 # If security definitions are implemented on the packing list, it is time to apply them\n
 packing_list.assignRoleToSecurityGroup()\n
@@ -188,10 +181,6 @@
                             <string>packing_list</string>
                             <string>_getattr_</string>
                             <string>related_order</string>
-                            <string>marker</string>
-                            <string>source_project_value</string>
-                            <string>_getiter_</string>
-                            <string>packing_list_line</string>
                             <string>source_person</string>
                             <string>destination_decision_person</string>
                             <string>None</string>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=17096&r1=17095&r2=17096&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Mon Oct 22 16:55:38 2007
@@ -1,1 +1,1 @@
-332
+334