odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Olivier Dony 2010-07-16 20:28:55 +02:00
parent 81f66c0a8a
commit b444adde28
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/marketing_campaign/marketing_campaign.py
View File

@ -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()

12
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -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>