summaryrefslogtreecommitdiff
path: root/addons/plugin/plugin_handler.py
diff options
context:
space:
mode:
authorRGA(OpenERP) <>2012-12-20 15:29:31 +0530
committerRGA(OpenERP) <>2012-12-20 15:29:31 +0530
commit67c51fcdeddfb402c2cd553253484514336d5e86 (patch)
tree293421a3063b899a7058935bd36dab0f705ecb36 /addons/plugin/plugin_handler.py
parent0a75f29308f1294d169d81b5881fff567b6ba5c1 (diff)
parentce136421f009f2b4ec768cc495a4947512e9a303 (diff)
Merge with trunk
bzr revid: rgaopenerp-20121220095931-4frnwgj02avrnpzh
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'