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

[Qual] Uniformize code

Browse Source
This commit is contained in:
philippe grand 2015-11-11 12:27:09 +01:00
parent d06a445e01
commit 12c5d02a7a
9 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/bank/account.php
View File

@ -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); $insertid = $object->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
if ($insertid > 0) if ($insertid > 0)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$id."&action=addline"); header("Location: ".$_SERVER['PHP_SELF']."?id=".$id."&action=addline");
exit; exit;
} }
else else
{ {
setEventMessage($object->error, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
else else

2
htdocs/compta/bank/annuel.php
View File

@ -291,7 +291,7 @@ if ($result < 0)
{ {
$langs->load("errors"); $langs->load("errors");
$error++; $error++;
setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors'); setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
} }
else else
{ {

18
htdocs/compta/bank/card.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.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 * 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 * 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)) 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 $action='create'; // Force chargement page en mode creation
$error++; $error++;
} }
if (empty($account->ref)) 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 $action='create'; // Force chargement page en mode creation
$error++; $error++;
} }
if (empty($account->label)) 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 $action='create'; // Force chargement page en mode creation
$error++; $error++;
} }
@ -130,7 +130,7 @@ if ($_POST["action"] == 'add')
$_GET["id"]=$id; // Force chargement page en mode visu $_GET["id"]=$id; // Force chargement page en mode visu
} }
else { else {
setEventMessage($account->error,'errors'); setEventMessages($account->error, $account->errors, 'errors');
$action='create'; // Force chargement page en mode creation $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)) 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 $action='edit'; // Force chargement page en mode creation
$error++; $error++;
} }
if (empty($account->ref)) 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 $action='edit'; // Force chargement page en mode creation
$error++; $error++;
} }
if (empty($account->label)) 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 $action='edit'; // Force chargement page en mode creation
$error++; $error++;
} }
@ -206,7 +206,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
} }
else else
{ {
setEventMessage($account->error, 'errors'); setEventMessages($account->error, $account->errors, 'errors');
$action='edit'; // Force chargement page edition $action='edit'; // Force chargement page edition
} }
} }

4
htdocs/compta/bank/document.php
View File

@ -133,9 +133,9 @@ else if ($action == 'confirm_deletefile' && $confirm == 'yes') {
$ret = dol_delete_file($file, 0, 0, 0, $object); $ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret) { if ($ret) {
setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
} else { } else {
setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
} }
Header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id); Header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);

12
htdocs/compta/bank/graph.php
View File

@ -81,7 +81,7 @@ if ($result < 0)
{ {
$langs->load("errors"); $langs->load("errors");
$error++; $error++;
setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors'); setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
} }
else else
{ {
@ -113,7 +113,7 @@ else
if ($mode == 'standard') if ($mode == 'standard')
{ {
// Chargement du tableau $amounts // Loading table $amounts
$amounts = array(); $amounts = array();
$monthnext = $month+1; $monthnext = $month+1;
@ -153,7 +153,7 @@ else
dol_print_error($db); dol_print_error($db);
} }
// Calcul de $solde avant le debut du graphe // Calculation of $solde before the start of the graph
$solde = 0; $solde = 0;
$sql = "SELECT SUM(b.amount)"; $sql = "SELECT SUM(b.amount)";
@ -265,7 +265,7 @@ else
if ($mode == 'standard') if ($mode == 'standard')
{ {
// Chargement du tableau $amounts // Loading table $amounts
$amounts = array(); $amounts = array();
$sql = "SELECT date_format(b.datev,'%Y%m%d')"; $sql = "SELECT date_format(b.datev,'%Y%m%d')";
$sql.= ", SUM(b.amount)"; $sql.= ", SUM(b.amount)";
@ -296,7 +296,7 @@ else
dol_print_error($db); dol_print_error($db);
} }
// Calcul de $solde avant le debut du graphe // Calculation of $solde before the start of the graph
$solde = 0; $solde = 0;
$sql = "SELECT SUM(b.amount)"; $sql = "SELECT SUM(b.amount)";
@ -403,7 +403,7 @@ else
if ($mode == 'showalltime') if ($mode == 'showalltime')
{ {
// Chargement du tableau $amounts // Loading table $amounts
$amounts = array(); $amounts = array();
$sql = "SELECT date_format(b.datev,'%Y%m%d')"; $sql = "SELECT date_format(b.datev,'%Y%m%d')";

4
htdocs/compta/bank/index.php
View File

@ -113,7 +113,7 @@ foreach ($accounts as $key=>$type)
{ {
$result=$acc->load_board($user,$acc->id); $result=$acc->load_board($user,$acc->id);
if ($result<0) { if ($result<0) {
setEventMessage($acc->error, 'errors'); setEventMessages($acc->error, $acc->errors, 'errors');
} else { } else {
print $result->nbtodo; print $result->nbtodo;
if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')'; 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); $result=$acc->load_board($user,$acc->id);
if ($result<0) { if ($result<0) {
setEventMessage($acc->error, 'errors'); setEventMessages($acc->error, $acc->errors, 'errors');
} else { } else {
print $result->nbtodo; print $result->nbtodo;
if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')'; if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')';

8
htdocs/compta/bank/ligne.php
View File

@ -104,7 +104,7 @@ if ($user->rights->banque->modifier && $action == "update")
if ($ac->courant == 2 && $_POST['value'] != 'LIQ') if ($ac->courant == 2 && $_POST['value'] != 'LIQ')
{ {
setEventMessage($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), 'errors'); setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
$error++; $error++;
} }
@ -146,7 +146,7 @@ if ($user->rights->banque->modifier && $action == "update")
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
$db->commit(); $db->commit();
} }
else else
@ -184,7 +184,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
setEventMessage($langs->trans("RecordSaved")); setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
$db->commit(); $db->commit();
} }
else else
@ -205,7 +205,7 @@ $form = new Form($db);
llxHeader(); llxHeader();
// On initialise la liste des categories // The list of categories is initialized
$sql = "SELECT rowid, label"; $sql = "SELECT rowid, label";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_categ"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_categ";
$sql.= " ORDER BY label"; $sql.= " ORDER BY label";

4
htdocs/compta/bank/rappro.php
View File

@ -71,7 +71,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
$result=$bankline->update_conciliation($user,$_POST["cat"]); $result=$bankline->update_conciliation($user,$_POST["cat"]);
if ($result < 0) if ($result < 0)
{ {
setEventMessage($bankline->error, 'errors'); setEventMessages($bankline->error, $bankline->errors, 'errors');
$error++; $error++;
break; break;
} }
@ -83,7 +83,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
{ {
$error++; $error++;
$langs->load("errors"); $langs->load("errors");
setEventMessage($langs->trans("ErrorPleaseTypeBankTransactionReportName"), 'errors'); setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
} }
if (! $error) if (! $error)

8
htdocs/compta/bank/virement.php
View File

@ -113,18 +113,18 @@ if ($action == 'add')
if (! $error) 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)); $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(); $db->commit();
} }
else else
{ {
setEventMessage($accountfrom->error.' '.$accountto->error, 'errors'); setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors');
$db->rollback(); $db->rollback();
} }
} }
else else
{ {
setEventMessage($langs->trans("ErrorFromToAccountsMustDiffers"), 'errors'); setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
} }
} }
} }
@ -132,7 +132,7 @@ if ($action == 'add')
/* /*
* Affichage * View
*/ */
llxHeader(); llxHeader();