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

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Jan 31 05:15:28 2007
New Revision: 12470

URL: http://svn.erp5.org?rev=12470&view=rev
Log:
Fix some issues in task_report_builder.

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=12470&r1=12469&r2=12470&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 Wed Jan 31 05:15:28 2007
@@ -68,6 +68,7 @@
                 <string>OrderMovementGroup</string>
                 <string>DateMovementGroup</string>
                 <string>SectionPathMovementGroup</string>
+                <string>PathMovementGroup</string>
               </tuple>
             </value>
         </item>
@@ -78,7 +79,6 @@
                 <string>ResourceMovementGroup</string>
                 <string>SourceProjectMovementGroup</string>
                 <string>TitleMovementGroup</string>
-                <string>PathMovementGroup</string>
                 <string>BaseVariantMovementGroup</string>
                 <string>RequirementMovementGroup</string>
               </tuple>

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=12470&r1=12469&r2=12470&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 Wed Jan 31 05:15:28 2007
@@ -82,8 +82,7 @@
     delivery_mode = related_order.getDeliveryMode(),\n
     incoterm = related_order.getIncoterm(),\n
     source_administration_value = related_order.getSourceAdministrationValue(),\n
-    title = related_order.getTitle(),\n
-    destination = related_order.getTitle()\n
+    title = related_order.getTitle()\n
   )\n
 \n
 \n
@@ -96,7 +95,10 @@
 if destination_decision_person is None:\n
   destination_decision_person = context.getDestinationValue(portal_type="Person")\n
 if source_person is not None:\n
-  from_email = destination_decision_person.getDefaultEmailText()\n
+  if destination_decision_person is not None:\n
+    from_email = destination_decision_person.getDefaultEmailText()\n
+  else:\n
+    from_email = getattr(context,email_from_address, None)\n
   email = source_person.getDefaultEmailValue()\n
   if email is not None:\n
     msg = """\n
@@ -183,6 +185,8 @@
                             <string>destination_decision_person</string>
                             <string>None</string>
                             <string>from_email</string>
+                            <string>getattr</string>
+                            <string>email_from_address</string>
                             <string>email</string>
                             <string>msg</string>
                             <string>activity</string>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=12470&r1=12469&r2=12470&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Wed Jan 31 05:15:28 2007
@@ -1,1 +1,1 @@
-201
+202