diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 1e9d15fdf8a..ba787c038c0 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -538,7 +538,6 @@ class account_analytic_account(osv.osv): 'context': context, 'domain' : [('order_id','in',sale_ids)], 'res_model': 'sale.order.line', - 'nodestroy': True, } # Allows quick creation of accounts only in specific cases @@ -644,7 +643,6 @@ class account_analytic_account(osv.osv): 'view_mode': 'tree,form', 'domain' : domain, 'res_model': 'account.analytic.line', - 'nodestroy': True, } def _prepare_invoice_data(self, cr, uid, contract, context=None): diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py index 58b6c0c3351..9bb6fe8df53 100644 --- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py +++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py @@ -130,5 +130,4 @@ class account_analytic_account(osv.osv): 'view_mode': 'tree,form', 'domain' : domain, 'res_model': 'account.analytic.line', - 'nodestroy': True, } diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index d354246a430..6209d75d346 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -718,7 +718,6 @@ class fleet_vehicle_log_contract(osv.Model): 'view_type': 'tree,form', 'res_model': 'fleet.vehicle.log.contract', 'type': 'ir.actions.act_window', - 'nodestroy': True, 'domain': '[]', 'res_id': newid, 'context': {'active_id':newid}, diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 2065b112e3c..ea3c06724c2 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -364,7 +364,6 @@ class hr_expense_expense(osv.osv): 'view_id': view_id, 'res_model': 'account.move', 'type': 'ir.actions.act_window', - 'nodestroy': True, 'target': 'current', 'res_id': expense.account_move_id.id, } diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 20614a9ca38..d449015405e 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -319,7 +319,6 @@ class hr_payslip(osv.osv): 'view_type': 'form', 'res_model': 'hr.payslip', 'type': 'ir.actions.act_window', - 'nodestroy': True, 'target': 'current', 'domain': "[('id', 'in', %s)]" % [id_copy], 'views': [(tree_res, 'tree'), (form_res, 'form')], diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index a4d7ae12ac3..f96afda1034 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -764,7 +764,6 @@ class marketing_campaign_workitem(osv.osv): 'views': [(view_id and view_id[1] or 0, 'form')], 'type': 'ir.actions.act_window', 'target': 'new', - 'nodestroy':True, 'context': "{'template_id':%d,'default_res_id':%d}"% (wi_obj.activity_id.email_template_id.id, wi_obj.res_id) diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 3d7eff77909..aa97a711293 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -948,7 +948,6 @@ class pos_order(osv.osv): 'view_id': False, 'context':context, 'type': 'ir.actions.act_window', - 'nodestroy': True, 'target': 'current', } return abs @@ -1026,7 +1025,6 @@ class pos_order(osv.osv): 'res_model': 'account.invoice', 'context': "{'type':'out_invoice'}", 'type': 'ir.actions.act_window', - 'nodestroy': True, 'target': 'current', 'res_id': inv_ids and inv_ids[0] or False, } diff --git a/addons/project/project.py b/addons/project/project.py index 31540694f2e..b75a0e2fa95 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -299,7 +299,6 @@ class project(osv.osv): 'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')], 'type': 'ir.actions.act_window', 'search_view_id': search_view['res_id'], - 'nodestroy': True } # set active value for a project, its sub projects and its tasks diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index b26221d07c6..2722f73b624 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -445,7 +445,6 @@ class purchase_order(osv.osv): 'res_model': 'account.invoice', 'context': "{'type':'in_invoice', 'journal_type': 'purchase'}", 'type': 'ir.actions.act_window', - 'nodestroy': True, 'target': 'current', 'res_id': inv_ids and inv_ids[0] or False, } diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 0edeabe9fdc..9e956481815 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -214,7 +214,6 @@ class sale_order(osv.osv): 'view_mode': 'form', 'view_id': view_id, 'target': 'current', - 'nodestroy': True, } def _track_subtype(self, cr, uid, ids, init_values, context=None): @@ -401,7 +400,6 @@ class sale_order(osv.osv): 'res_model': 'account.invoice', 'context': "{'type':'out_invoice'}", 'type': 'ir.actions.act_window', - 'nodestroy': True, 'target': 'current', 'res_id': new_inv_ids and new_inv_ids[0] or False, } diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 602dfe5bff3..52baa6acf4e 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -1158,7 +1158,6 @@ Launch Manually Once: after having been launched manually, it sets automatically if act_type != 'ir.actions.act_window': return res res.setdefault('context','{}') - res['nodestroy'] = True # Open a specific record when res_id is provided in the context user = self.pool.get('res.users').browse(cr, uid, uid, context=context) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index d8aa1903b1f..af88ab44a99 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -42,7 +42,6 @@ ACTION_DICT = { 'res_model': 'base.module.upgrade', 'target': 'new', 'type': 'ir.actions.act_window', - 'nodestroy': True, } def backup(path, raise_exception=True): diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 65dfb5a2649..8f0e14adbfa 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -83,9 +83,7 @@ class res_config_configurable(osv.osv_memory): next = self._next_action(cr, uid, context=context) _logger.info('next action is %s', next) if next: - res = next.action_launch(context=context) - res['nodestroy'] = False - return res + return next.action_launch(context=context) return { 'type': 'ir.actions.client',