From 24b0b132d4d48a5666490c432f2ca259dfc6595d Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 11 Feb 2014 11:55:25 +0100 Subject: [PATCH] [FIX] module: fix imports broken at revision 5055 get_module_resource method is required by function fields of ir.module.module bzr revid: mat@openerp.com-20140211105525-tuhs10hb8y3o1rnp --- openerp/addons/base/module/module.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index d55061c3900..6ad74857f39 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -41,8 +41,9 @@ except ImportError: from StringIO import StringIO # NOQA import openerp -from openerp import modules, tools, addons +from openerp import modules, tools from openerp.modules.db import create_categories +from openerp.modules import get_module_resource from openerp.tools.parse_version import parse_version from openerp.tools.translate import _ from openerp.osv import fields, osv, orm @@ -154,7 +155,7 @@ class module(osv.osv): def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None): res = dict.fromkeys(ids, '') for module in self.browse(cr, uid, ids, context=context): - path = addons.get_module_resource(module.name, 'static/description/index.html') + path = get_module_resource(module.name, 'static/description/index.html') if path: with tools.file_open(path, 'rb') as desc_file: doc = desc_file.read() @@ -233,7 +234,7 @@ class module(osv.osv): def _get_icon_image(self, cr, uid, ids, field_name=None, arg=None, context=None): res = dict.fromkeys(ids, '') for module in self.browse(cr, uid, ids, context=context): - path = addons.get_module_resource(module.name, 'static', 'description', 'icon.png') + path = get_module_resource(module.name, 'static', 'description', 'icon.png') if path: image_file = tools.file_open(path, 'rb') try: