[FIX] point_of_sale: fixed display of untaxed amount in sales lines report
authorDavid Monjoie <dmo@odoo.com>
Mon, 13 Oct 2014 14:41:33 +0000 (16:41 +0200)
committerDavid Monjoie <dmo@odoo.com>
Tue, 14 Oct 2014 12:10:06 +0000 (14:10 +0200)
addons/point_of_sale/views/report_saleslines.xml

index a3f479c..3a1dc1f 100644 (file)
@@ -68,8 +68,8 @@
                                 <tr class="border-black">
                                     <td><strong>Total Without Taxes</strong></td>
                                     <td class="text-right">
-                                        <span t-field="o.amount_total"
-                                            t-field-options='{"widget": "monetary", "display_currency": "o.pricelist_id.currency_id"}'/>
+                                        <span t-esc="o.amount_total - o.amount_tax"
+                                            t-esc-options='{"widget": "monetary", "display_currency": "o.pricelist_id.currency_id"}'/>
                                     </td>
                                 </tr>
                                 <tr>
@@ -82,8 +82,8 @@
                                 <tr class="border-black">
                                     <td><strong>Total</strong></td>
                                     <td class="text-right">
-                                        <span t-esc="(o.amount_total + o.amount_tax)"
-                                            t-esc-options='{"widget": "monetary", "display_currency": "o.pricelist_id.currency_id"}'/>
+                                        <span t-field="o.amount_total"
+                                            t-field-options='{"widget": "monetary", "display_currency": "o.pricelist_id.currency_id"}'/>
                                     </td>
                                 </tr>
                             </table>