diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml index ca9608949dd1c1266782cd5e35f94f2edd13a733..f67210ef27153378eb032f1ebbcbc56ec0d77bf5 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml @@ -60,7 +60,7 @@ sender = event.getSourceValue()\n if sender is not None:\n from_url = formataddr((sender.getTitle(), sender.getDefaultEmailText()))\n else:\n - from_url = portal.portal_preferences.getPreferredEventSenderEmail()\n + from_url = kw.get(\'from_url\', portal.portal_preferences.getPreferredEventSenderEmail())\n \n to_url = formataddr((context.getTitle(), context.getDefaultEmailText()))\n \n diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 4df0a83b86969ac3a3cd7c547815408adf355217..567c9739adf09bbad21be88ee7fd4055ab656435 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -1018 \ No newline at end of file +1019 \ No newline at end of file