summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authordle@openerp.com <>2012-12-21 11:12:15 +0100
committerdle@openerp.com <>2012-12-21 11:12:15 +0100
commit9b7b831608e5dd3dc0fd67314a98ae1193843f1e (patch)
tree0cbee886cc6bda1f6566dbe470461bba36c9cb89 /addons/plugin/plugin_handler.py
parentdba2775b638e56accc2472571b68d42a6a4319b4 (diff)
parent1dbea4a07a37325e420e26b3429e4a27f3e8e308 (diff)
[MERGE]Latest trunk
bzr revid: dle@openerp.com-20121221101215-8k320vze3pma2wjl
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'