diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
| commit | 2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch) | |
| tree | e7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/document/nodes.py | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/document/nodes.py')
| -rw-r--r-- | addons/document/nodes.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/document/nodes.py b/addons/document/nodes.py index aeb2e64fc97..9513434374f 100644 --- a/addons/document/nodes.py +++ b/addons/document/nodes.py @@ -20,10 +20,10 @@ ############################################################################## # import urlparse -import pooler -from tools.safe_eval import safe_eval +from openerp import pooler +from openerp.tools.safe_eval import safe_eval -from tools.misc import ustr +from openerp.tools.misc import ustr import errno # import os import time |