From b9c3c074b105d089fb05fa59e33487033473f5cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Mar 2015 14:43:19 +0100
Subject: [PATCH] Fix: a line was inserted when making update Fix: missing
message into notification admin page
---
htdocs/admin/notification.php | 2 +-
htdocs/fourn/commande/card.php | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 6de3cc09665..b9c163972ce 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 26a0b5a5438..b593d6c6c19 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)
--
GitLab