diff --git a/build.xml b/build.xml
index b93db6e37f69ddb542e67ab44457a0673bf58cfb..b51744882059e8b39d3ed4e01c206501e928e064 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 <project name="dolibarr" default="hudson" basedir=".">
 
 <!-- Exclude/ignore paths -->
- <property name="ignorepaths" value="${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/fpdf,${basedir}/htdocs/includes/fpdfi,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/iwebkit,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/tcpdf" />
+ <property name="ignorepaths" value="${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes/adodbtime,${basedir}/htdocs/includes/artichow,${basedir}/htdocs/includes/barcode/php-barcode,${basedir}/htdocs/includes/ckeditor,${basedir}/htdocs/includes/fpdfi,${basedir}/htdocs/includes/geoip,${basedir}/htdocs/includes/jquery,${basedir}/htdocs/includes/jsgantt,${basedir}/htdocs/includes/nusoap,${basedir}/htdocs/includes/odtphp,${basedir}/htdocs/includes/phpexcel,${basedir}/htdocs/includes/tcpdf" />
 
  <target name="clean">
   <!-- Clean up -->
@@ -41,46 +41,44 @@
  <!-- Generate pmd-cpd.xml -->
  <target name="phpcpd">
   <exec executable="phpcpd">
-   <arg line="--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
-              --exclude '${basedir}/htdocs/includes/adodbtime'
-              --exclude '${basedir}/htdocs/includes/artichow'
-              --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
-              --exclude '${basedir}/htdocs/includes/ckeditor'
-              --exclude '${basedir}/htdocs/includes/fpdf'
-              --exclude '${basedir}/htdocs/includes/fpdfi'
-              --exclude '${basedir}/htdocs/includes/geoip'
-              --exclude '${basedir}/htdocs/includes/iwebkit'
-              --exclude '${basedir}/htdocs/includes/jquery'
-              --exclude '${basedir}/htdocs/includes/jsgantt'
-              --exclude '${basedir}/htdocs/includes/nusoap'
-              --exclude '${basedir}/htdocs/includes/odtphp'
-              --exclude '${basedir}/htdocs/includes/phpexcel'
-              --exclude '${basedir}/htdocs/includes/tcpdf'
-              htdocs
-              " />
+   <arg line="	--log-pmd '${basedir}/hudson/logs/pmd-cpd.xml'
+   				--exclude '${basedir}/htdocs/core/filemanagerdol'
+   				--exclude '${basedir}/htdocs/includes/adodbtime'
+   				--exclude '${basedir}/htdocs/includes/artichow'
+   				--exclude '${basedir}/htdocs/includes/barcode/php-barcode'
+   				--exclude '${basedir}/htdocs/includes/ckeditor'
+   				--exclude '${basedir}/htdocs/includes/fpdfi'
+   				--exclude '${basedir}/htdocs/includes/geoip'
+   				--exclude '${basedir}/htdocs/includes/jquery'
+   				--exclude '${basedir}/htdocs/includes/jsgantt'
+   				--exclude '${basedir}/htdocs/includes/nusoap'
+   				--exclude '${basedir}/htdocs/includes/odtphp'
+   				--exclude '${basedir}/htdocs/includes/phpexcel'
+   				--exclude '${basedir}/htdocs/includes/tcpdf'
+   				htdocs
+   				" />
   </exec>
  </target>
  
  <!-- Generate phploc.csv -->
  <target name="phploc">
   <exec executable="phploc">
