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

Merge pull request #4199 from grandoc/develop

Browse Source 
[Qual] Uniformize code
This commit is contained in:
Laurent Destailleur 2015-12-11 16:59:25 +01:00
commit 8ac189a1c3
85 changed files with 168 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/accountancy/admin/card.php
View File

@ -303,6 +303,7 @@ else if ($id)
dol_print_error($db);
}
}
$db->close();
llxFooter();
llxFooter();
$db->close();

3
htdocs/accountancy/admin/fiscalyear_info.php
View File

@ -55,6 +55,5 @@ if ($id)
print '</div>';
}
$db->close();
llxFooter();
$db->close();

3
htdocs/accountancy/journal/bankjournal.php
View File

@ -709,7 +709,6 @@ else
print "</table>";
// End of page
llxFooter();
}
llxFooter();
$db->close();

4
htdocs/accountancy/journal/index.php
View File

@ -42,5 +42,5 @@ llxHeader('', 'Journaux', '');
$form = new Form($db);
// End of page
$db->close();
llxFooter();
llxFooter();
$db->close();

3
htdocs/accountancy/journal/purchasesjournal.php
View File

@ -488,7 +488,6 @@ if ($action == 'export_csv')
print "</table>";
// End of page
llxFooter();
}
llxFooter();
$db->close();

4
htdocs/accountancy/journal/sellsjournal.php
View File

@ -531,8 +531,6 @@ if ($action == 'export_csv')
print "</table>";
// End of page
llxFooter();
}
llxFooter();
$db->close();

3
htdocs/adherents/info_subscription.php
View File

@ -77,6 +77,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

2
htdocs/admin/compta.php
View File

@ -166,6 +166,6 @@ print "</table>\n";
print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
print '</form>';
$db->close();
llxFooter();
$db->close();

3
htdocs/admin/confexped.php
View File

@ -158,6 +158,5 @@ print '</div>';
print info_admin($langs->trans("NoNeedForDeliveryReceipts"));
$db->close();
llxFooter();
$db->close();

5
htdocs/admin/external_rss.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2011 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
*
* 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
@ -320,6 +320,5 @@ else
}
$db->close();
llxFooter();
$db->close();

3
htdocs/admin/ldap.php
View File

@ -325,6 +325,5 @@ if (function_exists("ldap_connect"))
}
}
$db->close();
llxFooter();
$db->close();

3
htdocs/admin/ldap_contacts.php
View File

@ -337,7 +337,6 @@ if (function_exists("ldap_connect"))
}
}
llxFooter();
$db->close();
llxFooter();

3
htdocs/admin/ldap_groups.php
View File

@ -257,6 +257,5 @@ if (function_exists("ldap_connect"))
}
}
$db->close();
llxFooter();
$db->close();

3
htdocs/admin/ldap_users.php
View File

@ -452,6 +452,5 @@ if (function_exists("ldap_connect"))
}
}
$db->close();
llxFooter();
$db->close();

4
htdocs/admin/menus/edit.php
View File

@ -466,7 +466,5 @@ elseif ($action == 'edit')
print '<br>';
}
$db->close();
llxFooter();
$db->close();

4
htdocs/admin/perms.php
View File

@ -218,7 +218,5 @@ print '</table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

3
htdocs/admin/prelevement.php
View File

@ -284,6 +284,5 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
}
*/
$db->close();
llxFooter();
$db->close();

3
htdocs/admin/proxy.php
View File

@ -208,6 +208,5 @@ print '</div>';
print '</form>';
$db->close();
llxFooter();
$db->close();

1
htdocs/admin/supplier_proposal.php
View File

@ -603,6 +603,7 @@ print " <td>".$langs->trans("Value")."</td>\n";
print "</tr>\n";
print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("PathDirectory")."</td>\n <td>".$conf->supplier_proposal->dir_output."</td>\n</tr>\n";
print "</table>\n<br>";
llxFooter();
$db->close();

1
htdocs/admin/system/os.php
View File

@ -51,3 +51,4 @@ print '</table>';
llxFooter();
$db->close();

3
htdocs/admin/taxes.php
View File

@ -226,6 +226,5 @@ print '</div>';
print '</form>';
$db->close();
llxFooter();
$db->close();

1
htdocs/api/admin/explorer.php
View File

@ -162,4 +162,5 @@ foreach($listofapis['v1'] as $key => $val)
}
llxFooter();
$db->close();

1
htdocs/asterisk/wrapper.php
View File

@ -190,3 +190,4 @@ else {
}
llxFooter();
$db->close();

3
htdocs/bookmarks/admin/bookmark.php
View File

@ -82,6 +82,5 @@ print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf-
print '</td></tr>';
print '</table><br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div></form>';
$db->close();
llxFooter();
$db->close();

3
htdocs/cashdesk/admin/cashdesk.php
View File

@ -188,6 +188,5 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
print "</form>\n";
$db->close();
llxFooter();
$db->close();

4
htdocs/categories/admin/categorie.php
View File

@ -121,5 +121,5 @@ print '</td></tr>';
print '</table>';
$db->close();
llxFooter();
llxFooter();
$db->close();

3
htdocs/comm/action/info.php
View File

@ -64,6 +64,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

4
htdocs/comm/action/rapport/index.php
View File

@ -150,7 +150,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

3
htdocs/comm/mailing/info.php
View File

@ -63,6 +63,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
print '</div>';
}
$db->close();
llxFooter();
$db->close();

3
htdocs/comm/multiprix.php
View File

@ -171,6 +171,5 @@ if ($_socid > 0)
}
$db->close();
llxFooter();
$db->close();

4
htdocs/comm/prospect/recap-prospect.php
View File

@ -89,7 +89,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

4
htdocs/comm/recap-client.php
View File

@ -88,7 +88,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

3
htdocs/comm/remise.php
View File

@ -199,6 +199,5 @@ if ($socid > 0)
}
$db->close();
llxFooter();
$db->close();

3
htdocs/comm/remx.php
View File

@ -544,6 +544,5 @@ if ($socid > 0)
}
$db->close();
llxFooter();
$db->close();

4
htdocs/commande/info.php
View File

@ -62,7 +62,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/bank/bilan.php
View File

@ -89,6 +89,5 @@ print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"ri
print "</table>";
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/bank/budget.php
View File

@ -97,6 +97,5 @@ else
}
print "</table>";
$db->close();
llxFooter();
$db->close();

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

@ -1041,8 +1041,5 @@ else
}
$db->close();
llxFooter();
$db->close();

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

@ -62,7 +62,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

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

@ -353,7 +353,5 @@ if ($_POST["action"] == "search" && ! $num)
print $langs->trans("NoRecordFound");
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/bank/treso.php
View File

@ -339,6 +339,5 @@ else
print $langs->trans("ErrorBankAccountNotFound");
}
$db->close();
llxFooter();
$db->close();

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

@ -188,6 +188,5 @@ print '<br><div class="center"><input type="submit" class="button" value="'.$lan
print "</form>";
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/clients.php
View File

@ -210,6 +210,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/deplacement/info.php
View File

@ -58,6 +58,5 @@ if ($id)
print '</div>';
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/facture/info.php
View File

@ -54,6 +54,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

4
htdocs/compta/localtax/card.php
View File

@ -269,8 +269,6 @@ if ($id)
print "</div>";
}
llxFooter();
$db->close();
llxFooter();

4
htdocs/compta/localtax/clients.php
View File

@ -318,7 +318,5 @@ if($conf->global->$calc ==0){
}
print '</table>';
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/localtax/index.php
View File

@ -280,6 +280,5 @@ print '</td></tr></table>';
print '</td></tr>';
print '</table>';
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/localtax/quadri_detail.php
View File

@ -663,6 +663,5 @@ else
$i++;
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/localtax/reglement.php
View File

@ -92,6 +92,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/paiement/avalider.php
View File

@ -118,6 +118,5 @@ if ($resql)
print "</table>";
}
$db->close();
llxFooter();
$db->close();

5
htdocs/compta/paiement/index.php
View File

@ -31,8 +31,5 @@ llxHeader();
print load_fiche_titre("Payments");
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/paiement/info.php
View File

@ -63,6 +63,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

4
htdocs/compta/paiement_charge.php
View File

@ -323,7 +323,5 @@ if ($_GET["action"] == 'create')
print "</form>\n";
}
$db->close();
llxFooter();
$db->close();

4
htdocs/compta/prelevement/create.php
View File

@ -299,7 +299,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

2
htdocs/compta/prelevement/demandes.php
View File

@ -157,5 +157,5 @@ else
dol_print_error($db);
}
llxFooter();
$db->close();

3
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -178,6 +178,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/prelevement/fiche-stat.php
View File

@ -159,6 +159,5 @@ if ($prev_id)
}
}
$db->close();
llxFooter();
$db->close();

4
htdocs/compta/prelevement/list.php
View File

@ -192,7 +192,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/prelevement/rejets.php
View File

@ -124,6 +124,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

6
htdocs/compta/sociales/index.php
View File

@ -247,9 +247,5 @@ else
dol_print_error($db);
}
$db->close();
llxFooter();
$db->close();

4
htdocs/compta/tva/card.php
View File

@ -372,7 +372,5 @@ if ($id)
print "</div>";
}
$db->close();
llxFooter();
$db->close();

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

@ -252,7 +252,5 @@ print "</td></tr></table>";
print '</td></tr>';
print '</table>';
$db->close();
llxFooter();
$db->close();

4
htdocs/compta/tva/quadri.php
View File

@ -313,7 +313,5 @@ print '</table>';
echo '</td></tr>';
echo '</table>';
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/tva/quadri_detail.php
View File

@ -638,6 +638,5 @@ else
}
echo '</table>';
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/tva/quarter_report.php
View File

@ -707,6 +707,5 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
print '</table>';
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/ventilation/card.php
View File

@ -160,6 +160,5 @@ else
print "Error ID incorrect";
}
$db->close();
llxFooter();
$db->close();

3
htdocs/compta/ventilation/fournisseur/card.php
View File

@ -144,6 +144,5 @@ else
print "Error ID incorrect";
}
$db->close();
llxFooter();
$db->close();

2
htdocs/compta/ventilation/fournisseur/list.php
View File

@ -100,6 +100,6 @@ else
{
print $db->error();
}
$db->close();
llxFooter();
$db->close();

3
htdocs/contrat/info.php
View File

@ -55,6 +55,5 @@ print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
$db->close();

5
htdocs/cron/info.php
View File

@ -55,6 +55,5 @@ dol_print_object_info($object);
print '</td></tr></table>';
print '</div>';
$db->close();
llxFooter();
llxFooter();
$db->close();

2
htdocs/exports/export.php
View File

@ -259,7 +259,7 @@ if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes')
$file = $upload_dir . "/" . GETPOST('file'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
exit;

2
htdocs/fourn/card.php
View File

@ -375,7 +375,7 @@ if ($object->id > 0)
$orders2invoice = $db->num_rows($resql2);
$db->free($resql2);
} else {
setEventMessage($db->lasterror(),'errors');
setEventMessages($db->lasterror(), null, 'errors');
}
// TODO move to DAO class

