diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index ad26c7f0bdc..41526340daf 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -272,12 +272,7 @@
 
     <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired" />
 
-    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
-    </rule>
-
-
-
-
+    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle" />
 
     <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
         <severity>0</severity>
@@ -310,20 +305,21 @@
 	<!-- Test if () are removed for includes -->
 	<rule ref="PEAR.Files.IncludingFile" />
 
-    <!-- Disable some error messages that we do not want. -->
-
+	<!-- We disable this: We must be able to make require inside if -->
     <rule ref="PEAR.Files.IncludingFile.UseInclude">
         <severity>0</severity>
     </rule>
     
-    <!-- TODO Enable this test. We should use require for include in prior of include when out of if -->
+    <!-- We disable this. We must be allowed to use strict require instead of non strict include anywhere -->
     <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
         <severity>0</severity>
     </rule>
+    
     <rule ref="PEAR.Files.IncludingFile.UseRequire">
-        <severity>0</severity>
+     	<severity>0</severity>
     </rule>
-    <!-- TODO Enable this test. We should use require for include in prior of include when out of if -->
+    
+    <!-- We disable this: We want to allow include_once -->
     <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
         <severity>0</severity>
     </rule>
@@ -332,27 +328,25 @@
 
 	<rule ref="PEAR.Functions.FunctionCallSignature" />
 
-    <!-- TODO Enable this test. -->
+    <!-- We disable this: It returns a lot of false positive -->
     <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
         <severity>0</severity>
     </rule>
-    <!-- TODO Enable this test. -->
+    
+    <!-- We disable this: We want to allow small function on 1 line -->
     <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
         <severity>0</severity>
     </rule>
 
-	<rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine">
-	    <severity>0</severity>
-	</rule>
+	<rule ref="PEAR.Functions.FunctionCallSignature.EmptyLine" />
+
+	<!-- We disable this: Too many false positive -->
 	<rule ref="PEAR.Functions.FunctionCallSignature.Indent">
-	    <severity>0</severity>
+		<severity>0</severity>
 	</rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
-        <severity>0</severity>
-    </rule>
+
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket" />
+    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket" />
 
 	<rule ref="PEAR.Functions.ValidDefaultValue" />
 
@@ -361,26 +355,26 @@
         <severity>0</severity>
 	</rule>
 
+	<!-- We disable this: there is a lot of existing method not starting with a capital letter (class modXxxx, ...) -->
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCapital">
-        <severity>0</severity>
+		<severity>0</severity>
 	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
+	<!-- some phpcs have a typo error in rule, so we add it this rule too with term "Captial" instead of "Capital" -->
 	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
         <severity>0</severity>
 	</rule>
 
 	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore" />
 
-	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore">
-        <severity>0</severity>
-	</rule>
+	<!-- We disable this: there is a lot of existing function not starting with a capital letter (class modXxxx, ...) -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNameInvalid">
         <severity>0</severity>
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCapital">
         <severity>0</severity>
 	</rule>
-	<!-- some phpcs have a typo error in rule, so we add it too -->
+	<!-- some phpcs have a typo error in rule, so we add it this rule too with term "Captial" instead of "Capital" -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
         <severity>0</severity>
 	</rule>
@@ -391,16 +385,16 @@
 	<!--<rule ref="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
         <severity>0</severity>
 	</rule>-->
+	
+	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
 	</rule>
+
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
-    <rule ref="PSR2.Classes.ClassDeclaration" />
-    <rule ref="PSR2.Methods.FunctionClosingBrace" />
-    <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed" />
-
 	<!-- This is not in PSR2 -->
+	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
         <severity>0</severity>
     </rule>
@@ -411,7 +405,6 @@
 	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
         <severity>0</severity>
     </rule>
-
     <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
         <severity>0</severity>
     </rule>
@@ -421,15 +414,21 @@
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
 
 
-	<!-- Rules from Zend Standard-->
-
-    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-    <rule ref="Zend.Files.ClosingTag"/>
-
+	<!--  Rules PSR 2 -->
+    <rule ref="PSR2.Classes.ClassDeclaration" />
+    <rule ref="PSR2.Methods.FunctionClosingBrace" />
+    <rule ref="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed" />
     <rule ref="PSR2.Classes.ClassDeclaration" />
     <rule ref="PSR2.Methods.FunctionClosingBrace" />
     <rule ref="PSR2.Files.EndFileNewline.TooMany" />
 	<rule ref="PSR2.Files.EndFileNewline.NoneFound" />
 	<rule ref="PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket" />
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
+	
+
+	<!-- Rules from Zend Standard-->
+
+    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
+    <rule ref="Zend.Files.ClosingTag"/>
+	
 </ruleset>
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 58115537b1f..3fcbffba3b2 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1672,8 +1672,7 @@ class Account extends CommonObject
 				//Replace the old AccountNumber key with the new BankAccountNumber key
 				$fieldlists = explode(
 					' ',
-                    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber',
-					$conf->global->BANK_SHOW_ORDER_OPTION)
+                    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber', $conf->global->BANK_SHOW_ORDER_OPTION)
 				);
 			}
 		}
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 61024cdd7ff..c111e075972 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -44,9 +44,7 @@ if (!empty($user->socid))
 $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array(
-		'productstatssupplyorder'
-));
+$hookmanager->initHooks(array('productstatssupplyorder'));
 
 $mesg = '';
 
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index bc3d4a78c6a..39ed3b3cdf5 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -153,8 +153,8 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-	'code' => array('name'=>'code', 'type'=>'xsd:string'),
-	'libelle' => array('name'=>'libelle', 'type'=>'xsd:string')
+		'code' => array('name'=>'code', 'type'=>'xsd:string'),
+		'libelle' => array('name'=>'libelle', 'type'=>'xsd:string')
 	)
 );
 
@@ -164,7 +164,7 @@ $server->wsdl->addComplexType(
 	'array',
 	'sequence',
 	'',
-	 array(
+	array(
         'actioncommtype' => array(
             'name' => 'actioncommtype',
             'type' => 'tns:actioncommtype',