Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

dev/codesniffer/jenkins_ruleset.xml

@@ -2,6 +2,23 @@
 <!DOCTYPE ruleset SYSTEM "ruleset.dtd">
 <ruleset name="Dolibarr">
 	<description>Dolibarr coding standard.</description>
+	
+	<!--
+    You can hard-code ignore patterns directly into your
+    custom standard so you don't have to specify the
+    patterns on the command line.
+    
+    The following two tags are equivalent to the command line
+    argument: --ignore=*/tests/*,*/data/*
+	-->
+	<exclude-pattern>*/conf/*</exclude-pattern>
+	<exclude-pattern>*/filemanagerdol/*</exclude-pattern>
+	<exclude-pattern>*/includes/*</exclude-pattern>
+	<exclude-pattern>*/PEAR/*</exclude-pattern>
+	<exclude-pattern>*/NET/*</exclude-pattern>
+	<exclude-pattern>*/HTTP/*</exclude-pattern>
+	<exclude-pattern>*/zendgdata/*</exclude-pattern>
+	<exclude-pattern>*/reportico/*</exclude-pattern>
 
 	<!-- List of all tests -->
 

quickbuild.xml

@@ -69,7 +69,6 @@
  <target name="phpcs">
  	<exec executable="phpcs" dir="${basedir}">
 		<arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
-					--ignore=**/conf/*,**/filemanagerdol/*,**/includes/*,**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*
 					--report=checkstyle
 					--report-file=${basedir}/hudson/logs/checkstyle.xml
 					-v