From 827f51a82022247903f038bb8546874c3724b27e Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Mon, 5 May 2014 11:59:51 +0200
Subject: [PATCH] display city instead of coutry in pdf. Fix #358

---
 templates/pdf/default/I18n/fr_FR.php | 2 +-
 templates/pdf/default/delivery.html  | 4 ++--
 templates/pdf/default/invoice.html   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php
index faa75085e..fdfc48491 100755
--- a/templates/pdf/default/I18n/fr_FR.php
+++ b/templates/pdf/default/I18n/fr_FR.php
@@ -14,7 +14,7 @@ return array(
     'Ref' => 'Ref',
     'THANK YOU' => 'MERCI',
     'Tax' => 'Taxes',
-    'Taxed total' => 'Montant total des taxes',
+    'Taxed total' => 'Total TTC',
     'Total' => 'Total',
     'Total with tax' => 'Total TTC',
     'Total without tax' => 'Total HT',
diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html
index 8ff2f6ae2..3cad6a9b5 100644
--- a/templates/pdf/default/delivery.html
+++ b/templates/pdf/default/delivery.html
@@ -135,7 +135,7 @@
                 {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}
                 {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                 {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                {$ZIPCODE} {$COUNTRY}<br/>
+                {$ZIPCODE} {$CITY}<br/>
                 {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                 {/loop}
             </p>
@@ -146,7 +146,7 @@
                 {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}
                 {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                 {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                {$ZIPCODE} {$COUNTRY}<br/>
+                {$ZIPCODE} {$CITY}<br/>
                 {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                 {/loop}
             </p>
diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html
index 6117a04b8..e6def76e1 100644
--- a/templates/pdf/default/invoice.html
+++ b/templates/pdf/default/invoice.html
@@ -108,7 +108,7 @@
                     {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}
                     {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                     {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                    {$ZIPCODE} {$COUNTRY}<br/>
+                    {$ZIPCODE} {$CITY}<br/>
                     {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                     {/loop}
                 </p>
@@ -119,7 +119,7 @@
                     {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}
                     {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                     {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                    {$ZIPCODE} {$COUNTRY}<br/>
+                    {$ZIPCODE} {$CITY}<br/>
                     {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                     {/loop}
                 </p>