Commit d2fb776c authored by Rafael Monnerat's avatar Rafael Monnerat

Fix some issues in task_report_builder.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12470 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c3a1ba06
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
<string>OrderMovementGroup</string> <string>OrderMovementGroup</string>
<string>DateMovementGroup</string> <string>DateMovementGroup</string>
<string>SectionPathMovementGroup</string> <string>SectionPathMovementGroup</string>
<string>PathMovementGroup</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -78,7 +79,6 @@ ...@@ -78,7 +79,6 @@
<string>ResourceMovementGroup</string> <string>ResourceMovementGroup</string>
<string>SourceProjectMovementGroup</string> <string>SourceProjectMovementGroup</string>
<string>TitleMovementGroup</string> <string>TitleMovementGroup</string>
<string>PathMovementGroup</string>
<string>BaseVariantMovementGroup</string> <string>BaseVariantMovementGroup</string>
<string>RequirementMovementGroup</string> <string>RequirementMovementGroup</string>
</tuple> </tuple>
......
...@@ -82,8 +82,7 @@ if packing_list.getSimulationState()==\'draft\':\n ...@@ -82,8 +82,7 @@ if packing_list.getSimulationState()==\'draft\':\n
delivery_mode = related_order.getDeliveryMode(),\n delivery_mode = related_order.getDeliveryMode(),\n
incoterm = related_order.getIncoterm(),\n incoterm = related_order.getIncoterm(),\n
source_administration_value = related_order.getSourceAdministrationValue(),\n source_administration_value = related_order.getSourceAdministrationValue(),\n
title = related_order.getTitle(),\n title = related_order.getTitle()\n
destination = related_order.getTitle()\n
)\n )\n
\n \n
\n \n
...@@ -96,7 +95,10 @@ destination_decision_person = context.getDestinationDecisionValue(portal_type="P ...@@ -96,7 +95,10 @@ destination_decision_person = context.getDestinationDecisionValue(portal_type="P
if destination_decision_person is None:\n if destination_decision_person is None:\n
destination_decision_person = context.getDestinationValue(portal_type="Person")\n destination_decision_person = context.getDestinationValue(portal_type="Person")\n
if source_person is not None:\n if source_person is not None:\n
if destination_decision_person is not None:\n
from_email = destination_decision_person.getDefaultEmailText()\n from_email = destination_decision_person.getDefaultEmailText()\n
else:\n
from_email = getattr(context,email_from_address, None)\n
email = source_person.getDefaultEmailValue()\n email = source_person.getDefaultEmailValue()\n
if email is not None:\n if email is not None:\n
msg = """\n msg = """\n
...@@ -183,6 +185,8 @@ packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImm ...@@ -183,6 +185,8 @@ packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImm
<string>destination_decision_person</string> <string>destination_decision_person</string>
<string>None</string> <string>None</string>
<string>from_email</string> <string>from_email</string>
<string>getattr</string>
<string>email_from_address</string>
<string>email</string> <string>email</string>
<string>msg</string> <string>msg</string>
<string>activity</string> <string>activity</string>
......
201 202
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment