diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-12-18 14:41:18 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-12-18 14:41:18 +0100 |
| commit | a513344bc1d6e7e1d01b747315b15a87b3b10f6f (patch) | |
| tree | fe2aa92f5e9f833f12fa8487eff94e7dd3cf0de4 /addons/google_docs/google_docs.py | |
| parent | 13637c22b972545e4835832fe08e3e58137e7ad1 (diff) | |
| parent | add034cafbc0253f688ff3ee4bc0d46559dc83b2 (diff) | |
[MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121218134118-ixggega7sumgv6gq
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__) |