diff options
| author | RGA(OpenERP) <> | 2012-12-20 15:29:31 +0530 |
|---|---|---|
| committer | RGA(OpenERP) <> | 2012-12-20 15:29:31 +0530 |
| commit | 67c51fcdeddfb402c2cd553253484514336d5e86 (patch) | |
| tree | 293421a3063b899a7058935bd36dab0f705ecb36 /addons/google_docs/google_docs.py | |
| parent | 0a75f29308f1294d169d81b5881fff567b6ba5c1 (diff) | |
| parent | ce136421f009f2b4ec768cc495a4947512e9a303 (diff) | |
Merge with trunk
bzr revid: rgaopenerp-20121220095931-4frnwgj02avrnpzh
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__) |
