New: Add ability for numbering module to not be shown if a condition is not true.

htdocs/admin/barcode.php

@@ -102,10 +102,13 @@ while (($file = readdir($handle))!==false)
 				if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 				if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 	
+				if ($module->isEnabled())
+				{
 					$barcodelist[$filebis]=$module->info();
 				}
 			}
 		}
+	}
 }
 
 

htdocs/admin/commande.php

@@ -205,6 +205,8 @@ if ($handle)
 		    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 		    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
+		    if ($module->isEnabled())
+		    {
 	            $var=!$var;
 	            print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 	            print $module->info();
@@ -252,6 +254,7 @@ if ($handle)
 	            print '</tr>';
 		    }
         }
+    }
     closedir($handle);
 }
 

htdocs/admin/dons.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-208 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -14,15 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**	
         \file       htdocs/admin/dons.php
 		\ingroup    dons
 		\brief      Page d'administration/configuration du module Dons
-		\version    $Revision$
+		\version    $Id$
 */
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -180,6 +178,12 @@ while (($file = readdir($handle))!==false)
 		require_once($dir.'/'.$file);
 		$module=new $classname($db);
 
+		// Show modules according to features level
+	    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+	    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+	    if ($module->isEnabled())
+	    {
 	        print '<tr '.$bc[$var].'><td width=\"100\">';
 	        echo $module->name;
 	        print '</td>';
@@ -187,7 +191,7 @@ while (($file = readdir($handle))!==false)
 	        print $module->description;
 	        print '</td>';
 	
-		// Activ<EFBFBD>
+			// Active
 			if (in_array($name, $def))
 			{
 		        print "<td align=\"center\">\n";
@@ -237,7 +241,7 @@ while (($file = readdir($handle))!==false)
 	    	print '</td>';
 	    	
 	        print "</tr>\n";
-
+	    }
     }
 }
 closedir($handle);

htdocs/admin/facture.php

@@ -257,6 +257,8 @@ while (($file = readdir($handle))!==false)
 		    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 		    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 			
+		    if ($module->isEnabled())
+		    {
 		        $var = !$var;
 		        print '<tr '.$bc[$var].'><td width="100">';
 		        echo "$file";
@@ -323,6 +325,7 @@ while (($file = readdir($handle))!==false)
 		        print "</tr>\n";
 		    }
 		}
+    }
 }
 closedir($handle);
 

htdocs/admin/fichinter.php

@@ -26,7 +26,7 @@
  \ingroup    fichinter
  \brief      Page d'administration/configuration du module FicheInter
  \version    $Id$
-*/
+ */
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -38,7 +38,7 @@ $langs->load("other");
 $langs->load("interventions");
 
 if (!$user->admin)
-  accessforbidden();
+accessforbidden();
 
 
 /*
@@ -193,6 +193,12 @@ if ($handle)
 
 			$module = new $file;
 
+			// Show modules according to features level
+			if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+			if ($module->isEnabled())
+			{
 				$var=!$var;
 				print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 				print $module->info();
@@ -229,6 +235,7 @@ if ($handle)
 				print '</tr>';
 			}
 		}
+	}
 	closedir($handle);
 }
 

htdocs/admin/fournisseur.php

@@ -148,8 +148,9 @@ if ($_POST["action"] == 'updatePrefixCommande') dolibarr_set_const($db, "COMMAND
 if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_DELTA",$_POST["offset"]);
 if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "COMMANDE_FOURNISSEUR_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"]);
 
+
 /*
- * Affichage page
+ * View
  */
  
 llxHeader();
@@ -191,6 +192,8 @@ if ($handle)
 
             $module = new $file;
 
+			if ($module->isEnabled())
+			{
 	            // Show modules according to features level
 			    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 			    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
@@ -242,6 +245,7 @@ if ($handle)
 	            print '</tr>';
 			}
         }
+    }
     closedir($handle);
 }
 

htdocs/admin/livraison.php

@@ -217,6 +217,8 @@ if ($handle)
 		    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 		    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
