diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index b9c0d3821bc2fb2ef331154802ccce244510d3bf..d6f8652d31ce3aeab230eb4222a7490dc87e2045 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -152,13 +152,13 @@ if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banqu
$insertid = $object->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
if ($insertid > 0)
{
- setEventMessage($langs->trans("RecordSaved"));
+ setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id."&action=addline");
exit;
}
else
{
- setEventMessage($object->error, 'errors');
+ setEventMessages($object->error, $object->errors, 'errors');
}
}
else
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 68ef0a42e32aa81b5c5a2b7e0adc6b304345bc05..7b53d775cb672ed29876df1b347894fe1bd64456 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -291,7 +291,7 @@ if ($result < 0)
{
$langs->load("errors");
$error++;
- setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors');
+ setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
}
else
{
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 063fee8ca786cd36ac89272f90eb5327ff8c643b..fb8383cd91a6cb845ddb4ae638fc9eb61a81b835 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
- * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
+ * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -102,19 +102,19 @@ if ($_POST["action"] == 'add')
if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
{
- setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error');
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
$action='create'; // Force chargement page en mode creation
$error++;
}
if (empty($account->ref))
{
- setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors');
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
$action='create'; // Force chargement page en mode creation
$error++;
}
if (empty($account->label))
{
- setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
$action='create'; // Force chargement page en mode creation
$error++;
}
@@ -130,7 +130,7 @@ if ($_POST["action"] == 'add')
$_GET["id"]=$id; // Force chargement page en mode visu
}
else {
- setEventMessage($account->error,'errors');
+ setEventMessages($account->error, $account->errors, 'errors');
$action='create'; // Force chargement page en mode creation
}
}
@@ -177,19 +177,19 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
{
- setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error');
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), null, 'error');
$action='edit'; // Force chargement page en mode creation
$error++;
}
if (empty($account->ref))
{
- setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors');
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), null, 'errors');
$action='edit'; // Force chargement page en mode creation
$error++;
}
if (empty($account->label))
{
- setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
+ setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
$action='edit'; // Force chargement page en mode creation
$error++;
}
@@ -206,7 +206,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
}
else
{
- setEventMessage($account->error, 'errors');
+ setEventMessages($account->error, $account->errors, 'errors');
$action='edit'; // Force chargement page edition
}
}
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 0b588fa64d02596595d29d5975ad02dec95f14ec..3b6957df40f44273875899dd963140ca4b316b80 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -133,9 +133,9 @@ else if ($action == 'confirm_deletefile' && $confirm == 'yes') {
$ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret) {
- setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+ setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
} else {
- setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+ setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
}
Header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 6f885e12bde80765f859dea917ed49c6fb98aaa2..0764c87f5abf78c38e667f11fc1516f779b0b16e 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -81,7 +81,7 @@ if ($result < 0)
{
$langs->load("errors");
$error++;
- setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors');
+ setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
}
else
{
@@ -113,7 +113,7 @@ else
if ($mode == 'standard')
{
- // Chargement du tableau $amounts
+ // Loading table $amounts
$amounts = array();
$monthnext = $month+1;
@@ -153,7 +153,7 @@ else
dol_print_error($db);
}
- // Calcul de $solde avant le debut du graphe
+ // Calculation of $solde before the start of the graph
$solde = 0;
$sql = "SELECT SUM(b.amount)";
@@ -265,7 +265,7 @@ else
if ($mode == 'standard')
{
- // Chargement du tableau $amounts
+ // Loading table $amounts
$amounts = array();
$sql = "SELECT date_format(b.datev,'%Y%m%d')";
$sql.= ", SUM(b.amount)";
@@ -296,7 +296,7 @@ else
dol_print_error($db);
}
- // Calcul de $solde avant le debut du graphe
+ // Calculation of $solde before the start of the graph
$solde = 0;
$sql = "SELECT SUM(b.amount)";
@@ -403,7 +403,7 @@ else
if ($mode == 'showalltime')
{
- // Chargement du tableau $amounts
+ // Loading table $amounts
$amounts = array();
$sql = "SELECT date_format(b.datev,'%Y%m%d')";
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 46b382ed0805f4529d3f43d7207ddb3b41518d49..7ea3bf1be5a91da981ee7463e158b0d3c112ab8f 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -113,7 +113,7 @@ foreach ($accounts as $key=>$type)
{
$result=$acc->load_board($user,$acc->id);
if ($result<0) {
- setEventMessage($acc->error, 'errors');
+ setEventMessages($acc->error, $acc->errors, 'errors');
} else {
print $result->nbtodo;
if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')';
@@ -229,7 +229,7 @@ foreach ($accounts as $key=>$type)
{
$result=$acc->load_board($user,$acc->id);
if ($result<0) {
- setEventMessage($acc->error, 'errors');
+ setEventMessages($acc->error, $acc->errors, 'errors');
} else {
print $result->nbtodo;
if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')';
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index d210e209b59ee10e6c5f69c01374a9a156750f66..0f73e5cb6cff6d9f2deed1133fc4c2265c575d51 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -104,7 +104,7 @@ if ($user->rights->banque->modifier && $action == "update")
if ($ac->courant == 2 && $_POST['value'] != 'LIQ')
{
- setEventMessage($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), 'errors');
+ setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
$error++;
}
@@ -146,7 +146,7 @@ if ($user->rights->banque->modifier && $action == "update")
$result = $db->query($sql);
if ($result)
{
- setEventMessage($langs->trans("RecordSaved"));
+ setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
$db->commit();
}
else
@@ -184,7 +184,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
$result = $db->query($sql);
if ($result)
{
- setEventMessage($langs->trans("RecordSaved"));
+ setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
$db->commit();
}
else
@@ -205,7 +205,7 @@ $form = new Form($db);
llxHeader();
-// On initialise la liste des categories
+// The list of categories is initialized
$sql = "SELECT rowid, label";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
$sql.= " ORDER BY label";
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 332e7fffe603f2b60f4baeb5669422c2be663aa9..82070a957e2b27b50bd86d8c0076467d1e195dac 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -71,7 +71,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
$result=$bankline->update_conciliation($user,$_POST["cat"]);
if ($result < 0)
{
- setEventMessage($bankline->error, 'errors');
+ setEventMessages($bankline->error, $bankline->errors, 'errors');
$error++;
break;
}
@@ -83,7 +83,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
{
$error++;
$langs->load("errors");
- setEventMessage($langs->trans("ErrorPleaseTypeBankTransactionReportName"), 'errors');
+ setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
}
if (! $error)
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 56071d61f9b6274c425d311cb16681a165d61642..4e323893d85ec599f746a5e361541eeb6484ede6 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -113,18 +113,18 @@ if ($action == 'add')
if (! $error)
{
$mesgs = $langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
- setEventMessage($mesgs);
+ setEventMessages($mesgs, null, 'mesgs');
$db->commit();
}
else
{
- setEventMessage($accountfrom->error.' '.$accountto->error, 'errors');
+ setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors');
$db->rollback();
}
}
else
{
- setEventMessage($langs->trans("ErrorFromToAccountsMustDiffers"), 'errors');
+ setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
}
}
}
@@ -132,7 +132,7 @@ if ($action == 'add')
/*
- * Affichage
+ * View
*/
llxHeader();