Send properly email notofication.

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createPersonAndAssignment.xml

@@ -88,7 +88,10 @@ login, password = context.CredentialRequest_createUser()\n
 # Update Local Roles\n
 context.CredentialRequest_updateLocalRolesOnSecurityGroups()\n
 \n
-if portal_preferences.isPreferredSystemGeneratePassword():\n
+if password is not None:\n
+  if password.startswith(\'{SSHA}\'):\n
+    #password is encoded, set it to None to script witch send the password to user\n
+    password = None\n
   # Send notification in activities only if we already generated and set password\n
   # else a Credential Recovery process will take care\n
   context.activate(activity=\'SQLQueue\').CredentialRequest_sendAcceptedNotification(login, password)\n

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.xml

@@ -90,10 +90,10 @@ if not person.getPassword():\n
       password = None\n
       module = portal.getDefaultModule(portal_type=\'Credential Recovery\')\n
       credential_recovery = module.newContent(\n
-                portal_type="Credential Recovery",\n
-                reference=login,\n
-                destination_decision=person.getRelativeUrl(),\n
-                language=portal.Localizer.get_selected_language())\n
+                                     portal_type="Credential Recovery",\n
+                                     reference=login,\n
+                                     destination_decision=person.getRelativeUrl(),\n
+                                     language=portal.Localizer.get_selected_language())\n
       credential_recovery.submit()\n
     else:\n
       # system should generate a password\n
@@ -111,10 +111,6 @@ else:\n
     #Check assignment for the current instance\n
     person.Person_validateGlobalUserAccount()\n
 \n
-if password is not None and password.startswith(\'{SSHA}\'):\n
-  #password is encoded, set it to None to script witch send the password to user\n
-  password = None\n
-\n
 return login, password\n
 </string> </value>
         </item>

bt5/erp5_credential/bt/revision

-381
+382
\ No newline at end of file