diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml index 79b1b1c30bf0d76c5c32f2d436086d4e8598c368..945ce650ce802f270dec96209f57cfe2a41ef47a 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml @@ -82,8 +82,7 @@ if source_person is not None \\\n and destination_decision_person is not None\\\n and source_person.getDefaultEmailText() \\\n and source_person.getReference():\n - source_user = portal.portal_membership.getMemberById(source_person.getReference())\n - if source_user is not None:\n + if len(portal.acl_users.erp5_users.getUserByLogin(source_person.getReference())):\n message = """\n A question from task has been assigned to you by %(assignor)s.\n \n @@ -172,7 +171,6 @@ Please visit ERP5: %(url)s\n <string>source_person</string> <string>destination_decision_person</string> <string>None</string> - <string>source_user</string> <string>message</string> </tuple> </value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml index ab85dc51380933c35626c9bc01eb0724632773b6..00a7c23a119c846b0a7a19e3a648120fbf66612d 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml @@ -68,8 +68,7 @@ if source_person is not None \\\n and destination_decision_person is not None\\\n and source_person.getDefaultEmailText() \\\n and source_person.getReference():\n - source_user = portal.portal_membership.getMemberById(source_person.getReference())\n - if source_user is not None:\n + if len(portal.acl_users.erp5_users.getUserByLogin(source_person.getReference())):\n message = """\n Restarted task has been assigned to you by %(assignor)s.\n \n @@ -145,7 +144,7 @@ Please visit ERP5: %(url)s\n <string>source_person</string> <string>destination_decision_person</string> <string>None</string> - <string>source_user</string> + <string>len</string> <string>message</string> </tuple> </value> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index c5ba36b3c368d99de88c947ec0246108d02a86ab..24c5507b23c0f31b724642a81eefdd7cb9f8af04 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -632 \ No newline at end of file +633 \ No newline at end of file