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

Modifs for allowing to not put report in the right toolbar (multi="1") 

bzr revid: fp@tinyerp.com-42fd4b1052091cfe4169652f6e3fa6b5e4d01628
This commit is contained in:
Fabien Pinckaers 2007-06-25 08:10:39 +00:00
parent 9d6a60ef00
commit c1941337ff
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/addons/base/ir/ir_actions.py
View File

@ -75,7 +75,11 @@ class report_custom(osv.osv):
'type': fields.char('Report Type', size=32, required=True),
'model':fields.char('Model', size=64, required=True),
'report_id': fields.integer('Report Ref.', required=True),
'usage': fields.char('Action Usage', size=32)
'usage': fields.char('Action Usage', size=32),
'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form views.")
}
_defaults = {
'multi': lambda *a: False,
}
report_custom()
@ -96,9 +100,11 @@ class report_xml(osv.osv):
'auto': fields.boolean('Automatic XSL:RML', required=True),
'usage': fields.char('Action Usage', size=32),
'header': fields.boolean('Add RML header', help="Add or not the coporate RML header"),
'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form views.")
}
_defaults = {
'type': lambda *a: 'ir.actions.report.xml',
'multi': lambda *a: False,
'auto': lambda *a: True,
'header': lambda *a: True,
'report_sxw_content': lambda *a: False,
@ -157,6 +163,10 @@ class act_window_view(osv.osv):
'view_id': fields.many2one('ir.ui.view', 'View'),
'view_mode': fields.selection((('tree', 'Tree'),('form', 'Form'),('graph', 'Graph')), string='Type of view', required=True),
'act_window_id': fields.many2one('ir.actions.act_window', 'Action'),
'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form views.")
}
_defaults = {
'multi': lambda *a: False,
}
_order = 'sequence'
act_window_view()

1
bin/osv/orm.py
View File

@ -1342,6 +1342,7 @@ class orm(object):
resprint = map(clean, resprint)
resaction = map(clean, resaction)
resaction = filter(lambda x: not x.get('multi',False), resaction)
resprint = filter(lambda x: not x.get('multi',False), resprint)
resrelate = map(lambda x:x[2], resrelate)
for x in resprint+resaction+resrelate:
x['string'] = x['name']

1
bin/tools/convert.py
View File

@ -148,6 +148,7 @@ class xml_import(object):
res['report_sxw_content'] = sxw_content
if rec.hasAttribute('header'):
res['header'] = eval(rec.getAttribute('header'))
res['multi'] = rec.hasAttribute('multi') and eval(rec.getAttribute('multi'))
xml_id = rec.getAttribute('id').encode('utf8')
id = self.pool.get('ir.model.data')._update(cr, self.uid, "ir.actions.report.xml", self.module, res, xml_id, mode=self.mode)
self.idref[xml_id] = id