diff --git a/doc/dev/dolibarr-doxygen-build.pl b/doc/dev/dolibarr-doxygen-build.pl
index 1111abca3d13a03caf5897bcb5e1b64d0e69a0aa..619a81ba1b39bc14cb2da9dfa9926361234bb8ac 100755
--- a/doc/dev/dolibarr-doxygen-build.pl
+++ b/doc/dev/dolibarr-doxygen-build.pl
@@ -11,10 +11,10 @@ $DIR||='.';
 $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $OPTIONS="";
-$OPTIONS="-d Preprocessor";
+#$OPTIONS="-d Preprocessor";
 
 $CONFFILE="doc/dev/dolibarr-doxygen.conf";
-$CONFFILE="doc/dev/dolibarr-doxygen2.conf";
+#$CONFFILE="doc/dev/dolibarr-doxygen2.conf";
 
 use Cwd;
 my $dir = getcwd;
diff --git a/doc/dev/dolibarr-doxygen.conf b/doc/dev/dolibarr-doxygen.conf
index 395a7f96ef06c42a2719bd0baebb70ba78d136e8..1281440a7d50a1e431dda5e96158aa683c08c2a5 100644
--- a/doc/dev/dolibarr-doxygen.conf
+++ b/doc/dev/dolibarr-doxygen.conf
@@ -1,7 +1,6 @@
-# Doxyfile 1.4.6
+# Doxyfile 1.5.3
 #
 # $Id$
-# $Source$
 
 
 #---------------------------------------------------------------------------
@@ -38,15 +37,15 @@ SUBGROUPING            = YES
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
 HIDE_UNDOC_MEMBERS     = YES
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
 HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
+CASE_SENSE_NAMES       = NO
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = YES
 INLINE_INFO            = YES
@@ -75,7 +74,9 @@ WARN_LOGFILE           = doxygen_warnings.log
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = htdocs
-FILE_PATTERNS          = *.php
+FILE_PATTERNS          = *.php *.pl
+#Tres lent et ne semble pas etre effectif
+#FILE_VERSION_FILTER    = doc/dev/dolibarr-doxygen-getversion.pl
 RECURSIVE              = YES
 EXCLUDE                = mssql \
 						 mysql \
@@ -120,12 +121,12 @@ EXCLUDE                = mssql \
 						 scripts/lolix
                          scripts/energie						 
 EXCLUDE_SYMLINKS       = YES
-EXCLUDE_PATTERNS       = */CVS/*
+EXCLUDE_PATTERNS       = */CVS/* *google* *pibarcode*
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = doc/images
-INPUT_FILTER           = 
+INPUT_FILTER           = doc/dev/dolibarr-doxygen-filter.pl
 FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
@@ -217,13 +218,13 @@ PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING   = NO
 MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = 
 INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
+PREDEFINED             =
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index e71908718be5a28088a784d29779921f5995c055..5c1ac930f897232f93799cdd0562c4336ca0918c 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -54,9 +54,8 @@ if ($_REQUEST["menu_handler"]) $menu_handler=$_REQUEST["menu_handler"];
 * Actions
 */
 
-if (isset($_GET["action"]) && $_GET["action"] == 'up')
+if (isset($_GET["action"]) && ($_GET["action"] == 'up'))
 {
-
 	$sql = "SELECT m.rowid, m.position FROM ".MAIN_DB_PREFIX."menu as m";
 	$sql.= " WHERE m.rowid = ".$_GET["menuId"];
 	$result = $db->query($sql);