summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2012-12-19 14:09:53 +0100
committerRaphael Collet <rco@openerp.com>2012-12-19 14:09:53 +0100
commit29ee76d744e9b408d00acdf54dbcf899000fd7b6 (patch)
treedcb7438ebc733f3c4b5a8906d6298f29533e6563 /addons/plugin/plugin_handler.py
parent0ca480a80d4e87883941f84508c58d36c97d6329 (diff)
parent698369a0cff70bad9a2f2ea78848bcef9cd10da4 (diff)
[MERGE] from trunk
bzr revid: rco@openerp.com-20121219130953-tq0e2mzw145j1ewx
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'