64
htdocs/fourn/facture/card.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2005 Marc Barilley <marc@ocebo.fr>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
*
@ -128,7 +128,7 @@ if (empty($reshook))
else
{
$langs->load("errors");
setEventMessage($langs->trans($object->error), 'errors');
setEventMessages($langs->trans($object->error), null, 'errors');
$action='';
}
// }
@ -161,7 +161,7 @@ if (empty($reshook))
if (! $idwarehouse || $idwarehouse == -1)
{
$error++;
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
$action='';
}
}
@ -188,7 +188,7 @@ if (empty($reshook))
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
@ -219,7 +219,7 @@ if (empty($reshook))
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
$action='';
}
@ -231,7 +231,7 @@ if (empty($reshook))
$result=$object->set_paid($user);
if ($result<0)
{
setEventMessage($object->error,'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
@ -242,13 +242,13 @@ if (empty($reshook))
if ($result < 0) dol_print_error($db, $object->error);
}
// conditions de reglement
// payments conditions
if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
{
$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
}
// mode de reglement
// payment mode
else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
{
$result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
@ -282,7 +282,7 @@ if (empty($reshook))
if (! empty($object->date_echeance) && $object->date_echeance < $object->date)
{
$object->date_echeance=$object->date;
setEventMessage($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"),'warnings');
setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
}
$result=$object->update($user);
if ($result < 0) dol_print_error($db,$object->error);
@ -298,7 +298,7 @@ if (empty($reshook))
$result=$paiementfourn->fetch(GETPOST('paiement_id'));
if ($result > 0) $result=$paiementfourn->delete(); // If fetch ok and found
if ($result < 0) {
setEventMessage($paiementfourn->error, 'errors');
setEventMessages($paiementfourn->error, $paiementfourn->errors, 'errors');
}
}
}
@ -313,21 +313,21 @@ if (empty($reshook))
if (GETPOST('socid','int')<1)
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')), null, 'errors');
$action='create';
$error++;
}
if ($datefacture == '')
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')), null, 'errors');
$action='create';
$_GET['socid']=$_POST['socid'];
$error++;
}
if (! GETPOST('ref_supplier'))
{
setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('RefSupplier')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('RefSupplier')), null, 'errors');
$action='create';
$_GET['socid']=$_POST['socid'];
$error++;
@ -602,7 +602,7 @@ if (empty($reshook))
else
{
$db->rollback();
setEventMessage($object->error,'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
@ -657,27 +657,27 @@ if (empty($reshook))
if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
{
setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
$error++;
}
if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
{
setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
$error++;
}
if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
{
setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
setEventMessages($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), null, 'errors');
$error++;
}
if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
{
setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
$error++;
}
if (! GETPOST('qty'))
{
setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
$error++;
}
@ -727,7 +727,7 @@ if (empty($reshook))
// Quantity too low
$error++;
$langs->load("errors");
setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
}
}
else if( GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='' )
@ -820,7 +820,7 @@ if (empty($reshook))
else
{
$db->rollback();
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
$action = '';
@ -886,7 +886,7 @@ if (empty($reshook))
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
}
@ -995,7 +995,7 @@ if (empty($reshook))
$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
if ($mailfile->error)
{
setEventMessage($mailfile->error,'errors');
setEventMessages($mailfile->error, $mailfile->errors, 'errors');
}
else
{
@ -1003,7 +1003,7 @@ if (empty($reshook))
if ($result)
{
$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contain "
setEventMessage($mesg);
setEventMessages($mesg, null, 'mesgs');
$error=0;
@ -1048,7 +1048,7 @@ if (empty($reshook))
{
$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
}
setEventMessage($mesg, 'errors');
setEventMessages($mesg, null, 'errors');
}
}
}
@ -1056,14 +1056,14 @@ if (empty($reshook))
else
{
$langs->load("other");
setEventMessage($langs->trans('ErrorMailRecipientIsEmpty'), 'errors');
setEventMessages($langs->trans('ErrorMailRecipientIsEmpty'), null, 'errors');
dol_syslog('Recipient email is empty');
}
}
else
{
$langs->load("other");
setEventMessage($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), 'errors');
setEventMessages($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), null, 'errors');
dol_syslog('Unable to read data from the invoice. The invoice file has perhaps not been generated.');
}
@ -1120,8 +1120,8 @@ if (empty($reshook))
$upload_dir = $conf->fournisseur->facture->dir_output . "/";
$file = $upload_dir . '/' . GETPOST('file');
$ret=dol_delete_file($file,0,0,0,$object);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
}
}
@ -1185,11 +1185,11 @@ if (empty($reshook))
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
}
@ -1524,7 +1524,7 @@ if ($action == 'create')
$cntinvoice=count($objectsrc->linkedObjects['invoice_supplier']);
if ($cntinvoice>=1)
{
setEventMessage('WarningBillExist','warnings');
setEventMessages('WarningBillExist', null, 'warnings');
echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['invoice_supplier'])->getNomUrl(1).')';
}
echo '</td></tr>';

4
htdocs/fourn/facture/contact.php
View File

@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
}

14
htdocs/fourn/facture/paiement.php
View File

@ -117,7 +117,7 @@ if (empty($reshook))
{
$langs->load("errors");
//$error++;
setEventMessage($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), 'warnings');
setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
}
}
@ -128,7 +128,7 @@ if (empty($reshook))
// Check parameters
if ($_POST['paiementid'] <= 0)
{
setEventMessage($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('PaymentMode')), 'errors');
setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('PaymentMode')), null, 'errors');
$error++;
}
@ -137,20 +137,20 @@ if (empty($reshook))
// If bank module is on, account is required to enter a payment
if (GETPOST('accountid') <= 0)
{
setEventMessage($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), 'errors');
setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
$error++;
}
}
if (empty($totalpayment) && empty($atleastonepaymentnotnull))
{
setEventMessage($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), 'errors');
setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), null, 'errors');
$error++;
}
if (empty($datepaye))
{
setEventMessage($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('Date')), 'errors');
setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('Date')), null, 'errors');
$error++;
}
}
@ -193,7 +193,7 @@ if (empty($reshook))
$paiement_id = $paiement->create($user,(GETPOST('closepaidinvoices')=='on'?1:0));
if ($paiement_id < 0)
{
setEventMessage($paiement->error, 'errors');
setEventMessages($paiement->error, $paiement->errors, 'errors');
$error++;
}
}
@ -203,7 +203,7 @@ if (empty($reshook))
$result=$paiement->addPaymentToBank($user,'payment_supplier','(SupplierInvoicePayment)',$accountid,'','');
if ($result < 0)
{
setEventMessage($paiement->error, 'errors');
setEventMessages($paiement->error, $paiement->errors, 'errors');
$error++;
}
}

