From 254a7be2647e71390197c51e00ef75e3f94e8b42 Mon Sep 17 00:00:00 2001
From: MVA <mva@openerp.com>
Date: Mon, 13 Feb 2012 16:24:22 +0100
Subject: [PATCH] [REF] change email template and refactore event code

bzr revid: mva@openerp.com-20120213152422-iakgz4scpj9y2g9t
---
 addons/event/email_template.xml |  19 ++-
 addons/event/event.py           |   2 +-
 addons/event/event_demo.xml     | 199 ++++++++++++++++----------------
 addons/event/event_view.xml     |   4 +-
 4 files changed, 118 insertions(+), 106 deletions(-)

diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index 59a49239efe..996ebf65474 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -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>
diff --git a/addons/event/event.py b/addons/event/event.py
index c94ef1c3ee2..6840072aae1 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -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
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index c39f11b314f..ffbf610323b 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -1,134 +1,131 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
     <record id="base.user_demo" model="res.users">
              <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
      </record>
-     
-     
 
-     
+
 <!-- Demo Data for Product -->
-	<record id="event_product_0" model="product.product">
-		<field name="list_price">68.00</field>
-		<field name="standard_price">15.00</field>
-		<field name="uom_id" ref="product.product_uom_unit"/>
-		<field name="uom_po_id" ref="product.product_uom_unit"/>
-		<field name="name">Ticket for Concert</field>
-		<field name="categ_id" model="product.category" search="[]"/>
-	</record>
+    <record id="event_product_0" model="product.product">
+        <field name="list_price">68.00</field>
+        <field name="standard_price">15.00</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="name">Ticket for Concert</field>
+        <field name="categ_id" model="product.category" search="[]"/>
+    </record>
 
-	<record id="event_product_1" model="product.product">
-		<field name="list_price">24.00</field>
-		<field name="standard_price">15.00</field>
-		<field name="uom_id" ref="product.product_uom_unit"/>
-		<field name="uom_po_id" ref="product.product_uom_unit"/>
-		<field name="name">Ticket for Opera</field>
-		<field name="categ_id" model="product.category" search="[]"/>
-	</record>
+    <record id="event_product_1" model="product.product">
+        <field name="list_price">24.00</field>
+        <field name="standard_price">15.00</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="name">Ticket for Opera</field>
+        <field name="categ_id" model="product.category" search="[]"/>
+    </record>
 
-	<record id="event_product_2" model="product.product">
-		<field name="list_price">15.50</field>
-		<field name="standard_price">5.00</field>
-		<field name="uom_id" ref="product.product_uom_unit"/>
-		<field name="uom_po_id" ref="product.product_uom_unit"/>
-		<field name="name">Ticket for Conference</field>
-		<field name="categ_id" model="product.category" search="[]"/>
-	</record>
+    <record id="event_product_2" model="product.product">
+        <field name="list_price">15.50</field>
+        <field name="standard_price">5.00</field>
+        <field name="uom_id" ref="product.product_uom_unit"/>
+        <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="name">Ticket for Conference</field>
+        <field name="categ_id" model="product.category" search="[]"/>
+    </record>
 
 
 <!-- Demo Data for Event Type -->
-	<record id="event_type_0" model="event.type">
-		<field name="name">Seminar</field>
-	</record>
+    <record id="event_type_0" model="event.type">
+        <field name="name">Seminar</field>
+    </record>
 
-	<record id="event_type_1" model="event.type">
-		<field name="name">Exhibition</field>
-	</record>
+    <record id="event_type_1" model="event.type">
+        <field name="name">Exhibition</field>
+    </record>
 
-	<record id="event_type_2" model="event.type">
-		<field name="name">Conference</field>
-	</record>
+    <record id="event_type_2" model="event.type">
+        <field name="name">Conference</field>
+    </record>
 
-	<record id="event_type_3" model="event.type">
-		<field name="name">Saloon</field>
-	</record>
+    <record id="event_type_3" model="event.type">
+        <field name="name">Saloon</field>
+    </record>
 
-	<record id="event_type_4" model="event.type">
-		<field name="name">Training</field>
-	</record>
+    <record id="event_type_4" model="event.type">
+        <field name="name">Training</field>
+    </record>
 
 <!-- Demo data for Event -->
-	<record id="event_0" model="event.event">
-		<field name="name">Concert of Bon Jovi</field>
+    <record id="event_0" model="event.event">
+        <field name="name">Concert of Bon Jovi</field>
         <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-		<field name="product_id" ref="event_product_0"/>
