diff options
| author | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2013-01-28 11:20:29 +0530 |
|---|---|---|
| committer | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2013-01-28 11:20:29 +0530 |
| commit | 105e52adb1c23c91c62726ef82f0f19731394cb9 (patch) | |
| tree | e1ccfed4fae5550cd77e21a2e50f62121863d5de /addons/plugin/plugin_handler.py | |
| parent | 64a2c1a0dcbbf7711c608a5602942be95de42199 (diff) | |
| parent | b390a5697cd4eb8cced5f4cdcf2c34b6cad3a7e4 (diff) | |
[MERGE] merge with trunk
bzr revid: fka@tinyerp.com-20130128055029-1ct295a3gydghcmg
Diffstat (limited to 'addons/plugin/plugin_handler.py')
| -rw-r--r-- | addons/plugin/plugin_handler.py | 2 |
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' |