Merge pull request #9137 from grandoc/new_branch_23_07_2018

clean and update code

htdocs/accountancy/bookkeeping/thirdparty_lettrage.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013      Florian Henry	      <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
  */
 
 /**
- * \file accounting/bookkeeping/thirdparty_lettrage.php
+ * \file accountancy/bookkeeping/thirdparty_lettrage.php
  * \ingroup Advanced accountancy
  * \brief Onglet de gestion de parametrages des ventilations
  */
@@ -82,8 +82,9 @@ $socid = GETPOST("socid", 'int');
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result < 0) {
+if ($result < 0) 
-	setEventMessage($object->error, 'errors');
+{
+	setEventMessages($object->error, $object->errors, 'errors');
 }
 
 $form = new Form($db);
@@ -252,7 +253,6 @@ if ($resql) {
 	print '</td>';
 	print '</tr>';
 
-	$var = false;
 	$solde = 0;
 	$tmp = '';
 	while ( $obj = $db->fetch_object($resql) ) {
@@ -261,11 +261,10 @@ if ($resql) {
 			$tmp = $obj->lettering_code;
 
 		if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
-			$var = ! $var;
 
 		$solde += ($obj->credit - $obj->debit);
 
-		print "<tr $bc[$var]>";
+		print '<tr class="oddeven">';
 
 		if (empty($obj->lettering_code)) {
 			print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">';
@@ -293,14 +292,13 @@ if ($resql) {
 	}
 
 	print '<tr class="oddeven">';
-
 	print '<td colspan="4">Mouvement totaux</td>' . "\n";
 	print '<td><strong>' . price($debit) . '</strong></td>';
 	print '<td><strong>' . price($credit) . '</strong></td>';
 	print '<td colspan="5"></td>';
 	print "</tr>\n";
 
-	print "<tr $bc[$var]>";
+	print '<tr class="oddeven">';
 	print '<td colspan="9">Solde Comptable</td>' . "\n";
 	print '<td><strong>' . price($credit - $debit) . '</strong></td>';
 	print '<td colspan="5"></td>';

htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013      Florian Henry	      <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
  */
 
 /**
- * \file accounting/bookkeeping/thirdparty_lettrage.php
+ * \file accountancy/bookkeeping/thirdparty_lettrage_supplier.php
  * \ingroup Advanced accountancy
  * \brief Tab to setup lettering
  */
@@ -86,8 +86,9 @@ $socid = GETPOST("socid", 'int');
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result<0) {
+if ($result<0) 
-	setEventMessage($object->error,'errors');
+{
+	setEventMessages($object->error, $object->errors, 'errors');
 }
 
 $form = new Form($db);
@@ -133,7 +134,7 @@ if (!empty($search_doc_ref)) $param.='&search_doc_ref='.$search_doc_ref;
 
 
 /*
- * Affichage onglets
+ * Display tabs
  */
 $head = societe_prepare_head($object);
 
@@ -272,7 +273,6 @@ if ($resql) {
 	print '</td>';
 	print '</tr>';
 
-	$var = false;
 	$solde = 0;
 	$tmp = '';
 	while ($obj = $db->fetch_object($resql)) {
@@ -281,11 +281,10 @@ if ($resql) {
 			$tmp = $obj->lettering_code;
 
 			if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
-			$var = ! $var;
 
 		$solde += ($obj->credit - $obj->debit);
 
-		print "<tr $bc[$var]>";
+		print '<tr class="oddeven">';
 
 		if (empty($obj->lettering_code)) {
 			print '<td><a href="' . dol_buildpath('/accountancy/bookkeeping/card.php', 1) . '?piece_num=' . $obj->piece_num . '">';
@@ -320,7 +319,7 @@ if ($resql) {
 	print '<td colspan="5"></td>';
 	print "</tr>\n";
 
-	print "<tr $bc[$var]>";
+	print '<tr class="oddeven">';
 	print '<td colspan="9">Solde Comptable</td>' . "\n";
 	print '<td><strong>' . price($credit - $debit) . '</strong></td>';
 	print '<td colspan="5"></td>';

htdocs/accountancy/customer/index.php

@@ -89,7 +89,7 @@ if ($action == 'clean' || $action == 'validatehistory')
 	if (! $resql1) {
 		$error ++;
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
 		$db->commit();
 	}

htdocs/accountancy/expensereport/index.php

@@ -86,7 +86,7 @@ if ($action == 'clean' || $action == 'validatehistory')
 	if (! $resql1) {
 		$error ++;
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
 		$db->commit();
 	}

htdocs/accountancy/supplier/index.php

@@ -87,7 +87,7 @@ if ($action == 'clean' || $action == 'validatehistory')
 	if (! $resql1) {
 		$error ++;
 		$db->rollback();
-		setEventMessage($db->lasterror(), 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
 		$db->commit();
 	}

htdocs/admin/system/filecheck.php

@@ -366,11 +366,11 @@ if (! $error && $xml)
         // Show warning
         if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
         {
-            setEventMessage($langs->trans("FileIntegrityIsStrictlyConformedWithReference"));
+            setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
         }
         else
         {
-            setEventMessage($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), 'warnings');
+            setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
         }
     }
     else

htdocs/admin/ticket.php

@@ -54,10 +54,13 @@ if ($action == 'updateMask') {
         $error++;
     }
 
-    if (!$error) {
+    if (!$error) 
-        setEventMessage($langs->trans("SetupSaved"));
+    {
-    } else {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        setEventMessage($langs->trans("Error"), 'errors');
+    } 
+    else 
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 } elseif ($action == 'setmod') {
     // TODO Verifier si module numerotation choisi peut etre active

htdocs/api/class/api_setup.class.php

@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2016   Xebax Christy           <xebax@wanadoo.fr>
  * Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2017	Regis Houssin	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2017	Regis Houssin	        <regis.houssin@capnetworks.com>
- * Copyright (C) 2017	Neil Orley	<neil.orley@oeris.fr>
+ * Copyright (C) 2017	Neil Orley	            <neil.orley@oeris.fr>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -863,11 +863,11 @@ class Setup extends DolibarrApi
     			// Show warning
     			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
     			{
-    				//setEventMessage($langs->trans("FileIntegrityIsStrictlyConformedWithReference"));
+    				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
     			}
     			else
     			{
-    				//setEventMessage($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), 'warnings');
+    				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
     			}
     		}
     		else

htdocs/blockedlog/admin/blockedlog_list.php

@@ -138,7 +138,7 @@ else if (GETPOST('downloadcsv','alpha'))
 		else
 		{
 			$error++;
-			setEventMessage($db->lasterror, 'errors');
+			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
 
@@ -243,7 +243,7 @@ else if (GETPOST('downloadcsv','alpha'))
 		}
 		else
 		{
-			setEventMessage($db->lasterror, 'errors');
+			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
 }

htdocs/cashdesk/validation_verif.php

@@ -253,7 +253,7 @@ switch ($action)
 			}
 			else
 			{
-				setEventMessage($invoice->error, $invoice->errors, 'errors');
+				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
 

htdocs/comm/mailing/advtargetemailing.php

@@ -84,9 +84,12 @@ if (empty($template_id)) {
 	$result = $advTarget->fetch($template_id);
 }
 
-if ($result < 0) {
+if ($result < 0) 
-	setEventMessage($advTarget->error, 'errors');
+{
-} else {
+	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
+} 
+else 
+{
 	if (! empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
 	}
@@ -101,7 +104,7 @@ if ($action == 'loadfilter') {
 	if (! empty($template_id)) {
 		$result = $advTarget->fetch($template_id);
 		if ($result < 0) {
-			setEventMessage($advTarget->error, 'errors');
+			setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 		} else {
 			if (! empty($advTarget->id)) {
 				$array_query = json_decode($advTarget->filtervalue, true);
@@ -202,7 +205,7 @@ if ($action == 'add') {
 	// if ($array_query ['type_of_target'] == 1 || $array_query ['type_of_target'] == 3) {
 	$result = $advTarget->query_thirdparty($array_query);
 	if ($result < 0) {
-		setEventMessage($advTarget->error, 'errors');
+		setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 	}
 	/*} else {
 		$advTarget->thirdparty_lines = array ();
@@ -211,7 +214,7 @@ if ($action == 'add') {
 	if ($user_contact_query && ($array_query['type_of_target'] == 1 || $array_query['type_of_target'] == 2 || $array_query['type_of_target'] == 4)) {
 		$result = $advTarget->query_contact($array_query, 1);
 		if ($result < 0) {
-			setEventMessage($advTarget->error, 'errors');
+			setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 		}
 		// If use contact but no result use artefact to so not use socid into add_to_target
 		if (count($advTarget->contact_lines) == 0) {
@@ -241,10 +244,10 @@ if ($action == 'add') {
 		exit();
 	}
 	if ($result == 0) {
-		setEventMessage($langs->trans("WarningNoEMailsAdded"), 'warnings');
+		setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
 	}
 	if ($result < 0) {
-		setEventMessage($obj->error, 'errors');
+		setEventMessages($obj->error, $obj->errors, 'errors');
 	}
 }
 
@@ -264,7 +267,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 	$error = 0;
 
 	if ($action == 'createfilter' && empty($template_name)) {
-		setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), 'errors');
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors');
 		$error ++;
 	}
 
@@ -353,13 +356,13 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 			$advTarget->name = $template_name;
 			$result = $advTarget->create($user);
 			if ($result < 0) {
-				setEventMessage($advTarget->error, 'errors');
+				setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 			}
 		} elseif ($action == 'savefilter') {
 			
 			$result = $advTarget->update($user);
 			if ($result < 0) {
-				setEventMessage($advTarget->error, 'errors');
+				setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 			}
 		}
 		$template_id = $advTarget->id;
@@ -369,7 +372,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 if ($action == 'deletefilter') {
 	$result = $advTarget->delete($user);
 	if ($result < 0) {
-		setEventMessage($advTarget->error, 'errors');
+		setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 	}
 	header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);
 	exit();