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

[REF, IMP]: crm: Improved the quality of code, 

* Used get_object_reference instead of _get_id from ir.model.data object when redirect_phonecall_view, redirect_partner_form, redirect_opportunity_view,
* Changed variable names

bzr revid: ron@tinyerp.com-20111103061432-3jubdl6rpvq0oz3b
This commit is contained in:
ron@tinyerp.com 2011-11-03 11:44:32 +05:30
parent 7b9390159a
commit f7591afdbe
3 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/crm/crm_lead.py
View File

@ -688,17 +688,8 @@ class crm_lead(crm_case, osv.osv):
models_data = self.pool.get('ir.model.data')
# Get Opportunity views
opportunity_view_form = models_data._get_id(
cr, uid, 'crm', 'crm_case_form_view_oppor')
opportunity_view_tree = models_data._get_id(
cr, uid, 'crm', 'crm_case_tree_view_oppor')
if opportunity_view_form:
opportunity_view_form = models_data.browse(
cr, uid, opportunity_view_form, context=context).res_id
if opportunity_view_tree:
opportunity_view_tree = models_data.browse(
cr, uid, opportunity_view_tree, context=context).res_id
form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
return {
'name': _('Opportunity'),
'view_type': 'form',
@ -707,8 +698,8 @@ class crm_lead(crm_case, osv.osv):
'domain': [('type', '=', 'opportunity')],
'res_id': int(opportunity_id),
'view_id': False,
'views': [(opportunity_view_form, 'form'),
(opportunity_view_tree, 'tree'),
'views': [(form_view and form_view[1] or False, 'form'),
(tree_view and tree_view[1] or False, 'tree'),
(False, 'calendar'), (False, 'graph')],
'type': 'ir.actions.act_window',
}

17
addons/crm/crm_phonecall.py
View File

@ -209,25 +209,18 @@ class crm_phonecall(crm_base, osv.osv):
def redirect_phonecall_view(self, cr, uid, phonecall_id, context=None):
model_data = self.pool.get('ir.model.data')
# Select the view
id2 = model_data._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
id3 = model_data._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
if id2:
id2 = model_data.browse(cr, uid, id2, context=context).res_id
if id3:
id3 = model_data.browse(cr, uid, id3, context=context).res_id
result = model_data._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
res = model_data.read(cr, uid, result, ['res_id'])
tree_view = model_data.get_object_reference(cr, uid, 'crm', 'crm_case_phone_tree_view')
form_view = model_data.get_object_reference(cr, uid, 'crm', 'crm_case_phone_form_view')
search_view = model_data.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
value = {
'name': _('Phone Call'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'crm.phonecall',
'res_id' : int(phonecall_id),
'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
'views': [(form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree'), (False, 'calendar')],
'type': 'ir.actions.act_window',
'search_view_id': res['res_id'],
'search_view_id': search_view and search_view[1] or False,
}
return value

7
addons/crm/res_partner.py
View File

@ -35,10 +35,7 @@ class res_partner(osv.osv):
}
def redirect_partner_form(self, cr, uid, partner_id, context=None):
model_data = self.pool.get('ir.model.data')
result = model_data._get_id(cr, uid, 'base', 'view_res_partner_filter')
res = model_data.read(cr, uid, result, ['res_id'])
search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
value = {
'domain': "[]",
'view_type': 'form',
@ -48,7 +45,7 @@ class res_partner(osv.osv):
'view_id': False,
'context': context,
'type': 'ir.actions.act_window',
'search_view_id': res['res_id']
'search_view_id': search_view and search_view[1] or False
}
return value