From 4acec40fbf77b4e3d767bddfef67f494b8e31670 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 5 Sep 2012 15:05:33 +0000 Subject: [PATCH] // tax lines must be negative on order_slip as the other parts --- classes/pdf/HTMLTemplateOrderSlip.php | 1 + pdf/invoice.tax-tab.tpl | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php index e5330d8a3..ec05334cc 100644 --- a/classes/pdf/HTMLTemplateOrderSlip.php +++ b/classes/pdf/HTMLTemplateOrderSlip.php @@ -148,6 +148,7 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice 'product_tax_breakdown' => $this->getProductTaxesBreakdown(), 'shipping_tax_breakdown' => $this->getShippingTaxesBreakdown(), 'order' => $this->order, + 'is_order_slip' => true )); return $this->smarty->fetch($this->getTemplate('invoice.tax-tab')); diff --git a/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl index eb1ef3613..9632d73c2 100755 --- a/pdf/invoice.tax-tab.tpl +++ b/pdf/invoice.tax-tab.tpl @@ -50,10 +50,10 @@ {$rate} % {if !$use_one_after_another_method} - {displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl} + {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_price_tax_excl} {/if} - {displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount} + {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$product_tax_infos.total_amount} {/foreach} {/if} @@ -64,9 +64,9 @@ {l s='Shipping' pdf='true'} {$shipping_tax_infos.rate} % {if !$use_one_after_another_method} - {displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl} + {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_tax_excl} {/if} - {displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount} + {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$shipping_tax_infos.total_amount} {/foreach} {/if} @@ -78,9 +78,9 @@ {l s='Ecotax' pdf='true'} {$ecotax_tax_infos.rate } % {if !$use_one_after_another_method} - {displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl} + {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=$ecotax_tax_infos.ecotax_tax_excl} {/if} - {displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)} + {if isset($is_order_slip) && $is_order_slip}- {/if}{displayPrice currency=$order->id_currency price=($ecotax_tax_infos.ecotax_tax_incl - $ecotax_tax_infos.ecotax_tax_excl)} {/if} {/foreach}