diff options
| author | dle@openerp.com <> | 2012-12-21 15:44:34 +0100 |
|---|---|---|
| committer | dle@openerp.com <> | 2012-12-21 15:44:34 +0100 |
| commit | 91ccc4570beac673a2d7af211a868e557e7b748e (patch) | |
| tree | f1bc21eca2bd1d3cafb533591653a5ddbde0434a /addons/google_docs/google_docs.py | |
| parent | 91cbb9dec9e2f17947719ee65362c11b91b150f5 (diff) | |
| parent | e9f9e1191ca4e782d8014a4ba13a1feedf3fc4d7 (diff) | |
[MERGE]Latest trunk
bzr revid: dle@openerp.com-20121221144434-1lj0ir3jjosw5iih
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__) |