From b444adde2876f25f7bcc57383497fb0e8f39a477 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 16 Jul 2010 20:28:55 +0200
Subject: [PATCH] [IMP] marketing_campaign, email_template: second series of
 small improvements during review of these modules for v6: naming, icons,
 error conditions

bzr revid: odo@openerp.com-20100716182855-c2rk0j4fake5900s
---
 addons/marketing_campaign/marketing_campaign.py      |  2 ++
 .../marketing_campaign/marketing_campaign_view.xml   | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index b6d2bc72b94..38707ace374 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -678,6 +678,8 @@ class marketing_campaign_workitem(osv.osv):
                 'datas' : datas,
                 'nodestroy': True,
             }
+        else:
+            raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))
         return res
 
 marketing_campaign_workitem()
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 289730a1531..95b9cfbebba 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -306,8 +306,8 @@
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
-                <button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
-                <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
+                <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
+                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                 <button string="Cancel" states="todo" name="button_cancel" type="object" icon="gtk-cancel"/>
             </tree>
         </field>
@@ -335,7 +335,7 @@
                         <separator string="Date" colspan="2"/>
                         <field name="date"/>
                         <label string="" colspan="1"/>
-                        <button string="Preview" states="todo" name="preview" icon="gtk-apply" type="object"/>
+                        <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                     </group>
                 </group>
                 <group colspan="4" col="4" attrs="{'invisible':[('state','!=','exception')]}">
@@ -345,8 +345,8 @@
                 <separator string="Status" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" nolabel="1" readonly="True" select="1"/>
-                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-ok"/>
-                    <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
+                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
+                    <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="gtk-cancel"/>
                 </group>
             </form>
@@ -379,7 +379,7 @@
    </record>
 
     <record model="ir.actions.act_window" id="action_marketing_campaign_workitem">
-        <field name="name">Campaign Activities (Workitems)</field>
+        <field name="name">Campaign Followup</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">marketing.campaign.workitem</field>
         <field name="view_type">form</field>