← Back to branch summary

~camptocamp/account-invoice-report/add-domain

« back to all changes in this revision

Viewing changes to invoice_webkit/report/account_invoice.mako

  • Committer: Joel Grand-Guillaume
  • Author(s): nicolas.bessi at camptocamp
  • Date: 2013-01-29 10:39:01 UTC
  • mfrom: (10.1.1 account-invoice-report)
  • Revision ID: joel.grandguillaume@camptocamp.com-20130129103901-12ulayexwar3o0h8
[MRG] [IMP] Account invoice text use html fields + small css glitch

Show diffs side-by-side

added added

removed removed

Lines of Context:
invoice_webkit/report/account_invoice.mako
32
32
 
33
33
.formatted_note {
34
34
        border-right:thin solid #EEEEEE;
 
35
        border-left:thin solid #EEEEEE;
 
36
        border-top:thin solid #EEEEEE;
35
37
        left:10px;
36
38
        font-size:smaller;
37
39
}
178
180
    <div>
179
181
 
180
182
    %if inv.note1 :
181
 
        <p class="std_text"> ${inv.note1 | carriage_returns} </p>
 
183
        <p class="std_text"> ${inv.note1 | n} </p>
182
184
    %endif
183
185
    </div>
184
186
    <h1 style="clear: both; padding-top: 20px;">
240
242
            </tr>
241
243
            %if line.formatted_note:
242
244
            <tr>
243
 
              <td class="formatted_note">
 
245
              <td class="formatted_note" colspan="7">
244
246
                ${line.formatted_note| n}
245
247
              </td>
246
248
            <tr>
329
331
        <p class="std_text">${inv.comment | carriage_returns}</p>
330
332
    %endif
331
333
    %if inv.note2 :
332
 
        <p class="std_text">${inv.note2 | carriage_returns}</p>
 
334
        <p class="std_text">${inv.note2 | n}</p>
333
335
    %endif
334
336
    <p style="page-break-after:always"></p>
335
337
    %endfor