From b495fdb58eb68686ef36fb0e99c20023d76c8dc4 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 10 Mar 2016 15:51:31 +0100
Subject: [PATCH] [Qal] uniformize code
---
htdocs/compta/localtax/card.php | 9 +++++----
htdocs/compta/prelevement/create.php | 6 ++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index aded1c6aa1f..566a2ff53cc 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -77,7 +77,7 @@ if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
else
{
$db->rollback();
- $mesg='<div class="error">'.$localtax->error.'</div>';
+ setEventMessages($localtax->error, $localtax->errors, 'errors');
$_GET["action"]="create";
}
}
@@ -112,18 +112,19 @@ if ($_GET["action"] == 'delete')
{
$localtax->error=$accountline->error;
$db->rollback();
- $mesg='<div class="error">'.$localtax->error.'</div>';
+ setEventMessages($localtax->error, $localtax->errors, 'errors');
}
}
else
{
$db->rollback();
- $mesg='<div class="error">'.$localtax->error.'</div>';
+ setEventMessages($localtax->error, $localtax->errors, 'errors');
}
}
else
{
- $mesg='<div class="error">Error try do delete a line linked to a conciliated bank transaction</div>';
+ $mesg='Error try do delete a line linked to a conciliated bank transaction';
+ setEventMessages($mesg, null, 'errors');
}
}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 7fd5cb10483..33d02bff05b 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -65,11 +65,13 @@ if ($action == 'create')
$result=$bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET);
if ($result < 0)
{
- $mesg='<div class="error">'.$bprev->error.'</div>';
+ setEventMessages($bprev->error , $bprev->errors, 'errors');
}
if ($result == 0)
{
- $mesg='<div class="error">'.$langs->trans("NoInvoiceCouldBeWithdrawed").'</div>';
+ $mesg='';
+ $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed");
+ setEventMessages($mesg, null, 'errors');
foreach($bprev->invoice_in_error as $key => $val)
{
$mesg.=$val."<br>\n";
--
GitLab