diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 6de3cc09665e62a3af844cd1346622c316a26c02..b9c163972ce063f62c28c56212300f8d879888ed 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -240,7 +240,7 @@ foreach($listofnotifiedevents as $notifiedevent) } // New entry input fields $s='<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator. - print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"),1,'help','',0,2); + print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"),1,'help','',0,2); print '</td>'; print '<td>'; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 26a0b5a543822567881ed12ec726157355669069..b593d6c6c1933bcc8b2caef9e037265fdd27df13 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -448,14 +448,12 @@ if (empty($reshook)) { $price_base_type = 'HT'; $ht = price2num(GETPOST('price_ht')); - $result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, 0, $type,'','', $date_start, $date_end); } else { $ttc = price2num(GETPOST('price_ttc')); $ht = $ttc / (1 + ($tva_tx / 100)); $price_base_type = 'HT'; - $result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end); } if ($lineid)