From 9ed6b7ddd026cc52a096d384bc3501bf4aa1a04d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Tue, 26 Jun 2012 12:16:21 +0530
Subject: [PATCH] [REN] followup to follow-up markerting*

bzr revid: jam@tinyerp.com-20120626064621-6nhwjs9olqlgcbrc
---
 .../i18n/marketing_campaign.pot               |  2 +-
 .../marketing_campaign_view.xml               |  4 ++--
 .../test/marketing_campaign.yml               | 24 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index be6053bc189..a1c06f6037d 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -957,7 +957,7 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
 #: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
-msgid "Campaign Followup"
+msgid "Campaign Follow-up"
 msgstr ""
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index aa8ea08217e..b10c57e4169 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -421,7 +421,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Followup</field>
+        <field name="name">Campaign Follow-up</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>
@@ -442,7 +442,7 @@
         context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
     />
 
-    <!-- Campaign Followups -->
+    <!-- Campaign Follow-ups -->
     <act_window
         context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
         id="act_marketing_campaing_followup"
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
index 1b7a7fa2ae3..4151fa44457 100644
--- a/addons/marketing_campaign/test/marketing_campaign.yml
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -42,37 +42,37 @@
     record = self.browse(cr, uid, ids[0])
     assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
 -
-  I check followup detail of first activity.
+  I check follow-up 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.'
+    assert ids, 'Follow-up item is not created for first activity.'
     work_item_id = self.browse(cr ,uid ,ids[0] ,context)
     assert work_item_id.res_name, 'Resource Name is not defined.'
 -
-  I process followup of first activity.
+  I process follow-up 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."
+    assert record.state == "done", "Follow-up item should be closed after process."
 -
-  I check followup detail of second activity after process of first activity.
+  I check follow-up 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.'
+    assert ids, 'Follow-up 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.
+  I process follow-up of second activity after set draft.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -80,21 +80,21 @@
     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."
+    assert record.state == "done", "Follow-up item should be closed after process."
 -
-  I check followup detail of third activity after process of second activity.
+  I check follow-up 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.'
+    assert ids, 'Follow-up 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.
+  I process follow-up of third activity after set draft.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -102,7 +102,7 @@
     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."
+    assert record.state == "done", "Follow-up item should be closed after process."
 -
   I print workitem report.
 -