diff options
| author | Xavier ALT <xal@openerp.com> | 2012-12-21 11:03:30 +0100 |
|---|---|---|
| committer | Xavier ALT <xal@openerp.com> | 2012-12-21 11:03:30 +0100 |
| commit | 6f0f58562d1918d89bbdd6e05cb46f5f0ffd9b02 (patch) | |
| tree | 53b02fa949afd8e84f938bc77c9ce478089b6148 /addons/plugin/plugin_handler.py | |
| parent | afc2b06042284a122dc44cbd8f85f55a1cd99874 (diff) | |
| parent | 1dbea4a07a37325e420e26b3429e4a27f3e8e308 (diff) | |
[MERGE] sync with latest trunk @2012-12-21
bzr revid: xal@openerp.com-20121221100330-b0aw0q6txzbq9t0g
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' |