From fd9ec559cbe39c6dd38a81be46c51c1e7bb0e220 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 8 Nov 2011 16:50:23 +0530
Subject: [PATCH] [IMP] marketing_campaign, marketing_campaign_crm_demo:
 Traceback generate when processing workitem, and Improved demo data of Email
 template

bzr revid: ron@tinyerp.com-20111108112023-1fwd5vdez50lmiiw
---
 .../marketing_campaign/marketing_campaign.py  |  2 +-
 .../marketing_campaign_demo.xml               | 64 +++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 547281911c4..9dc48c99873 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -707,7 +707,7 @@ class marketing_campaign_workitem(osv.osv):
 
             if result:
                 # process _chain
-                workitem = workitem.browse(context)[0] # reload
+                workitem = workitem.browse(context=context)[0] # reload
                 date = datetime.strptime(workitem.date, DT_FMT)
 
                 for transition in activity.to_ids:
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index ee11fbcdb75..b89daa50438 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -34,27 +34,27 @@
 
         <!-- 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 name="subject">Thanks for showing interest in OpenERP</field>
+            <field name="email_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 name="model_id" 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 openERP.Regards,OpenERP Team,</field>
+            <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.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 OpenERP Discovery Day on May 2010</field>
-            <field name="def_to">info@tinyerp.com</field>
+            <field name="subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
+            <field name="email_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 name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello,We have very good offer that might suit you.
+            <field name="body_text">Hello,We have very good offer that might suit you.
             We propose you to subscribe to the OpenERP Discovery Day on May 2010.
             If any further information required kindly revert back.
             We really appreciate your co-operation on this.
@@ -65,14 +65,14 @@
         </record>
 
             <record id="email_template_3" model="email.template">
-            <field name="def_subject">Thanks for subscribing to the OpenERP Discovery Day</field>
-            <field name="def_to">info@tinyerp.com</field>
+            <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
+            <field name="email_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 name="model_id" 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 the OpenERP Discovery Day.
+            <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
              If any further information required kindly revert back.
              I really appreciate your co-operation on this.
              Regards,OpenERP Team,</field>
@@ -82,14 +82,14 @@
         </record>
 
              <record id="email_template_4" model="email.template">
-            <field name="def_subject">Thanks for buying the OpenERP book</field>
-            <field name="def_to">info@tinyerp.com</field>
+            <field name="subject">Thanks for buying the OpenERP book</field>
+            <field name="email_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 name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+            <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
             Regards,OpenERP Team,</field>
@@ -99,14 +99,14 @@
         </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 name="subject">Propose a free technical training to Gold partners</field>
+            <field name="email_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 name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            <field name="body_text">Hello, We have very good offer that might suit you.
             For our gold partners,We are arranging free technical training on june,2010.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -117,14 +117,14 @@
         </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 name="subject">Propose paid training to Silver partners</field>
+            <field name="email_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 name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            <field name="body_text">Hello, We have very good offer that might suit you.
             For our silver partners,We are  paid technical training on june,2010.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -135,14 +135,14 @@
         </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 name="subject">Propose gold partnership to silver partners</field>
+            <field name="email_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 name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="use_sign"/>
-            <field name="def_body_text">Hello, We have very good offer that might suit you.
+            <field name="body_text">Hello, We have very good offer that might suit you.
             For our silver partners,We are  offering Gold partnership.
             If any further information required kindly revert back.
             I really appreciate your co-operation on this.
@@ -153,14 +153,14 @@
         </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 name="subject">Thanks for subscribing to technical training</field>
+            <field name="email_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 name="model_id" 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.
+            <field name="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 name="name">For subscribing to technical training</field>