diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
| commit | d23c5c8dca985dd0fde280c9237dee85b7bb4d7a (patch) | |
| tree | cf03bc2a74a1d9e93b5ef571fb78070c09c9857b /addons/note/note.py | |
| parent | f4ab81afb8285a8157258232c5fb2a6745ae7f72 (diff) | |
| parent | 66afff1b52b7ab6ab8c340e18960fb6367cfb714 (diff) | |
[MERGE]merge with trunk
bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g
Diffstat (limited to 'addons/note/note.py')
| -rw-r--r-- | addons/note/note.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/note/note.py b/addons/note/note.py index fe5eca5efd7..9e1a9187095 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -20,9 +20,7 @@ ############################################################################## from openerp.osv import osv, fields -from tools.translate import _ -import re -from openerp.tools.misc import html2plaintext +from openerp.tools import html2plaintext class note_stage(osv.osv): """ Category of Note """ |