Qual: Better error managment on numbering setup

htdocs/admin/agenda.php

@@ -35,8 +35,7 @@ $langs->load("other");
 
 $action=$_POST["action"];
 
-// Load array of all events supported by triggers
+// Get list of triggers available
-// TODO add function
 $sql = "SELECT a.rowid, a.code, a.label, a.elementtype";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a";
 $sql.= " ORDER BY a.rang ASC";

htdocs/admin/commande.php

@@ -276,7 +276,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 

htdocs/admin/contract.php

@@ -132,7 +132,8 @@ if (is_resource($handle))
                 // Show example of numbering module
                 print '<td nowrap="nowrap">';
                 $tmp=$module->getExample();
-                if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+                if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                 else print $tmp;
                 print '</td>'."\n";
 

htdocs/admin/expedition.php

@@ -384,11 +384,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp))
+                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-                        {
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-                        	$langs->load('errors');
-                        	print $langs->trans($tmp);
-                        }
                         else print $tmp;
                         print '</td>'."\n";
 

htdocs/admin/facture.php

@@ -355,7 +355,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
                             // Show example of numbering module
                             print '<td nowrap="nowrap">';
                             $tmp=$module->getExample();
-                            if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+                            if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                            elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                             else print $tmp;
                             print '</td>'."\n";
 

htdocs/admin/fichinter.php

@@ -276,7 +276,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 

htdocs/admin/fournisseur.php

@@ -302,11 +302,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
 						// Show example of numbering module
 						print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-						if (preg_match('/^Error/',$tmp)) 
+                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-						{
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-							$langs->load("errors");
-							print $langs->trans($tmp);
-						}
                         else print $tmp;
 						print '</td>'."\n";
 

htdocs/admin/livraison.php

@@ -270,11 +270,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp))
+                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-                        {
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
-                        	$langs->load("errors");
-                        	print $langs->trans($tmp);
-                        }
                         else print $tmp;
                         print '</td>'."\n";
 

htdocs/admin/prelevement.php

@@ -190,6 +190,7 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
         $db->free($resql);
     }
 
+    // Get list of triggers for module withdraw
     $sql = "SELECT rowid, code, label";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
     $sql.= " WHERE elementtype = 'withdraw'";

htdocs/admin/project.php

@@ -227,7 +227,8 @@ if (is_resource($handle))
                 // Show example of numbering module
                 print '<td nowrap="nowrap">';
                 $tmp=$module->getExample();
-                if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+                if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                 else print $tmp;
                 print '</td>'."\n";
 

htdocs/admin/propale.php

@@ -309,7 +309,8 @@ foreach ($conf->file->dol_document_root as $dirroot)
                         // Show example of numbering module
                         print '<td nowrap="nowrap">';
                         $tmp=$module->getExample();
-                        if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+                        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 

htdocs/admin/security.php

@@ -259,7 +259,8 @@ foreach ($arrayhandler as $key => $module)
         // Show example of numbering module
         print '<td nowrap="nowrap">';
         $tmp=$module->getExample();
-        if (preg_match('/^Error/',$tmp)) print $langs->trans($tmp);
+        if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
+        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
         else print $tmp;
         print '</td>'."\n";
 

htdocs/comm/propal/class/propal.class.php

