diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 4679a8ae2bb..242c8e8ba61 100755
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -47,7 +47,9 @@ this campaign to be run"),
                                 ('test_realtime', 'Realtime'),
                                 ('manual', 'Manual'),
                                 ('active', 'Active')],
-                                 'Mode', required=True),
+                                 'Mode', required=True, help="Mode defines different mode of campaign on \
+which you want to run your campaign.\nTest - Campaign created for testing purpose.\nRealtime -\
+ Campaign should be tested in Realtime.\nManual - Campaign should be tested by user manually."),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -220,8 +222,7 @@ be tested before action is executed. Eg : revenue > 10"),
                                   ('action', 'Action'),
                                   ('subcampaign', 'Sub-Campaign')],
                                   'Type', required=True,
-                                  help="Describe type of action to be performed on the Activity.\
-                                    Eg : Send email,Send paper.."),
+                                  help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
         'email_template_id': fields.many2one('email.template','Email Template'),
         'report_id': fields.many2one('ir.actions.report.xml', 'Reports', ),
         'report_directory_id': fields.many2one('document.directory','Directory',
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 7296ebf9c50..8bc5f879321 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
+    <data>
+
 <!-- Document directory -->
         <record id="document_directory_marketingcampaign" model="document.directory">
             <field eval="0" name="ressource_tree"/>
@@ -20,33 +20,27 @@
             <field name="parent_id" ref="document_directory_marketingcampaign"/>
             <field eval="&quot;&quot;&quot;ressource&quot;&quot;&quot;" name="type"/>
             <field name="ressource_type_id" ref="model_marketing_campaign"/>
-        </record>	
-        
-        <!-- Email tempalte -->	
-		<record id="email_template_1" model="email.template">
-			<field name="def_subject">Thanks for showing interest in OpenERP</field>
-			<field name="def_to">info@tinyerp.com</field>
-			<field eval="[(6,0,[])]" name="allowed_groups"/>
-			<field eval="0" name="auto_email"/>
-			<field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-			<field eval="[(6,0,[])]" name="table_required_fields"/>
-			<field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
-			<field name="object_name" ref="crm.model_crm_lead"/>
-			<field eval="0" name="use_sign"/>
-			<field name="def_body_text">Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,</field>
-			<field name="template_language">mako</field>
-			<field eval="0" name="send_on_create"/>
-			<field name="name">For OpenERP OnDemand Free Trial 2010</field>
-			<field name="model_int_name">crm.lead</field>
-			<field eval="0" name="send_on_write"/>
-		</record>	
-		<record id="email_template_2" model="email.template">
+        </record>
+
+        <!-- Email tempalte -->
+        <record id="email_template_1" model="email.template">
+            <field name="def_subject">Thanks for showing interest in OpenERP</field>
+            <field name="def_to">info@tinyerp.com</field>
+            <field eval="[(6,0,[])]" name="allowed_groups"/>
+            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
+            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
+            <field name="object_name" ref="crm.model_crm_lead"/>
+            <field eval="0" name="use_sign"/>
+            <field name="def_body_text">Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team,</field>
+            <field name="template_language">mako</field>
+            <field name="name">For OpenERP OnDemand Free Trial 2010</field>
+            <field name="model_int_name">crm.lead</field>
+        </record>
+        <record id="email_template_2" model="email.template">
             <field name="def_subject">Propose to subscribe to the Open ERP Discovery Day on May 2010</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
@@ -56,19 +50,15 @@
             We really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For Open ERP Discovery Day on May 2010</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
-        </record> 
-        
+        </record>
+
             <record id="email_template_3" model="email.template">
             <field name="def_subject">Thanks for subscribing to the Open ERP Discovery Day</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
@@ -77,19 +67,15 @@
              I really appreciate your co-operation on this.
              Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For Open ERP Discovery Day</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
-        </record>  
-        
+        </record>
+
              <record id="email_template_4" model="email.template">
             <field name="def_subject">Thanks for buying the Open ERP book</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
@@ -98,19 +84,15 @@
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For Open ERP book</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
         </record>
-        
+
          <record id="email_template_5" model="email.template">
             <field name="def_subject">Propose a free technical training to Gold partners</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
@@ -120,19 +102,15 @@
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For technical training to Gold partners</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
         </record>
-        
+
           <record id="email_template_6" model="email.template">
             <field name="def_subject">Propose paid training to Silver partners</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
@@ -142,19 +120,15 @@
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For training to Silver partners</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
         </record>
-    
+
         <record id="email_template_7" model="email.template">
             <field name="def_subject">Propose gold partnership to silver partners</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
@@ -164,73 +138,67 @@
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For gold partnership to silver partners</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
         </record>
-        
+
         <record id="email_template_8" model="email.template">
             <field name="def_subject">Thanks for subscribing to technical training</field>
             <field name="def_to">info@tinyerp.com</field>
             <field eval="[(6,0,[])]" name="allowed_groups"/>
-            <field eval="0" name="auto_email"/>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
-            <field eval="[(6,0,[])]" name="table_required_fields"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="object_name" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
             <field name="def_body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
             <field name="template_language">mako</field>
-            <field eval="0" name="send_on_create"/>
             <field name="name">For subscribing to technical training</field>
             <field name="model_int_name">crm.lead</field>
-            <field eval="0" name="send_on_write"/>
         </record>
-        <!-- Report -->	
-    
-		<record id="mc_crm_lead_demo_report" model="ir.actions.report.xml">
-			<field name="name">Marketing campaign demo report</field>
-			<field name="type">ir.actions.report.xml</field>
-			<field name="model">crm.lead</field>
-			<field name="report_name">crm.lead.demo</field>
-			<field name="report_rml">marketing_campaign/report/crm_lead_mc_demo_report.rml</field>
-			<field name="report_type">pdf</field>
-		</record>
-		
-    <!-- Campaign -->			
-		<record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
-			<field name="name">OpenERP OnDemand Free Trial 2010</field>
-			<field name="object_id" ref="crm.model_crm_lead"/>
-		</record>
-            
-            <!-- Activity -->	
-            		
-		<record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
-			<field name="name">Propose a 1 month free trial for an OnDemand offer</field>
-			<field name="server_action_id" ref="base.action_start_configurator"/>
-			<field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
-			<field name="report_directory_id" ref="document_directory_campaign1"/>
-			<field name="type">paper</field>
-			<field eval="1" name="start"/>
-			<field name="report_id" ref="mc_crm_lead_demo_report"/>
-		</record>
-		<record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
-			<field name="name">Thanks for showing interest</field>
-			<field name="server_action_id" ref="base.action_start_configurator"/>
-			<field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
-		    <field name="email_template_id" ref="email_template_1"/>
-		</record>
-		
-		<record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
+        <!-- Report -->
+
+        <record id="mc_crm_lead_demo_report" model="ir.actions.report.xml">
+            <field name="name">Marketing campaign demo report</field>
+            <field name="type">ir.actions.report.xml</field>
+            <field name="model">crm.lead</field>
+            <field name="report_name">crm.lead.demo</field>
+            <field name="report_rml">marketing_campaign/report/crm_lead_mc_demo_report.rml</field>
+            <field name="report_type">pdf</field>
+        </record>
+
+    <!-- Campaign -->
+        <record id="marketing_campaign_openerpondemandfreetrial0" model="marketing.campaign">
+            <field name="name">OpenERP OnDemand Free Trial 2010</field>
+            <field name="object_id" ref="crm.model_crm_lead"/>
+        </record>
+
+            <!-- Activity -->
+
+        <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
+            <field name="name">Propose a 1 month free trial for an OnDemand offer</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="report_directory_id" ref="document_directory_campaign1"/>
+            <field name="type">paper</field>
+            <field eval="1" name="start"/>
+            <field name="report_id" ref="mc_crm_lead_demo_report"/>
+        </record>
+        <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
+            <field name="name">Thanks for showing interest</field>
+            <field name="server_action_id" ref="base.action_start_configurator"/>
+            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="email_template_id" ref="email_template_1"/>
+        </record>
+
+        <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
             <field name="name">Propose to subscribe to the Open ERP Discovery Day on May 2010</field>
             <field name="server_action_id" ref="base.action_start_configurator"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
              <field name="email_template_id" ref="email_template_2"/>
         </record>
-		
-		<record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
+
+        <record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to the Open ERP Discovery Day</field>
             <field name="server_action_id" ref="base.action_start_configurator"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
@@ -244,7 +212,7 @@
             <field name="type">paper</field>
             <field name="report_id" ref="mc_crm_lead_demo_report"/>
         </record>
-        
+
         <record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
             <field name="name">Thanks for buying the Open ERP book</field>
             <field name="server_action_id" ref="base.action_start_configurator"/>
@@ -263,28 +231,28 @@
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_6"/>
         </record>
-        
+
         <record id="marketing_campaign_activity_8" model="marketing.campaign.activity">
             <field name="name">Propose gold partnership to silver partners</field>
             <field name="server_action_id" ref="base.action_start_configurator"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_7"/>
         </record>
-        
+
          <record id="marketing_campaign_activity_9" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to technical training</field>
             <field name="server_action_id" ref="base.action_start_configurator"/>
             <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
         <field name="email_template_id" ref="email_template_8"/>
         </record>
-        
-    <!-- Tranisition -->							
-		<record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-			<field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-			<field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
-		</record>
-		
-		<record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
+
+    <!-- Tranisition -->
+        <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
+            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
+            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+        </record>
+
+        <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
             <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
             <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
         </record>
@@ -324,15 +292,15 @@
             <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_9"/>
             <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
         </record>
-		
-    <!-- Segment -->					
-		<record id="marketing_campaign_segment_bosslistusassociationslist0" model="marketing.campaign.segment">
-			<field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
-			<field name="name">BossList US Associations List-0/90</field>
-			<field name="sync_mode">create_date</field>
-			<field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
-			<field name="state">draft</field>
-		</record>
-		
-	</data>
-</openerp>
+
+    <!-- Segment -->
+        <record id="marketing_campaign_segment_bosslistusassociationslist0" model="marketing.campaign.segment">
+            <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
+            <field name="name">BossList US Associations List-0/90</field>
+            <field name="sync_mode">create_date</field>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="state">draft</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file