From 71c3f2e71f21b8ad9e0c57c5d0ca2bc12c606b97 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 29 Apr 2013 11:35:47 +0200
Subject: [PATCH] [-] FO : removed misleading label on the shipping total
 #PSCFV-8556

---
 themes/default/order-payment.tpl | 2 +-
 themes/default/shopping-cart.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/default/order-payment.tpl b/themes/default/order-payment.tpl
index bde92b04f..db4482b2f 100644
--- a/themes/default/order-payment.tpl
+++ b/themes/default/order-payment.tpl
@@ -118,7 +118,7 @@
 					<td class="price" id="total_shipping">{l s='Free Shipping!'}</td>
 				</tr>
 			{else}
-				{if $use_taxes}
+				{if $use_taxes && $total_shipping_tax_exc != $total_shipping}
 					{if $priceDisplay}
 						<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none"{/if}>
 							<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</td>
diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 8b486c2de..cf3a8858a 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -126,7 +126,7 @@
 					<td colspan="2" class="price" id="total_shipping">{l s='Free Shipping!'}</td>
 				</tr>
 			{else}
-				{if $use_taxes}
+				{if $use_taxes && $total_shipping_tax_exc != $total_shipping}
 					{if $priceDisplay}
 						<tr class="cart_total_delivery" {if $total_shipping_tax_exc <= 0} style="display:none;"{/if}>
 							<td colspan="5">{if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if}</td>