diff options
| author | philubert@gmail.com <> | 2011-02-16 15:32:49 +1100 |
|---|---|---|
| committer | philubert@gmail.com <> | 2011-02-16 15:32:49 +1100 |
| commit | b1af67b6f52523d0a7f18ebd44f3e5d6d7648124 (patch) | |
| tree | f977de5dbabb8fba52231bfa257511542d5c4245 /addons/web_uservoice/web/controllers.py | |
| parent | ea447e0da0b5dd923ea17bde2d05ce782ef29b71 (diff) | |
| parent | 5eb533a415f8e9738a81554cb4237597f1977485 (diff) | |
Did a merge from the parent branch.
bzr revid: philubert@gmail.com-20110216043249-1rgk002k9hjo7hu1
Diffstat (limited to 'addons/web_uservoice/web/controllers.py')
| -rw-r--r-- | addons/web_uservoice/web/controllers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_uservoice/web/controllers.py b/addons/web_uservoice/web/controllers.py index af3730b07b0..07376ee8fed 100644 --- a/addons/web_uservoice/web/controllers.py +++ b/addons/web_uservoice/web/controllers.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.controllers import SecuredController -from openerp.utils import rpc +from openobject import rpc from openobject.tools import expose import cherrypy |