14
htdocs/fourn/paiement/card.php
View File

@ -59,7 +59,7 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
}
}
@ -78,7 +78,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
}
}
@ -99,7 +99,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
}
}
@ -110,11 +110,11 @@ if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement']))
$res = $object->update_num($_POST['num_paiement']);
if ($res === 0)
{
setEventMessage($langs->trans('PaymentNumberUpdateSucceeded'));
setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
}
else
{
setEventMessage($langs->trans('PaymentNumberUpdateFailed'), 'errors');
setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
}
}
@ -125,11 +125,11 @@ if ($action == 'setdatep' && ! empty($_POST['datepday']))
$res = $object->update_date($datepaye);
if ($res === 0)
{
setEventMessage($langs->trans('PaymentDateUpdateSucceeded'));
setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
}
else
{
setEventMessage($langs->trans('PaymentDateUpdateFailed'), 'errors');
setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
}
}

23
htdocs/ftp/index.php
View File

@ -108,15 +108,15 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
$langs->load("errors");
if ($resupload < 0) // Unknown error
{
setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors');
setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
}
else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus
{
setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors');
setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
}
else // Known error
{
setEventMessage($langs->trans($resupload), 'errors');
setEventMessages($langs->trans($resupload), null, 'errors');
}
}
}
@ -124,7 +124,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
// Echec transfert (fichier depassant la limite ?)
$langs->load("errors");
setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
}
}
@ -143,8 +143,7 @@ if ($action == 'add' && $user->rights->ftp->setup)
}
else
{
//TODO: Translate
setEventMessage('Error '.$langs->trans($ecmdir->error));
setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
$action = "create";
}
}
@ -176,12 +175,12 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
$result=@ftp_delete($conn_id, $newremotefileiso);
if ($result)
{
setEventMessage($langs->trans("FileWasRemoved",$file));
setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
}
else
{
dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors');
setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
}
//ftp_close($conn_id); Close later
@ -226,12 +225,12 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
$result=@ftp_delete($conn_id, $newremotefileiso);
if ($result)
{
setEventMessage($langs->trans("FileWasRemoved",$file));
setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
}
else
{
dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors');
setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
}
//ftp_close($conn_id); Close later
@ -270,11 +269,11 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
$result=@ftp_rmdir($conn_id, $newremotefileiso);
if ($result)
{
setEventMessage($langs->trans("DirWasRemoved",$file));
setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
}
else
{
setEventMessage($langs->trans("FTPFailedToRemoveDir",$file), 'errors');
setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
}
//ftp_close($conn_id); Close later

10
htdocs/holiday/card.php
View File

@ -60,7 +60,7 @@ if ($action == 'create')
if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
{
$error++;
setEventMessage($langs->trans('CantCreateCP'));
setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
$action='request';
}
@ -130,7 +130,7 @@ if ($action == 'create')
// If no validator designated
if ($valideur < 1)
{
setEventMessage($langs->transnoentitiesnoconv('InvalidValidatorCP'), 'errors');
setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
$error++;
}
@ -138,7 +138,7 @@ if ($action == 'create')
if ($type < 1)
{
setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Type")), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Type")), null, 'errors');
$error++;
}
@ -723,7 +723,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
break;
}
setEventMessage($errors, 'errors');
setEventMessages($errors, null, 'errors');
}
@ -946,7 +946,7 @@ else
break;
}
setEventMessage($errors, 'errors');
setEventMessages($errors, null, 'errors');
}
// On vérifie si l'utilisateur à le droit de lire cette demande

6
htdocs/hrm/establishment/card.php
View File

@ -62,7 +62,7 @@ if ($action == 'confirm_delete' && $confirm == "yes")
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
@ -75,7 +75,7 @@ else if ($action == 'add')
$object->name = GETPOST('name', 'alpha');
if (empty($object->name))
{
setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors');
setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), null, 'errors');
$error++;
}
@ -124,7 +124,7 @@ else if ($action == 'update')
$name = GETPOST('name', 'alpha');
if (empty($name)) {
setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('Name')), 'errors');
setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('Name')), null, 'errors');
$error ++;
}

