From 4181486b6a4973a9f4baf6c2fac4f4008a6cc937 Mon Sep 17 00:00:00 2001 From: "PSO(Open ERP)" <> Date: Thu, 10 Jun 2010 20:01:12 +0530 Subject: [PATCH] [MOD,IMP] tooltip added, removed unused fields from demo data bzr revid: vir@tinyerp.com-20100610143112-j6xaqwrn3bekiagf --- .../marketing_campaign/marketing_campaign.py | 7 +- .../marketing_campaign_demo.xml | 208 ++++++++---------- 2 files changed, 92 insertions(+), 123 deletions(-) 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 @@ - - + + @@ -20,33 +20,27 @@ - - - - - Thanks for showing interest in OpenERP - info@tinyerp.com - - - - - - - - Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team, - mako - - For OpenERP OnDemand Free Trial 2010 - crm.lead - - - + + + + + Thanks for showing interest in OpenERP + info@tinyerp.com + + + + + + Hello,Thanks for generous interest you have shown in the open ERP.Regards,OpenERP Team, + mako + For OpenERP OnDemand Free Trial 2010 + crm.lead + + Propose to subscribe to the Open ERP Discovery Day on May 2010 info@tinyerp.com - - @@ -56,19 +50,15 @@ We really appreciate your co-operation on this. Regards,OpenERP Team, mako - For Open ERP Discovery Day on May 2010 crm.lead - - - + + Thanks for subscribing to the Open ERP Discovery Day info@tinyerp.com - - @@ -77,19 +67,15 @@ I really appreciate your co-operation on this. Regards,OpenERP Team, mako - For Open ERP Discovery Day crm.lead - - - + + Thanks for buying the Open ERP book info@tinyerp.com - - @@ -98,19 +84,15 @@ I really appreciate your co-operation on this. Regards,OpenERP Team, mako - For Open ERP book crm.lead - - + Propose a free technical training to Gold partners info@tinyerp.com - - @@ -120,19 +102,15 @@ I really appreciate your co-operation on this. Regards,OpenERP Team, mako - For technical training to Gold partners crm.lead - - + Propose paid training to Silver partners info@tinyerp.com - - @@ -142,19 +120,15 @@ I really appreciate your co-operation on this. Regards,OpenERP Team, mako - For training to Silver partners crm.lead - - + Propose gold partnership to silver partners info@tinyerp.com - - @@ -164,73 +138,67 @@ I really appreciate your co-operation on this. Regards,OpenERP Team, mako - For gold partnership to silver partners crm.lead - - + Thanks for subscribing to technical training info@tinyerp.com - - 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, mako - For subscribing to technical training crm.lead - - - - - Marketing campaign demo report - ir.actions.report.xml - crm.lead - crm.lead.demo - marketing_campaign/report/crm_lead_mc_demo_report.rml - pdf - - - - - OpenERP OnDemand Free Trial 2010 - - - - - - - Propose a 1 month free trial for an OnDemand offer - - - - paper - - - - - Thanks for showing interest - - - - - - + + + + Marketing campaign demo report + ir.actions.report.xml + crm.lead + crm.lead.demo + marketing_campaign/report/crm_lead_mc_demo_report.rml + pdf + + + + + OpenERP OnDemand Free Trial 2010 + + + + + + + Propose a 1 month free trial for an OnDemand offer + + + + paper + + + + + Thanks for showing interest + + + + + + Propose to subscribe to the Open ERP Discovery Day on May 2010 - - + + Thanks for subscribing to the Open ERP Discovery Day @@ -244,7 +212,7 @@ paper - + Thanks for buying the Open ERP book @@ -263,28 +231,28 @@ - + Propose gold partnership to silver partners - + Thanks for subscribing to technical training - - - - - - - - + + + + + + + + @@ -324,15 +292,15 @@ - - - - - BossList US Associations List-0/90 - create_date - - draft - - - - + + + + + BossList US Associations List-0/90 + create_date + + draft + + + + \ No newline at end of file