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

[IMP] Event: use the method get_object_reference instead of _get_id 

bzr revid: ara@tinyerp.com-20101028112536-wdjhhmtj3gjcjij3
This commit is contained in:
ARA (OpenERP) 2010-10-28 16:55:36 +05:30
parent 68babbe4df
commit 8232e99c1f
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/event/event.py
View File

@ -115,9 +115,8 @@ class event_event(osv.osv):
else:
unconfirmed_ids.append(event.id)
if unconfirmed_ids:
view_id = data_pool._get_id(cr, uid, 'event', 'view_event_confirm')
view_data = data_pool.browse(cr, uid, view_id, context=context)
view_id = view_data.res_id
view_id = data_pool.get_object_reference(cr, uid, 'event', 'view_event_confirm') or False
view_id = view_id and view_id[1] or False
context['event_ids'] = unconfirmed_ids
return {
'name': _('Confirm Event'),
@ -467,9 +466,8 @@ class event_registration(osv.osv):
else:
unconfirmed_ids.append(registration.id)
if unconfirmed_ids:
view_id = data_pool._get_id(cr, uid, 'event', 'view_event_confirm_registration')
view_data = data_pool.browse(cr, uid, view_id, context=context)
view_id = view_data.res_id
view_id = data_pool.get_object_reference(cr, uid, 'event', 'view_event_confirm_registration') or False
view_id = view_id and view_id[1] or False
context['registration_ids'] = unconfirmed_ids
return {
'name': _('Confirm Registration'),
@ -498,9 +496,8 @@ class event_registration(osv.osv):
else:
self.do_close(cr, uid, [registration.id], context=context)
if unclosed_ids:
view_id = data_pool._get_id(cr, uid, 'event', 'view_event_make_invoice')
view_data = data_pool.browse(cr, uid, view_id, context=context)
view_id = view_data.res_id
view_id = data_pool.get_object_reference(cr, uid, 'event', 'view_event_make_invoice') or False
view_id = view_id and view_id[1] or False
context['active_ids'] = unclosed_ids
return {
'name': _('Close Registration'),

8
addons/event/wizard/event_make_invoice.py
View File

@ -75,10 +75,10 @@ class event_make_invoice(osv.osv_memory):
for data in self.browse(cr, uid, ids, context=context):
res = reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
form_id = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
form_res = mod_obj.browse(cr, uid, form_id, context=context).res_id
tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
form_id = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form') or False
form_res = form_id and form_id[1] or False
tree_id = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree') or False
tree_res = tree_id and tree_id[1] or False
return {
'domain': "[('id', 'in', %s)]" % res,
'name': 'Customer Invoices',

17
addons/event/wizard/partner_event_registration.py
View File

@ -64,16 +64,15 @@ class partner_event_registration(osv.osv_memory):
contact_id = contact.contact_id.id
email = contact.email
result = mod_obj._get_id(cr, uid, 'event', 'view_registration_search')
res = mod_obj.read(cr, uid, result, ['res_id'])
result = mod_obj.get_object_reference(cr, uid, 'event', 'view_registration_search') or False
res = result and result[1] or False
# Select the view
id2 = mod_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
id3 = mod_obj._get_id(cr, uid, 'event', 'view_event_registration_tree')
if id2:
id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
if id3:
id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
id2 = mod_obj.get_object_reference(cr, uid, 'event', 'view_event_registration_form') or False
id2 = id2 and id2[1] or False
id3 = mod_obj.get_object_reference(cr, uid, 'event', 'view_event_registration_tree') or False
id3 = id3 and id3[1] or False
for current in self.browse(cr, uid, ids, context=context):
for partner in res_obj.browse(cr, uid, record_ids, context=context):
@ -98,7 +97,7 @@ class partner_event_registration(osv.osv_memory):
'res_id': new_case,
'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
'type': 'ir.actions.act_window',
'search_view_id': res['res_id']
'search_view_id': res
}
return value