Merge lp:~openerp-dev/openobject-addons/trunk-bug-1093807-psa into lp:openobject-addons

[Paramjit Singh Sahota(OpenERP)]

Hello,

Fixed the issue,
>Note use of & operator badly encoded.
>Only "amperson" sign is not able to decode so replaced it with '&'.

Thankz YoU.
 -PSA.

Unmerged revisions

8488. By Paramjit Singh Sahota(OpenERP) on 2013-01-01

[FIX][Trunk/7.0] note use of & operator badly encoded

=== modified file 'note/note.py'
--- note/note.py	2012-12-20 11:47:30 +0000
+++ note/note.py	2013-01-01 08:50:28 +0000
@@ -61,8 +61,7 @@
     def _get_note_first_line(self, cr, uid, ids, name="", args={}, context=None):
         res = {}
         for note in self.browse(cr, uid, ids, context=context):
-            res[note.id] = (note.memo and html2plaintext(note.memo) or "").strip().replace('*','').split("\n")[0]
-
+            res[note.id] = (note.memo and html2plaintext(note.memo) or "").strip().replace('*','').replace('&','&').split("\n")[0]
         return res
 
     def onclick_note_is_done(self, cr, uid, ids, context=None):