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

[FIX]crm_partner_assign: next_or_list client action more generic 

bzr revid: dle@openerp.com-20140221161001-5tlisrmfcvjp93g5
This commit is contained in:
Denis Ledoux 2014-02-21 17:10:01 +01:00
parent 5fd307b921
commit 38d6de8e6f
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/crm_partner_assign/static/src/js/next.js
View File

@ -1,18 +1,19 @@
openerp.crm_partner_assign = function (instance) { openerp.crm_partner_assign = function (instance) {
instance.crm_partner_assign = instance.crm_partner_assign || {}; instance.crm_partner_assign = instance.crm_partner_assign || {};
instance.crm_partner_assign.next_or_list = function(parent) { instance.crm_partner_assign.next_or_list = function(parent) {
if (parent.inner_widget.active_view === "form"){ var view = parent.inner_widget.active_view;
var form = parent.inner_widget.views.form.controller; var controller = parent.inner_widget.views[view].controller;
form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]); if (view === "form"){
form.reload(); if (controller.dataset.size()) {
if (!form.dataset.ids.length){ controller.execute_pager_action('next');
parent.inner_widget.switch_mode('list'); } else {
} controller.do_action('history_back');
} }
else{ }
parent.inner_widget.views[parent.inner_widget.active_view].controller.reload(); controller.do_action({ type: 'ir.actions.act_window_close' });
} if (view === "list"){
parent.do_action({ type: 'ir.actions.act_window_close' }); controller.records.remove(controller.records.get(parent.dialog_widget.action.context.active_id));
}
}; };
instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list"); instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list");
} }

2
addons/crm_partner_assign/wizard/crm_channel_interested.py
View File

@ -71,7 +71,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
lead_obj.convert_opportunity(cr, SUPERUSER_ID, [lead.id], lead.partner_id and lead.partner_id.id or None, context=None) lead_obj.convert_opportunity(cr, SUPERUSER_ID, [lead.id], lead.partner_id and lead.partner_id.id or None, context=None)
return { return {
'type': 'ir.actions.client', 'type': 'ir.actions.client',
'tag': 'next_or_list', 'tag': 'reload',
'params': { 'params': {
}, },
} }