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

[IMP+FIX] emails: menu name improvement for Incomming server and Outgoing Server and fix regression in markertin compain module 

bzr revid: hmo@tinyerp.com-20110215073150-q3r9hyk41ryn1jjx
This commit is contained in:
Harry (OpenERP) 2011-02-15 13:01:50 +05:30
parent 933100051d
commit 53dc88ecaa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/emails/email_view.xml
View File

@ -196,7 +196,7 @@
</record>
<record model="ir.actions.act_window" id="action_email_smtp_server_tree_all">
<field name="name">Smtp Server</field>
<field name="name">Outgoing Servers</field>
<field name="res_model">email.smtp_server</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
@ -207,7 +207,7 @@
<menuitem name="Email" id="menu_config_email" parent="base.menu_lunch_survey_root" sequence="20"/>
<menuitem name="Smtp Server" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
<menuitem name="Outgoing Servers" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
</data>
</openerp>

6
addons/fetchmail/fetchmail_view.xml
View File

@ -93,7 +93,7 @@
</record>
<record model="ir.actions.act_window" id="action_email_server_tree">
<field name="name">Email Servers</field>
<field name="name">Incomming Servers</field>
<field name="res_model">email.server</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -102,10 +102,10 @@
</record>
<menuitem
parent="emails.menu_email_message_tools"
parent="emails.menu_config_email"
id="menu_action_fetchmail_server_tree"
action="action_email_server_tree"
name="Email Servers"
name="Incomming Servers"
/>
<record model="ir.ui.view" id="email_message_tree_view">

2
addons/marketing_campaign/marketing_campaign.py
View File

@ -777,7 +777,7 @@ marketing_campaign_workitem()
class email_template(osv.osv):
_inherit = "email.template"
_defaults = {
'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
'model_id': lambda obj, cr, uid, context: context.get('object_id',False),
}
# TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign

2
addons/marketing_campaign/marketing_campaign_view.xml
View File

@ -266,7 +266,7 @@
<field name="type"/>
<group colspan='2' col='1'>
<field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
context="{'default_object_name':object_id}" />
context="{'default_model_id':object_id}" />
<group attrs="{'invisible':[('type','!=','report')]}" >
<field name="report_id" attrs="{'required':[('type','=','report')]}" context="{'object_id':object_id}"/>
<field name="report_directory_id" attrs="{'required':[('type','=','report')]}" />