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

[FIX]: remove unused code 

bzr revid: atp@tinyerp.com-20120301041444-jksnjci0ozaly28a
This commit is contained in:
Atul Patel (OpenERP) 2012-03-01 09:44:44 +05:30
parent 3465869df7
commit 9d8b51afc3
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir_actions.py
View File

@ -510,7 +510,7 @@ class actions_server(osv.osv):
'code':fields.text('Python Code', help="Python code to be executed if condition is met.\n"
"It is a Python block that can use the same values as for the condition field"),
'sequence': fields.integer('Sequence', help="Important when you deal with multiple actions, the execution order will be decided based on this, low number is higher priority."),
'model_id': fields.many2one('ir.model', 'Object', required=True, help="Select the object on which the action will work (read, write, create).", ondelete='cascade'),
'model_id': fields.many2one('ir.model', 'Object', required=True, help="Select the object on which the action will work (read, write, create)."),
'action_id': fields.many2one('ir.actions.actions', 'Client Action', help="Select the Action Window, Report, Wizard to be executed."),
'trigger_name': fields.selection(_select_signals, string='Trigger Signal', size=128, help="The workflow signal to trigger"),
'wkf_model_id': fields.many2one('ir.model', 'Target Object', help="The object that should receive the workflow signal (must have an associated workflow)"),

3
openerp/addons/base/ir/ir_model.py
View File

@ -861,11 +861,10 @@ class ir_model_data(osv.osv):
process_query = 'select id,name,model,res_id,module from ir_model_data where module IN (' + module_in + ')'
process_query+= ' and noupdate=%s'
to_unlink = []
cr.execute( process_query, modules + [False])
cr.execute(process_query, modules + [False])
for (id, name, model, res_id,module) in cr.fetchall():
if (module,name) not in self.loads:
to_unlink.append((model,res_id))
self.pool.get(model).unlink(cr, uid, [res_id])
if not config.get('import_partial'):
for (model, res_id) in to_unlink:
if self.pool.get(model):

2
openerp/addons/base/ir/ir_rule.py
View File

@ -75,7 +75,7 @@ class ir_rule(osv.osv):
_columns = {
'name': fields.char('Name', size=128, select=1),
'model_id': fields.many2one('ir.model', 'Object',select=1, required=True, ondelete='cascade'),
'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
'global': fields.function(_get_value, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
'domain_force': fields.text('Domain'),