Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-yml-marketing_campaign-tpa into
lp:~openerp-dev/openobject-addons/trunk-coverage-marketing-ron.
Requested reviews:
Ujjvala Collins (OpenERP) (uco-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-yml-marketing_campaign-tpa/+merge/85291
marketing_campaign
solved the YML test case error.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-yml-marketing_campaign-tpa/+merge/85291
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-coverage-marketing-ron.
=== modified file 'marketing_campaign/marketing_campaign_demo.xml'
--- marketing_campaign/marketing_campaign_demo.xml 2011-12-02 11:01:18 +0000
+++ marketing_campaign/marketing_campaign_demo.xml 2011-12-12 06:29:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
<?xml version="1.0" ?>
<openerp>
<data>
@@ -91,3 +92,98 @@
</data>
</openerp>
+=======
+<?xml version="1.0" ?>
+<openerp>
+ <data>
+ <!-- Email tempalte -->
+ <record id="email_template_1" model="email.template">
+ <field name="name">Template for New Partner</field>
+ <field name="email_from">[email protected]</field>
+ <field name="subject">Welcome in OpenERP Partner Channel!</field>
+ <field name="email_to">${object.email or ''}</field>
+ <field name="model_id" ref="base.model_res_partner"/>
+ <field name="body_text">Hello, We are very happy to send Welcome message.</field>
+ </record>
+ <record id="email_template_2" model="email.template">
+ <field name="name">Template for Silver Partner</field>
+ <field name="email_from">[email protected]</field>
+ <field name="subject">Congratulation! You become now our Silver Partner.</field>
+ <field name="email_to">${object.email or ''}</field>
+ <field name="model_id" ref="base.model_res_partner"/>
+ <field name="body_text">Hello, We are happy to announce that you now become our Silver Partner.</field>
+ </record>
+
+ <record id="email_template_3" model="email.template">
+ <field name="name">Template for Gold Partner</field>
+ <field name="email_from">[email protected]</field>
+ <field name="subject">Congratulation! You become our Gold Partner.</field>
+ <field name="email_to">${object.email or ''}</field>
+ <field name="model_id" ref="base.model_res_partner"/>
+ <field name="body_text">Hello, We are happy to announce that you become our Gold Partner.</field>
+ </record>
+
+
+
+ <!-- Campaign -->
+ <record id="marketing_campaign_openerppartnerchannel" model="marketing.campaign">
+ <field name="name">OpenERP Partner Channel</field>
+ <field name="object_id" ref="base.model_res_partner"/>
+ <field name="mode">active</field>
+ </record>
+
+ <!-- Activity -->
+
+ <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
+ <field name="name">New Partner</field>
+ <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+ <field name="email_template_id" ref="email_template_1"/>
+ <field name="condition">object.credit_limit < 10000</field>
+ <field name="keep_if_condition_not_met">True</field>
+ <field eval="1" name="start"/>
+ </record>
+ <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
+ <field name="name">Silver Partner</field>
+ <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+ <field name="condition">object.credit_limit >= 10000 and object.credit_limit < 50000</field>
+ <field name="keep_if_condition_not_met">True</field>
+ <field name="email_template_id" ref="email_template_2"/>
+ </record>
+
+ <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
+ <field name="name">Gold Partner</field>
+ <field name="condition">object.credit_limit >= 100000</field>
+ <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+ <field name="keep_if_condition_not_met">True</field>
+ <field name="email_template_id" ref="email_template_3"/>
+ </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">
+ <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/>
+ <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+ </record>
+
+ <!-- Segment -->
+ <record id="filter0" model="ir.filters">
+ <field name="name">Partners</field>
+ <field name="domain">[('name','like','Agrolait')]</field>
+ <field name="model_id">res.partner</field>
+ </record>
+ <record id="marketing_campaign_segment0" model="marketing.campaign.segment">
+ <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
+ <field name="name">OpenERP Partner</field>
+ <field name="sync_mode">create_date</field>
+ <field name="ir_filter_id" ref="filter0"></field>
+ <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
+ </record>
+
+ </data>
+</openerp>
+>>>>>>> MERGE-SOURCE
=== modified file 'marketing_campaign/test/marketing_campaign.yml'
--- marketing_campaign/test/marketing_campaign.yml 2011-12-02 11:15:24 +0000
+++ marketing_campaign/test/marketing_campaign.yml 2011-12-12 06:29:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
-
In order to test process of compaign, I start compaign.
-
@@ -112,3 +113,114 @@
!assert {model: marketing.campaign.segment, id: marketing_campaign_openerppartnerchannel}:
- state == 'done'
+=======
+-
+ In order to test process of compaign, I start compaign.
+-
+ !workflow {model: marketing.campaign, action: state_running_set, ref: marketing_campaign_openerppartnerchannel}
+-
+ I check the campaign on Running mode after started.
+-
+ !assert {model: marketing.campaign, id: marketing_campaign_openerppartnerchannel}:
+ - state == 'running'
+-
+ I start this segment after assinged campaign.
+-
+ !workflow {model: marketing.campaign.segment, action: state_running_set, ref: marketing_campaign_segment0}
+-
+ I check the segment on Running mode after started.
+-
+ !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+ - state == 'running'
+-
+ I synchronized segment manually to see all step of activity and process covered on this campaign.
+-
+ !python {model: marketing.campaign.segment}: |
+ self.synchroniz(cr, uid, [ref("marketing_campaign_segment0")])
+-
+ I check followup detail of first activity.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
+ assert ids, 'Followup item is not created for first activity.'
+-
+ I process followup of first activity.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
+ self.process(cr, uid, ids)
+ record = self.browse(cr, uid, ids)[0]
+ assert record.state == "done", "Followup item should be closed after process."
+-
+ I check followup detail of second activity after process of first activity.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
+ assert ids, 'Followup item is not created for second activity.'
+-
+ Now I increase credit limit of customer
+-
+ !python {model: res.partner}: |
+ self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':41000}, context=context)
+-
+ I process followup of second activity after set draft.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_1'))])
+ self.button_draft(cr, uid, ids, context=context)
+ self.process(cr, uid, ids, context=context)
+ record = self.browse(cr, uid, ids[0], context=context)
+ assert record.state == "done", "Followup item should be closed after process."
+-
+ I check followup detail of third activity after process of second activity.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+ assert ids, 'Followup item is not created for third activity.'
+-
+ Now I increase credit limit of customer
+-
+ !python {model: res.partner}: |
+ self.write(cr, uid, [ref("base.res_partner_agrolait")], {'credit_limit':151000}, context=context)
+-
+ I process followup of third activity after set draft.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+ self.button_draft(cr, uid, ids, context=context)
+ self.process(cr, uid, ids, context=context)
+ record = self.browse(cr, uid, ids[0], context=context)
+ assert record.state == "done", "Followup item should be closed after process."
+-
+ I print workitem report.
+-
+ !python {model: marketing.campaign.workitem}: |
+ ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
+ ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_2'))])
+ self.preview(cr, uid, ids)
+-
+ I close segmentation After completion of all activity.
+-
+ !workflow {model: marketing.campaign.segment, action: state_done_set, ref: marketing_campaign_segment0}
+-
+ I check the segmentation is done.
+-
+ !assert {model: marketing.campaign.segment, id: marketing_campaign_segment0}:
+ - state == 'done'
+-
+ I close this campaing.
+-
+ !workflow {model: marketing.campaign.segment, action: state_done_set, ref: marketing_campaign_openerppartnerchannel}
+-
+ I check the campaing is done.
+-
+ !assert {model: marketing.campaign.segment, id: marketing_campaign_openerppartnerchannel}:
+ - state == 'done'
+
+>>>>>>> MERGE-SOURCE
=== modified file 'marketing_campaign_crm_demo/marketing_campaign_demo.xml'
--- marketing_campaign_crm_demo/marketing_campaign_demo.xml 2011-12-09 11:02:52 +0000
+++ marketing_campaign_crm_demo/marketing_campaign_demo.xml 2011-12-12 06:29:43 +0000
@@ -38,9 +38,18 @@
<field name="email_to">[email protected]</field>
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+>>>>>>> MERGE-SOURCE
<field name="name">For OpenERP OnDemand Free Trial 2010</field>
</record>
<record id="email_template_2" model="email.template">
@@ -48,9 +57,18 @@
<field name="email_to">[email protected]</field>
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <field name="body_text">Hello,We have very good offer that might suit you.
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,We have very good offer that might suit you.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello,We have very good offer that might suit you.
+>>>>>>> MERGE-SOURCE
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.
@@ -58,28 +76,66 @@
<field name="name">For OpenERP Discovery Day on May 2010</field>
</record>
- <record id="email_template_3" model="email.template">
- <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
- <field name="email_to">[email protected]</field>
+<<<<<<< TREE
+ <record id="email_template_3" model="email.template">
+ <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
+ <field name="email_to">[email protected]</field>
+=======
+<<<<<<< TREE
+ <record id="email_template_3" model="email.template">
+=======
+ <record id="email_template_3" model="email.template">
+>>>>>>> MERGE-SOURCE
+ <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
+ <field name="email_to">[email protected]</field>
+>>>>>>> MERGE-SOURCE
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
+>>>>>>> MERGE-SOURCE
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
<field name="name">For OpenERP Discovery Day</field>
</record>
- <record id="email_template_4" model="email.template">
- <field name="subject">Thanks for buying the OpenERP book</field>
- <field name="email_to">[email protected]</field>
+<<<<<<< TREE
+ <record id="email_template_4" model="email.template">
+ <field name="subject">Thanks for buying the OpenERP book</field>
+ <field name="email_to">[email protected]</field>
+=======
+<<<<<<< TREE
+ <record id="email_template_4" model="email.template">
+=======
+ <record id="email_template_4" model="email.template">
+>>>>>>> MERGE-SOURCE
+ <field name="subject">Thanks for buying the OpenERP book</field>
+ <field name="email_to">[email protected]</field>
+>>>>>>> MERGE-SOURCE
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+>>>>>>> MERGE-SOURCE
If any further information required kindly revert back.
I really appreciate your co-operation on this.
Regards,OpenERP Team,</field>
@@ -91,8 +147,17 @@
<field name="email_to">[email protected]</field>
<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 eval="0" name="user_signature"/>
- <field name="body_text">Hello, We have very good offer that might suit you.
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, We have very good offer that might suit you.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello, We have very good offer that might suit you.
+>>>>>>> MERGE-SOURCE
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.
@@ -105,9 +170,18 @@
<field name="email_to">[email protected]</field>
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <field name="body_text">Hello, We have very good offer that might suit you.
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, We have very good offer that might suit you.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello, We have very good offer that might suit you.
+>>>>>>> MERGE-SOURCE
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.
@@ -120,9 +194,18 @@
<field name="email_to">[email protected]</field>
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <field name="body_text">Hello, We have very good offer that might suit you.
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <field name="body_text">Hello, We have very good offer that might suit you.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <field name="body_text">Hello, We have very good offer that might suit you.
+>>>>>>> MERGE-SOURCE
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.
@@ -135,9 +218,18 @@
<field name="email_to">[email protected]</field>
<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="model_id" ref="crm.model_crm_lead"/>
- <field eval="0" name="user_signature"/>
- <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.
+<<<<<<< TREE
+ <field name="model_id" ref="crm.model_crm_lead"/>
+ <field eval="0" name="user_signature"/>
+ <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.
+=======
+ <field name="model_id" ref="crm.model_crm_lead"/>
+<<<<<<< TREE
+ <field eval="0" name="user_signature"/>
+=======
+>>>>>>> MERGE-SOURCE
+ <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.
+>>>>>>> MERGE-SOURCE
Regards,OpenERP Team,</field>
<field name="name">For subscribing to technical training</field>
</record>
_______________________________________________
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
