TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display city instead of coutry in pdf. Fix #358

Browse Source
This commit is contained in:
Manuel Raynaud
2014-05-05 11:59:51 +02:00
parent 65be312137
commit 827f51a820
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/pdf/default/I18n/fr_FR.php
View File

@@ -14,7 +14,7 @@ return array(
'Ref' => 'Ref', 'Ref' => 'Ref',
'THANK YOU' => 'MERCI', 'THANK YOU' => 'MERCI',
'Tax' => 'Taxes', 'Tax' => 'Taxes',
'Taxed total' => 'Montant total des taxes', 'Taxed total' => 'Total TTC',
'Total' => 'Total', 'Total' => 'Total',
'Total with tax' => 'Total TTC', 'Total with tax' => 'Total TTC',
'Total without tax' => 'Total HT', 'Total without tax' => 'Total HT',

4
templates/pdf/default/delivery.html
View File

@@ -135,7 +135,7 @@
{loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} {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 /> {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br /> {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
{$ZIPCODE} {$COUNTRY}<br/> {$ZIPCODE} {$CITY}<br/>
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
{/loop} {/loop}
</p> </p>
@@ -146,7 +146,7 @@
{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} {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 /> {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br /> {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
{$ZIPCODE} {$COUNTRY}<br/> {$ZIPCODE} {$CITY}<br/>
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
{/loop} {/loop}
</p> </p>

4
templates/pdf/default/invoice.html
View File

@@ -108,7 +108,7 @@
{loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} {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 /> {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br /> {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
{$ZIPCODE} {$COUNTRY}<br/> {$ZIPCODE} {$CITY}<br/>
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
{/loop} {/loop}
</p> </p>
@@ -119,7 +119,7 @@
{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} {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 /> {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br /> {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
{$ZIPCODE} {$COUNTRY}<br/> {$ZIPCODE} {$CITY}<br/>
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
{/loop} {/loop}
</p> </p>