summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2012-12-21 14:49:01 +0100
committerChristophe Matthieu <chm@openerp.com>2012-12-21 14:49:01 +0100
commit5ef06851b5f7304afefdf48be1c6601d2dc95f31 (patch)
tree52d02522a6b391ec8558a029122175c1acb8357f /addons/plugin/plugin_handler.py
parentb958df1e322a1ac89c2cd6a0542b37acaee1c094 (diff)
parent558fcc4471f3b5bf4ee9675a36ad834d611d9fca (diff)
[MERGE] from trunk
bzr revid: chm@openerp.com-20121221134901-msdq5zr29946s757
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'