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

fix_from_xrg_regression 

bzr revid: fp@tinyerp.com-20101017182833-dywgmlxltkq1g2rs
This commit is contained in:
Fabien Pinckaers 2010-10-17 20:28:33 +02:00
parent da25cf7cb8
commit f1c40bd6d4
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/board/board_administration_view.xml
View File

@ -2,26 +2,11 @@
<openerp>
<data>
<!-- Latest Activities -->
<record model="ir.ui.view" id="view_latest_activities_tree">
<field name="name">latest.activities.tree</field>
<field name="model">res.log</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Latest Activities">
<field name="name"/>
<field name="create_date"/>
<field name="user_id" />
<field name="res_model"/>
<field name="res_id"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_latest_activities_tree">
<field name="name">Latest Activities</field>
<field name="res_model">res.log</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_latest_activities_tree"></field>
</record>
<record id="board_administration_form" model="ir.ui.view">

12
addons/crm/crm_lead.py
View File

@ -199,11 +199,11 @@ class crm_lead(crm_case, osv.osv):
for case in self.browse(cr, uid, ids):
if case.type == 'lead':
message = _("The lead '%s' has been opened.") % name
message = _("The lead '%s' has been opened.") % case.name
elif case.type == 'opportunity':
message = _("The opportunity '%s' has been opened.") % name
message = _("The opportunity '%s' has been opened.") % case.name
else:
message = _("The case '%s' has been opened.") % name
message = _("The case '%s' has been opened.") % case.name
self.log(cr, uid, case.id, message)
return res
@ -219,11 +219,11 @@ class crm_lead(crm_case, osv.osv):
self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
for case in self.browse(cr, uid, ids):
if case.type == 'lead':
message = _("The lead '%s' has been closed.") % name
message = _("The lead '%s' has been closed.") % case.name
elif case.type == 'opportunity':
message = _("The opportunity '%s' has been closed.") % name
message = _("The opportunity '%s' has been closed.") % case.name
else:
message = _("The case '%s' has been closed.") % name
message = _("The case '%s' has been closed.") % case.name
self.log(cr, uid, case.id, message)
return res