diff --git a/install/insert.sql b/install/insert.sql
index 946d99dd8..0f1634d6f 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -1274,3 +1274,12 @@ INSERT INTO resource_i18n (`id`, `locale`, `title`) VALUES
 (22, 'fr_FR', 'Configuration / Tax'),
 (23, 'en_US', 'Configuration / Template'),
 (23, 'fr_FR', 'Configuration / Template');
+
+
+INSERT INTO `message` (`id`, `name`, `secured`, `created_at`, `updated_at`, `version`, `version_created_at`, `version_created_by`) VALUES
+(1, 'order_confirmation', NULL, NOW(), NOW(), 2, NOW(), NULL);
+
+INSERT INTO `message_i18n` (`id`, `locale`, `title`, `subject`, `text_message`, `html_message`) VALUES
+(1, 'en_US', 'order confirmation', 'Commande : Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $CODE}\r\n    {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n    {assign "realPrice" $PROMO_PRICE}\r\n    {assign "realTax" $PROMO_PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n    {assign "realPrice" $PRICE}\r\n    {assign "realTax" $PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n    \\r\\n\r\n    Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n    {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n    {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n    Quantité : {$QUANTITY}\\r\\n\r\n    Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC :    {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC :    {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale:            {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $SYMBOL}\r\n    {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n    {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\r\n    <title>courriel de confirmation de commande de {config key="url_site"} </title>\r\n    {literal}\r\n    <style type="text/css">body {font-family: Arial, Helvetica, sans-serif; font-size:100%; text-align:center;}#liencompte {margin:15px 0 ; text-align:center; font-size:10pt;}#wrapper {width:480pt;margin:0 auto;}#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}#logoimg{float:left;}#h2 {margin:0;padding:0;font-size:140%;text-align:center;}#h3 {margin:0;padding:0;font-size:120%;text-align:center;}#tableprix {margin:0 auto;border-collapse:collapse;font-size:80%;}#intitules {font-weight:bold;text-align:center;}#ref {width:65pt;border:1px solid #000;}#designation {width:278pt;border:1px solid #000;}#pu {width:65pt;border:1px solid #000;}#qte {width:60pt;border:1px solid #000;}.ligneproduit{font-weight:normal;}.cellref{text-align:right;padding-right:6pt;border:1px solid #000;}.celldsg{text-align:left;padding-left:6pt;border:1px solid #000;}.cellpu{text-align:right;padding-right:6pt;border:1px solid #000;}.cellqte{text-align:right;padding-right:6pt;border:1px solid #000;}.lignevide{border-bottom:1px solid #000;}.totauxtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;}.totauxcmdtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;border-bottom:1px solid #000;}.totauxprix{text-align:right;padding-right:6pt;border:1px solid #000;}.blocadresses{display:inline;float:left;width:228pt;margin:12pt 4pt 12pt 5pt;font-size:80%;line-height:18pt;text-align:left;border:1px solid #000;}.stylenom{margin:0;padding:0 0 0 10pt;border-bottom:1px solid #000;}.styleliste{margin:0;padding:0 0 0 10pt;}</style>\r\n    {/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n    <div id="entete"><h1 id="logotexte">{config key="company_name"}</h1>\r\n        <h2 id="info">Confirmation de commande</h2>\r\n        <h3 id="commande">N&deg; {$REF} du <span style="font-size:80%">{format_date date=$INVOICE_DATE output="date"}</span></h3>\r\n    </div>\r\n    <table id="tableprix" border="0">\r\n        <tbody>\r\n        <tr id="intitules">\r\n            <th id="ref">R&eacute;f&eacute;rence</th>\r\n            <th id="designation">D&eacute;signation</th>\r\n            <th id="pu">P.U. &euro;</th>\r\n            <th id="qte">Qt&eacute;</th>\r\n        </tr>\r\n        {loop type="order_product" name="order-products" order=$ID}\r\n        {if $WAS_IN_PROMO == 1}\r\n            {assign "realPrice" $PROMO_PRICE}\r\n            {assign "realTax" $PROMO_PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n        {else}\r\n            {assign "realPrice" $PRICE}\r\n            {assign "realTax" $PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PRICE}\r\n        {/if}\r\n            <tr class="ligneproduit">\r\n                <td class="cellref">{$REF}</td>\r\n                <td class="celldsg">{$TITLE}\r\n                    {ifloop rel="combinations"}\r\n                        {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n                            {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>\r\n                        {/loop}\r\n                    {/ifloop}\r\n                </td>\r\n                <td class="cellpu">{$orderCurrency} {$realTaxedPrice}</td>\r\n                <td class="cellqte">{$QUANTITY}</td>\r\n            </tr>\r\n        {/loop}\r\n        <!-- insere une ligne vide -->\r\n        <tr class="ligneproduit">\r\n            <td class="lignevide" colspan="4">&nbsp;</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Montant total avant remise &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Port &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxcmdtitre" colspan="3">Montant total de la commande &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</td>\r\n        </tr>\r\n        </tbody>\r\n    </table>\r\n    <div class="blocadresses">\r\n        <p class="stylenom">LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <div class="blocadresses">\r\n        <p class="stylenom">FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <p id="liencompte">Le suivi de votre commande est disponible dans la rubrique mon compte sur <a href="{config key="url_site"}">{config key="url_site"}</a></p>\r\n</div>\r\n</body>\r\n</html>\r\n{/loop}'),
+(1, 'fr_FR', 'order confirmation', 'Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $CODE}\r\n    {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n    {assign "realPrice" $PROMO_PRICE}\r\n    {assign "realTax" $PROMO_PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n    {assign "realPrice" $PRICE}\r\n    {assign "realTax" $PRICE_TAX}\r\n    {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n    \\r\\n\r\n    Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n    {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n    {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n    Quantité : {$QUANTITY}\\r\\n\r\n    Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC :    {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC :    {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale:            {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n    {loop name="currency.order" type="currency" id=$CURRENCY}\r\n        {assign "orderCurrency" $SYMBOL}\r\n    {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n    {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\r\n    <title>courriel de confirmation de commande de {config key="url_site"} </title>\r\n    {literal}\r\n    <style type="text/css">body {font-family: Arial, Helvetica, sans-serif; font-size:100%; text-align:center;}#liencompte {margin:15px 0 ; text-align:center; font-size:10pt;}#wrapper {width:480pt;margin:0 auto;}#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}#logoimg{float:left;}#h2 {margin:0;padding:0;font-size:140%;text-align:center;}#h3 {margin:0;padding:0;font-size:120%;text-align:center;}#tableprix {margin:0 auto;border-collapse:collapse;font-size:80%;}#intitules {font-weight:bold;text-align:center;}#ref {width:65pt;border:1px solid #000;}#designation {width:278pt;border:1px solid #000;}#pu {width:65pt;border:1px solid #000;}#qte {width:60pt;border:1px solid #000;}.ligneproduit{font-weight:normal;}.cellref{text-align:right;padding-right:6pt;border:1px solid #000;}.celldsg{text-align:left;padding-left:6pt;border:1px solid #000;}.cellpu{text-align:right;padding-right:6pt;border:1px solid #000;}.cellqte{text-align:right;padding-right:6pt;border:1px solid #000;}.lignevide{border-bottom:1px solid #000;}.totauxtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;}.totauxcmdtitre{text-align:right;padding-right:6pt;border-left:1px solid #000;border-bottom:1px solid #000;}.totauxprix{text-align:right;padding-right:6pt;border:1px solid #000;}.blocadresses{display:inline;float:left;width:228pt;margin:12pt 4pt 12pt 5pt;font-size:80%;line-height:18pt;text-align:left;border:1px solid #000;}.stylenom{margin:0;padding:0 0 0 10pt;border-bottom:1px solid #000;}.styleliste{margin:0;padding:0 0 0 10pt;}</style>\r\n    {/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n    <div id="entete"><h1 id="logotexte">{config key="company_name"}</h1>\r\n        <h2 id="info">Confirmation de commande</h2>\r\n        <h3 id="commande">N&deg; {$REF} du <span style="font-size:80%">{format_date date=$INVOICE_DATE output="date"}</span></h3>\r\n    </div>\r\n    <table id="tableprix" border="0">\r\n        <tbody>\r\n        <tr id="intitules">\r\n            <th id="ref">R&eacute;f&eacute;rence</th>\r\n            <th id="designation">D&eacute;signation</th>\r\n            <th id="pu">P.U. &euro;</th>\r\n            <th id="qte">Qt&eacute;</th>\r\n        </tr>\r\n        {loop type="order_product" name="order-products" order=$ID}\r\n        {if $WAS_IN_PROMO == 1}\r\n            {assign "realPrice" $PROMO_PRICE}\r\n            {assign "realTax" $PROMO_PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n        {else}\r\n            {assign "realPrice" $PRICE}\r\n            {assign "realTax" $PRICE_TAX}\r\n            {assign "realTaxedPrice" $TAXED_PRICE}\r\n        {/if}\r\n            <tr class="ligneproduit">\r\n                <td class="cellref">{$REF}</td>\r\n                <td class="celldsg">{$TITLE}\r\n                    {ifloop rel="combinations"}\r\n                        {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n                            {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>\r\n                        {/loop}\r\n                    {/ifloop}\r\n                </td>\r\n                <td class="cellpu">{$orderCurrency} {$realTaxedPrice}</td>\r\n                <td class="cellqte">{$QUANTITY}</td>\r\n            </tr>\r\n        {/loop}\r\n        <!-- insere une ligne vide -->\r\n        <tr class="ligneproduit">\r\n            <td class="lignevide" colspan="4">&nbsp;</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Montant total avant remise &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxtitre" colspan="3">Port &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$POSTAGE}</td>\r\n        </tr>\r\n        <tr class="ligneproduit">\r\n            <td class="totauxcmdtitre" colspan="3">Montant total de la commande &euro;</td>\r\n            <td class="totauxprix">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</td>\r\n        </tr>\r\n        </tbody>\r\n    </table>\r\n    <div class="blocadresses">\r\n        <p class="stylenom">LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <div class="blocadresses">\r\n        <p class="stylenom">FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</p>\r\n    {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n        <p class="styleliste">N&deg; de client : {$customer_ref}</p>\r\n        <p class="styleliste">Nom :\r\n            {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}</p>\r\n        <p class="styleliste">N&deg; et rue :\r\n            {$ADDRESS1}</p>\r\n        <p class="styleliste">Compl&eacute;ment : {$ADDRESS2}\r\n            {$ADDRESS3}</p>\r\n        <p class="styleliste">Code postal : {$ZIPCODE}</p>\r\n        <p class="styleliste">Ville : {$CITY}</p>\r\n        <p class="styleliste">Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}</p>\r\n    </div>\r\n    {/loop}\r\n    <p id="liencompte">Le suivi de votre commande est disponible dans la rubrique mon compte sur <a href="{config key="url_site"}">{config key="url_site"}</a></p>\r\n</div>\r\n</body>\r\n</html>\r\n{/loop}');
+

Référence	Désignation	P.U. €	Qté
{$REF}	{$TITLE}\r\n {ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE} \r\n {/loop}\r\n {/ifloop}\r\n	{$orderCurrency} {$realTaxedPrice}	{$QUANTITY}

Montant total avant remise €			{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}
Port €			{$orderCurrency} {$POSTAGE}
Montant total de la commande €			{$orderCurrency} {$TOTAL_TAXED_AMOUNT}