16
htdocs/imports/import.php
View File

@ -139,11 +139,11 @@ if ($action == 'builddoc')
$result=$objimport->build_file($user, GETPOST('model','alpha'), $datatoimport, $array_match_file_to_database);
if ($result < 0)
{
setEventMessage($objimport->error, 'errors');
setEventMessages($objimport->error, $objimport->errors, 'errors');
}
else
{
setEventMessage($langs->trans("FileSuccessfullyBuilt"));
setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
}
}
@ -176,17 +176,17 @@ if ($action == 'add_import_model')
$result = $objimport->create($user);
if ($result >= 0)
{
setEventMessage($langs->trans("ImportModelSaved",$objimport->model_name));
setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
}
else
{
$langs->load("errors");
if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
setEventMessage($langs->trans("ErrorImportDuplicateProfil"), 'errors');
setEventMessages($langs->trans("ErrorImportDuplicateProfil"), null, 'errors');
}
else {
setEventMessage($objimport->error, 'errors');
setEventMessages($objimport->error, null, 'errors');
}
}
}
@ -211,7 +211,7 @@ if ($step == 3 && $datatoimport)
else
{
$langs->load("errors");
setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
}
}
@ -225,8 +225,8 @@ if ($step == 3 && $datatoimport)
$file = $conf->import->dir_temp . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
Header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.$param);
exit;
}

6
htdocs/livraison/card.php
View File

@ -113,7 +113,7 @@ if ($action == 'add')
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
$db->rollback();
$_GET["commande_id"]=$_POST["commande_id"];
@ -216,8 +216,8 @@ elseif ($action == 'remove_file')
$upload_dir = $conf->expedition->dir_output . "/receipt";
$file = $upload_dir . '/' . GETPOST('file');
$ret=dol_delete_file($file,0,0,0,$object);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
}

12
htdocs/loan/card.php
View File

@ -54,11 +54,11 @@ if ($action == 'confirm_paid' && $confirm == 'yes')
$result = $object->set_paid($user);
if ($result > 0)
{
setEventMessage($langs->trans('LoanPaid'));
setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
}
else
{
setEventMessage($loan->error, 'errors');
setEventMessages($loan->error, null, 'errors');
}
}
@ -69,13 +69,13 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
$result=$object->delete($user);
if ($result > 0)
{
setEventMessage($langs->trans('LoanDeleted'));
setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
header("Location: index.php");
exit;
}
else
{
setEventMessage($loan->error, 'errors');
setEventMessages($loan->error, null, 'errors');
}
}
@ -121,7 +121,7 @@ if ($action == 'add' && $user->rights->loan->write)
$id=$object->create($user);
if ($id <= 0)
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
}
@ -157,7 +157,7 @@ else if ($action == 'update' && $user->rights->loan->write)
}
else
{
setEventMessage($object->error, 'errors');
setEventMessages($object->error, $object->errors, 'errors');
}
}
else

4
htdocs/loan/payment/card.php
View File

@ -65,7 +65,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
}
else
{
setEventMessage($payment->error, 'errors');
setEventMessages($payment->error, $payment->errors, 'errors');
$db->rollback();
}
}
@ -103,7 +103,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
}
else
{
setEventMessage($payment->error);
setEventMessages($payment->error, $payment->errors, 'errors');
$db->rollback();
}
}

6
htdocs/loan/payment/payment.php
View File

@ -83,7 +83,7 @@ if ($action == 'add_payment')
$amount = GETPOST('amount_capital') + GETPOST('amount_insurance') + GETPOST('amount_interest');
if ($amount == 0)
{
setEventMessage($langs->trans('ErrorNoPaymentDefined'), 'errors');
setEventMessages($langs->trans('ErrorNoPaymentDefined'), null, 'errors');
$error++;
}
@ -109,7 +109,7 @@ if ($action == 'add_payment')
$paymentid = $payment->create($user);
if ($paymentid < 0)
{
setEventMessage($payment->error, 'errors');
setEventMessages($payment->error, $payment->errors, 'errors');
$error++;
}
}
@ -119,7 +119,7 @@ if ($action == 'add_payment')
$result = $payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', '');
if (! $result > 0)
{
setEventMessage($payment->error, 'errors');
setEventMessages($payment->error, $payment->errors, 'errors');
$error++;
}
}