+		    if ($module->isEnabled())
+		    {
 				$var=!$var;
 				print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 				print $module->info();
@@ -264,6 +266,7 @@ if ($handle)
 				print '</tr>';
 		    }
 		}
+    }
     closedir($handle);
 }
 print '</table>';

htdocs/admin/propale.php

@@ -229,6 +229,8 @@ if ($handle)
 		    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 		    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
+		    if ($module->isEnabled())
+		    {
 	            $var=!$var;
 	            print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 	            print $module->info();
@@ -276,6 +278,7 @@ if ($handle)
 	            print "</tr>\n";
 		    }
         }
+    }
     closedir($handle);
 }
 print "</table><br>\n";

htdocs/admin/security.php

@@ -208,11 +208,17 @@ print '</tr>';
 
 foreach ($arrayhandler as $key => $module)
 {
+	// Show modules according to features level
+    if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+    if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+	if ($module->isEnabled())
+	{
         $var = !$var;
         print '<tr '.$bc[$var].'><td width="100">';
         print ucfirst($key);
         print "</td><td>\n";
-        print $arrayhandler[$key]->getDescription();
+        print $module->getDescription();
         print '</td>';
 
         // Affiche example
@@ -229,6 +235,7 @@ foreach ($arrayhandler as $key => $module)
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
         }
         print "</td></tr>\n";
+	}
 }
 print '</table>';
 print '</form>';

htdocs/fourn/commande/modules/modules_commandefournisseur.php

@@ -91,6 +91,14 @@ class ModeleNumRefSuppliersOrders
 {
     var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
 	/**     \brief      Renvoi la description par defaut du modele de num<75>rotation
      *      \return     string      Texte descripif
      */

htdocs/includes/modules/barcode/phpbarcode.modules.php

@@ -38,6 +38,14 @@ class modPhpbarcode extends ModeleBarCode
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $error='';
 	
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
 	/**     \brief      Renvoi la description du modele de num<75>rotation
      *      \return     string      Texte descripif
      */

htdocs/includes/modules/commande/modules_commande.php

@@ -95,6 +95,14 @@ class ModeleNumRefCommandes
 {
     var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
     /**     \brief      Renvoi la description par defaut du modele de num<75>rotation
      *      \return     string      Texte descripif
      */

htdocs/includes/modules/dons/modules_don.php

@@ -88,6 +88,14 @@ class ModeleNumRefDons
 {
     var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
     /**     \brief      Renvoi la description par defaut du modele de num<75>rotation
      *      \return     string      Texte descripif
      */

htdocs/includes/modules/facture/modules_facture.php

@@ -93,6 +93,14 @@ class ModeleNumRefFactures
 {
 	var $error='';
 	
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
 	/**		\brief		Renvoi la description par defaut du modele de num<75>rotation
 	*      	\return     string      Texte descripif
 	*/

htdocs/includes/modules/fichinter/modules_fichinter.php

@@ -96,6 +96,14 @@ class ModeleNumRefFicheinter
 {
     var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
     /**     \brief      Renvoi la description par defaut du modele de num<75>rotation
      *      \return     string      Texte descripif
      */

htdocs/includes/modules/propale/modules_propale.php

@@ -90,6 +90,14 @@ class ModeleNumRefPropales
 {
     var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
     /**     \brief      Renvoi la description par defaut du modele de num<75>rotation
      *      \return     string      Texte descripif
      */

htdocs/includes/modules/security/generate/modules_genpassword.php

@@ -36,6 +36,14 @@ class ModeleGenPassword
 {
 	var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
 	/**		\brief		Renvoi la description par defaut du modele
 	*      	\return     string      Texte descripif
 	*/

htdocs/livraison/mods/modules_livraison.php

@@ -92,6 +92,14 @@ class ModeleNumRefDeliveryOrder
 {
     var $error='';
 
+	/**     \brief     	Return if a module can be used or not
+	*      	\return		boolean     true if module can be used
+	*/
+	function isEnabled()
+	{
+		return true;
+	}
+
     /**     \brief      Renvoi la description par defaut du modele de num<75>rotation
      *      \return     string      Texte descripif
      */