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

[IMP] crm :- call email.message.send.wizard in oprtunity instead of crm.send.mail wizard. 

bzr revid: ysa@tinyerp.com-20110218104600-e7ma1jrlvjvpbz4m
This commit is contained in:
Yogesh (OpenERP) 2011-02-18 16:16:00 +05:30
parent f4ff6da00e
commit de37cd5b35
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/crm/crm_lead_view.xml
View File

@ -187,11 +187,10 @@
<page string="Details">
<group attrs="{'invisible': [('history', '!=', True)]}">
<field name="description" colspan="4" nolabel="1" height="250"/>
<button colspan="4"
string="Reply"
<button colspan="4" string="Reply"
name="%(emails.action_email_message_wizard_send)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
icon="terp-mail-replied" type="action" />
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('history', '=', True)]}">
<field name="display_text" colspan="4" nolabel="1" height="250"/>

32
addons/crm/crm_opportunity_view.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
<record id="crm_opportunity_stage_act" model="ir.actions.act_window">
<field name="name">Stages</field>
<field name="res_model">crm.case.stage</field>
@ -11,13 +11,13 @@
<field name="context">{'type':'opportunity'}</field>
<field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
</record>
<menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
groups="base.group_extended" sequence="0"
parent="base.menu_crm_config_opportunity" />
<!-- Opportunities Form View -->
<record model="ir.ui.view" id="crm_case_form_view_oppor">
<field name="name">Opportunities</field>
@ -154,11 +154,10 @@
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
<button string="Reply"
name="%(emails.action_email_message_wizard_send)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</tree>
<form string="History">
<group col="4" colspan="4">
@ -173,11 +172,10 @@
<page string="Details">
<group attrs="{'invisible': [('history', '!=', True)]}">
<field name="description" colspan="4" nolabel="1" height="250"/>
<button colspan="4"
string="Reply"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
<button colspan="4" string="Reply"
name="%(emails.action_email_message_wizard_send)d"
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
icon="terp-mail-replied" type="action"/>
</group>
<group attrs="{'invisible': [('history', '=', True)]}">
<field name="display_text" colspan="4" nolabel="1" height="250"/>
@ -193,10 +191,10 @@
name="%(crm.action_crm_add_note)d"
context="{'model': 'crm.lead' }"
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.lead'}"
icon="terp-mail-message-new" type="action" />
<button string="Send New Email"
name="action_send_email"
context="{'mail':'new', 'model': 'crm.lead', 'rec_id' : active_id}"
icon="terp-mail-message-new" type="object" />
</page>
<page string="Extra Info" groups="base.group_extended">
<group col="2" colspan="2">