Merge lp:~nbessi-c2c-deactivatedaccount/account-invoice-report/account-invoice-report-fix-html-fields-and-css into lp:~account-core-editors/account-invoice-report/7.0

[Nicolas Bessi - Camptocamp]

Account invoice text use html fields + small css glitch

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Seems fine to me

review: Approve (no test, code review)

=== modified file 'invoice_webkit/invoice.py'
--- invoice_webkit/invoice.py	2013-01-15 08:16:58 +0000
+++ invoice_webkit/invoice.py	2013-01-24 14:21:25 +0000
@@ -40,7 +40,7 @@
                                    ('footer', 'Bottom condition')],
                                     'type', required=True),
 
-        'text': fields.text('Condition', translate=True, required=True)}
+        'text': fields.html('Condition', translate=True, required=True)}
 
 class AccountInvoice(Model):
     """ Add account.condition_text to invoice"""
@@ -66,8 +66,8 @@
 
     _columns = {'text_condition1': fields.many2one('account.condition_text', 'Header condition'),
                 'text_condition2': fields.many2one('account.condition_text', 'Footer condition'),
-                'note1': fields.text('Header'),
-                'note2': fields.text('Footer'),}
+                'note1': fields.html('Header'),
+                'note2': fields.html('Footer'),}
 
 
 class AccountInvoiceLine(Model):
 
=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-01-15 08:16:58 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-01-24 14:21:25 +0000
@@ -32,6 +32,8 @@
 
 .formatted_note {
         border-right:thin solid #EEEEEE;
+        border-left:thin solid #EEEEEE;
+        border-top:thin solid #EEEEEE;
         left:10px;
         font-size:smaller;
 }
@@ -178,7 +180,7 @@
     <div>
 
     %if inv.note1 :
-        <p class="std_text"> ${inv.note1 | carriage_returns} </p>
+        <p class="std_text"> ${inv.note1 | n} </p>
     %endif
     </div>
     <h1 style="clear: both; padding-top: 20px;">
@@ -240,7 +242,7 @@
             </tr>
             %if line.formatted_note:
             <tr>
-              <td class="formatted_note">
+              <td class="formatted_note" colspan="7">
                 ${line.formatted_note| n}
               </td>
             <tr>
@@ -329,7 +331,7 @@
         <p class="std_text">${inv.comment | carriage_returns}</p>
     %endif
     %if inv.note2 :
-        <p class="std_text">${inv.note2 | carriage_returns}</p>
+        <p class="std_text">${inv.note2 | n}</p>
     %endif
     <p style="page-break-after:always"></p>
     %endfor