[IMP]: crm*: Improvement in labels: Name => Contact Name, Communication History => History

* rename Success Probability -> Success Rate (%)
* The name of the opportunity proposed must be Partner Name instead of the contact name

bzr revid: rpa@tinyerp.com-20100917121318-12qglf1a6dbxssj8
This commit is contained in:
rpa (Open ERP) 2010-09-17 17:43:18 +05:30
parent c966c3c426
commit 7419a9981c
12 changed files with 23 additions and 23 deletions

View File

@ -55,7 +55,7 @@
<field name="arch" type="xml">
<form string="Leads Form">
<group colspan="4" col="7">
<field name="name" required="1" string="Name"/>
<field name="name" required="1" string="Contact Name"/>
<field name="priority"/>
<field name="categ_id"
widget="selection"
@ -237,7 +237,7 @@
<tree string="Leads" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
<field name="date_deadline" invisible="1"/>
<field name="create_date"/>
<field name="name"/>
<field name="name" string="Contact Name"/>
<field name="partner_name"/>
<field name="country_id" invisible="context.get('invisible_country', True)" />
<field name="email_from"/>

View File

@ -128,7 +128,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -137,7 +137,7 @@
context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -530,7 +530,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -539,7 +539,7 @@
context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -106,7 +106,7 @@ class crm_lead2opportunity(osv.osv_memory):
_columns = {
'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
'probability': fields.float('Success Probability'),
'probability': fields.float('Success Rate (%)'),
'planned_revenue': fields.float('Expected Revenue'),
'partner_id': fields.many2one('res.partner', 'Partner'),
}
@ -149,7 +149,7 @@ Leads Could not convert into Opportunity"))
res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
for lead in lead_obj.browse(cr, uid, data, context=context):
if 'name' in fields:
res.update({'name': lead.name})
res.update({'name': lead.partner_name})
if 'partner_id' in fields:
res.update({'partner_id': lead.partner_id.id or False})
return res

View File

@ -16,7 +16,7 @@
<field name="date" string="Planned Date"/>
<newline/>
<field name="user_id" />
<field name="section_id"/>
<field name="section_id" widget="selection" />
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
<separator string="" colspan="4"/>
<label string ="" colspan="2"/>

View File

@ -168,7 +168,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<button
string="Reply"
@ -176,7 +176,7 @@
context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
icon="terp-mail-replied" type="action" attrs="{'invisible': [('history', '!=', True)]}" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -159,7 +159,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -168,7 +168,7 @@
context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -96,7 +96,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -105,7 +105,7 @@
context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -371,7 +371,7 @@
<field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -380,7 +380,7 @@
context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -148,7 +148,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -157,7 +157,7 @@
context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -78,7 +78,7 @@
<field colspan="4" name="email_cc" string="Global CC" widget="char"/>
</group>
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
<field name="history" invisible="1"/>
<button
@ -87,7 +87,7 @@
context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
icon="terp-mail-replied" type="action" />
</tree>
<form string="Communication history">
<form string="History">
<group col="4" colspan="4">
<field name="email_from"/>
<field name="date"/>

View File

@ -8,9 +8,9 @@
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
<page string="Communication History">
<page string="History">
<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
<tree string="Communication history">
<tree string="History">
<field name="display_text" string="History Information"/>
</tree>
<form string="History">