[REF] change email template and refactore event code

bzr revid: mva@openerp.com-20120213152422-iakgz4scpj9y2g9t
This commit is contained in:
MVA 2012-02-13 16:24:22 +01:00
parent 139c69c18a
commit 254a7be264
4 changed files with 118 additions and 106 deletions

View File

@ -7,7 +7,15 @@
<field name="email_from" >${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
<field name="email_to" >${object.email_from}</field>
<field name="subject">Ticket for ${object.event_id.name}</field>
<field name="body_text">thank you for your registration</field>
<field name="body_text">
hello ${object.contact_id.name},
The event ${object.event_id.name} that you register is confirmed
we thank you for your participation
best regards
</field>
</record>
</data>
@ -19,7 +27,14 @@
<field name="email_from" >${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
<field name="email_to" >${object.email_from}</field>
<field name="subject">Ticket for ${object.event_id.name}</field>
<field name="body_text">thank you for your registration</field>
<field name="body_text">
hello ${object.contact_id.name},
You have just been registered for the event ${object.event_id.name} to be held from ${object.event_id.date_begin} to ${object.event_id.date_end}
we thank you for your participation
best regards
</field>
</record>
</data>

View File

@ -101,7 +101,7 @@ class event_event(osv.osv):
register_pool = self.pool.get('event.registration')
for event in self.browse(cr, uid, ids, context=context):
total_confirmed = event.register_current
if total_confirmed < event.register_min or total_confirmed > event.register_max:
if total_confirmed < event.register_min or total_confirmed > event.register_max and event.register_max!=0:
raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (even.name))
if event.email_confirmation_id:
#send reminder that will confirm the event for all the people that were already confirmed

View File

@ -6,8 +6,6 @@
</record>
<!-- Demo Data for Product -->
<record id="event_product_0" model="product.product">
<field name="list_price">68.00</field>
@ -120,7 +118,6 @@
</record>
<record id="reg_0_1" model="event.registration">
<field name="event_id" ref="event_0"/>
<field name="partner_id_address" ref="base.res_partner_c2c"/>
@ -141,7 +138,5 @@
<field name="unit_price">20</field>
</record>
</data>
</openerp>

View File

@ -150,6 +150,7 @@
<field name="date_end"/>
<field name="register_current"/>
<field name="register_min"/>
<field name="register_max" invisible="1"/>
<field name="main_speaker_id" groups="base.extended"/>
<field name="user_id"/>
<field name="state"/>
@ -277,6 +278,7 @@
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
<button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button name="case_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
<button string="Set To Draft" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
</tree>
</field>
</record>
@ -317,7 +319,7 @@
<button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
<button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
<button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
<button string="Set To Draft" name="do_draft" states="cancel" type="object" icon="gtk-convert"/>
<button string="Set To Draft" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Emails" groups="base.group_extended">