summaryrefslogtreecommitdiff
path: root/bin/addons/base/module/module.py
diff options
context:
space:
mode:
authorRvo (Open ERP) <rvo@tinyerp.co.in>2010-03-11 14:19:41 +0530
committerRvo (Open ERP) <rvo@tinyerp.co.in>2010-03-11 14:19:41 +0530
commit587828161d84b829e03eb312d962b4dd9b40300f (patch)
treea6748a3c341c046f59c8e7bd6555a0bd1964a983 /bin/addons/base/module/module.py
parent0dfa91ac8a0851d7972e8319f9fc26dfde7df731 (diff)
[ADD]:suppot for __openerp__.py or __terp__.py
bzr revid: rvo@tinyerp.co.in-20100311084941-1l92enpyz1a98hrr
Diffstat (limited to 'bin/addons/base/module/module.py')
-rw-r--r--bin/addons/base/module/module.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index a474866f885..faec4ffa9be 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -65,7 +65,10 @@ class module(osv.osv):
def get_module_info(self, name):
try:
- f = tools.file_open(os.path.join(name, '__terp__.py'))
+ terp_file = addons.get_module_resource(name, '__openerp__.py')
+ if not os.path.isfile(terp_file):
+ terp_file = addons.get_module_resource(name, '__terp__.py')
+ f = tools.file_open(terp_file)
data = f.read()
info = eval(data)
if 'version' in info: