summaryrefslogtreecommitdiff
path: root/addons/plugin
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2012-12-18 09:59:14 +0100
committerRaphael Collet <rco@openerp.com>2012-12-18 09:59:14 +0100
commit73980eba5f64c674b0bc366c714a9a38d3bb915a (patch)
treefce41f64e3309f05aa0a33eae1395b445c389a41 /addons/plugin
parent57acd22a0077feeae6261aae617ad9ad0a3be36d (diff)
parent0cc0dfb8cf8d26c1029d02b7377226809821dc9b (diff)
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
Diffstat (limited to 'addons/plugin')
-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'