diff options
| author | nicolas.bessi@camptocamp.com <> | 2012-12-18 14:29:53 +0100 |
|---|---|---|
| committer | nicolas.bessi@camptocamp.com <> | 2012-12-18 14:29:53 +0100 |
| commit | cbd012145e49391ddec31715891d7ec3c666e4ea (patch) | |
| tree | 2c84b5cb8cf4d32172ba123769f66545f6c6cbf1 /addons/google_docs/google_docs.py | |
| parent | 83d569af5e439527784fa67b4848ec22d275e754 (diff) | |
| parent | a841f066778cf87d7ccbd6a71a6f7a26ec91ca4a (diff) | |
[MRG] from trunk
bzr revid: nicolas.bessi@camptocamp.com-20121218132953-sx2u7mxkrc321bua
Diffstat (limited to 'addons/google_docs/google_docs.py')
| -rw-r--r-- | addons/google_docs/google_docs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py index 1f6af0378ca..ac0cf68f3f6 100644 --- a/addons/google_docs/google_docs.py +++ b/addons/google_docs/google_docs.py @@ -20,9 +20,9 @@ import logging from datetime import datetime -from tools import DEFAULT_SERVER_DATETIME_FORMAT -from osv import osv, fields -from tools.translate import _ +from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.osv import fields, osv +from openerp.tools.translate import _ _logger = logging.getLogger(__name__) |