NaNtic/trytond-electronic_mail_wizard-old
1
0
Fork 0
mirror of https://github.com/NaN-tic/trytond-electronic_mail_wizard-old.git synced 2023-12-13 21:30:11 +01:00
Code Issues Projects Releases Wiki Activity

Mailbox from template or mail configuration

Browse source
This commit is contained in:
resteve 2015-03-03 16:43:16 +01:00
parent d9393c59bd
commit 1b5ba6be47
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
electronic_mail_wizard.py
View file

@ -258,9 +258,11 @@ class GenerateTemplateEmail(Wizard):
template = self.start.template
if self.start.queue:
mailbox = email_configuration.outbox
mailbox = template.mailbox_outbox \
if template.mailbox_outbox else email_configuration.outbox
else:
mailbox = email_configuration.sent
mailbox = template.mailbox if template.mailbox \
else email_configuration.sent
active_ids = Transaction().context.get('active_ids')
total = len(active_ids)
@ -319,7 +321,7 @@ class GenerateTemplateEmail(Wizard):
context['bcc'] = values.get('bcc')
electronic_email = Mail.create_from_email(email_message,
mailbox.id, context)
mailbox, context)
template.add_event(record, electronic_email) # add event
electronic_emails.add(electronic_email)
@ -353,4 +355,6 @@ class GenerateTemplateEmail(Wizard):
(electronic_email.rec_name))
else:
electronic_email.mailbox = draft_mailbox
electronic_email.save()
transaction.cursor.commit()