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-18 16:05:41 +01:00
parent 209ec62bfe
commit 42ed3d2bb7
7 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/dict.php
View File

@ -692,7 +692,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
$resql = $db->query($sql); $resql = $db->query($sql);
if (! $resql) if (! $resql)
{ {
setEventMessage($db->error(), 'errors'); setEventMessages($db->error(), null, 'errors');
} }
} }
//$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition //$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition

2
htdocs/admin/tools/listevents.php
View File

@ -111,7 +111,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
if (! $resql) if (! $resql)
{ {
$error++; $error++;
setEventMessage($db->lasterror(), 'errors'); setEventMessages($db->lasterror(), null, 'errors');
} }
// Add event purge // Add event purge

2
htdocs/admin/tools/purge.php
View File

@ -105,7 +105,7 @@ if ($action=='purge' && ! preg_match('/^confirm/i',$choice) && ($choice != 'allf
if ($count) $mesg=$langs->trans("PurgeNDirectoriesDeleted", $count); if ($count) $mesg=$langs->trans("PurgeNDirectoriesDeleted", $count);
else $mesg=$langs->trans("PurgeNothingToDelete"); else $mesg=$langs->trans("PurgeNothingToDelete");
setEventMessage($mesg); setEventMessages($mesg, null, 'mesgs');
} }

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

@ -47,7 +47,7 @@ if (preg_match('/set_(.*)/',$action,$reg))
} }
else else
{ {
setEventMessage($db->lasterror(),'errors'); setEventMessages($db->lasterror(), null, 'errors');
} }
} }
@ -61,7 +61,7 @@ if (preg_match('/del_(.*)/',$action,$reg))
} }
else else
{ {
setEventMessage($db->lasterror(),'errors'); setEventMessages($db->lasterror(), null, 'errors');
} }
} }

8
htdocs/compta/facture.php
View File

@ -402,7 +402,7 @@ if (empty($reshook))
$langs->load("errors"); $langs->load("errors");
$error ++; $error ++;
setEventMessage($langs->trans('ErrorProdIdIsMandatory', $langs->transcountry('ProfId' . $i, $object->thirdparty->country_code)), 'errors'); setEventMessages($langs->trans('ErrorProdIdIsMandatory', $langs->transcountry('ProfId' . $i, $object->thirdparty->country_code)), null, 'errors');
} }
} }
@ -418,7 +418,7 @@ if (empty($reshook))
{ {
if (! $idwarehouse || $idwarehouse == - 1) { if (! $idwarehouse || $idwarehouse == - 1) {
$error ++; $error ++;
setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
$action = ''; $action = '';
} }
} }
@ -448,7 +448,7 @@ if (empty($reshook))
} }
else else
{ {
if (count($object->errors)) setEventMessage($object->errors, 'errors'); if (count($object->errors)) setEventMessages(null, $object->errors, 'errors');
else setEventMessages($object->error, $object->errors, 'errors'); else setEventMessages($object->error, $object->errors, 'errors');
} }
} }
@ -1054,7 +1054,7 @@ if (empty($reshook))
if ($discountid > 0) { if ($discountid > 0) {
$result = $object->insert_discount($discountid); // This include link_to_invoice $result = $object->insert_discount($discountid); // This include link_to_invoice
} else { } else {
setEventMessage($discount->error, 'errors'); setEventMessages($discount->error, $discount->errors, 'errors');
$error ++; $error ++;
break; break;
} }

7
htdocs/contact/card.php
View File

@ -143,7 +143,7 @@ if (empty($reshook))
$object->fetch($id); $object->fetch($id);
if ($object->setstatus(0)<0) if ($object->setstatus(0)<0)
{ {
setEventMessage($object->error,'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
else else
{ {
@ -158,7 +158,7 @@ if (empty($reshook))
$object->fetch($id); $object->fetch($id);
if ($object->setstatus(1)<0) if ($object->setstatus(1)<0)
{ {
setEventMessage($object->error,'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
else else
{ {
@ -397,8 +397,7 @@ if (empty($reshook))
} }
else else
{ {
setEventMessage($object->error,'errors'); setEventMessages($object->error, $object->errors, 'errors');
setEventMessage($object->errors,'errors');
$action = 'edit'; $action = 'edit';
} }
} }

4
htdocs/contact/ldap.php
View File

@ -65,12 +65,12 @@ if ($action == 'dolibarr2ldap')
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans("ContactSynchronized")); setEventMessages($langs->trans("ContactSynchronized"), null, 'mesgs');
$db->commit(); $db->commit();
} }
else else
{ {
setEventMessage($ldap->error, 'errors'); setEventMessages($ldap->error, $ldap->errors, 'errors');
$db->rollback(); $db->rollback();
} }
} }