diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php index 44560bd02..5336d6da9 100644 --- a/classes/order/OrderInvoice.php +++ b/classes/order/OrderInvoice.php @@ -349,11 +349,13 @@ class OrderInvoiceCore extends ObjectModel public function getEcoTaxTaxesBreakdown() { return Db::getInstance()->executeS(' - SELECT `ecotax_tax_rate`, SUM(`ecotax`) as `ecotax_tax_excl`, SUM(`ecotax`) as `ecotax_tax_incl` + SELECT `ecotax_tax_rate` as `rate`, SUM(`ecotax`) as `ecotax_tax_excl`, SUM(`ecotax`) as `ecotax_tax_incl` FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order` = '.(int)$this->id_order.' - AND `id_order_invoice` = '.(int)$this->id + AND `id_order_invoice` = '.(int)$this->id.' + GROUP BY `ecotax_tax_rate`' ); + } /** diff --git a/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl index 98db5b1c9..08015bb5f 100755 --- a/pdf/invoice.tax-tab.tpl +++ b/pdf/invoice.tax-tab.tpl @@ -62,6 +62,15 @@ {displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount} {/foreach} + + {foreach $ecotax_tax_breakdown as $ecotax_tax_infos} + + {l s='Ecotax' pdf='true'} + {$ecotax_tax_infos.rate} % + {displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl} + {displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)} + + {/foreach} {/if}