Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2-event_temp_notification-ssu
into lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-event_temp_notification-ssu/+merge/92413
Hello sir,
I have improved the event module by sending email template for event auto
registration and event auto confirmation.
Thank you.
SSU
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-phase2-event_temp_notification-ssu/+merge/92413
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-phase2.
=== modified file 'event/event.py'
--- event/event.py 2012-02-08 08:33:02 +0000
+++ event/event.py 2012-02-10 05:19:14 +0000
@@ -124,6 +124,7 @@
""" Confirm Event and send confirmation email to all register peoples
"""
register_pool = self.pool.get('event.registration')
+ res = self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
for event in self.browse(cr, uid, ids, context=context):
if event.mail_auto_confirm:
#send reminder that will confirm the event for all the people that were already confirmed
@@ -132,7 +133,7 @@
('state', 'not in', ['draft', 'cancel'])], context=context)
register_pool.mail_user_confirm(cr, uid, reg_ids)
- return self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+ return res
def _get_register(self, cr, uid, ids, fields, args, context=None):
"""Get Confirm or uncofirm register value.
=== modified file 'event/event_data.xml'
--- event/event_data.xml 2012-01-31 09:32:33 +0000
+++ event/event_data.xml 2012-02-10 05:19:14 +0000
@@ -9,5 +9,53 @@
<field name="type">vevent</field>
<field name="object_id" ref="model_event_event"/>
</record>
+
+ <!-- Event Registration Auto Registraion -->
+ <record id="template_event_registration_autoregister" model="email.template">
+ <field name="body_text">Hello ${object.partner_id.name},
+
+ Your event registration ' ${object.name or ' no-name'} ' for the event ' ${object.event_id.name} ' has been auto confirmed.
+Kindly check your event attendance confirmation.
+
+Thank you.</field>
+ <field eval="0" name="auto_delete"/>
+ <field name="email_from">${object.user_id.user_email or ''}</field>
+ <field name="subject">[ ${object.id} ] Event Registration : ${object.event_id.name or 'noname'}</field>
+ <field eval="[(6,0,[])]" name="attachment_ids"/>
+ <field name="state">received</field>
+ <field eval="1" name="track_campaign_item"/>
+ <field eval="1" name="user_signature"/>
+ <field name="email_cc">${object.email_cc or ''}</field>
+ <field name="model_id" ref="event.model_event_registration"/>
+ <field name="email_to">${object.partner_id.email or ''}</field>
+ <field name="name">Event Auto Registration</field>
+ <field name="subtype">plain</field>
+ <field name="reply_to">${object.event_id.reply_to or ''}</field>
+ <field name="model">event.registration</field>
+ </record>
+
+ <!-- Event Registration Auto Confirmation -->
+ <record id="template_event_registration_autoconfirm" model="email.template">
+ <field name="body_text">Hello ${object.partner_id.name},
+
+ Event ' ${object.name or 'no-name' }' has been confirmed on Date ${object.date}.
+Kindly check your event attendance.
+
+Thank you.</field>
+ <field eval="0" name="auto_delete"/>
+ <field name="email_from">${object.user_id.user_email or ''}</field>
+ <field name="subject">[ ${object.id} ] Event Confirmation : ${object.event_id.name or 'noname'}</field>
+ <field eval="[(6,0,[])]" name="attachment_ids"/>
+ <field name="state">received</field>
+ <field eval="1" name="track_campaign_item"/>
+ <field eval="1" name="user_signature"/>
+ <field name="email_cc">${object.email_cc or ''}</field>
+ <field name="model_id" ref="event.model_event_registration"/>
+ <field name="email_to">${object.partner_id.email or ''}</field>
+ <field name="name">Event Auto Confirmation</field>
+ <field name="subtype">plain</field>
+ <field name="reply_to">${object.event_id.reply_to or ''}</field>
+ <field name="model">event.registration</field>
+ </record>
</data>
</openerp>
=== modified file 'event/event_registration.py'
--- event/event_registration.py 2012-02-01 05:15:51 +0000
+++ event/event_registration.py 2012-02-10 05:19:14 +0000
@@ -318,31 +318,12 @@
Send email to user
"""
mail_message = self.pool.get('mail.message')
+ template_pool = self.pool.get('email.template')
for registration in self.browse(cr, uid, ids, context=context):
- src = registration.event_id.reply_to or False
- email_to = []
- email_cc = []
- if registration.email_from:
- email_to = [registration.email_from]
- if registration.email_cc:
- email_cc += [registration.email_cc]
- if not (email_to or email_cc):
- continue
- subject = ""
- body = ""
- if confirm:
- subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name)
- body = registration.event_id.mail_confirm
- elif registration.event_id.mail_auto_confirm or registration.event_id.mail_auto_registr:
- if registration.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and registration.event_id.mail_auto_registr:
- subject = _('Auto Registration: [%s] %s') %(registration.id, registration.name)
- body = registration.event_id.mail_registr
- if (registration.event_id.state in ['confirm', 'running']) and registration.event_id.mail_auto_confirm:
- subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name)
- body = registration.event_id.mail_confirm
- if subject or body:
- mail_message.schedule_with_attach(cr, uid, src, email_to, subject, body, model='event.registration', email_cc=email_cc, res_id=registration.id)
-
+ if registration.event_id.state in ['draft', 'confirm'] and registration.event_id.mail_auto_registr:
+ template_pool.send_mail(cr, uid, registration.event_id.alarm_email_template_id.id, registration.id, force_send=False, context=context)
+ if (registration.event_id.state in ['confirm']) and registration.event_id.mail_auto_confirm:
+ template_pool.send_mail(cr, uid, registration.event_id.attendee_notification_email_template_id.id, registration.id, force_send=False, context=context)
return True
def mail_user_confirm(self, cr, uid, ids, context=None):
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-02-06 09:49:39 +0000
+++ event/event_view.xml 2012-02-10 05:19:14 +0000
@@ -160,17 +160,15 @@
<group col="2" colspan="2">
<separator string="Auto Registration Email" colspan="4"/>
<field name="mail_auto_registr" colspan="4"/>
- <group colspan="4" attrs="{'readonly':[('mail_auto_registr','=',False)]}">
- <separator string="Registration Email Body" colspan="4"/>
- <field name="mail_registr" colspan="4" nolabel="1" />
+ <group colspan="4" attrs="{'required':[('mail_auto_registr','=',True)]}">
+ <field domain="[('model','=','event.registration')]" name="alarm_email_template_id" string="Event Auto Registration" />
</group>
</group>
<group col="2" colspan="2">
<separator string="Auto Confirmation Email" colspan="4"/>
<field name="mail_auto_confirm" colspan="4"/>
- <group colspan="4" attrs="{'readonly':[('mail_auto_confirm','=',False)]}">
- <separator string="Confirmation Email Body" colspan="4"/>
- <field name="mail_confirm" nolabel="1" colspan="4"/>
+ <group colspan="4" attrs="{'required':[('mail_auto_confirm','=',True)]}">
+ <field domain="[('model','=','event.registration')]" name="attendee_notification_email_template_id" string="Event Auto Confirmation"/>
</group>
</group>
</group>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
