From ed3fb8daaa110d5aed65179d85fd8fc5990d9d48 Mon Sep 17 00:00:00 2001
From: fBrignoli <franck.brignoli@prestashop.com>
Date: Mon, 2 Jul 2012 15:24:32 +0000
Subject: [PATCH] [-] PDF : Bug Fixed #PSCFV-2788 - Incorrect discount value if
 free shipping

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16179 b9a71923-0436-4b27-9f14-aed3839534dd
---
 pdf/invoice.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pdf/invoice.tpl b/pdf/invoice.tpl
index a3b1d3419..06b732bdd 100755
--- a/pdf/invoice.tpl
+++ b/pdf/invoice.tpl
@@ -184,11 +184,15 @@
 				<!-- END PRODUCTS -->
 
 				<!-- CART RULES -->
+				{assign var="shipping_discount_tax_incl" value="0"}
 				{foreach $cart_rules as $cart_rule}
 				{cycle values='#FFF,#DDD' assign=bgcolor}
 					<tr style="line-height:6px;background-color:{$bgcolor};" text-align="left">
 						<td colspan="{if !$tax_excluded_display}5{else}4{/if}">{$cart_rule.name}</td>
 						<td>
+							{if $cart_rule.free_shipping}
+								{assign var="shipping_discount_tax_incl" value=$order_invoice->total_shipping_tax_incl}
+							{/if}
 							{if $tax_excluded_display}
 								- {$cart_rule.value_tax_excl}
 							{else}
@@ -221,7 +225,7 @@
 				{if $order_invoice->total_discount_tax_incl > 0}
 				<tr style="line-height:5px;">
 					<td style="text-align: right; font-weight: bold">{l s='Total Vouchers' pdf='true'}</td>
-					<td style="width: 15%; text-align: right;">-{displayPrice currency=$order->id_currency price=$order_invoice->total_discount_tax_incl}</td>
+					<td style="width: 15%; text-align: right;">-{displayPrice currency=$order->id_currency price=($order_invoice->total_discount_tax_incl + $shipping_discount_tax_incl)}</td>
 				</tr>
 				{/if}