[-] INSTALLER : Fixed a missing "echo" at Step 3 in the SMTP configuration

[-] BO : Fixed a French hardcoded page (Favorites Views)
[-] BO : Fixed a typo ("Informations" => "Information")
[*] BO : Improved the UI of the Combinations generator and added some explanations - #PSCFV-770
[*] MO : Added a # before the order number in the e-mail sent to the merchant when an order is placed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15461 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bLeveque
2012-05-19 20:55:05 +00:00
parent e1fa585f43
commit 6f00731fba
9 changed files with 81 additions and 99 deletions
@@ -583,8 +583,7 @@
<br /><br />{l s='Merchandise returns are disabled'}
{/if}
</div>
<div style="float:right;">
<div style="float:right; margin-top: 20px;">
<table class="table" width="450px;" style="border-radius:0px;"cellspacing="0" cellpadding="0">
<tr id="total_products">
<td width="150px;"><b>{l s='Products'}</b></td>