From 43690eb21f88759f76f591247f43cf6aa548e611 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 1 Mar 2011 12:52:41 +0530 Subject: [PATCH 1/4] [IMP] REWORK-SERVERSIDE :Improvement Config wiz , ON SERVER SIDE bzr revid: aag@tinyerp.co.in-20110301072241-a8s1iialq6xeot23 --- openerp/addons/base/ir/ir.xml | 2 +- openerp/addons/base/ir/ir_actions.py | 4 +-- .../wizard/base_module_configuration_view.xml | 2 +- .../addons/base/res/partner/partner_view.xml | 4 ++- openerp/addons/base/res/res_config.py | 31 +------------------ 5 files changed, 8 insertions(+), 35 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index a7e9922331b..d1917a4a52f 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -1908,7 +1908,7 @@ search - + diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 7a07ca40ef8..1d73ad70171 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -794,14 +794,14 @@ class ir_actions_todo(osv.osv): 'sequence': fields.integer('Sequence'), 'state': fields.selection(TODO_STATES, string='State', required=True), 'name':fields.char('Name', size=64), - 'restart': fields.selection([('onskip','On Skip'),('always','Always'),('never','Never')],'Restart',required=True), + 'restart': fields.selection([('on_trigger','On Trigger'),('always','Always'),('never','Never')],'Restart',required=True), 'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'), 'note':fields.text('Text', translate=True), } _defaults={ 'state': 'open', 'sequence': 10, - 'restart': 'onskip', + 'restart': 'on_trigger', } _order="sequence,name,id" diff --git a/openerp/addons/base/module/wizard/base_module_configuration_view.xml b/openerp/addons/base/module/wizard/base_module_configuration_view.xml index f8abf1e2732..be86145a156 100644 --- a/openerp/addons/base/module/wizard/base_module_configuration_view.xml +++ b/openerp/addons/base/module/wizard/base_module_configuration_view.xml @@ -24,7 +24,7 @@ action = obj.start() - diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml index 9d46404132c..e32e73deedb 100644 --- a/openerp/addons/base/res/partner/partner_view.xml +++ b/openerp/addons/base/res/partner/partner_view.xml @@ -3,7 +3,9 @@ + web_icon_hover="data/sales-hover.png" + groups="base.group_sale_salesman,base.group_sale_salesman"/> + diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 3f8c6f20b8d..2f0b5c44509 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=='onskip' and (todo.state in ('skip','cancel'))): + if (todo.restart=='always') or (todo.restart=='on_trigger' and (todo.state in ('skip','cancel'))): todo.write({'state':'open'}) return self.next(cr, uid, ids, context) @@ -355,35 +355,6 @@ class res_config_installer(osv.osv_memory): return (base | hooks_results | additionals) - set( map(attrgetter('name'), self._already_installed(cr, uid, context))) - def default_get(self, cr, uid, fields_list, context=None): - ''' If an addon is already installed, check it by default - ''' - defaults = super(res_config_installer, self).default_get( - cr, uid, fields_list, context=context) - - return dict(defaults, - **dict.fromkeys( - map(attrgetter('name'), - self._already_installed(cr, uid, context=context)), - True)) - - def fields_get(self, cr, uid, fields=None, context=None, write_access=True): - """ If an addon is already installed, set it to readonly as - res.config.installer doesn't handle uninstallations of already - installed addons - """ - fields = super(res_config_installer, self).fields_get( - cr, uid, fields, context, write_access) - - for module in self._already_installed(cr, uid, context=context): - if module.name not in fields: - continue - fields[module.name].update( - readonly=True, - help= ustr(fields[module.name].get('help', '')) + - _('\n\nThis addon is already installed on your system')) - return fields - def execute(self, cr, uid, ids, context=None): modules = self.pool.get('ir.module.module') to_install = list(self.modules_to_install( From 7ddf04e324b668d020c2bed77a7dae28bc74e992 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 1 Mar 2011 14:24:43 +0530 Subject: [PATCH 2/4] [IMP] REWORK-SERVERSIDE :Add sale manager in Sale menu , ON SERVER SIDE bzr revid: aag@tinyerp.co.in-20110301085443-5amgb5oh64469hwa --- openerp/addons/base/res/partner/partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml index e32e73deedb..e9a2ca1b762 100644 --- a/openerp/addons/base/res/partner/partner_view.xml +++ b/openerp/addons/base/res/partner/partner_view.xml @@ -4,7 +4,7 @@ + groups="base.group_sale_salesman,base.group_sale_manager"/> From 6a165fd4a4e53a27d3eab738d30df40f0cb17637 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 1 Mar 2011 18:58:44 +0530 Subject: [PATCH 3/4] [IMP] REWORK-SERVERSIDE :Sale menu is not shown when Any appl not install , ON SERVER SIDE bzr revid: aag@tinyerp.co.in-20110301132844-3w2q2czymhuyuvgb --- openerp/addons/base/res/partner/partner_view.xml | 2 +- openerp/addons/base/security/base_security.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml index e9a2ca1b762..a104825ea1b 100644 --- a/openerp/addons/base/res/partner/partner_view.xml +++ b/openerp/addons/base/res/partner/partner_view.xml @@ -4,7 +4,7 @@ + groups="base.group_sale_salesman"/> diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index eb39dbf43d5..3b699f6686e 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -35,6 +35,11 @@ Sales / User + + + + + From 2f343a608390019d48e232e4e740f01f2abcfd43 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 4 Mar 2011 17:03:27 +0530 Subject: [PATCH 4/4] [IMP] REWORK-SERVERSIDE :Now skip wiz not Shown , ON SERVER SIDE bzr revid: aag@tinyerp.co.in-20110304113327-wviumoee6o7n3n0u --- openerp/addons/base/module/wizard/base_module_configuration.py | 2 +- 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)