diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml index 6b720427155..77af8c7814d 100644 --- a/addons/sale/data/mail_data.xml +++ b/addons/sale/data/mail_data.xml @@ -141,10 +141,16 @@
- + - - + +
ProductsProducts QuantityPriceQuantity + % if object.user_id.has_group('account.group_show_line_subtotals_tax_excluded'): + VAT Excl. + % else + VAT Incl. + % endif +
% for line in object.order_line: @@ -167,13 +173,14 @@ Product image ${line.product_id.name} - ${line.product_uom_qty} + ${line.product_uom_qty} + % if object.user_id.has_group('account.group_show_line_subtotals_tax_excluded'): - ${format_amount(line.price_reduce_taxexcl, object.currency_id)} - % endif - % if object.user_id.has_group('account.group_show_line_subtotals_tax_included'): - ${format_amount(line.price_reduce_taxinc, object.currency_id)} + ${format_amount(line.price_reduce_taxexcl, object.currency_id)} + % else + ${format_amount(line.price_reduce_taxinc, object.currency_id)} % endif + % endif diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 5f91d24127a..7f0dcd3bdd8 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -99,10 +99,16 @@ msgid "" "
\n" " \n" " \n" -" \n" +" \n" " \n" -" \n" +" \n" +" \n" " \n" "
ProductsProducts\n" -" QuantityPriceQuantity\n" +" % if object.user_id.has_group('account.group_show_line_subtotals_tax_excluded'):\n" +" VAT Excl.\n" +" % else\n" +" VAT Incl.\n" +" % endif\n" +"
\n" " % for line in object.order_line:\n" @@ -125,13 +131,14 @@ msgid "" " \"Product\n" " \n" " ${line.product_id.name}\n" -" ${line.product_uom_qty}\n" +" ${line.product_uom_qty}\n" +" \n" " % if object.user_id.has_group('account.group_show_line_subtotals_tax_excluded'):\n" -" ${format_amount(line.price_reduce_taxexcl, object.currency_id)}\n" -" % endif\n" -" % if object.user_id.has_group('account.group_show_line_subtotals_tax_included'):\n" -" ${format_amount(line.price_reduce_taxinc, object.currency_id)}\n" +" ${format_amount(line.price_reduce_taxexcl, object.currency_id)}\n" +" % else\n" +" ${format_amount(line.price_reduce_taxinc, object.currency_id)}\n" " % endif\n" +" \n" " \n" " \n" " % endif\n"