Merge lp:~camptocamp/account-invoice-report/7.0-sync-tax-column-with-so-20130415 into lp:~account-core-editors/account-invoice-report/7.0

[Yannick Vaucher @ Camptocamp]

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

review: Approve

=== modified file 'invoice_webkit/report/account_invoice.mako'
--- invoice_webkit/report/account_invoice.mako	2013-04-10 11:24:57 +0000
+++ invoice_webkit/report/account_invoice.mako	2013-04-15 13:17:29 +0000
@@ -247,7 +247,7 @@
                 <td class="amount">${formatLang(line.quantity or 0.0,digits=get_digits(dp='Account'))}</td>
                 <td class="amount">${line.uos_id and line.uos_id.name or ''}</td>
                 <td class="amount">${formatLang(line.price_unit)}</td>
-                <td style="font-style:italic; font-size: 10;text-align:center;" >${ ', '.join([ tax.description or '' for tax in line.invoice_line_tax_id ])}</td>
+                <td style="font-style:italic; font-size: 10;text-align:center;" >${ ', '.join([ tax.description or tax.name for tax in line.invoice_line_tax_id ])}</td>
                 <td class="amount" width="10%">${line.discount and formatLang(line.discount, digits=get_digits(dp='Account')) or ''} ${line.discount and '%' or ''}</td>
                 <td class="amount" width="13%">${formatLang(line.price_subtotal, digits=get_digits(dp='Account'))} ${inv.currency_id.symbol}</td>
             </tr>
@@ -344,6 +344,13 @@
     %if inv.note2 :
         <p class="std_text">${inv.note2 | n}</p>
     %endif
+    %if inv.fiscal_position :
+        <br/>
+        <p class="std_text">
+        <b>Fiscal Position Remark :</b> <br/>
+        ${inv.fiscal_position.note | n}
+        </p>
+    %endif
     <p style="page-break-after:always"></p>
     %endfor
 </body>