-		<field name="unit_price">68.00</field>
-		<field name="mail_auto_registr">True</field>
-		<field name="mail_auto_confirm">True</field>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="register_max">500</field>
-		<field name="type" ref="event_type_1"/>
-	</record>
+        <field name="product_id" ref="event_product_0"/>
+        <field name="unit_price">68.00</field>
+        <field name="mail_auto_registr">True</field>
+        <field name="mail_auto_confirm">True</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="register_max">500</field>
+        <field name="type" ref="event_type_1"/>
+    </record>
 
-	<record id="event_1" model="event.event">
-		<field name="name">Opera of Verdi</field>
+    <record id="event_1" model="event.event">
+        <field name="name">Opera of Verdi</field>
         <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
-		<field name="product_id" ref="event_product_1"/>
-		<field name="unit_price">24.00</field>
-		<field name="type" ref="event_type_1"/>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="register_min">50</field>
-		<field name="register_max">350</field>
-	</record>
-	<record id="event_2" model="event.event">
-		<field name="name">Conference on ERP Buisness</field>
+        <field name="product_id" ref="event_product_1"/>
+        <field name="unit_price">24.00</field>
+        <field name="type" ref="event_type_1"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="register_min">50</field>
+        <field name="register_max">350</field>
+    </record>
+    <record id="event_2" model="event.event">
+        <field name="name">Conference on ERP Buisness</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
         <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
-		<field name="product_id" ref="event_product_2"/>
-		<field name="unit_price">15.50</field>
-		<field name="type" ref="event_type_2"/>
-		<field name="register_max">200</field>
-		<field name="user_id" ref="base.user_root"/>
-		<field name="mail_auto_registr">True</field>
-		<field name="mail_auto_confirm">True</field>
-		<field name="mail_registr">Thanks for registration. We will keep you informed of the modalities.</field>
-		<field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
-	</record>
+        <field name="product_id" ref="event_product_2"/>
+        <field name="unit_price">15.50</field>
+        <field name="type" ref="event_type_2"/>
+        <field name="register_max">200</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="mail_auto_registr">True</field>
+        <field name="mail_auto_confirm">True</field>
+        <field name="mail_registr">Thanks for registration. We will keep you informed of the modalities.</field>
+        <field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
+    </record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
-	<record id="reg_1_1" model="event.registration">
-		<field name="event_id" ref="event_1"/>
-		<field name="partner_id_address" ref="base.res_partner_asus"/>
-		<field name="partner_invoice_id" ref="base.res_partner_asus"/>
-		<field name="nb_register">5</field>
-		<field name="event_product">Ticket for Opera</field>
-		<field name="unit_price">24.00</field>
-	</record>
+    <record id="reg_1_1" model="event.registration">
+        <field name="event_id" ref="event_1"/>
+        <field name="partner_id_address" ref="base.res_partner_asus"/>
+        <field name="partner_invoice_id" ref="base.res_partner_asus"/>
+        <field name="nb_register">5</field>
+        <field name="event_product">Ticket for Opera</field>
+        <field name="unit_price">24.00</field>
+    </record>
 
-	<record id="reg_1_2" model="event.registration">
-		<field name="event_id" ref="event_1"/>
-		<field name="partner_id_address" ref="base.res_partner_agrolait"/>
-		<field name="partner_invoice_id" ref="base.res_partner_agrolait"/>
-		<field name="nb_register">10</field>
-		<field name="event_product">Ticket for Opera</field>
-		<field name="unit_price">24.00</field>
-	</record>
+    <record id="reg_1_2" model="event.registration">
+        <field name="event_id" ref="event_1"/>
+        <field name="partner_id_address" ref="base.res_partner_agrolait"/>
+        <field name="partner_invoice_id" ref="base.res_partner_agrolait"/>
+        <field name="nb_register">10</field>
+        <field name="event_product">Ticket for Opera</field>
+        <field name="unit_price">24.00</field>
+    </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"/>
-		<field name="partner_invoice_id" ref="base.res_partner_c2c"/>
-		<field name="nb_register">6</field>
-		<field name="event_product">Ticket for Concert</field>
-		<field name="unit_price">15.50</field>
-	</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"/>
+        <field name="partner_invoice_id" ref="base.res_partner_c2c"/>
+        <field name="nb_register">6</field>
+        <field name="event_product">Ticket for Concert</field>
+        <field name="unit_price">15.50</field>
+    </record>
 
 
 
@@ -140,8 +137,6 @@
         <field name="event_product">Ticket for Conference</field>
         <field name="unit_price">20</field>
     </record>
-    
 
-    
-	</data>
+    </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5defec03dfb..13a775f9bd8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -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">