Merge branch 'ticket-returnprocess-final' into develop

This commit is contained in:
Marion Muszynski 2017-08-17 16:09:42 +02:00
commit 89f1f6f102

View File

@ -1403,7 +1403,7 @@ class AdminAntReturnprocess extends AdminTab
foreach ($discounts as $discount){
$html .= '
<tr>
<td colspans="5" style="vertical-align:middle;color:#444;" align="left">'.$discount['name'].'</td>
<td colspan="5" style="vertical-align:middle;color:#444;" align="left"><span style="font-weight:bold;font-size:11px" class="productName">'.$this->l('Bon réduction').'</span><br />'.$discount['name'].'</td>
<td style=" width:70px;vertical-align:middle;color:#444;" align="center">'.($discount['value'] != 0.00 ? '- ' : '').Tools::displayPrice($discount['value'], $currency, false).'</td>
<td width="70" style="vertical-align:middle;color:#444;"></td>
</tr>';