diff options
| author | aag (OpenERP) <aag@tinyerp.co.in> | 2011-03-04 17:03:27 +0530 |
|---|---|---|
| committer | aag (OpenERP) <aag@tinyerp.co.in> | 2011-03-04 17:03:27 +0530 |
| commit | 2f343a608390019d48e232e4e740f01f2abcfd43 (patch) | |
| tree | bd574b290696a9617f52bec1f2fd2bbfb31d8237 | |
| parent | 6a165fd4a4e53a27d3eab738d30df40f0cb17637 (diff) | |
[IMP] REWORK-SERVERSIDE :Now skip wiz not Shown , ON SERVER SIDE
bzr revid: aag@tinyerp.co.in-20110304113327-wviumoee6o7n3n0u
| -rw-r--r-- | openerp/addons/base/module/wizard/base_module_configuration.py | 2 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openerp/addons/base/module/wizard/base_module_configuration.py b/openerp/addons/base/module/wizard/base_module_configuration.py index 866b22905e0..e4da656d646 100644 --- a/openerp/addons/base/module/wizard/base_module_configuration.py +++ b/openerp/addons/base/module/wizard/base_module_configuration.py @@ -27,7 +27,7 @@ class base_module_configuration(osv.osv_memory): _name = "base.module.configuration" def start(self, cr, uid, ids, context=None): - todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', '|', ('restart','=','always'), ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'onskip')]) + todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, ['|', '|', ('restart','=','always'), ('state', '=', 'open'), '&', ('state', '=', 'skip'), ('restart', '=', 'on_trigger')]) if not todo_ids: # When there is no wizard todo it will display message data_obj = self.pool.get('ir.model.data') diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 2f0b5c44509..748405b8473 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -120,7 +120,7 @@ class res_config_configurable(osv.osv_memory): def start(self, cr, uid, ids, context=None): ids2 = self.pool.get('ir.actions.todo').search(cr, uid, [], context=context) for todo in self.pool.get('ir.actions.todo').browse(cr, uid, ids2, context=context): - if (todo.restart=='always') or (todo.restart=='on_trigger' and (todo.state in ('skip','cancel'))): + if (todo.restart=='always'): todo.write({'state':'open'}) return self.next(cr, uid, ids, context) |