// merge 1.4 (5397)

mails/fr/order_conf.html

@@ -90,25 +90,10 @@
 					</tr>
 					<tr>
 						<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
-							{delivery_company}
-							<br><span style="color:#DB3484; font-weight:bold;">{delivery_firstname} {delivery_lastname}</span>
-							<br>{delivery_address1}
-							<br>{delivery_address2}
-							<br>{delivery_city} {delivery_postal_code}
-							<br>{delivery_country} {delivery_state}
-							<br>{delivery_phone}
-							<br>{delivery_other}
+							{delivery_block_html}
 						</td>
 						<td style="padding:0.5em 0 0.5em 0.5em; background-color:#EBECEE;">
-							{invoice_company}
-							<br />{invoice_vat_number}
-							<br><span style="color:#DB3484; font-weight:bold;">{invoice_firstname} {invoice_lastname}</span>
-							<br>{invoice_address1}
-							<br>{invoice_address2}
-							<br>{invoice_city} {invoice_postal_code}
-							<br>{invoice_country} {invoice_state}
-							<br>{invoice_phone}
-							<br>{invoice_other}
+							{invoice_block_html}
 						</td>
 					</tr>
 				</table>

mails/fr/order_conf.txt

@@ -17,25 +17,10 @@ Livraison
 	Transporteur : {carrier}
 
 	Adresse de livraison :
-
-	{delivery_company}
-	{delivery_firstname} {delivery_lastname}
-	{delivery_address1}
-	{delivery_address2}
-	{delivery_postal_code} {delivery_city}
-	{delivery_country} {delivery_state}
-	{delivery_other}
+	{delivery_block_txt}
 
 	Adresse de facturation :
-
-	{invoice_company}
-	{invoice_vat_number}
-	{invoice_firstname} {invoice_lastname}
-	{invoice_address1}
-	{invoice_address2}
-	{invoice_postal_code} {invoice_city}
-	{invoice_country} {invoice_state}
-	{invoice_other}
+	{invoice_block_txt}
 
 Vous pouvez accéder au suivi de votre commande et télécharger votre facture dans "Historique des commandes" de la rubrique "Mon compte" sur notre site.
 Si vous avez un compte invité, vous pouvez suivre votre commande à cette adresse: {shop_url}guest-tracking.php