lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: a line was inserted when making update

Browse Source 
Fix: missing message into notification admin page
This commit is contained in:
Laurent Destailleur 2015-03-23 14:43:19 +01:00
parent cbadfa5075
commit b9c3c074b1
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/notification.php
View File

@ -240,7 +240,7 @@ foreach($listofnotifiedevents as $notifiedevent)
} }
// New entry input fields // 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. $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>';
print '<td>'; print '<td>';

2
htdocs/fourn/commande/card.php
View File

@ -448,14 +448,12 @@ if (empty($reshook))
{ {
$price_base_type = 'HT'; $price_base_type = 'HT';
$ht = price2num(GETPOST('price_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 else
{ {
$ttc = price2num(GETPOST('price_ttc')); $ttc = price2num(GETPOST('price_ttc'));
$ht = $ttc / (1 + ($tva_tx / 100)); $ht = $ttc / (1 + ($tva_tx / 100));
$price_base_type = 'HT'; $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) if ($lineid)