@@ -1139,9 +1139,10 @@ class Propal extends CommonObject
 	}
 
 	/**
-	 *      \brief      Passe au statut valider une propale
+	 *  Set status to validated
-	 *      \param      user        Objet utilisateur qui valide
+	 *
-	 *      \return     int         <0 si ko, >=0 si ok
+	 *  @param	User	$user       Object user that validate
+	 *  @return int         		<0 if KO, >=0 if OK
 	 */
 	function valid($user, $notrigger=0)
 	{
@@ -1157,6 +1158,7 @@ class Propal extends CommonObject
 			$sql.= " SET fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
 			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
+			dol_syslog(get_class($this).'::valid sql='.$sql);
 			if ($this->db->query($sql))
 			{
 				if (! $notrigger)
@@ -1194,10 +1196,11 @@ class Propal extends CommonObject
 
 
 	/**
-	 *      \brief      Define proposal date
+	 *  Define proposal date
-	 *      \param      user        		Object user that modify
+	 *
-	 *      \param      date				Date
+	 *  @param  User		$user      		Object user that modify
-	 *      \return     int         		<0 if KO, >0 if OK
+	 *  @param  timestamp	$date			Date
+	 *  @return	int         				<0 if KO, >0 if OK
 	 */
 	function set_date($user, $date)
 	{
@@ -1205,6 +1208,8 @@ class Propal extends CommonObject
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = ".$this->db->idate($date);
 			$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			dol_syslog(get_class($this)."::set_date sql=".$sql);
 			if ($this->db->query($sql) )
 			{
 				$this->date = $date;
@@ -1213,8 +1218,8 @@ class Propal extends CommonObject
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error=$this->db->lasterror();
-				dol_syslog("Propal::set_date Erreur SQL".$this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
@@ -2298,7 +2303,8 @@ class Propal extends CommonObject
 		}
 		else
 		{
-			print $langs->trans("Error")." ".$langs->trans("Error_PROPALE_ADDON_NotDefined");
+		    $langs->load("errors");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
 			return "";
 		}
 	}

htdocs/core/class/notify.class.php

@@ -46,20 +46,20 @@ class Notify
     /**
 	 *	Constructor
 	 *
-	 *	@param 		DoliDB		$DB		Database handler
+	 *	@param 		DoliDB		$db		Database handler
      */
-    function Notify($DB)
+    function Notify($db)
     {
-        $this->db = $DB ;
+        $this->db = $db;
     }
 
 
     /**
-     *  Renvoie le message signalant les notifications qui auront lieu sur
+     *  Return message that say how many notification will occurs on requested event.
-     *	un evenement pour affichage dans texte de confirmation evenement
+     *	This is to show confirmation messages before event is done.
      *
-     * 	@param		action		Id of action in llx_c_action_trigger
+     * 	@param	string	$action		Id of action in llx_c_action_trigger
-     * 	@param		socid		Id of third party
+     * 	@param	int		$socid		Id of third party
      *	@return	string				Message
      */
 	function confirmMessage($action,$socid)
@@ -75,10 +75,11 @@ class Notify
 	}
 
     /**
-     *    	\brief      Return number of notifications activated for action code and third party
+     * Return number of notifications activated for action code and third party
-     * 		\param		action		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
+     *
-     * 		\param		socid		Id of third party
+     * @param	string	$action		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
-     * 		\return		int			<0 si ko, sinon nombre de notifications definies
+     * @param	int		$socid		Id of third party
+     * @return	int					<0 if KO, nb of notifications sent if OK
      */
 	function countDefinedNotifications($action,$socid)
 	{

htdocs/core/modules/facture/mod_facture_mercure.php

@@ -98,7 +98,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
         if (! $numExample)
         {
-            $numExample = $langs->trans('NotConfigured');
+            $numExample = 'NotConfigured';
         }
         return $numExample;
     }

htdocs/core/modules/propale/mod_propale_saphir.php

@@ -91,7 +91,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 
 		if (! $numExample)
 		{
-			$numExample = $langs->trans('NotConfigured');
+			$numExample = 'NotConfigured';
 		}
 		return $numExample;
     }

htdocs/langs/en_US/admin.lang

@@ -82,7 +82,7 @@ DetailMenuIdParent=ID of parent menu (0 for a top menu)
 DetailPosition=Sort number to define menu position
 PersonalizedMenusNotSupported=Personalized menus not supported
 AllMenus=All
-NotConfigured=Not configured
+NotConfigured=Numbering module not configured
 Setup=Setup
 Activation=Activation
 Active=Active

htdocs/langs/fr_FR/admin.lang

@@ -83,7 +83,7 @@ DetailMenuIdParent= Id du menu parent (0 pour un menu du haut)
 DetailPosition= Numéro d'ordre déterminant la position du menu
 PersonalizedMenusNotSupported= Menus personnalisés non gérés
 AllMenus= Tous
-NotConfigured= Non configuré
+NotConfigured=Module numérotation non configuré
 Setup= Configuration
 Activation= Activation
 Active= Actif