diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml index e8237f0937d..472c8d7427c 100644 --- a/bin/addons/base/module/report/ir_module_reference.rml +++ b/bin/addons/base/module/report/ir_module_reference.rml @@ -136,7 +136,7 @@ - [[ module.description ]] + [[ format(module.description or '') ]]
[[ repeatIn(findobj(module.name) ,'object') ]] @@ -144,14 +144,14 @@ Object: [[ object.model ]] Description : [[ object.name ]] - [[ objdoc(object.model) ]] + [[ format(objdoc(object.model)) ]] - [[ repeatIn(findflds(object.model), 'field') ]] [[ field[0] ]] + [[ repeatIn(findflds(object.model), 'field') ]] [[ field[0] ]] [[ field[1].get('string', 'Unknown') ]], [[ field[1]['type'] ]] [[field[1].get('required',False) and ', required']] [[field[1].get('readonly',False) and ', readonly']] diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/bin/addons/base/module/report/ir_module_reference_print.py index b5c3468a0b3..47235430eff 100644 --- a/bin/addons/base/module/report/ir_module_reference_print.py +++ b/bin/addons/base/module/report/ir_module_reference_print.py @@ -37,12 +37,11 @@ class ir_module_reference_print(report_sxw.rml_parse): return modobj.__doc__ def _object_find(self, module): + ids2 = self.pool.get('ir.model.data').search(self.cr, self.uid, [('module','=',module), ('model','=','ir.model')]) + ids = [] + for mod in self.pool.get('ir.model.data').browse(self.cr, self.uid, ids2): + ids.append(mod.res_id) modobj = self.pool.get('ir.model') - if module=='base': - ids = modobj.search(self.cr, self.uid, [('model','=like','res%')]) - ids += modobj.search(self.cr, self.uid, [('model','=like','ir%')]) - else: - ids = modobj.search(self.cr, self.uid, [('model','=like',module+'%')]) return modobj.browse(self.cr, self.uid, ids) def _fields_find(self, obj):