-   <arg line="--log-csv '${basedir}/hudson/logs/phploc.csv'
-              --exclude '${basedir}/htdocs/includes/adodbtime'
-              --exclude '${basedir}/htdocs/includes/artichow'
-              --exclude '${basedir}/htdocs/includes/barcode/php-barcode'
-              --exclude '${basedir}/htdocs/includes/ckeditor'
-              --exclude '${basedir}/htdocs/includes/fpdf'
-              --exclude '${basedir}/htdocs/includes/fpdfi'
-              --exclude '${basedir}/htdocs/includes/geoip'
-              --exclude '${basedir}/htdocs/includes/iwebkit'
-              --exclude '${basedir}/htdocs/includes/jquery'
-              --exclude '${basedir}/htdocs/includes/jsgantt'
-              --exclude '${basedir}/htdocs/includes/nusoap'
-              --exclude '${basedir}/htdocs/includes/odtphp'
-              --exclude '${basedir}/htdocs/includes/phpexcel'
-              --exclude '${basedir}/htdocs/includes/tcpdf'
-              htdocs
-              " />
+   <arg line="	--log-csv '${basedir}/hudson/logs/phploc.csv'
+   				--exclude '${basedir}/htdocs/core/filemanagerdol'
+   				--exclude '${basedir}/htdocs/includes/adodbtime'
+   				--exclude '${basedir}/htdocs/includes/artichow'
+   				--exclude '${basedir}/htdocs/includes/barcode/php-barcode'
+   				--exclude '${basedir}/htdocs/includes/ckeditor'
+   				--exclude '${basedir}/htdocs/includes/fpdfi'
+   				--exclude '${basedir}/htdocs/includes/geoip'
+   				--exclude '${basedir}/htdocs/includes/jquery'
+   				--exclude '${basedir}/htdocs/includes/jsgantt'
+   				--exclude '${basedir}/htdocs/includes/nusoap'
+   				--exclude '${basedir}/htdocs/includes/odtphp'
+   				--exclude '${basedir}/htdocs/includes/phpexcel'
+   				--exclude '${basedir}/htdocs/includes/tcpdf'
+   				htdocs
+   				" />
   </exec>
  </target>
    
diff --git a/build/doxygen/hudson-doxygen.doxyfile b/build/doxygen/hudson-doxygen.doxyfile
index ee6a4166eee77f415f6d6507e351f788f37f4f9a..1a868d74ad0b78bfd6e5dc7ec573784c6d892233 100644
--- a/build/doxygen/hudson-doxygen.doxyfile
+++ b/build/doxygen/hudson-doxygen.doxyfile
@@ -611,7 +611,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie
+EXCLUDE = build dev doc documents htdocs/conf/conf.php htdocs/core/filemanagerdol htdocs/includes/adodbtime htdocs/includes/artichow htdocs/includes/barcode htdocs/includes/ckeditor htdocs/includes/fckeditor htdocs/includes/fpdfi htdocs/includes/geoip htdocs/includes/jquery htdocs/includes/nusoap htdocs/includes/odtphp htdocs/includes/pear htdocs/includes/phpexcel htdocs/includes/smtps htdocs/includes/tcpdf htdocs/includes/vcard htdocs/document htdocs/documents htdocs/oscommerce_ws/ws_client_demo htdocs/oscommerce_ws/ws_server scripts/addons scripts/courrier scripts/lolix scripts/energie
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 31c7ac3d7f4bcef22148fb1da424743acfec75b6..84b0d47377a4eeb1d670c6e429ed20928ce4791b 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1695,7 +1695,7 @@ class Propal extends CommonObject
     			}
     			$this->db->free($resql);
 
-    			$nump = sizeOf($tab_sqlobj);
+    			$nump = count($tab_sqlobj);
 
     			if ($nump)
     			{
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index cd059cdbfebb1aefed819cc3bdbc941c8ba0e002..103b8bde928dc5cc3f196b5576276ba455681357 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -240,7 +240,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			$tab_sqlobj[$key] = unserialize(trim($value, "'"));
 		}
 
-		$num = sizeOf($tab_sqlobj);
+		$num = count($tab_sqlobj);
 
 		//$num = $db->num_rows($result);
 		$i = 0;
diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/hudson_phpunittest.xml
index c2fc55599124d2427239d4e94e435103c8cd8448..d7370618ba7a0ab862a96bc42f8a8ba891731a86 100644
--- a/test/phpunit/hudson_phpunittest.xml
+++ b/test/phpunit/hudson_phpunittest.xml
@@ -15,10 +15,9 @@
     <directory suffix=".php">../../build/</directory>
     <directory suffix=".php">../../dev/</directory>
     <directory suffix=".php">../../doc/</directory>
-    <directory suffix=".php">../../htdocs/CVS/</directory>
     <directory suffix=".php">../../test/</directory>
+    <directory suffix=".php">../../htdocs/core/filemanagerdol/</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
-    <directory suffix=".php">../../htdocs/custom2/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>
@@ -53,10 +52,9 @@
     <directory suffix=".php">../../build/</directory>
     <directory suffix=".php">../../dev/</directory>
     <directory suffix=".php">../../doc/</directory>
-    <directory suffix=".php">../../htdocs/CVS/</directory>
     <directory suffix=".php">../../test/</directory>
+    <directory suffix=".php">../../htdocs/core/filemanagerdol/</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
-    <directory suffix=".php">../../htdocs/custom2/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>