[Erp5-report] r24277 - in /erp5/trunk/bt5/erp5_egov: WorkflowTemplateItem/portal_workflow/e...

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Oct 22 00:47:22 2008
New Revision: 24277

URL: http://svn.erp5.org?rev=24277&view=rev
Log:
fix some mistakes in sendCrendentialsByEMail workflow script and remove sender because it's not required

Modified:
    erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendCrendentialsByEMail.xml
    erp5/trunk/bt5/erp5_egov/bt/change_log
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendCrendentialsByEMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendCrendentialsByEMail.xml?rev=24277&r1=24276&r2=24277&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendCrendentialsByEMail.xml (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendCrendentialsByEMail.xml Wed Oct 22 00:47:22 2008
@@ -59,14 +59,17 @@
 This script tries to send a message containing the credentials to the\n
 organisation. It uses portal_notifications and the getObject API of ERP5Catalog.\n
 """\n
+from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+\n
 object = state_change[\'object\']\n
 \n
 translateString = object.Base_translateString\n
 portal_catalog = object.portal_catalog\n
+ninea = object.getNinea()\n
 \n
 # get the new organisation :\n
 result = portal_catalog(portal_type=\'Organisation\',\n
-    vat_code=object.getNinea())\n
+    vat_code=ninea)\n
 \n
 if len(result) > 1:\n
   msg = "Error : There is more than one company with the NINEA code ${code}"\n
@@ -96,9 +99,8 @@
             )\n
 \n
 # We can now notify the owner through the notification tool\n
-object.portal_notifications.sendMessage(sender=\'no-reply\',\n
-    recipient=organisation.getReference(), subject=subject, message=msg,\n
-    portal_type_list=(\'Person\', \'Organisation\'))\n
+object.portal_notifications.sendMessage(recipient=organisation.getReference(), \n
+    subject=subject, message=msg, portal_type_list=(\'Person\', \'Organisation\'))\n
 
 
 ]]></string> </value>
@@ -147,17 +149,18 @@
                         <value>
                           <tuple>
                             <string>state_change</string>
+                            <string>Products.DCWorkflow.DCWorkflow</string>
+                            <string>ValidationFailed</string>
                             <string>_getitem_</string>
                             <string>object</string>
                             <string>_getattr_</string>
                             <string>translateString</string>
                             <string>portal_catalog</string>
+                            <string>ninea</string>
                             <string>result</string>
                             <string>len</string>
                             <string>msg</string>
                             <string>dict</string>
-                            <string>ninea</string>
-                            <string>ValidationFailed</string>
                             <string>organisation</string>
                             <string>subject</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=24277&r1=24276&r2=24277&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log Wed Oct 22 00:47:22 2008
@@ -1,3 +1,6 @@
+2008-10-21 fabien
+* fix some mistakes in sendCrendentialsByEMail workflow script and remove sender because it's not required
+
 2008-10-20 fabien
 * update ERP5Site_getSecurityFromLatestWorkflowHistory  to remove workflow hardcoded value
 * add a script generateNewLogin to generate new login (remove spaces and accents, add a number at the end if the login already exists, ...)

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=24277&r1=24276&r2=24277&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision Wed Oct 22 00:47:22 2008
@@ -1,1 +1,1 @@
-415
+426