diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-12-18 16:34:18 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-12-18 16:34:18 +0530 |
| commit | b1cf17d0422cc5abe9b2dec920540442634ce198 (patch) | |
| tree | 519059564fdc7f07fc976214bd49c2639aa7047b /addons/google_docs/google_docs.py | |
| parent | 15345d009ff3aaf845dd22531c277a5fde0db2c7 (diff) | |
| parent | 79552522598f49389af873d6d4d5fde66dadab16 (diff) | |
[MERGE] Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20121218110418-46n4eixo5jl0q9i1
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__) |