Juan Rial (OpenERP) has proposed merging
lp:~openerp-dev/openerp-int/mck_addons-jri into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
tfr (Openerp) (tfr)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_addons-jri/+merge/144907
* Added some access rights I seem to have forgotten to commit
* Fixed bug where partner validation mails could not be sent anymore
* Now only sends the non-tracked version of the mail if cc-nontracked is
actually populated
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_addons-jri/+merge/144907
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_common/security/ir.model.access.csv'
--- mck_common/security/ir.model.access.csv 2012-12-07 14:03:23 +0000
+++ mck_common/security/ir.model.access.csv 2013-01-25 12:03:25 +0000
@@ -8,4 +8,4 @@
access_mail_message_uber_admin,mail.message,mck_common.model_mail_message,mck_base_menu.uber_user,1,1,1,1
preview_email_id,Email_preview_rule,mck_common.model_email_preview,mck_base_menu.practice_user,1,1,1,1
track_log_base,track log base,mck_common.model_mck_base_tracklog,base.group_no_one,1,1,1,1
-
+track_log_contact,track log Contact,base_contact.model_res_partner_contact,base.group_no_one,1,0,0,0
=== modified file 'mck_common/wizard/send_mail.py'
--- mck_common/wizard/send_mail.py 2012-12-06 11:12:19 +0000
+++ mck_common/wizard/send_mail.py 2013-01-25 12:03:25 +0000
@@ -172,9 +172,13 @@
headers = {}
bodies = {}
bodies_nontracked = {}
- for invitee_id in mail.invitee_ids:
- bodies_nontracked[invitee_id.id] = mail.body_html if mail.subtype == 'html' else mail.body_text
- bodies[invitee_id.id] = mail.body_html if mail.subtype == 'html' else mail.body_text
+ if context.get('active_model') in ['mck.event', 'mck.publication']:
+ to_mail_ids = [x.id for x in mail.invitee_ids]
+ else:
+ to_mail_ids = context.get('active_ids')
+ for to_mail_id in to_mail_ids:
+ bodies_nontracked[to_mail_id] = mail.body_html if mail.subtype == 'html' else mail.body_text
+ bodies[to_mail_id] = mail.body_html if mail.subtype == 'html' else mail.body_text
# Overwrite body if we have a template with a tracker URL
if template is not None and 'tracker_url' in template and template['tracker_url']:
if re.search('\?', template['tracker_url']):
@@ -239,10 +243,11 @@
model=mail.model, email_cc=to_email(email_cc), email_cc_nontracked=to_email(email_cc_nontracked), email_bcc=to_email(email_bcc), reply_to=reply_to,
attachments=attachment, references=references, res_id=active_id, include_recipients=['to', 'cc', 'bcc'],
subtype=mail.subtype, headers=headers, cell_id=cell_id ,context=context)
- mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_nontracked,
- model=mail.model, email_cc=to_email(email_cc), email_cc_nontracked=to_email(email_cc_nontracked), email_bcc=to_email(email_bcc), reply_to=reply_to,
- attachments=attachment, references=references, res_id=active_id, include_recipients=['cc-nontracked'],
- subtype=mail.subtype, headers=headers, cell_id=cell_id ,context=context)
+ if email_cc_nontracked:
+ mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_nontracked,
+ model=mail.model, email_cc=to_email(email_cc), email_cc_nontracked=to_email(email_cc_nontracked), email_bcc=to_email(email_bcc), reply_to=reply_to,
+ attachments=attachment, references=references, res_id=active_id, include_recipients=['cc-nontracked'],
+ subtype=mail.subtype, headers=headers, cell_id=cell_id ,context=context)
if template is not None and 'tracker_url' in template and template['tracker_url']:
self.pool.get('mck.base.tracklog').generate_event_log(cr, uid, curr_date, 'mail_sent', '127.0.0.1', '', template_track_str, invitee_track_strings[active_id])
else:
@@ -259,7 +264,8 @@
# in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
mail_message.send(cr, uid, [msg_id1], context=context)
- mail_message.send(cr, uid, [msg_id2], context=context)
+ if email_cc_nontracked:
+ mail_message.send(cr, uid, [msg_id2], context=context)
if template is not None and 'tracker_url' in template and template['tracker_url']:
# TODO: TFR, please verify this!
self.pool.get('mck.base.tracklog').generate_event_log(cr, uid, curr_date, 'mail_sent', '127.0.0.1', '', template_track_str, invitee_track_strings[active_ids[0]])
@@ -271,7 +277,7 @@
'type': 'ir.actions.act_window',
'target': 'new',
'context' : {'old_active_model' : active_model }
- }
+ }
def preview_email(self, cr, uid, ids, context=None):
context = context or {}
=== modified file 'mck_event/security/ir.model.access.csv'
--- mck_event/security/ir.model.access.csv 2013-01-09 14:18:11 +0000
+++ mck_event/security/ir.model.access.csv 2013-01-25 12:03:25 +0000
@@ -11,6 +11,13 @@
event_mail_analysis_report_practice_user,mail_analysis,mck_event.model_mck_event_mail_analysis,mck_base_menu.practice_user,1,1,1,1
access_event_tracklog_practice_user,mail_analysis,mck_event.model_mck_event_tracklog,mck_base_menu.practice_user,1,0,0,0
access_event_tracklog_practice_admin,mail_analysis,mck_event.model_mck_event_tracklog,mck_base_menu.practice_admin,1,1,1,1
+<<<<<<< TREE
track_log_event,track log Event,mck_event.model_mck_event_tracklog,base.group_no_one,1,1,1,1track_log_event,track log Event,mck_event.model_mck_event_tracklog,base.group_no_one,1,1,1,1
track_log_event_invite,tracklogger mck_invite,mck_event.model_mck_invitee,base.group_no_one,1,0,0,0
-track_log_event_stage,Tracklogger stage event,mck_event.model_event_stage,base.group_no_one,1,0,0,0
\ No newline at end of file
+track_log_event_stage,Tracklogger stage event,mck_event.model_event_stage,base.group_no_one,1,0,0,0=======
+track_log_event_tracklog,track log Event Tracklog,mck_event.model_mck_event_tracklog,base.group_no_one,1,1,1,1
+track_log_event,track log Event,mck_event.model_mck_event,base.group_no_one,1,0,0,0
+track_log_invitee,track log Invitee,mck_event.model_mck_invitee,base.group_no_one,1,1,0,0
+track_log_invitee_history,track log Invitee History,mck_event.model_history_invitee,base.group_no_one,1,1,1,0
+track_log_stage,track log Stage,mck_event.model_event_stage,base.group_no_one,1,0,0,0
+>>>>>>> MERGE-SOURCE
=== modified file 'mck_publication/security/ir.model.access.csv'
--- mck_publication/security/ir.model.access.csv 2013-01-09 14:18:11 +0000
+++ mck_publication/security/ir.model.access.csv 2013-01-25 12:03:25 +0000
@@ -13,6 +13,14 @@
publication_mail_analysis_report_practice_user,mail_analysis,mck_publication.model_mck_publication_mail_analysis,mck_base_menu.practice_user,1,1,1,1
access_publication_tracklog_practice_user,mail_analysis,mck_publication.model_mck_publication_tracklog,mck_base_menu.practice_user,1,0,0,0
access_publication_tracklog_practice_admin,mail_analysis,mck_publication.model_mck_publication_tracklog,mck_base_menu.practice_admin,1,1,1,1
+<<<<<<< TREE
track_log_pub,track log Pub,mck_publication.model_mck_publication_tracklog,base.group_no_one,1,1,1,1
track_log_recipient,Tracklogger recipient,mck_publication.model_mck_recipient,base.group_no_one,1,0,0,0
track_log_stage,Tracklogger stage recipient,mck_publication.model_publication_stage,base.group_no_one,1,0,0,0
+=======
+track_log_publication_tracklog,track log Publication Tracklog,mck_publication.model_mck_publication_tracklog,base.group_no_one,1,1,1,1
+track_log_publication,track log Publication Tracklog,mck_publication.model_mck_publication,base.group_no_one,1,0,0,0
+track_log_recipient,track log Recipient,mck_publication.model_mck_recipient,base.group_no_one,1,1,0,0
+track_log_recipient_history,track log Recipient History,mck_publication.model_history_recipient,base.group_no_one,1,1,1,0
+track_log_stage,track log Stage,mck_publication.model_publication_stage,base.group_no_one,1,0,0,0
+>>>>>>> MERGE-SOURCE
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
