summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>2012-12-18 16:34:18 +0530
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>2012-12-18 16:34:18 +0530
commitb1cf17d0422cc5abe9b2dec920540442634ce198 (patch)
tree519059564fdc7f07fc976214bd49c2639aa7047b /addons/plugin/plugin_handler.py
parent15345d009ff3aaf845dd22531c277a5fde0db2c7 (diff)
parent79552522598f49389af873d6d4d5fde66dadab16 (diff)
[MERGE] Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20121218110418-46n4eixo5jl0q9i1
Diffstat (limited to 'addons/plugin/plugin_handler.py')
-rw-r--r--addons/plugin/plugin_handler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 95fe80f3b29..0664af1c92e 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -4,7 +4,7 @@ Created on 18 oct. 2011
@author: openerp
'''
-from osv import osv, fields
+from openerp.osv import fields, osv
class plugin_handler(osv.osv_memory):
_name = 'plugin.handler'