dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/mailalerts/mails/fr/new_order.html
+2 -16
View File
@@ -81,24 +81,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><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>