diff --git a/.travis.yml b/.travis.yml
index 9958556d42d..f7903361b02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -291,7 +291,7 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  #phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
   if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
   set +e
   echo
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 976f2cb6ba3..581353b758b 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -110,7 +110,7 @@ print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp) {
-    foreach($tmp as $constname => $constvalue) {
+    foreach ($tmp as $constname => $constvalue) {
         print $constname.'='.$constvalue." ";
     }
 }
@@ -130,7 +130,7 @@ fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now
 
 foreach ($includeconstants as $countrycode => $tmp) {
     fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach($tmp as $constname => $constvalue) {
+    foreach ($tmp as $constname => $constvalue) {
         $valueforchecksum=(empty($constvalue)?'0':$constvalue);
         $checksumconcat[]=$valueforchecksum;
         fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php
index 1b212e0a5d7..1acf181a4ba 100755
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
@@ -87,14 +87,11 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->validate($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -106,9 +103,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php
index 703254ad5e9..7fe1a82251a 100755
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
@@ -85,14 +85,11 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$com->valid($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $com->error);
 	}
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $com->error);
 }
@@ -104,9 +101,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php
index 234658388df..20b898a92aa 100755
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
@@ -82,9 +82,7 @@ $idobject = $myproduct->create($user);
 if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $myproduct->error);
 }
@@ -95,9 +93,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index 96d369085d2..d585b490a9c 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -74,18 +74,14 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->setStatut(1);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-}
-elseif ($obj->error == 'ErrorLoginAlreadyExists')
+} elseif ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -97,9 +93,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/initdata/dbf/importdb-products.php b/dev/initdata/dbf/importdb-products.php
index 845064f0688..2c06c07e103 100644
--- a/dev/initdata/dbf/importdb-products.php
+++ b/dev/initdata/dbf/importdb-products.php
@@ -227,8 +227,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else
-    die("error : $sql");
+} else die("error : $sql");
 
 
 
diff --git a/dev/initdata/dbf/importdb-thirdparties.php b/dev/initdata/dbf/importdb-thirdparties.php
index 8f0eb0635f0..a6b2697eed8 100644
--- a/dev/initdata/dbf/importdb-thirdparties.php
+++ b/dev/initdata/dbf/importdb-thirdparties.php
@@ -179,8 +179,7 @@ while ($fields = $db->fetch_array($resql)) {
 	$object->town = trim($fields['FVILLE']);
 	if ($fields['FPAYS'])
 		$object->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['FPAYS']))), 'c_country', 'label', 'rowid');
-	else
-		$object->country_id = 1;
+	else $object->country_id = 1;
 	$object->phone = trim($fields['FTEL']) ? trim($fields['FTEL']) : trim($fields['FCONTACT']);
 	$object->phone = substr($object->phone, 0, 20);
 	$object->fax = trim($fields['FFAX']) ? trim($fields['FFAX']) : trim($fields['FCONTACT']);
@@ -299,8 +298,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$contact->town = trim($fields['LVILLE']);
 		if ($fields['FPAYS'])
 			$contact->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['LPAYS']))), 'c_country', 'label', 'rowid');
-		else
-			$contact->country_id = 1;
+		else $contact->country_id = 1;
 		$contact->email = $fields['LMAIL'];
 		$contact->phone = trim($fields['LTEL']) ? trim($fields['LTEL']) : trim($fields['LCONTACT']);
 		$contact->fax = trim($fields['LFAX']) ? trim($fields['LFAX']) : trim($fields['LCONTACT']);
@@ -340,8 +338,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else
-    die("error : $sql");
+} else die("error : $sql");
 
 $db->commit();
 
diff --git a/dev/initdata/dbf/includes/dbase.class.php b/dev/initdata/dbf/includes/dbase.class.php
index 0c2f6820a96..e70f18087c4 100644
--- a/dev/initdata/dbf/includes/dbase.class.php
+++ b/dev/initdata/dbf/includes/dbase.class.php
@@ -207,8 +207,7 @@ class DBase
                     $value = true;
                 elseif ($value == 'f' || $value == 'n')
                     $value = false;
-                else
-                    $value = null;
+                else $value = null;
             }
             $record[$i] = $value;
         }
@@ -295,8 +294,7 @@ class DBase
         $i = unpack("S$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else
-            return array_merge($i);
+        else return array_merge($i);
     }
 
     private static function putInt16($fd, $value)
@@ -310,8 +308,7 @@ class DBase
         $i = unpack("L$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else
-            return array_merge($i);
+        else return array_merge($i);
     }
 
     private static function putInt32($fd, $value)
diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index 3fe058e8d3e..c35fe2440ef 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -179,14 +179,10 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		if ($result)
 		{
 			print " OK with ref ".$object->ref."\n";;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db, $object->error);
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index 1dc56aa5582..c421e39ffe3 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -124,8 +124,7 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $societesid[$i] = $row[0];
     }
-}
-else { print "err"; }
+} else { print "err"; }
 
 $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
@@ -138,8 +137,7 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $commandesid[$i] = $row[0];
     }
-}
-else { print "err"; }
+} else { print "err"; }
 
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
@@ -206,16 +204,12 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
         {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-        }
-        else
-        {
+        } else {
             print " KO\n";
             $db->rollback();
             dol_print_error($db, $object->error);
         }
-    }
-    else
-    {
+    } else {
         print " KO\n";
         $db->rollback();
         dol_print_error($db, $object->error);
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index 4c5d70aadc4..42c0c4098f2 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -210,16 +210,12 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		{
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
-		}
-		else
-		{
+		} else {
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db, $object->error);
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index 05ac6416aa3..a13e2351e9c 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -136,9 +136,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
         }
 
         print "Company ".$s." created nom=".$soc->name."\n";
-    }
-    else
-    {
+    } else {
     	print "Error: ".$soc->error."\n";
     }
 }
diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index 4288c5bf3b1..fb07143f972 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -163,9 +163,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
-    }
-	else
-	{
+    } else {
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
@@ -180,9 +178,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - updatePrice OK";
     	}
 	}
@@ -200,9 +196,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - setMultiLangs OK";
     	}
 	}
@@ -227,9 +221,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index ef1dfcc99ab..a0ddaac7674 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -181,9 +181,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
     }
@@ -212,9 +210,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	{
     	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
     	    $errorrecord++;
-    	}
-    	else
-    	{
+    	} else {
     	    print " - create link sale representative OK";
     	}
 	}
@@ -243,9 +239,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - create contact OK";
     	}
 	}
@@ -277,9 +271,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - create contact OK";
     	}
 	}
@@ -305,9 +297,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 4247415288c..8e4878577a1 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -142,9 +142,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
-    }
-	else
-	{
+    } else {
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
@@ -168,9 +166,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index b1aadd56ed8..183140af202 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -198,7 +198,7 @@ if (empty($option))
 if ($option != 'all')
 {
     $listofoptions=explode(',', $option);
-    foreach($listofoptions as $cursoroption)
+    foreach ($listofoptions as $cursoroption)
     {
         if (! in_array($cursoroption, array_keys($sqls))) {
             print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
@@ -264,7 +264,7 @@ function processfamily($family, $date)
     global $db, $sqls;
 
     $error=0;
-    foreach($sqls[$family] as $sql)
+    foreach ($sqls[$family] as $sql)
     {
         if (preg_match('/^@/', $sql))
         {
@@ -302,10 +302,10 @@ function processfamily($family, $date)
 $db->begin();
 
 $listofoptions=explode(',', $option);
-foreach($listofoptions as $cursoroption)
+foreach ($listofoptions as $cursoroption)
 {
     $oldfamily='';
-    foreach($sqls as $family => $familysql)
+    foreach ($sqls as $family => $familysql)
     {
         if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) continue;
 
@@ -325,9 +325,7 @@ if ($error || $mode != 'confirm')
 {
     print "\nRollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
index 5b16d3afe9b..4da5ffaad58 100755
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -95,8 +95,7 @@ if ($connection)
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	}
-	else
-	{
+	else {
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
 		print "Generate dump ".$filesys1.'.bz2'."\n";
@@ -125,14 +124,13 @@ if ($connection)
 		$return_var=0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
-		foreach($output as $line) print $line."\n";
+		foreach ($output as $line) print $line."\n";
 
 		//ssh2_sftp_unlink($sftp, $fileinstalllock);
 		//print $output;
 	}
 }
-else
-{
+else {
 	print 'Failed to connect to ssh2 to '.$server;
 	exit(-6);
 }
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index 0cc43a18a9d..95d5ad12c83 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -87,7 +87,7 @@ while ($year <= $currentyear)
 
     if ($delta1)
     {
-        foreach($tables as $tablekey => $tableval)
+        foreach ($tables as $tablekey => $tableval)
         {
             print "Correct ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
             $sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
@@ -105,7 +105,7 @@ while ($year <= $currentyear)
                         print ".";
                         $sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
                         $j=0;
-                        foreach($tableval as $field)
+                        foreach ($tableval as $field)
                         {
                             if ($j) $sql2.=", ";
                             $sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index e726df6db7c..03104270dcf 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -27,7 +27,7 @@
 
 
 	<!-- Rules from Generic Standard -->
-	
+
 	<!-- We want to allow empty statement: It allows to put some code comments into the else for examples -->
 	<rule ref="Generic.CodeAnalysis.EmptyStatement">
         <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedIf"/>
@@ -101,7 +101,7 @@
 			<property name="error" value="false"/>
 		</properties>
 		</rule>
-	-->    
+	-->
 	<!--  We want to allow 'if () { ...small code... }' on same line for better code compacity and readability -->
 	<rule ref="Generic.Formatting.DisallowMultipleStatements">
 		<severity>0</severity>
@@ -117,7 +117,7 @@
 		</properties>
 		</rule>
 	-->
-	
+
 	<rule ref="Generic.Formatting.SpaceAfterCast" />
 
     <rule ref="Generic.Functions.CallTimePassByReference" />
@@ -188,8 +188,8 @@
 	</rule>
 
     <!-- Check for duplicate class names -->
-    <!-- Disabled: We need this for dependency injection. 
-    <rule ref="Generic.Classes.DuplicateClassName" /> 
+    <!-- Disabled: We need this for dependency injection.
+    <rule ref="Generic.Classes.DuplicateClassName" />
     -->
 
 
@@ -213,6 +213,10 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen" />
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
+    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
+
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceBeforeClose" />
 
@@ -309,16 +313,16 @@
     <rule ref="PEAR.Files.IncludingFile.UseInclude">
         <severity>0</severity>
     </rule>
-    
+
     <!-- 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>
     </rule>
-    
+
     <!-- We disable this: We want to allow include_once -->
     <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
         <severity>0</severity>
@@ -332,7 +336,7 @@
     <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
         <severity>0</severity>
     </rule>
-    
+
     <!-- We disable this: We want to allow small function on 1 line -->
     <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
         <severity>0</severity>
@@ -385,7 +389,7 @@
 	<!--<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>
@@ -426,5 +430,5 @@
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
     <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
     <rule ref="PSR2.Files.ClosingTag"/>
-	
+
 </ruleset>
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index f2794455ca3..c17a73dfe12 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -76,14 +76,12 @@ function getfieldname($l)
 	if (preg_match("/`(.*)`/", $l, $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else
-			return null;
+		else return null;
 	} // if its not in quotes, then it should (we hope!) be the first "word" on the line, up to the first space.
 	elseif (preg_match("/([^\ ]*)/", trim($l), $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else
-			return null;
+		else return null;
 	}
 }
 
@@ -102,8 +100,7 @@ function formatsize($s)
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
 	elseif ($s < pow(2, 30))
 		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
-	else
-		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
+	else return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
 }
 
 /**
@@ -146,8 +143,7 @@ function pg2mysql_large($infilename, $outfilename)
 		if ($c % 2 != 0) {
 			if ($inquotes)
 				$inquotes = false;
-			else
-				$inquotes = true;
+			else $inquotes = true;
 		}
 
 		if ($linenum % 10000 == 0) {
@@ -329,8 +325,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character varying\([0-9]*\)/", " varchar($num)", $line);
-				else
-					$line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
+				else $line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
 			}
 			// character varying with no size, we will default to varchar(255)
 			if (preg_match("/ character varying/", $line)) {
@@ -352,8 +347,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character\([0-9]*\)/", " varchar($num)", $line);
-				else
-					$line = preg_replace("/ character\([0-9]*\)/", " text", $line);
+				else $line = preg_replace("/ character\([0-9]*\)/", " text", $line);
 			}
 			// timestamps
 			$line = str_replace(" timestamp with time zone", " datetime", $line);
@@ -465,8 +459,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 					if ($c % 2 != 0) {
 						if ($inquotes)
 							$inquotes = false;
-						else
-							$inquotes = true;
+						else $inquotes = true;
 						// echo "inquotes=$inquotes\n";
 					}
 				} while (substr($lines[$linenumber], - 3, - 1) != ");" || $inquotes);
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index f9657482c86..b51515a42cb 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -77,7 +77,7 @@ class autoTranslator
 
 		$files = $this->getTranslationFilesArray($this->_refLang);
 		$counter = 1;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($this->_limittofile && $this->_limittofile != $file) continue;
 			$counter++;
@@ -94,7 +94,7 @@ class autoTranslator
 
 				// If we must process all languages
 				$arraytmp=dol_dir_list($this->_langDir, 'directories', 0);
-				foreach($arraytmp as $dirtmp)
+				foreach ($arraytmp as $dirtmp)
 				{
 					if ($dirtmp['name'] === $this->_refLang) continue;	// We discard source language
 					$tmppart=explode('_', $dirtmp['name']);
@@ -112,7 +112,7 @@ class autoTranslator
 			}
 
 			// Process translation of source file for each target languages
-			foreach($targetlangs as $my_destlang)
+			foreach ($targetlangs as $my_destlang)
 			{
 				$this->_translatedFiles = array();
 
@@ -124,15 +124,14 @@ class autoTranslator
 					echo "File not found: " . $destPath . ". We generate it.<br>\n";
 					$this->createTranslationFile($destPath, $my_destlang);
 				}
-				else
-				{
+				else {
 					echo "Updating file: " . $destPath . "<br>\n";
 				}
 
 				// Translate lines
 				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
 				$newlines=0;
-				foreach($fileContent as $line){
+				foreach ($fileContent as $line){
 					$key = $this->getLineKey($line);
 					$value = $this->getLineValue($line);
 					if ($key && $value)
@@ -167,7 +166,7 @@ class autoTranslator
 			fwrite($fp, "\n");
 			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
 			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
-			foreach($this->_translatedFiles[$file] as $line) {
+			foreach ($this->_translatedFiles[$file] as $line) {
 				fwrite($fp, $line . "\n");
 			}
 			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
@@ -209,7 +208,7 @@ class autoTranslator
 	{
 
 		//print "key    =".$key."\n";
-		foreach($content as $line) {
+		foreach ($content as $line) {
 			$destKey = $this->getLineKey($line);
 			$destValue = $this->getLineValue($line);
 			// If translated return
@@ -273,8 +272,8 @@ class autoTranslator
 	private function getTranslationFilesArray($lang)
 	{
 		$dir = new DirectoryIterator($this->_langDir.$lang);
-		while($dir->valid()) {
-			if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
+		while ($dir->valid()) {
+			if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
 				$files[] =  $dir->getFilename();
 			}
 			$dir->next();
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index f568ba2b04b..0268fc94ed8 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -360,16 +360,14 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
    			$unused[$value] = $line;
        		echo $line;        // $trad contains the \n
 		}
-		else
-		{
+		else {
 		    unset($output);
 		    //print 'X'.$output.'Y';
 		}
 	}
 
 	if (empty($unused)) print "No string not used found.\n";
-	else
-	{
+	else {
         $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
         print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
         file_put_contents($filetosave, implode("", $unused));
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index f2263b1d18b..adc5a706d06 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -80,8 +80,8 @@ $aEnglish = array();
 if ($filesToProcess == 'all')
 {
 	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
-	while($dir->valid()) {
-		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
+	while ($dir->valid()) {
+		if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
 			$files[] =  $dir->getFilename();
 		}
 		$dir->next();
@@ -94,7 +94,7 @@ else $filesToProcess=explode(',', $filesToProcess);
 
 
 // Loop on each file
-foreach($filesToProcess as $fileToProcess)
+foreach ($filesToProcess as $fileToProcess)
 {
 	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
 	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
@@ -285,8 +285,7 @@ foreach($filesToProcess as $fileToProcess)
 				print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
 				continue;
 			}
-			else
-			{
+			else {
 				$fileFirstFound[$key] = $fileToProcess;
 				$lineFirstFound[$key] = $cnt;
 			}
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 2ac97ee38ac..f6a4adac21e 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -119,8 +119,7 @@ if (empty($reshook))
 			{
 				$obj = $db->fetch_object($resql);
 				$country_code = $obj->code;
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 
 			// Try to load sql file
 			if ($country_code)
@@ -143,9 +142,7 @@ if (empty($reshook))
 				if ($result > 0)
 				{
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("ErrorDuringChartLoad"), null, 'warnings');
 				}
 			}
@@ -235,8 +232,7 @@ if (strlen(trim($search_account))) {
 			}
 			$sql .= " AND (aa.account_number LIKE '".$startchar.$search_account_tmp_clean."'";
 			$sql .= " OR aa.account_number LIKE '".$startchar.$search_account_clean."%')";
-		}
-		else $sql .= natural_search("aa.account_number", $search_account_tmp);
+		} else $sql .= natural_search("aa.account_number", $search_account_tmp);
 	}
 }
 if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
@@ -328,8 +324,7 @@ if ($resql)
 
             $i++;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     print "</select>";
     print ajax_combobox("chartofaccounts");
     print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
@@ -431,9 +426,7 @@ if ($resql)
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index b31cd23dfa4..9794198332e 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -228,8 +228,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($value == 'entity') {
+			} elseif ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -245,13 +244,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-		}
-		else
-		{
+		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -260,8 +256,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha'))
 	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-		else { $rowidcol = "rowid"; }
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
@@ -276,8 +271,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($field == 'entity') {
+			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -306,8 +300,7 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 
@@ -318,9 +311,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -329,13 +320,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
 	}
 
@@ -349,13 +338,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
 	}
 
@@ -369,13 +356,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$code."'";
 	}
 
@@ -389,13 +374,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$code."'";
 	}
 
@@ -581,9 +564,7 @@ if ($id)
 					print '<td class="liste_titre">';
 					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="liste_titre"></td>';
 				}
 			}
@@ -629,9 +610,7 @@ if ($id)
 
 					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-				}
-				else
-				{
+				} else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -652,26 +631,20 @@ if ($id)
 							if ($value == 'element')
 							{
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-							}
-							elseif ($value == 'source')
+							} elseif ($value == 'source')
 							{
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-							}
-							elseif ($valuetoshow == 'all') {
+							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							}
-							elseif ($fieldlist[$field] == 'country') {
+							} elseif ($fieldlist[$field] == 'country') {
 								if (empty($obj->country_code))
 								{
 									$valuetoshow = '-';
-								}
-								else
-								{
+								} else {
 									$key = $langs->trans("Country".strtoupper($obj->country_code));
 									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
 								}
-							}
-							elseif ($fieldlist[$field] == 'country_id') {
+							} elseif ($fieldlist[$field] == 'country_id') {
 								$showfield = 0;
 							}
 
@@ -708,8 +681,7 @@ if ($id)
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -761,8 +733,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -771,8 +742,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'type_cdr') {
+		} elseif ($fieldlist[$field] == 'type_cdr') {
 			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
 			else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
@@ -781,12 +751,9 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 708165fc757..bc695da0203 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -75,18 +75,14 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
 		{
 			$account_number = GETPOST('account_number', 'string');
-		}
-		else
-		{
+		} else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
 		if (GETPOST('account_parent', 'int') <= 0)
 		{
 			$account_parent = 0;
-		}
-		else
-		{
+		} else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -104,13 +100,11 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 			$error = 1;
 			$action = "create";
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		elseif ($res == - 4) {
+		} elseif ($res == - 4) {
 			$error = 2;
 			$action = "create";
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		elseif ($res < 0)
+		} elseif ($res < 0)
 		{
 		    $error++;
 		    setEventMessages($object->error, $object->errors, 'errors');
@@ -140,18 +134,14 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
 		{
 			$account_number = GETPOST('account_number', 'string');
-		}
-		else
-		{
+		} else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
 		if (GETPOST('account_parent', 'int') <= 0)
 		{
 			$account_parent = 0;
-		}
-		else
-		{
+		} else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -269,8 +259,7 @@ if ($action == 'create') {
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($id > 0 || $ref) {
+} elseif ($id > 0 || $ref) {
 	$result = $object->fetch($id, $ref, 1);
 
 	if ($result > 0) {
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 1b2733e2045..ddd4240a073 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -235,13 +235,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        }
-        else
-        {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -250,8 +247,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
     // Si verif ok et action modify, on modifie la ligne
     if ($ok && GETPOST('actionmodify', 'alpha'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         // Modify entry
         $sql = "UPDATE ".$tabname[$id]." SET ";
@@ -266,8 +262,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             if ($field == 'fk_country' && $_POST['country'] > 0) {
             	$_POST[$listfieldvalue[$i]] = $_POST['country'];
-            }
-            elseif ($field == 'entity') {
+            } elseif ($field == 'entity') {
             	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
             if ($i) $sql .= ",";
@@ -296,8 +291,7 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
 
@@ -308,9 +302,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
@@ -319,13 +311,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -339,13 +329,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -359,13 +347,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -379,13 +365,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape($code)."'";
     }
 
@@ -597,9 +581,7 @@ if ($id)
                     print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
-                }
-                else
-                {
+                } else {
                     print '<td class="liste_titre"></td>';
                 }
             }
@@ -726,10 +708,8 @@ if ($id)
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                     print '<td></td>';
-                }
-                else
-                {
-	              	$tmpaction = 'view';
+                } else {
+                    $tmpaction = 'view';
                     $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
@@ -745,35 +725,27 @@ if ($id)
                             if ($value == 'category_type')
                             {
                                 $valuetoshow = yn($valuetoshow);
-                            }
-                            elseif ($valuetoshow == 'all') {
+                            } elseif ($valuetoshow == 'all') {
                                 $valuetoshow = $langs->trans('All');
-                            }
-                            elseif ($fieldlist[$field] == 'country') {
+                            } elseif ($fieldlist[$field] == 'country') {
                                 if (empty($obj->country_code))
                                 {
                                     $valuetoshow = '-';
-                                }
-                                else
-                                {
+                                } else {
                                     $key = $langs->trans("Country".strtoupper($obj->country_code));
                                     $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
                                 $key = $langs->trans("Country".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
                                 $langs->loadLangs(array("propal"));
                                 $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
                                 $key = $langs->trans("Action".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
                                 $showfield = 0;
                             }
 
@@ -799,8 +771,7 @@ if ($id)
                     // Active
                     print '<td class="center" class="nowrap">';
                     if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else
-                 	{
+                    else {
                     	print $langs->trans("AlwaysActive");
                     }
                     print "</td>";
@@ -816,8 +787,7 @@ if ($id)
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    }
-                    else print '<td>&nbsp;</td>';
+                    } else print '<td>&nbsp;</td>';
 
                     // Link to setup the group
                     print '<td class="center">';
@@ -833,8 +803,7 @@ if ($id)
                 $i++;
             }
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -882,14 +851,11 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 			{
 				$fieldname = 'country_id';
 				print $form->select_country(GETPOST('country_id', 'int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else
-			{
+			} else {
 				print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : $mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -898,17 +864,13 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'category_type') {
+		} elseif ($fieldlist[$field] == 'category_type') {
 		    print '<td>';
 			print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index ad22a88f415..96303f36b1d 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -193,8 +193,7 @@ foreach ($list_account as $key) {
 	$reg = array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {
 		print '<tr class="liste_titre"><td>'.$langs->trans($reg[1]).'</td><td></td></tr>';
-	}
-	else {
+	} else {
 		print '<tr class="oddeven value">';
 		// Param
 		$label = $langs->trans($key);
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 88890aa004f..27ef1ea7bd1 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -71,9 +71,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
-
-elseif ($action == 'add') {
+} elseif ($action == 'add') {
 	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e34ce8094dd..74247c5fccd 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -238,13 +238,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-		}
-		else
-		{
+		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -253,8 +250,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha'))
 	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-		else { $rowidcol = "rowid"; }
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
@@ -269,8 +265,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($field == 'entity') {
+			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -300,8 +295,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 	$sql .= " AND entity = ".$conf->entity;
@@ -313,9 +307,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -324,13 +316,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
@@ -345,13 +335,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-	else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
-	}
-	elseif ($code) {
+	} elseif ($code) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
@@ -595,9 +583,7 @@ if ($id)
 					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
-				}
-				else
-				{
+				} else {
 				  	$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -614,12 +600,10 @@ if ($id)
 							$valuetoshow = $obj->{$fieldlist[$field]};
 							if ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							}
-							elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							} elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$key = $langs->trans("AccountingJournalType".strtoupper($obj->nature));
 								$valuetoshow = ($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature)) ? $key : $obj->{$fieldlist[$field]});
-							}
-							elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$valuetoshow = $langs->trans($obj->label);
                             }
 
@@ -667,8 +651,7 @@ if ($id)
 						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
-					}
-					else print '<td>&nbsp;</td>';
+					} else print '<td>&nbsp;</td>';
 
 					print '<td></td>';
 
@@ -679,8 +662,7 @@ if ($id)
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -724,12 +706,9 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('nature', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code')  $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index e32e47b169d..b6465b95355 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -252,25 +252,19 @@ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     $sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
 {
 	$sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
 {
 	$sql .= " p.accountancy_code_buy_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
 {
     $sql .= " p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
 {
     $sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-else
-{
+} else {
     $sql .= " p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
@@ -290,13 +284,11 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell", $search_current_account);
     }
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
     }
-}
-else {
+} else {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
     }
@@ -492,34 +484,27 @@ if ($result)
 			if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 	            $compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
     	        $compta_prodsell_id = $aarowid_prodsell_intra;
-			}
-        	elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
             	$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
             	$compta_prodsell_id = $aarowid_prodsell_export;
-        	}
-        	else {
+        	} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			}
-		}
-		else {
+		} else {
 			if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell_export;
-			}
-			else {
+			} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell;
 			}
@@ -530,34 +515,27 @@ if ($result)
 			if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy_export;
-			}
-			else {
+			} else {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy;
 			}
-		}
-		else {
+		} else {
 			if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy_export;
-			}
-			else {
+			} else {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy;
 			}
@@ -620,7 +598,7 @@ if ($result)
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
 			print '</td>';
-		}  elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy intra (In EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
@@ -630,7 +608,7 @@ if ($result)
 			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1);
 			print '</td>';
-		}  elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy export (Out of EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index f8fa0774400..1fcce431b24 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -138,9 +138,7 @@ if ($action == "confirm_update") {
 			}
 		}
 	}
-}
-
-elseif ($action == "add") {
+} elseif ($action == "add") {
 	$error = 0;
 
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0))
@@ -199,9 +197,7 @@ elseif ($action == "add") {
 			$action = '';
 		}
 	}
-}
-
-elseif ($action == "confirm_delete") {
+} elseif ($action == "confirm_delete") {
 	$object = new BookKeeping($db);
 
 	$result = $object->fetch($id, null, $mode);
@@ -216,9 +212,7 @@ elseif ($action == "confirm_delete") {
 		}
 	}
 	$action = '';
-}
-
-elseif ($action == "confirm_create") {
+} elseif ($action == "confirm_create") {
 	$error = 0;
 
 	$object = new BookKeeping($db);
@@ -628,9 +622,7 @@ if ($action == 'create')
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 						{
 							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1);
-						}
-						else
-						{
+						} else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
 						}
 						print '</td>';
@@ -685,9 +677,7 @@ if ($action == 'create')
 					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 					{
 						print $formaccounting->select_auxaccount('', 'subledger_account', 1);
-					}
-					else
-					{
+					} else {
 						print '<input type="text" class="maxwidth150" name="subledger_account" value="">';
 					}
 					print '</td>';
@@ -707,9 +697,7 @@ if ($action == 'create')
 					if ($total_debit == $total_credit)
 					{
 						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2889fbf4ef1..3282f7f363f 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -351,18 +351,14 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
 		header("Location: list.php".($param ? '?'.$param : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -373,9 +369,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -480,9 +474,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 	if ($result < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-	else
-	{
+	} else {
 	    // Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
@@ -490,9 +482,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
         if (!empty($accountancyexport->errors))
         {
             setEventMessages('', $accountancyexport->errors, 'errors');
-        }
-        else
-        {
+        } else {
             // Specify as export : update field date_export
             $error = 0;
             $db->begin();
@@ -521,9 +511,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
             {
             	$db->commit();
             	// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
             	$error++;
             	$db->rollback();
             	setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
@@ -559,9 +547,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -721,9 +707,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	}
-	else
-	{
+	} else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
 	}
 	print '</div>';
@@ -734,9 +718,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	}
-	else
-	{
+	} else {
 		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
 	}
 	print '</div>';
@@ -929,8 +911,7 @@ while ($i < min($num, $limit))
             $filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
             $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        }
-        elseif ($line->doc_type == 'supplier_invoice')
+        } elseif ($line->doc_type == 'supplier_invoice')
         {
             $langs->loadLangs(array('bills'));
 
@@ -943,8 +924,7 @@ while ($i < min($num, $limit))
             $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
             $subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-        }
-        elseif ($line->doc_type == 'expense_report')
+        } elseif ($line->doc_type == 'expense_report')
         {
             $langs->loadLangs(array('trips'));
 
@@ -957,9 +937,7 @@ while ($i < min($num, $limit))
             $filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
             $urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
             $documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-        }
-        else
-        {
+        } else {
             // Other type
         }
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 25f664d955e..1f4ac513806 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -254,18 +254,14 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
 		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -276,9 +272,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -537,9 +531,7 @@ while ($i < min($num, $limit))
 				print price($sous_total_debit - $sous_total_credit);
 				print '</td>';
 				print '<td></td>';
-			}
-			else
-			{
+			} else {
 				print '<td></td>';
 				print '<td class="nowraponall right">';
 				print price($sous_total_credit - $sous_total_debit);
@@ -611,8 +603,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		}
-		elseif ($line->doc_type == 'supplier_invoice')
+		} elseif ($line->doc_type == 'supplier_invoice')
 		{
 			$langs->loadLangs(array('bills'));
 
@@ -625,8 +616,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		}
-		elseif ($line->doc_type == 'expense_report')
+		} elseif ($line->doc_type == 'expense_report')
 		{
 			$langs->loadLangs(array('trips'));
 
@@ -639,9 +629,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		}
-		else
-		{
+		} else {
 			// Other type
 		}
 
@@ -742,9 +730,7 @@ if ($balance > 0 )
 	print price($sous_total_debit - $sous_total_credit);
 	print '</td>';
 	print '<td></td>';
-}
-else
-{
+} else {
 	print '<td></td>';
 	print '<td class="nowraponall right">';
 	print price($sous_total_credit - $sous_total_debit);
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index cc93232dcdc..c7f7f8cf68c 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -209,9 +209,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -241,8 +239,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
 		if ($id)   $sql .= " WHERE t.rowid = ".$id;
-		else
-		{
+		else {
 			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
 			if ($code) $sql .= " AND t.code = '".$this->db->escape($code)."'";
 			elseif ($label) $sql .= " AND t.label = '".$this->db->escape($label)."'";
@@ -270,9 +267,7 @@ class AccountancyCategory // extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -335,9 +330,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -375,9 +368,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -709,9 +700,7 @@ class AccountancyCategory // extends CommonObject
 				$listofaccount .= "'".$cptcursor."'";
 			}
 			$sql .= " AND t.numero_compte IN (".$listofaccount.")";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}
 		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
@@ -833,9 +822,7 @@ class AccountancyCategory // extends CommonObject
 			$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
 			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " ORDER BY t.account_number";
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE ".$predefinedgroupwhere;
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 3bf41e6326f..1c76d0408da 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -362,7 +362,7 @@ class AccountancyExport
 			if ($line->sens == 'D') {
 				print price($line->montant).$separator;
 				print ''.$separator;
-			}elseif ($line->sens == 'C') {
+			} elseif ($line->sens == 'C') {
 				print ''.$separator;
 				print price($line->montant).$separator;
 			}
@@ -518,11 +518,12 @@ class AccountancyExport
 			$Tab['contrepartie'] = str_repeat(' ', 8);
 
 			// elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
-			if (!empty($data->date_echeance))
+			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // elarifr:  format must be ddmmyy
-			else
+			} else {
 				$Tab['date_echeance'] = '000000';
+			}
 
 			//elarifr please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
 			//$Tab['lettrage'] = str_repeat(' ', 5);
@@ -597,12 +598,11 @@ class AccountancyExport
 
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
 
-			if($data->sens == 'D'){
+			if ($data->sens == 'D') {
 				$Tab['montant_debit']  =  str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
-			}
-			else{
+			} else {
 				$Tab['montant_debit']  = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
@@ -616,11 +616,12 @@ class AccountancyExport
 
 			$Tab['code_stat'] = str_repeat(' ', 4);
 
-			if (!empty($data->date_echeance))
+			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%Y');
-			else
+			} else {
 				$Tab['date_echeance'] = dol_print_date($data->doc_date, '%d%m%Y');
+			}
 
 			$Tab['monnaie'] = '1';
 
@@ -897,12 +898,10 @@ class AccountancyExport
             if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
             {
                 $sammelBuchung = true;
-            }
-            elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
+            } elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
             {
                 $sammelBuchung = true;
-            }
-            elseif ($aIndex + 1 < $aSize
+            } elseif ($aIndex + 1 < $aSize
                     && $objectLines[$aIndex + 1]->piece_num == $line->piece_num
                     && $aIndex - 1 < $aSize
                     && $objectLines[$aIndex - 1]->piece_num == $line->piece_num
@@ -924,9 +923,7 @@ class AccountancyExport
             if ($line->sens == 'D')
             {
                 print 'S'.$this->separator;
-            }
-            else
-            {
+            } else {
                 print 'H'.$this->separator;
             }
             //Grp
@@ -937,14 +934,10 @@ class AccountancyExport
                 if ($line->piece_num == $thisPieceNum)
                 {
                     print length_accounta($thisPieceAccountNr).$this->separator;
-                }
-                else
-                {
+                } else {
                     print "div".$this->separator;
                 }
-            }
-            else
-            {
+            } else {
                 print length_accounta($line->code_tiers).$this->separator;
             }
             //SId
@@ -960,9 +953,7 @@ class AccountancyExport
             if ($sammelBuchung)
             {
                 print "2".$this->separator;
-            }
-            else
-            {
+            } else {
                 print "1".$this->separator;
             }
             // Code
@@ -971,9 +962,7 @@ class AccountancyExport
             if ($line->montant >= 0)
             {
                 print $line->montant.$this->separator;
-            }
-            else
-            {
+            } else {
                 print ($line->montant * -1).$this->separator;
             }
             // Steuer
@@ -1458,7 +1447,9 @@ class AccountancyExport
 			print self::trunc($line->code_journal, 6).$separator; //Journal code
 
 			if (!empty($line->subledger_account)) $account = $line->subledger_account;
-			else  $account = $line->numero_compte;
+			else {
+				$account = $line->numero_compte;
+			}
 			print self::trunc($account, 15).$separator; //Account number
 
 			print self::trunc($line->label_compte, 60).$separator; //Account label
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index bcd17793db1..6a3fa8e7998 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -609,8 +609,7 @@ class AccountingAccount extends CommonObject
         if ($mode == 0)
         {
             $fieldtouse = 'active';
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             $fieldtouse = 'reconcilable';
         }
@@ -661,28 +660,23 @@ class AccountingAccount extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 727e68346fa..6067f557cfb 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -109,8 +109,7 @@ class AccountingJournal extends CommonObject
 			$sql .= " WHERE";
 			if ($rowid) {
 				$sql .= " rowid = ".(int) $rowid;
-			}
-			elseif ($journal_code)
+			} elseif ($journal_code)
 			{
 				$sql .= " code = '".$this->db->escape($journal_code)."'";
 				$sql .= " AND entity  = ".$conf->entity;
@@ -136,9 +135,7 @@ class AccountingJournal extends CommonObject
 				} else {
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
@@ -311,8 +308,7 @@ class AccountingJournal extends CommonObject
 			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
 			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
 			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($nature == 9) return $langs->trans('AccountingJournalType9');
 			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0162a98394e..713d5175d31 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -258,9 +258,7 @@ class BookKeeping extends CommonObject
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
 				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
-			}
-			else
-			{
+			} else {
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
 				$mesg = $this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
 				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
@@ -477,8 +475,7 @@ class BookKeeping extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 39ed325b5fe..ed8fc8ecc7e 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -42,8 +42,7 @@ if (!$user->rights->accounting->fiscalyear->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
index fe7fda5054f..808ccfba0ef 100644
--- a/htdocs/accountancy/closure/validate.php
+++ b/htdocs/accountancy/closure/validate.php
@@ -42,8 +42,7 @@ if ($user->socid > 0)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 0a39fbc8254..4d24110f7e6 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -59,9 +59,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else
-		{
+		} else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index eff348816fb..425e8aecc81 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -47,8 +47,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
@@ -202,8 +201,7 @@ if ($action == 'validatehistory') {
 	if ($error)
 	{
 		$db->rollback();
-	}
-	else {
+	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
@@ -278,15 +276,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -353,16 +349,14 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 
 		for ($i = 2; $i <= 12; $i++) {
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 1d93a0fea17..bf28da1d5d2 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -159,9 +159,7 @@ if ($massaction == 'ventil') {
             {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
-            }
-            else
-            {
+            } else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
@@ -629,8 +627,7 @@ if ($result) {
 					$suggestedid = $tmpaccount->id;
 				}
 				$accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id;
-			}
-			else {
+			} else {
 				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l];
 			}
 		}
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 36d587e0c99..8b04ca74c81 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -63,9 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			if ($backtopage)
 			{
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 387cfd0fb8e..9fe07b18a37 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -43,8 +43,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
@@ -190,15 +189,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
     	for ($i = 2; $i <= 12; $i++) {
             print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -261,16 +258,14 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
     	for ($i = 2; $i <= 12; $i++) {
             print '<td class="nowrap right">'.price($row[$i]).'</td>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index c4695ce01fe..e15bc779555 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -141,9 +141,7 @@ if ($massaction == 'ventil') {
             {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
-            }
-            else
-            {
+            } else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 56cf674505b..e92d42266a8 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -240,9 +240,7 @@ if ($conf->accounting->enabled)
     print $boxlist;
 
     print '</div>';
-}
-else
-{
+} else {
     print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
 
 	print $langs->trans("Module10Desc")."<br>\n";
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 3372105cd85..07614dcc618 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -276,8 +276,7 @@ if ($result) {
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabpay[$obj->rowid]['type'] = $links[$key]['type'];
 					$tabtype[$obj->rowid] = $links[$key]['type'];
-				}
-				elseif (in_array($links[$key]['type'], array('company', 'user')))
+				} elseif (in_array($links[$key]['type'], array('company', 'user')))
 				{
 					if ($tabpay[$obj->rowid]['type'] == 'unknown')
 					{
@@ -549,9 +548,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$error++;
 							$errorforline++;
 							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -575,9 +572,7 @@ if (!$error && $action == 'writebookkeeping') {
 						if ($tabtype[$key] == 'banktransfert')
 						{
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-						}
-						else
-						{
+						} else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
 						}
 
@@ -699,9 +694,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -709,8 +702,7 @@ if (!$error && $action == 'writebookkeeping') {
 						}
 					}
 				}
-			}
-			else {	// If thirdparty unknown, output the waiting account
+			} else {	// If thirdparty unknown, output the waiting account
 				foreach ($tabbq[$key] as $k => $mt) {
 					if ($mt)
 					{
@@ -747,9 +739,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -770,9 +760,7 @@ if (!$error && $action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
@@ -787,13 +775,10 @@ if (!$error && $action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -879,9 +864,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					if ($tabtype[$key] == 'banktransfert')
 					{
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-					}
-					else
-					{
+					} else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
 					}
 
@@ -979,8 +962,7 @@ if (empty($action) || $action == 'view') {
 			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
 			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 
 	// Button to write into Ledger
@@ -999,8 +981,7 @@ if (empty($action) || $action == 'view') {
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
 	    || ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 	    print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 	    if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
         else print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -1072,8 +1053,7 @@ if (empty($action) || $action == 'view') {
 				if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
-				}
-				else print $accounttoshow;
+				} else print $accounttoshow;
 				print "</td>";
 				// Subledger account
 				print "<td>";
@@ -1104,9 +1084,7 @@ if (empty($action) || $action == 'view') {
 					if ($tabtype[$key] == 'banktransfert')
 					{
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
-					}
-					else
-					{
+					} else {
 						$reflabel .= $val['soclib'];
 					}
 
@@ -1134,14 +1112,10 @@ if (empty($action) || $action == 'view') {
 							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1')
 							{
 								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
-							}
-							else
-							{
+							} else {
 								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
 							}
-						}
-						else
-						{
+						} else {
 							// We will refuse writing
 							$errorstring = 'UnknownAccountForThirdpartyBlocking';
 							if ($tabtype[$key] == 'payment')				$errorstring = 'MainAccountForCustomersNotDefined';
@@ -1152,8 +1126,7 @@ if (empty($action) || $action == 'view') {
 							if ($tabtype[$key] == 'member')					$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
 							print '<span class="error">'.$langs->trans($errorstring).'</span>';
 						}
-					}
-					else print $accounttoshow;
+					} else print $accounttoshow;
 					print "</td>";
 
 					// Subledger account
@@ -1177,13 +1150,10 @@ if (empty($action) || $action == 'view') {
 									} else {
 										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
 									}
-								}
-								else
-								{
+								} else {
 									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
-							}
-							else print $accounttoshowsubledger;
+							} else print $accounttoshowsubledger;
 						}
 					}
 					print "</td>";
@@ -1289,57 +1259,49 @@ function getSourceDocRef($val, $typerecord)
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
 		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
 		$ref = $langs->transnoentitiesnoconv("Invoice");
-	}
-	elseif ($typerecord == 'payment_supplier')
+	} elseif ($typerecord == 'payment_supplier')
 	{
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
-	}
-	elseif ($typerecord == 'payment_expensereport')
+	} elseif ($typerecord == 'payment_expensereport')
 	{
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
 		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
-	}
-	elseif ($typerecord == 'payment_salary')
+	} elseif ($typerecord == 'payment_salary')
 	{
 		$sqlmid = 'SELECT s.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
-	}
-	elseif ($typerecord == 'sc')
+	} elseif ($typerecord == 'sc')
 	{
 		$sqlmid = 'SELECT sc.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
 		$sqlmid .= " WHERE sc.rowid=".$val["paymentscid"];
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
-	}
-	elseif ($typerecord == 'payment_vat')
+	} elseif ($typerecord == 'payment_vat')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
-	}
-	elseif ($typerecord == 'payment_donation')
+	} elseif ($typerecord == 'payment_donation')
 	{
 		$sqlmid = 'SELECT payd.fk_donation as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
 		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
 		$ref = $langs->transnoentitiesnoconv("Donation");
-	}
-	elseif ($typerecord == 'payment_loan')
+	} elseif ($typerecord == 'payment_loan')
 	{
 		$sqlmid = 'SELECT l.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
 		$sqlmid .= " WHERE l.rowid=".$val["paymentloanid"];
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
-	}
-	elseif ($typerecord == 'payment_various')
+	} elseif ($typerecord == 'payment_various')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
@@ -1362,8 +1324,7 @@ function getSourceDocRef($val, $typerecord)
 			{
 				$ref .= ' '.$objmid->ref;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 4be0b133143..bffd533d312 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -231,9 +231,7 @@ if ($action == 'writebookkeeping') {
 							$error++;
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -281,9 +279,7 @@ if ($action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -341,9 +337,7 @@ if ($action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -365,9 +359,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -382,13 +374,10 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -511,8 +500,7 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -582,8 +570,7 @@ if (empty($action) || $action == 'view') {
 				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("FeeAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
+				} else print $accountoshow;
 				print '</td>';
 				// Subledger account
 				print "<td>";
@@ -612,8 +599,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForUsersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -621,8 +607,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("UserAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? -price(-$mt) : '')."</td>";
@@ -649,8 +634,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 42bff74097f..acdc3fbface 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -152,8 +152,9 @@ if ($result) {
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
-			else
+			else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
@@ -226,8 +227,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 //var_dump($errorforinvoice);exit;
 
@@ -331,9 +331,7 @@ if ($action == 'writebookkeeping') {
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					}
-					else
-					{
+					} else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -383,9 +381,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -446,9 +442,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -499,9 +493,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -524,9 +516,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -541,13 +531,10 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -743,8 +730,7 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -871,8 +857,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForSuppliersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -880,8 +865,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -904,8 +888,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -937,8 +920,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
@@ -968,8 +950,7 @@ if (empty($action) || $action == 'view') {
 					if ($accountoshow == '' || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print '</td>';
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index c3c9f45ed5a..77a911db9b3 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -158,8 +158,9 @@ if ($result) {
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
-			else
+			else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
@@ -240,8 +241,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 //var_dump($errorforinvoice);exit;
 
@@ -342,9 +342,7 @@ if ($action == 'writebookkeeping') {
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					}
-					else
-					{
+					} else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -394,9 +392,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -456,9 +452,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -482,9 +476,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -499,13 +491,9 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
-	{
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -659,8 +647,9 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		$description .= $langs->trans("DepositsAreNotIncluded");
-	else
+	else {
 		$description .= $langs->trans("DepositsAreIncluded");
+	}
 
 	$listofchoices = array('notyet'=>$langs->trans("NotYetInGeneralLedger"), 'already'=>$langs->trans("AlreadyInGeneralLedger"));
     $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
@@ -680,8 +669,7 @@ if (empty($action) || $action == 'view') {
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -807,8 +795,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -816,8 +803,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
@@ -841,8 +827,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -875,8 +860,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 6140f90fe8d..40bd99c5582 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -63,9 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else
-		{
+		} else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 07877378ce1..8b37418a3bc 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -45,8 +45,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$year_start = dol_print_date(dol_now(), '%Y');
 	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
@@ -192,8 +191,7 @@ if ($action == 'validatehistory') {
 	if ($error)
 	{
 		$db->rollback();
-	}
-	else {
+	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
@@ -262,15 +260,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -332,15 +328,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
     	for ($i = 2; $i <= 12; $i++) {
             print '<td class="nowrap right">'.price($row[$i]).'</td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 95afd80caf5..de562d8dbbf 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -163,9 +163,7 @@ if ($massaction == 'ventil') {
             {
                 $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
                 $ko++;
-            }
-            else
-            {
+            } else {
                 $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
                 $sql .= " SET fk_code_ventilation = ".$monCompte;
                 $sql .= " WHERE rowid = ".$monId;
@@ -609,8 +607,7 @@ if ($result) {
 					$suggestedid = $tmpaccount->id;
 				}
 				$accountingaccount_codetotid_cache[$objp->code_buy_l] = $tmpaccount->id;
-			}
-			else {
+			} else {
 				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_buy_l];
 			}
 		}
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index fb957db2233..44e103059d7 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -58,9 +58,7 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
 	$endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard');
 
 	$completefilename = $siren."FEC".$endaccountingperiod.".txt";
-}
-else
-{
+} else {
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 6b2d432fe46..ca1d1cc2a33 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -49,8 +49,7 @@ $action = GETPOST('action', 'alpha');
  */
 
 //
-if ($action == 'updateall')
-{
+if ($action == 'updateall') {
     $db->begin();
     $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
     $res1 = dolibarr_set_const($db, 'ADHERENT_LOGIN_NOT_REQUIRED', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha') ? 0 : 1, 'chaine', 0, '', $conf->entity);
@@ -58,36 +57,29 @@ if ($action == 'updateall')
     $res3 = dolibarr_set_const($db, 'ADHERENT_DEFAULT_SENDINFOBYMAIL', GETPOST('ADHERENT_DEFAULT_SENDINFOBYMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
     $res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
     // Use vat for invoice creation
-    if ($conf->facture->enabled)
-    {
+    if ($conf->facture->enabled) {
         $res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
         $res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
-        if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-        {
+        if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
             $res6 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
         }
     }
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constname = GETPOST('constname', 'alpha');
 	$constvalue = (GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
 
 	if (($constname == 'ADHERENT_CARD_TYPE' || $constname == 'ADHERENT_ETIQUETTE_TYPE' || $constname == 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue = '';
-	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
-	{
+	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') { // Invert choice
 		if ($constvalue) $constvalue = 0;
 		else $constvalue = 1;
 	}
@@ -98,32 +90,25 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
 // Action to enable of a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
@@ -183,33 +168,27 @@ if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty(
 if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $arraychoices['bankviainvoice'] = $langs->trans("MoreActionBankViaInvoice");
 print '<td>';
 print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
-if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice')
-{
+if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice') {
     print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
 }
 print '</td>';
 print "</tr>\n";
 
 // Use vat for invoice creation
-if ($conf->facture->enabled)
-{
+if ($conf->facture->enabled) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
 		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) ? '0' : $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
-	}
-	else
-	{
+	} else {
 		print '<td class="right">';
 		print $langs->trans("WarningModuleNotActive", $langs->transnoentities("Module85Name"));
 		print '</td>';
 	}
 	print "</tr>\n";
 
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-	{
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
@@ -234,12 +213,12 @@ print '<br>';
  */
 $constantes = array(
 		'ADHERENT_CARD_TYPE',
-//		'ADHERENT_CARD_BACKGROUND',
+		//'ADHERENT_CARD_BACKGROUND',
 		'ADHERENT_CARD_HEADER_TEXT',
 		'ADHERENT_CARD_TEXT',
 		'ADHERENT_CARD_TEXT_RIGHT',
 		'ADHERENT_CARD_FOOTER_TEXT'
-		);
+);
 
 print load_fiche_titre($langs->trans("MembersCards"), '', '');
 
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index e0675a6124a..c6eec8b2d83 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -65,26 +65,21 @@ $constantes = array(
  */
 
 //
-if ($action == 'updateall')
-{
+if ($action == 'updateall') {
     $db->begin();
     $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
     $res1 = dolibarr_set_const($db, 'XXXX', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constlineid = GETPOST('rowid', 'int');
 	$constname = GETPOST('constname', 'alpha');
 
@@ -98,32 +93,25 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
 // Action to enable a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 73e1a519c59..d3d91ecba09 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -78,8 +78,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -92,8 +91,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +103,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 7864505f2e1..fe7989a70b9 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -81,8 +81,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -95,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -108,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index a8cdc06784e..0dbb998f764 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -42,14 +42,12 @@ if (!$user->admin) accessforbidden();
  * Actions
  */
 
-if ($action == 'setMEMBER_ENABLE_PUBLIC')
-{
+if ($action == 'setMEMBER_ENABLE_PUBLIC') {
 	if (GETPOST('value')) dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
 	else dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
 }
 
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$public = GETPOST('MEMBER_ENABLE_PUBLIC');
 	$amount = GETPOST('MEMBER_NEWFORM_AMOUNT');
 	$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
@@ -61,16 +59,15 @@ if ($action == 'update')
     $res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
     if ($forcetype < 0) $res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
-    else                $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+    else {
+        $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+    }
 
     if (!$res > 0) $error++;
 
- 	if (!$error)
-    {
+ 	if (!$error) {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -99,8 +96,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
     print "\n".'<script type="text/javascript" language="javascript">';
     print 'jQuery(document).ready(function () {
                 function initemail()
@@ -139,15 +135,12 @@ print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").
 
 
 $enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
-if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	// Button off, click to enable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
 	$enabledisablehtml .= '</a>';
-}
-else
-{
+} else {
 	// Button on, click to disable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=0'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -159,8 +152,7 @@ print '<input type="hidden" id="MEMBER_ENABLE_PUBLIC" name="MEMBER_ENABLE_PUBLIC
 
 print '<br>';
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 
 	print '<table class="noborder centpercent">';
@@ -221,8 +213,7 @@ dol_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 20d712e6179..a7e7a6f3634 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -49,13 +49,10 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'a.datep,a.id';
 if (!$sortorder) $sortorder = 'DESC';
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -65,8 +62,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
 	$object->fetch_thirdparty();
 
     $adht = new AdherentType($db);
@@ -82,19 +78,16 @@ $parameters = array('id'=>$id, 'objcanvas'=>$objcanvas);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
+    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
         header("Location: ".$backtopage);
         exit;
     }
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-        $actioncode = '';
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+		$actioncode = '';
         $search_agenda_label = '';
     }
 }
@@ -112,8 +105,7 @@ $form = new Form($db);
 /*
  * Customer and/or supplier category sheet
  */
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -149,13 +141,11 @@ if ($object->id > 0)
 
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled))
-    {
+    if (!empty($conf->agenda->enabled)) {
         $newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
     }
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
     	print '<br>';
 
     	$param = '&id='.$id;
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index eeee48e2138..aa9797959a7 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -91,18 +91,15 @@ abstract class ActionsAdherentCardCommon
 
         if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value)
-        {
+        foreach ($this->object as $key => $value) {
             $this->tpl[$key] = $value;
         }
 
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-        if ($action == 'create' || $action == 'edit')
-        {
-        	if ($conf->use_javascript_ajax)
-			{
+        if ($action == 'create' || $action == 'edit') {
+        	if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -114,13 +111,10 @@ abstract class ActionsAdherentCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0)
-        	{
+        	if (is_object($objsoc) && $objsoc->id > 0) {
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -128,8 +122,7 @@ abstract class ActionsAdherentCardCommon
         	$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
         	// Predefined with third party
-        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE'))
-        	{
+        	if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE')) {
         		if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
         		if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
         		if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
@@ -161,38 +154,30 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
         }
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'edit' || $action == 'delete') {
         	// Emailing
-        	if (!empty($conf->mailing->enabled))
-			{
+        	if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
         	// Dolibarr user
-        	if ($this->object->user_id)
-			{
+        	if ($this->object->user_id) {
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
-			}
-			else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
+			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
-        if ($action == 'view' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'delete') {
         	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0)
-        	{
+        	if ($this->object->socid > 0) {
         		$objsoc = new Societe($this->db);
 
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
         	}
 
@@ -214,8 +199,7 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['note'] = nl2br($this->object->note);
         }
 
-        if ($action == 'create_user')
-        {
+        if ($action == 'create_user') {
         	// Full firstname and lastname separated with a dot : firstname.lastname
         	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
             require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -263,19 +247,15 @@ abstract class ActionsAdherentCardCommon
         $this->object->canvas = $_POST["canvas"];
 
         // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
+        if ($this->object->country_id) {
             $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->object->country_code = $obj->code;
                 $this->object->country = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->libelle;
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
             }
         }
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index 60bb2ecd034..db2473c55d9 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -90,8 +90,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-		if ($action == 'view')
-		{
+		if ($action == 'view') {
             // Card header
             $head = member_prepare_head($this->object);
             $title = $this->getTitle($action);
@@ -105,18 +104,14 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
             $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
-		}
-		else
-		{
+        } else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->adherent->supprimer)
-        	{
+        	if ($action == 'delete' && $user->rights->adherent->supprimer) {
         		$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$this->object->id, $langs->trans("DeleteAdherent"), $langs->trans("ConfirmDeleteAdherent"), "confirm_delete", '', 0, 1);
         	}
 		}
 
-		if ($action == 'list')
-		{
+		if ($action == 'list') {
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 92f1e11d7a2..b6c0b542d27 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 36e2deab14c..92a4fbddd38 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index b738f549247..8789b2fcb34 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index c913d6a1b49..727a99e060c 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -55,8 +55,7 @@ $typeid = GETPOST('typeid', 'int');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 
-if (!empty($conf->mailmanspip->enabled))
-{
+if (!empty($conf->mailmanspip->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
 
 	$langs->load('mailmanspip');
@@ -76,8 +75,7 @@ $socialnetworks = getArrayOfSocialNetworks();
 $object->getCanvas($id);
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
@@ -86,16 +84,14 @@ if (!empty($canvas))
 // Security check
 $result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objcanvas);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	// Load member
 	$result = $object->fetch($id);
 
 	// Define variables to know what current user can do on users
 	$canadduser = ($user->admin || $user->rights->user->user->creer);
 	// Define variables to know what current user can do on properties of user linked to edited member
-	if ($object->user_id)
-	{
+	if ($object->user_id) {
 		// $User is the user who edits, $object->user_id is the id of the related user in the edited member
 		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -107,8 +103,7 @@ if ($id > 0)
 // Define variables to determine what the current user can do on the members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
+if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -125,34 +120,26 @@ $parameters = array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas, 'confirm'=
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = '';
 	}
 
-	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-	{
+	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
 		$error = 0;
-		if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
-		{
-			if ($userid != $user->id && $userid != $object->user_id)
-			{
+		if (empty($user->rights->user->user->creer)) {	// If can edit only itself user, we can link to itself only
+			if ($userid != $user->id && $userid != $object->user_id) {
 				$error++;
 				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 			}
 		}
 
-		if (!$error)
-		{
-			if ($userid != $object->user_id)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($userid != $object->user_id) {	// If link differs from currently in database
 				$result = $object->setUserId($userid);
 				if ($result < 0) dol_print_error($object->db, $object->error);
 				$action = '';
@@ -160,22 +147,17 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'setsocid')
-	{
+	if ($action == 'setsocid') {
 		$error = 0;
-		if (!$error)
-		{
-			if ($socid != $object->socid)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($socid != $object->socid) {	// If link differs from currently in database
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
 				$sql .= " WHERE socid = '".$socid."'";
 				$sql .= " AND entity = ".$conf->entity;
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					if ($obj && $obj->rowid > 0)
-					{
+					if ($obj && $obj->rowid > 0) {
 						$othermember = new Adherent($db);
 						$othermember->fetch($obj->rowid);
 						$thirdparty = new Societe($db);
@@ -185,8 +167,7 @@ if (empty($reshook))
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $object->setThirdPartyId($socid);
 					if ($result < 0) dol_print_error($object->db, $object->error);
 					$action = '';
@@ -196,57 +177,45 @@ if (empty($reshook))
 	}
 
 	// Create user from a member
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+		if ($result > 0) {
 			// Creation user
 			$nuser = new User($db);
 			$result = $nuser->create_from_member($object, GETPOST('login', 'alphanohtml'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
 	// Create third party from a member
-	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+		if ($result > 0) {
 			// User creation
 			$company = new Societe($db);
 			$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($company->error), null, 'errors');
 				setEventMessages($company->error, $company->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if ($action == 'update' && !$cancel && $user->rights->adherent->creer)
-	{
+	if ($action == 'update' && !$cancel && $user->rights->adherent->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$lastname = $_POST["lastname"];
@@ -271,16 +240,14 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
 		}
 		// Check if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
 			}
 		}
 		// Create new object
-		if ($result > 0 && !$error)
-		{
+		if ($result > 0 && !$error) {
 			$object->oldcopy = clone $object;
 
 			// Change values
@@ -333,32 +300,27 @@ if (empty($reshook))
 
 			// Check if we need to also synchronize user information
 			$nosyncuser = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser = 1; // Disable synchronizing
 			}
 
 			// Check if we need to also synchronize password information
 			$nosyncuserpass = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass = 1; // Disable synchronizing
 			}
 
 			$result = $object->update($user, 0, $nosyncuser, $nosyncuserpass);
 
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$categories = GETPOST('memcats', 'array');
 				$object->setCategories($categories);
 
 				// Logo/Photo save
 				$dir = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos';
 				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if ($file_OK)
-				{
-					if (GETPOST('deletephoto'))
-					{
+				if ($file_OK) {
+					if (GETPOST('deletephoto')) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						$fileimg = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/'.$object->photo;
 						$dirthumbs = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/thumbs';
@@ -366,33 +328,23 @@ if (empty($reshook))
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
+					if (image_format_supported($_FILES['photo']['name']) > 0) {
 						dol_mkdir($dir);
 
-						if (@is_dir($dir))
-						{
+						if (@is_dir($dir)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
-							{
+							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-							}
-							else
-							{
+							} else {
 							    // Create thumbs
 							    $object->addThumbs($newfile);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages("ErrorBadImageFormat", null, 'errors');
 					}
-				}
-				else
-				{
-					switch ($_FILES['photo']['error'])
-					{
+				} else {
+					switch ($_FILES['photo']['error']) {
 						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 							$errors[] = "ErrorFileSizeTooLarge";
@@ -407,37 +359,29 @@ if (empty($reshook))
 	            $id = $object->id;
 				$action = '';
 
-				if (!empty($backtopage))
-				{
+				if (!empty($backtopage)) {
 					header("Location: ".$backtopage);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'edit';
 		}
 	}
 
-	if ($action == 'add' && $user->rights->adherent->creer)
-	{
+	if ($action == 'add' && $user->rights->adherent->creer) {
 		if ($canvas) $object->canvas = $canvas;
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$datesubscription = '';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-		{
+		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"])) {
 			$datesubscription = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 		}
 
@@ -522,13 +466,11 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MemberNature")), null, 'errors');
 		}
 		// Tests if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
-			}
-			else {
+			} else {
 				$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
 				$result = $db->query($sql);
 				if ($result) {
@@ -572,14 +514,12 @@ if (empty($reshook))
 		$public = 0;
 		if (isset($public)) $public = 1;
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Email about right and login does not exist
 			$result = $object->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Foundation categories
 				$memcats = GETPOST('memcats', 'array');
 				$object->setCategories($memcats);
@@ -588,9 +528,7 @@ if (empty($reshook))
 				$rowid = $object->id;
 				$id = $object->id;
 				$action = '';
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				if ($object->error) {
@@ -601,36 +539,27 @@ if (empty($reshook))
 
 				$action = 'create';
 			}
-		}
-		else {
+		} else {
 			$action = 'create';
 		}
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->delete($id, $user);
-		if ($result > 0)
-		{
-			if (!empty($backtopage))
-			{
+		if ($result > 0) {
+			if (!empty($backtopage)) {
 				header("Location: ".$backtopage);
 				exit;
-			}
-			else
-			{
+			} else {
 				header("Location: list.php");
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$errmesg = $object->error;
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes') {
 		$error = 0;
 
 		$db->begin();
@@ -640,11 +569,9 @@ if (empty($reshook))
 
 		$result = $object->validate($user);
 
-		if ($result >= 0 && !count($object->errors))
-		{
+		if ($result >= 0 && !count($object->errors)) {
 			// Send confirmation email (according to parameters of member type. Otherwise generic)
-			if ($object->email && GETPOST("send_mail"))
-			{
+			if ($object->email && GETPOST("send_mail")) {
 				$subject = '';
 				$msg = '';
 
@@ -662,8 +589,7 @@ if (empty($reshook))
 
 				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-				{
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 					$subject = $arraydefaultmessage->topic;
 					$msg     = $arraydefaultmessage->content;
 				}
@@ -672,8 +598,7 @@ if (empty($reshook))
 					//fallback on the old configuration.
 					setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
 					$error++;
-				}
-				else {
+				} else {
 					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -682,16 +607,13 @@ if (empty($reshook))
 					$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			if ($object->error) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -700,32 +622,25 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 		$action = '';
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_resign') {
 		$error = 0;
 
-		if ($confirm == 'yes')
-		{
+		if ($confirm == 'yes') {
 			$adht = new AdherentType($db);
 			$adht->fetch($object->typeid);
 
 			$result = $object->resiliate($user);
 
-			if ($result >= 0 && !count($object->errors))
-			{
-				if ($object->email && GETPOST("send_mail"))
-				{
+			if ($result >= 0 && !count($object->errors)) {
+				if ($object->email && GETPOST("send_mail")) {
 					$subject = '';
 					$msg = '';
 
@@ -743,8 +658,7 @@ if (empty($reshook))
 
 					if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-					{
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 						$subject = $arraydefaultmessage->topic;
 						$msg     = $arraydefaultmessage->content;
 					}
@@ -753,8 +667,7 @@ if (empty($reshook))
 						//fallback on the old configuration.
 						setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
 						$error++;
-					}
-					else {
+					} else {
 						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 						complete_substitutions_array($substitutionarray, $outputlangs, $object);
 						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -763,16 +676,13 @@ if (empty($reshook))
 						$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 						$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 
 				if ($object->error) {
@@ -783,31 +693,24 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-		if (!empty($backtopage) && !$error)
-		{
+		if (!empty($backtopage) && !$error) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 	}
 
 	// SPIP Management
-	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->del_to_spip($object))
-			{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->del_to_spip($object)) {
 				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->add_to_spip($object))
-			{
+	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->add_to_spip($object)) {
 				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
@@ -844,28 +747,23 @@ llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
+	if (empty($object->error) && $id) {
 		$object = new Adherent($db);
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error('', $object->error);
 	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
 	// -----------------------------------------
 	// When used in standard mode
 	// -----------------------------------------
 
-	if ($action == 'create')
-	{
+	if ($action == 'create') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Creation mode                                                              */
@@ -876,8 +774,7 @@ else
 
 		// We set country_id, country_code and country for the selected country
 		$object->country_id = GETPOST('country_id', 'int') ?GETPOST('country_id', 'int') : $mysoc->country_id;
-		if ($object->country_id)
-		{
+		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
 			$object->country = $tmparray['label'];
@@ -887,8 +784,7 @@ else
             $object = new Societe($db);
             if ($socid > 0) $object->fetch($socid);
 
-            if (!($object->id > 0))
-            {
+            if (!($object->id > 0)) {
                 $langs->load("errors");
                 print($langs->trans('ErrorRecordNotFound'));
                 exit;
@@ -899,8 +795,7 @@ else
 
 		print load_fiche_titre($langs->trans("NewMember"), '', 'members');
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -942,14 +837,12 @@ else
 		print '<tbody>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="minwidth300" maxlength="50" value="'.(isset($_POST["member_login"]) ?GETPOST("member_login", 'alpha', 2) : $object->login).'" autofocus="autofocus"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$generated_password = getRandomPassword(false);
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
@@ -960,8 +853,7 @@ else
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
 		$listetype = $adht->liste_array();
-		if (count($listetype))
-		{
+		if (count($listetype)) {
 			print $form->selectarray("typeid", $listetype, GETPOST('typeid', 'int') ?GETPOST('typeid', 'int') : $typeid, count($listetype) > 1 ? 1 : 0);
 		} else {
 			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
@@ -1021,15 +913,11 @@ else
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
+			if ($object->country_id) {
 				print $formcompany->select_state(GETPOST('state_id', 'int') ?GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
-			}
-			else
-			{
+			} else {
 				print $countrynotdefined;
 			}
 			print '</td></tr>';
@@ -1062,8 +950,7 @@ else
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
 			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
@@ -1081,12 +968,9 @@ else
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
 		print '&nbsp;&nbsp;';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-		}
-		else
-		{
+		} else {
 			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		}
 		print '</div>';
@@ -1094,8 +978,7 @@ else
 		print "</form>\n";
 	}
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		/********************************************
 		*
 		* Edition mode
@@ -1116,16 +999,12 @@ else
 
 		// We set country_id, and country_code, country of the chosen country
 		$country = GETPOST('country', 'int');
-		if (!empty($country) || $object->country_id)
-		{
+		if (!empty($country) || $object->country_id) {
 			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country) ? $country : $object->country_id);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			$object->country_id = $obj->rowid;
@@ -1136,8 +1015,7 @@ else
 		$head = member_prepare_head($object);
 
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 				jQuery("#selectcountry_id").change(function() {
@@ -1182,14 +1060,12 @@ else
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="minwidth300" maxlength="50" value="'.(isset($_POST["login"]) ?GETPOST("login", 'alpha', 2) : $object->login).'"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(isset($_POST["pass"]) ?GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
 		}
 		// Morphy
@@ -1201,12 +1077,9 @@ else
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
+		if ($user->rights->adherent->creer) {
 			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ?GETPOST("typeid", 'int') : $object->typeid));
-		}
-		else
-		{
+		} else {
 			print $adht->getNomUrl(1);
 			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
 		}
@@ -1240,8 +1113,7 @@ else
 		print '<tr><td>'.$langs->trans("Photo").'</td>';
 		print '<td class="hideonsmartphone" valign="middle">';
 		print $form->showphoto('memberphoto', $object)."\n";
-		if ($caneditfieldmember)
-		{
+		if ($caneditfieldmember) {
 			if ($object->photo) print "<br>\n";
 			print '<table class="nobordernopadding">';
 			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
@@ -1274,8 +1146,7 @@ else
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			print $formcompany->select_state($object->state_id, isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id);
 			print '</td></tr>';
@@ -1308,8 +1179,7 @@ else
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td>';
 			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
@@ -1326,17 +1196,13 @@ else
 		}
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->socid)
-			{
+			if ($object->socid) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->socid);
 				print $company->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 			print '</td></tr>';
@@ -1344,11 +1210,9 @@ else
 
 		// Login Dolibarr
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
+		} else print $langs->trans("NoDolibarrAccess");
 		print '</td></tr>';
 
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
@@ -1366,8 +1230,7 @@ else
 		print '</form>';
 	}
 
-	if ($id > 0 && $action != 'edit')
-	{
+	if ($id > 0 && $action != 'edit') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* View mode                                                                  */
@@ -1398,11 +1261,9 @@ else
 		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
-		if ($action == 'create_user')
-		{
+		if ($action == 'create_user') {
 			$login = $object->login;
-			if (empty($login))
-			{
+			if (empty($login)) {
 				// Full firstname and name separated with a dot : firstname.name
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				$login = dol_buildlogin($object->lastname, $object->firstname);
@@ -1414,8 +1275,7 @@ else
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
 			$text = $langs->trans("ConfirmCreateLogin").'<br>';
-			if (!empty($conf->societe->enabled))
-			{
+			if (!empty($conf->societe->enabled)) {
 				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
 				else $text .= $langs->trans("UserWillBeInternalUser");
 			}
@@ -1423,18 +1283,14 @@ else
 		}
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
-			}
-			else
-			{
+			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) $companyalias = $object->company;
 			}
@@ -1449,8 +1305,7 @@ else
 		}
 
 		// Confirm validate member
-		if ($action == 'valid')
-		{
+		if ($action == 'valid') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1473,8 +1328,7 @@ else
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1510,8 +1364,7 @@ else
 		}
 
 		// Confirm terminate
-		if ($action == 'resign')
-		{
+		if ($action == 'resign') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1534,8 +1387,7 @@ else
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1566,21 +1418,18 @@ else
 		}
 
 		// Confirm remove member
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$formquestion = array();
 			if ($backtopage) $formquestion[] = array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("DeleteMember"), $langs->trans("ConfirmDeleteMember"), "confirm_delete", $formquestion, 'no', 1);
 		}
 
 		// Confirm add in spip
-		if ($action == 'add_spip')
-		{
+		if ($action == 'add_spip') {
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
 		}
 		// Confirm removed from spip
-		if ($action == 'del_spip')
-		{
+		if ($action == 'del_spip') {
 			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
 		}
 
@@ -1599,8 +1448,7 @@ else
 		print '<table class="border tableforfield centpercent">';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 		}
 
@@ -1625,17 +1473,14 @@ else
 		print '</tr>';
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 			if ($object->pass) print preg_replace('/./i', '*', $object->pass);
-			else
-			{
+			else {
 			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
 			    else print $langs->trans("Hidden");
 			}
-			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id))
-			{
+			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 			    $langs->load("errors");
 			    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 			    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -1645,26 +1490,18 @@ else
 
 		// Date end subscription
 		print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-		if ($object->datefin)
-		{
+		if ($object->datefin) {
 			print dol_print_date($object->datefin, 'day');
 			if ($object->hasDelay()) {
 				print " ".img_warning($langs->trans("Late"));
 			}
-		}
-		else
-		{
-			if ($object->need_subscription == 0)
-            {
+		} else {
+			if ($object->need_subscription == 0) {
                 print $langs->trans("SubscriptionNotNeeded");
-            }
-            elseif (!$adht->subscription)
-			{
+            } elseif (!$adht->subscription) {
 				print $langs->trans("SubscriptionNotRecorded");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-			}
-			else
-			{
+			} else {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
@@ -1672,14 +1509,12 @@ else
 		print '</td></tr>';
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>';
 			$editenable = $user->rights->adherent->creer;
 			print $form->editfieldkey('LinkedToDolibarrThirdParty', 'thirdparty', '', $object, $editenable);
 			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
+			if ($action == 'editthirdparty') {
 				$htmlname = 'socid';
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -1691,17 +1526,12 @@ else
 				print '</td>';
 				print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
-			}
-			else
-			{
-				if ($object->socid)
-				{
+			} else {
+				if ($object->socid) {
 					$company = new Societe($db);
 					$result = $company->fetch($object->socid);
 					print $company->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("NoThirdPartyAssociatedToMember");
 				}
 			}
@@ -1713,17 +1543,14 @@ else
 		$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
 		print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
+		if ($action == 'editlogin') {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
-		}
-		else
-		{
-			if ($object->user_id)
-			{
+		} else {
+			if ($object->user_id) {
 				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
+			} else {
+				print $langs->trans("NoDolibarrAccess");
 			}
-			else print $langs->trans("NoDolibarrAccess");
 		}
 		print '</td></tr>';
 
@@ -1743,8 +1570,7 @@ else
 		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
 			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -1770,8 +1596,7 @@ else
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 		if (empty($reshook)) {
-			if ($action != 'editlogin' && $action != 'editthirdparty')
-			{
+			if ($action != 'editlogin' && $action != 'editthirdparty') {
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
@@ -1800,103 +1625,74 @@ else
 				}*/
 
 				// Modify
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
 
 				// Validate
-				if ($object->statut == -1)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == -1) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
 					}
 				}
 
 				// Reactivate
-				if ($object->statut == 0)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == 0) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
 					}
 				}
 
 				// Terminate
-				if ($object->statut >= 1)
-				{
-					if ($user->rights->adherent->supprimer)
-					{
+				if ($object->statut >= 1) {
+					if ($user->rights->adherent->supprimer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
 					}
 				}
 
 				// Create third party
-				if (!empty($conf->societe->enabled) && !$object->socid)
-				{
-					if ($user->rights->societe->creer)
-					{
+				if (!empty($conf->societe->enabled) && !$object->socid) {
+					if ($user->rights->societe->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
 					}
 				}
 
 				// Create user
-				if (!$user->socid && !$object->user_id)
-				{
-					if ($user->rights->user->user->creer)
-					{
+				if (!$user->socid && !$object->user_id) {
+					if ($user->rights->user->user->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 					}
 				}
 
 				// Delete
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
 				}
 
 				// Action SPIP
-				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP))
-				{
+				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
 
-					if ($isinspip == 1)
-					{
+					if ($isinspip == 1) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
 					}
-					if ($isinspip == 0)
-					{
+					if ($isinspip == 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
@@ -1904,8 +1700,7 @@ else
 		}
 		print '</div>';
 
-		if ($isinspip == -1)
-		{
+		if ($isinspip == -1) {
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}
 
@@ -1915,8 +1710,7 @@ else
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
@@ -1944,8 +1738,7 @@ else
 			// Shon online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-			if ($useonlinepayment)
-			{
+			if ($useonlinepayment) {
 				print '<br>';
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 86bf523ac51..958750178f1 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -55,13 +55,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  * Actions
  */
 
-if ($mode == 'cardlogin' && empty($foruserlogin))
-{
+if ($mode == 'cardlogin' && empty($foruserlogin)) {
     $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 }
 
-if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
-{
+if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
     $arrayofmembers = array();
 
     // request taking into account member with up to date subscriptions
@@ -83,12 +81,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
 
     dol_syslog("Search members", LOG_DEBUG);
     $result = $db->query($sql);
-    if ($result)
-    {
+    if ($result) {
     	$num = $db->num_rows($result);
     	$i = 0;
-    	while ($i < $num)
-    	{
+    	while ($i < $num) {
     		$objp = $db->fetch_object($result);
 
     		if ($objp->country == '-') $objp->country = '';
@@ -98,14 +94,11 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     		$adherentstatic->firstname = $objp->firstname;
 
             // Format extrafield so they can be parsed in function complete_substitutions_array
-    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
-            {
+    		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
                 $adherentstatic->array_options = array();
-                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-                {
+                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                     $tmpkey = 'options_'.$key;
-                    if (!empty($objp->$tmpkey))
-                    {
+                    if (!empty($objp->$tmpkey)) {
                         $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
                     }
                     //if (!empty($objp->$key))
@@ -139,20 +132,17 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
             // For business cards
-            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-            {
+            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
                 $textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
                 $textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
                 $textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
                 $textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
-                if (is_numeric($foruserid) || $foruserlogin)
-                {
+                if (is_numeric($foruserid) || $foruserlogin) {
                     $nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];
                     if ($nb <= 0) $nb = 1; // Protection to avoid empty page
 
-                    for ($j = 0; $j < $nb; $j++)
-                    {
+                    for ($j = 0; $j < $nb; $j++) {
                         $arrayofmembers[] = array(
                         	'textleft'=>$textleft,
                             'textheader'=>$textheader,
@@ -162,11 +152,9 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
                             'photo'=>$objp->photo
                         );
                     }
-                }
-                else
-                {
+                } else {
                     $arrayofmembers[] = array(
-                    	'textleft'=>$textleft,
+                        'textleft'=>$textleft,
                         'textheader'=>$textheader,
                         'textfooter'=>$textfooter,
                         'textright'=>$textright,
@@ -177,8 +165,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             }
 
             // For labels
-            if ($mode == 'label')
-            {
+            if ($mode == 'label') {
             	if (empty($conf->global->ADHERENT_ETIQUETTE_TEXT)) $conf->global->ADHERENT_ETIQUETTE_TEXT = "__FULLNAME__\n__ADDRESS__\n__ZIP__ __TOWN__\n__COUNTRY__";
                 $textleft = make_substitutions($conf->global->ADHERENT_ETIQUETTE_TEXT, $substitutionarray);
                 $textheader = '';
@@ -197,43 +184,32 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     	}
 
     	// Build and output PDF
-        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-        {
-            if (!count($arrayofmembers))
-            {
+        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-            if (empty($model) || $model == '-1')
-            {
+            if (empty($model) || $model == '-1') {
             	$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_CARD_TYPE"));
             }
             if (!$mesg) $result = members_card_pdf_create($db, $arrayofmembers, $model, $outputlangs);
-        }
-        elseif ($mode == 'label')
-        {
-            if (!count($arrayofmembers))
-            {
+        } elseif ($mode == 'label') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-        	if (empty($modellabel) || $modellabel == '-1')
-    		{
+        	if (empty($modellabel) || $modellabel == '-1') {
     			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
     		}
         	if (!$mesg) $result = doc_label_pdf_create($db, $arrayofmembers, $modellabel, $outputlangs);
         }
 
-    	if ($result <= 0)
-    	{
+    	if ($result <= 0) {
     		dol_print_error('', $result);
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
-    if (!$mesg)
-    {
+    if (!$mesg) {
     	$db->close();
     	exit;
     }
@@ -266,8 +242,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -285,8 +260,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -305,8 +279,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 55504a547c2..1f78a0d1c7b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -660,8 +660,7 @@ class Adherent extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
 				if ($result < 0) {
 					$error++;
@@ -704,8 +703,7 @@ class Adherent extends CommonObject
 				}
 			}
 
-			if (!$error && $nbrowsaffected) // If something has change in main data
-			{
+			if (!$error && $nbrowsaffected) { // If something has change in main data
 				// Update information on linked user if it is an update
 				if (!$error && $this->user_id > 0 && !$nosyncuser) {
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1282,10 +1280,11 @@ class Adherent extends CommonObject
 
 				$this->country_id = $obj->country_id;
 				$this->country_code = $obj->country_code;
-				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)
+				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) {
 					$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
-				else
+				} else {
 					$this->country = $obj->country;
+				}
 
 				$this->phone = $obj->phone;
 				$this->phone_perso = $obj->phone_perso;
@@ -1554,8 +1553,7 @@ class Adherent extends CommonObject
 			$customer = new Societe($this->db);
 
 			if (!$error) {
-				if (!($this->fk_soc > 0)) // If not yet linked to a company
-				{
+				if (!($this->fk_soc > 0)) { // If not yet linked to a company
 					if ($autocreatethirdparty) {
 						// Create a linked thirdparty to member
 						$companyalias = '';
@@ -2037,12 +2035,13 @@ class Adherent extends CommonObject
 		if ($withpictoimg > -2 && $withpictoimg != 2) {
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<span class="nopadding valignmiddle'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').
 				($morecss ? ' usertext'.$morecss : '').'">';
-			if ($mode == 'login')
+			if ($mode == 'login') {
 				$result .= dol_trunc($this->login, $maxlen);
-			elseif ($mode == 'ref')
+			} elseif ($mode == 'ref') {
 				$result .= $this->id;
-			else
+			} else {
 				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+			}
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</span>';
 		}
 		if ($withpictoimg) $result .= '</div>';
@@ -2418,8 +2417,7 @@ class Adherent extends CommonObject
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
 		} // Set LDAP password if possible
-		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-		{
+		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				// Just for the default MD5 !
 				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
@@ -2618,8 +2616,7 @@ class Adherent extends CommonObject
 
 		$blockingerrormsg = '';
 
-		if (empty($conf->adherent->enabled)) // Should not happen. If module disabled, cron job should not be visible.
-		{
+		if (empty($conf->adherent->enabled)) { // Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
@@ -2638,8 +2635,7 @@ class Adherent extends CommonObject
 		$listofmembersko = array();
 
 		$arraydaysbeforeend = explode(';', $daysbeforeendlist);
-		foreach ($arraydaysbeforeend as $daysbeforeend) // Loop on each delay
-		{
+		foreach ($arraydaysbeforeend as $daysbeforeend) { // Loop on each delay
 			dol_syslog(__METHOD__.' - Process delta = '.$daysbeforeend, LOG_DEBUG);
 
 			if (!is_numeric($daysbeforeend)) {
@@ -2803,10 +2799,11 @@ class Adherent extends CommonObject
 						$listofids .= ', ...';
 						break;
 					}
-					if (empty($listofids))
+					if (empty($listofids)) {
 						$listofids .= ' [';
-					else
+					} else {
 						$listofids .= ', ';
+					}
 					$listofids .= $idmember;
 					$i++;
 				}
@@ -2823,10 +2820,11 @@ class Adherent extends CommonObject
 							$listofids .= ', ...';
 							break;
 						}
-						if (empty($listofids))
+						if (empty($listofids)) {
 							$listofids .= ' [';
-						else
+						} else {
 							$listofids .= ', ';
+						}
 						$listofids .= $idmember;
 						$i++;
 					}
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 4af80ab4a63..25df072fbde 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -132,12 +132,10 @@ class AdherentType extends CommonObject
 
         $result = $this->db->query($sql);
         if ($result) {
-            while ($obj = $this->db->fetch_object($result))
-            {
+            while ($obj = $this->db->fetch_object($result)) {
                 //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-                if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
-                {
-                    $this->label        = $obj->label;
+                if ($obj->lang == $current_lang) {  // si on a les traduct. dans la langue courante on les charge en infos principales.
+					$this->label        = $obj->label;
                     $this->description = $obj->description;
                     $this->email        = $obj->email;
                 }
@@ -146,9 +144,7 @@ class AdherentType extends CommonObject
                 $this->multilangs["$obj->lang"]["email"] = $obj->email;
             }
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
             return -1;
         }
@@ -167,8 +163,7 @@ class AdherentType extends CommonObject
         $langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
         $current_lang = $langs->getDefaultLang();
 
-        foreach ($langs_available as $key => $value)
-        {
+        foreach ($langs_available as $key => $value) {
             if ($key == $current_lang) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
@@ -177,16 +172,13 @@ class AdherentType extends CommonObject
 
                 $result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+                if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
                     $sql2 .= " SET ";
                     $sql2 .= " label='".$this->db->escape($this->label)."',";
                     $sql2 .= " description='".$this->db->escape($this->description)."'";
                     $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
                     $sql2 .= ")";
                     $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
@@ -198,8 +190,7 @@ class AdherentType extends CommonObject
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
-            }
-            elseif (isset($this->multilangs[$key])) {
+            } elseif (isset($this->multilangs[$key])) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
                 $sql .= " WHERE fk_type=".$this->id;
@@ -207,16 +198,13 @@ class AdherentType extends CommonObject
 
                 $result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+                if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
                     $sql2 .= " SET ";
                     $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
                     $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
                     $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
                     $sql2 .= ")";
                     $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
@@ -231,9 +219,7 @@ class AdherentType extends CommonObject
                         return -1;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 // language is not current language and we didn't provide a multilang description for this language
             }
         }
@@ -274,9 +260,7 @@ class AdherentType extends CommonObject
             }
             // End call triggers
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
             return -1;
@@ -313,39 +297,31 @@ class AdherentType extends CommonObject
 
 		dol_syslog("Adherent_type::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent_type");
 
 			$result = $this->update($user, 1);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -3;
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -382,8 +358,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid =".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
             $this->description = $this->db->escape($this->note);
 
             // Multilangs
@@ -397,37 +372,29 @@ class AdherentType extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -449,8 +416,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_TYPE_DELETE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -2; }
@@ -458,9 +424,7 @@ class AdherentType extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -484,10 +448,8 @@ class AdherentType extends CommonObject
 		dol_syslog("Adherent_type::fetch", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id             = $obj->rowid;
@@ -511,9 +473,7 @@ class AdherentType extends CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -537,24 +497,19 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE entity IN (".getEntity('member_type').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 
 					$adherenttypes[$obj->rowid] = $langs->trans($obj->label);
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 		return $adherenttypes;
@@ -583,14 +538,10 @@ class AdherentType extends CommonObject
 
 		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (!array_key_exists($obj->rowid, $ret))
-				{
-					if ($mode < 2)
-					{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!array_key_exists($obj->rowid, $ret)) {
+					if ($mode < 2) {
 						$memberstatic = new Adherent($this->db);
 						if ($mode == 1) {
 							$memberstatic->fetch($obj->rowid, '', '', '', false, false);
@@ -598,8 +549,7 @@ class AdherentType extends CommonObject
 							$memberstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $memberstatic;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
@@ -608,9 +558,7 @@ class AdherentType extends CommonObject
 			$this->members = $ret;
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -625,9 +573,7 @@ class AdherentType extends CommonObject
 	public function getmorphylib($morphy = '')
 	{
 		global $langs;
-		if ($morphy == 'phy') { return $langs->trans("Physical"); }
-		elseif ($morphy == 'mor') { return $langs->trans("Moral"); }
-        else return $langs->trans("MorPhy");
+		if ($morphy == 'phy') { return $langs->trans("Physical"); } elseif ($morphy == 'mor') { return $langs->trans("Moral"); } else return $langs->trans("MorPhy");
 		//return $morphy;
 	}
 
@@ -685,8 +631,7 @@ class AdherentType extends CommonObject
 		$statusType = 'status4';
 		if ($status == 0) $statusType = 'status5';
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$this->labelStatus[0] = $langs->trans("ActivityCeased");
 			$this->labelStatus[1] = $langs->trans("InActivity");
 			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -739,11 +684,9 @@ class AdherentType extends CommonObject
 		// Champs
 		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
 		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
-		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS))
-		{
+		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)) {
 			$valueofldapfield = array();
-			foreach ($this->members as $key=>$val)    // This is array of users for group into dolibarr database.
-			{
+			foreach ($this->members as $key=>$val) {    // This is array of users for group into dolibarr database.
 				$member = new Adherent($this->db);
 				$member->fetch($val->id, '', '', '', false, false);
 				$info2 = $member->_load_ldap_info();
@@ -793,8 +736,7 @@ class AdherentType extends CommonObject
 	{
 		global $conf;
 
-		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid)))
-		{
+		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid))) {
 			return $this->mail_valid;
 		}
 
@@ -811,8 +753,7 @@ class AdherentType extends CommonObject
 		global $conf;
 
 		// mail_subscription not  defined so never used
-		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription)))  // Property not yet defined
-		{
+		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) {  // Property not yet defined
 			return $this->mail_subscription;
 		}
 
@@ -829,9 +770,8 @@ class AdherentType extends CommonObject
         global $conf;
 
         // NOTE mail_resiliate not defined so never used
-        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate)))  // Property not yet defined
-        {
-            return $this->mail_resiliate;
+        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate))) {  // Property not yet defined
+			return $this->mail_resiliate;
         }
 
         return '';
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index bdb174cc0bd..b3029a6bd55 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -71,8 +71,7 @@ class AdherentStats extends Stats
 		$this->where .= " m.statut != 0";
 		$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($this->memberid)
-		{
+		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".$this->memberid;
 		}
         //if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 8e2e0d278f0..2128abe73d6 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -109,8 +109,7 @@ class Members extends DolibarrApi
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
     	}
         $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
-        if (!empty($typeid))
-        {
+        if (!empty($typeid)) {
             $sql .= ' AND t.fk_adherent_type='.$typeid;
         }
     	// Select members of given category
@@ -119,10 +118,8 @@ class Members extends DolibarrApi
 			$sql .= " AND c.fk_member = t.rowid ";
     	}
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -131,8 +128,7 @@ class Members extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -141,13 +137,11 @@ class Members extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
+            while ($i < $min) {
             	$obj = $db->fetch_object($result);
                 $member = new Adherent($this->db);
                 if ($member->fetch($obj->rowid)) {
@@ -155,8 +149,7 @@ class Members extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve member list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -236,13 +229,10 @@ class Members extends DolibarrApi
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($member->update(DolibarrApiAccess::$user) >= 0)
-        {
+        if ($member->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $member->error);
+        } else {
+            throw new RestException(500, $member->error);
         }
     }
 
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 98cb25b7fc3..6930b96e656 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -101,10 +101,8 @@ class MembersTypes extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
 
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -113,8 +111,7 @@ class MembersTypes extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -123,13 +120,11 @@ class MembersTypes extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
+            while ($i < $min) {
             	$obj = $db->fetch_object($result);
                 $membertype = new AdherentType($this->db);
                 if ($membertype->fetch($obj->rowid)) {
@@ -137,8 +132,7 @@ class MembersTypes extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve member type list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -204,13 +198,10 @@ class MembersTypes extends DolibarrApi
 
         // If there is no error, update() returns the number of affected rows
         // so if the update is a no op, the return value is zero.
-        if ($membertype->update(DolibarrApiAccess::$user) >= 0)
-        {
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $membertype->error);
+        } else {
+            throw new RestException(500, $membertype->error);
         }
     }
 
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index c9804e5d802..502a855657c 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -99,10 +99,8 @@ class Subscriptions extends DolibarrApi
         $sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
         $sql .= ' WHERE 1 = 1';
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
 	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -111,8 +109,7 @@ class Subscriptions extends DolibarrApi
 
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
@@ -121,12 +118,10 @@ class Subscriptions extends DolibarrApi
         }
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $i = 0;
             $num = $db->num_rows($result);
-            while ($i < min($limit, $num))
-            {
+            while ($i < min($limit, $num)) {
                 $obj = $db->fetch_object($result);
                 $subscription = new Subscription($this->db);
                 if ($subscription->fetch($obj->rowid)) {
@@ -134,8 +129,7 @@ class Subscriptions extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve subscription list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -193,13 +187,10 @@ class Subscriptions extends DolibarrApi
             $subscription->$field = $value;
         }
 
-        if ($subscription->update(DolibarrApiAccess::$user) > 0)
-        {
+        if ($subscription->update(DolibarrApiAccess::$user) > 0) {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $subscription->error);
+        } else {
+            throw new RestException(500, $subscription->error);
         }
     }
 
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index e512e1152bb..cdc70cf0cd1 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -136,8 +136,7 @@ class Subscription extends CommonObject
         $now = dol_now();
 
         // Check parameters
-        if ($this->datef <= $this->dateh)
-        {
+        if ($this->datef <= $this->dateh) {
             $this->error = $langs->trans("ErrorBadValueForDate");
             return -1;
         }
@@ -169,14 +168,12 @@ class Subscription extends CommonObject
             $this->errors[] = $this->db->lasterror();
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->fk_type = $type;
         }
 
-        if (!$error && !$notrigger)
-        {
+        if (!$error && !$notrigger) {
         	$this->context = array('member'=>$member);
         	// Call triggers
             $result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
@@ -213,10 +210,8 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
+        if ($resql) {
+            if ($this->db->num_rows($resql)) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id             = $obj->rowid;
@@ -232,14 +227,10 @@ class Subscription extends CommonObject
                 $this->note           = $obj->note;
                 $this->fk_bank        = $obj->fk_bank;
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -272,8 +263,7 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
+        if ($resql) {
             require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
             $member = new Adherent($this->db);
             $result = $member->fetch($this->fk_adherent);
@@ -286,9 +276,7 @@ class Subscription extends CommonObject
                 if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
                 // End call triggers
             }
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
         }
@@ -315,8 +303,7 @@ class Subscription extends CommonObject
         $error = 0;
 
         // It subscription is linked to a bank transaction, we get it
-        if ($this->fk_bank > 0)
-        {
+        if ($this->fk_bank > 0) {
             require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
             $accountline = new AccountLine($this->db);
             $result = $accountline->fetch($this->fk_bank);
@@ -333,50 +320,37 @@ class Subscription extends CommonObject
             }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $num = $this->db->affected_rows($resql);
-                if ($num)
-                {
+                if ($num) {
                     require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
                     $member = new Adherent($this->db);
                     $result = $member->fetch($this->fk_adherent);
                     $result = $member->update_end_date($user);
 
-                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0)	// If we found bank account line (this means this->fk_bank defined)
-                    {
-                        $result = $accountline->delete($user); // Return false if refused because line is conciliated
-                        if ($result > 0)
-                        {
+                    if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
+						$result = $accountline->delete($user); // Return false if refused because line is conciliated
+                        if ($result > 0) {
                             $this->db->commit();
                             return 1;
-                        }
-                        else
-                        {
+                        } else {
                             $this->error = $accountline->error;
                             $this->db->rollback();
                             return -1;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->db->commit();
                         return 1;
                     }
-                }
-                else
-                {
+                } else {
                     $this->db->commit();
                     return 0;
                 }
-            }
-            else
-            {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
             }
@@ -414,8 +388,7 @@ class Subscription extends CommonObject
 
         $url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
 
-        if ($option != 'nolink')
-        {
+        if ($option != 'nolink') {
             // Add param to save lastsearch_values or not
             $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
             if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
@@ -476,10 +449,8 @@ class Subscription extends CommonObject
         $sql .= ' WHERE c.rowid = '.$id;
 
         $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
+        if ($result) {
+            if ($this->db->num_rows($result)) {
                 $obj = $this->db->fetch_object($result);
                 $this->id = $obj->rowid;
 
@@ -488,9 +459,7 @@ class Subscription extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 05ccf20169c..141e19d0c96 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -61,8 +61,7 @@ $form = new Form($db);
 $object = new Adherent($db);
 $membert = new AdherentType($db);
 $result = $object->fetch($id);
-if ($result < 0)
-{
+if ($result < 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -86,16 +85,13 @@ $title = $langs->trans("Member")." - ".$langs->trans("Documents");
 $helpurl = "EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros";
 llxHeader("", $title, $helpurl);
 
-if ($id > 0)
-{
+if ($id > 0) {
     $result = $membert->fetch($object->typeid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
@@ -118,8 +114,7 @@ if ($id > 0)
 		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         // Login
-        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-        {
+        if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
             print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
         }
 
@@ -158,14 +153,10 @@ if ($id > 0)
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 		print "<br><br>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
     $langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index b7aa8da5d14..fc9b2eaf7f9 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -40,13 +40,11 @@ $now = dol_now();
 
 if (empty($sortorder)) {  $sortorder = "ASC"; }
 if (empty($sortfield)) {  $sortfield = "d.login"; }
-if (!isset($statut))
-{
+if (!isset($statut)) {
 	$statut = 1;
 }
 
-if (!isset($cotis))
-{
+if (!isset($cotis)) {
 	// by default, members must be up to date of subscription
 	$cotis = 1;
 }
@@ -55,33 +53,28 @@ if (!isset($cotis))
 $sql = "SELECT d.login, d.pass, d.datefin";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d ";
 $sql .= " WHERE d.statut = ".$statut;
-if ($cotis == 1)
-{
+if ($cotis == 1) {
 	$sql .= " AND datefin > '".$db->idate($now)."'";
 }
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.=$db->plimit($conf->liste_limit, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	print_barre_liste($langs->trans("HTPasswordExport"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0);
 
 	print "<hr>\n";
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$htpass = crypt($objp->pass, makesalt());
 		print $objp->login.":".$htpass."<br>\n";
 		$i++;
 	}
 	print "<hr>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 6d069386592..89f95b3e3dc 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -73,12 +73,10 @@ $sql .= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members per type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$adhtype = new AdherentType($db);
@@ -110,12 +108,10 @@ $sql .= " GROUP BY d.fk_adherent_type";
 
 dol_syslog("index.php::select nb of uptodate members by type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$MemberUpToDate[$objp->fk_adherent_type] = $objp->somme;
 		$i++;
@@ -127,23 +123,19 @@ if ($result)
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
-    // Search contact/address
-    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-    {
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
+	// Search contact/address
+    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
     	$listofsearchfields['search_member'] = array('text'=>'Member');
     }
 
-    if (count($listofsearchfields))
-    {
+    if (count($listofsearchfields)) {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
     	print '<input type="hidden" name="token" value="'.newToken().'">';
         print '<div class="div-table-responsive-no-min">';
     	print '<table class="noborder nohover centpercent">';
     	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
+    	foreach ($listofsearchfields as $key => $value) {
     		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
     		print '<tr class="oddeven">';
     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
@@ -163,8 +155,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  * Statistics
  */
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder nohover centpercent">';
     print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
@@ -177,8 +168,7 @@ if ($conf->use_javascript_ajax)
     $total = 0;
     $dataval = array();
     $i = 0;
-    foreach ($AdherentType as $key => $adhtype)
-    {
+    foreach ($AdherentType as $key => $adhtype) {
         $dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
         $dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
         $dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
@@ -232,12 +222,10 @@ $sql .= " AND d.rowid = c.fk_adherent";
 
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    while ($i < $num)
-    {
+    while ($i < $num) {
         $objp = $db->fetch_object($result);
         $year = dol_print_date($db->jdate($objp->dateh), "%Y");
         $Total[$year] = (isset($Total[$year]) ? $Total[$year] : 0) + $objp->subscription;
@@ -259,10 +247,8 @@ print "</tr>\n";
 
 krsort($Total);
 $i = 0;
-foreach ($Total as $key=>$value)
-{
-	if ($i >= 8)
-	{
+foreach ($Total as $key=>$value) {
+	if ($i >= 8) {
 		print '<tr class="oddeven">';
 		print "<td>...</td>";
 		print "<td class=\"right\"></td>";
@@ -308,32 +294,26 @@ $sql .= $db->order("a.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastMembersModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$staticmember->id = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
-			if (!empty($obj->fk_soc))
-			{
+			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
 				$staticmember->name = $staticmember->thirdparty->name;
-			}
-			else
-			{
+			} else {
 				$staticmember->name = $obj->company;
 			}
 			$staticmember->ref = $staticmember->getFullName($langs);
@@ -349,9 +329,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -371,19 +349,16 @@ $sql .= $db->order("c.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="5">'.$langs->trans("LastSubscriptionsModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$subscriptionstatic->id = $obj->cid;
@@ -411,9 +386,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -429,8 +402,7 @@ print '<th class=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
 print '<th class=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
-foreach ($AdherentType as $key => $adhtype)
-{
+foreach ($AdherentType as $key => $adhtype) {
 	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td class="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '').' '.$staticmember->LibStatut(-1, $adhtype->subscription, 0, 3).'</td>';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 6a49f99fbf4..3094c6a50ac 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -37,15 +37,13 @@ $action = GETPOST('action', 'aZ09');
 
 // Protection
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $socid = $user->socid;
 }
 
 $object = new Adherent($db);
 $result = $object->fetch($rowid);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db, "Failed to get adherent: ".$object->error);
 	exit;
 }
@@ -55,13 +53,11 @@ if (!$result)
  * Actions
  */
 
-if ($action == 'dolibarr2ldap')
-{
+if ($action == 'dolibarr2ldap') {
 	$ldap = new Ldap();
 	$result = $ldap->connect_bind();
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$info = $object->_load_ldap_info();
 		$dn = $object->_load_ldap_dn($info);
 		$olddn = $dn; // We can say that old dn = dn as we force synchro
@@ -71,8 +67,7 @@ if ($action == 'dolibarr2ldap')
 
 	if ($result >= 0) {
 		setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
@@ -104,8 +99,7 @@ print '<table class="border centpercent tableforfield">';
 print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 // If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else
-if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
-{
+if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
 	print '<td class="valeur">'.$object->pass.'</td>';
 	print "</tr>\n";
@@ -142,8 +136,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr')
-{
+if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') {
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a></div>';
 }
 
@@ -166,46 +159,34 @@ print '</tr>';
 // Lecture LDAP
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
 	$info = $object->_load_ldap_info();
 	$dn = $object->_load_ldap_dn($info, 1);
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
-	if (empty($dn))
-	{
+	if (empty($dn)) {
 	    $langs->load("errors");
 	    print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
-	}
-    else
-    {
+	} else {
     	$records = $ldap->getAttribute($dn, $search);
 
     	//print_r($records);
 
     	// Show tree
-    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    	{
-    		if (!is_array($records))
-    		{
+    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+    		if (!is_array($records)) {
     			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-    		}
-    		else
-    		{
+    		} else {
     			$result = show_ldap_content($records, 0, $records['count'], true);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     	}
     }
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index bf8353da5c9..6004f29acff 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -141,10 +141,8 @@ $arrayfields = array(
 	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
 			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
@@ -162,14 +160,12 @@ $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search = "";
 		$search_ref = "";
 		$search_lastname = "";
@@ -198,37 +194,29 @@ if (empty($reshook))
 	}
 
 	// Close
-	if ($massaction == 'close' && $user->rights->adherent->creer)
-	{
+	if ($massaction == 'close' && $user->rights->adherent->creer) {
 	    $tmpmember = new Adherent($db);
 	    $error = 0;
 	    $nbclose = 0;
 
 	    $db->begin();
 
-        foreach ($toselect as $idtoclose)
-        {
+        foreach ($toselect as $idtoclose) {
             $tmpmember->fetch($idtoclose);
             $result = $tmpmember->resiliate($user);
 
-            if ($result < 0 && !count($tmpmember->errors))
-    	    {
+            if ($result < 0 && !count($tmpmember->errors)) {
     	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
-    	    }
-    	    else
-    	    {
+    	    } else {
     	        if ($result > 0) $nbclose++;
     	    }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
 	}
@@ -286,8 +274,7 @@ $sql .= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
 if ($statut != '') $sql .= " AND d.statut in (".$db->escape($statut).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
-if ($search_ref)
-{
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (d.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -320,13 +307,11 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	if ($resql) $nbtotalofrecords = $db->num_rows($resql);
 	else dol_print_error($db);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -336,8 +321,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("get list", LOG_DEBUG);
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -346,8 +330,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/card.php?id='.$id);
@@ -357,22 +340,18 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
 
 $titre = $langs->trans("MembersList");
-if (GETPOSTISSET("statut"))
-{
+if (GETPOSTISSET("statut")) {
 	if ($statut == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
 	if ($statut == '-1') { $titre = $langs->trans("MembersListToValid"); }
 	if ($statut == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
 	if ($statut == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
 	if ($statut == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
 	if ($statut == '0') { $titre = $langs->trans("MembersListResiliated"); }
-}
-elseif ($action == 'search')
-{
+} elseif ($action == 'search') {
 	$titre = $langs->trans("MembersListQualified");
 }
 
-if ($search_type > 0)
-{
+if ($search_type > 0) {
 	$membertype = new AdherentType($db);
 	$result = $membertype->fetch(GETPOST("type", 'int'));
 	$titre .= " (".$membertype->label.")";
@@ -416,8 +395,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->creer)
-{
+if ($user->rights->adherent->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 
@@ -438,16 +416,14 @@ $objecttmp = new Adherent($db);
 $trackid = 'mem'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
@@ -458,8 +434,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -477,120 +452,100 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['d.civility']['checked']))
-{
+if (!empty($arrayfields['d.civility']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_civility" value="'.dol_escape_htmltag($search_civility).'"></td>';
 }
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
-if (!empty($arrayfields['d.gender']['checked']))
-{
+if (!empty($arrayfields['d.gender']['checked'])) {
 	print '<td class="liste_titre">';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['d.company']['checked']))
-{
+if (!empty($arrayfields['d.company']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
-if (!empty($arrayfields['d.morphy']['checked']))
-{
+if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	$listetype = $membertypestatic->liste_array();
 	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.address']['checked']))
-{
+if (!empty($arrayfields['d.address']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_address" value="'.$search_address.'"></td>';
 }
 
-if (!empty($arrayfields['d.zip']['checked']))
-{
+if (!empty($arrayfields['d.zip']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 }
-if (!empty($arrayfields['d.town']['checked']))
-{
+if (!empty($arrayfields['d.town']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_town" value="'.$search_town.'"></td>';
 }
 // State
-if (!empty($arrayfields['state.nom']['checked']))
-{
+if (!empty($arrayfields['state.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Country
-if (!empty($arrayfields['country.code_iso']['checked']))
-{
+if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 	print '</td>';
 }
 // Phone pro
-if (!empty($arrayfields['d.phone']['checked']))
-{
+if (!empty($arrayfields['d.phone']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone" value="'.$search_phone.'"></td>';
 }
 // Phone perso
-if (!empty($arrayfields['d.phone_perso']['checked']))
-{
+if (!empty($arrayfields['d.phone_perso']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.$search_phone_perso.'"></td>';
 }
 // Phone mobile
-if (!empty($arrayfields['d.phone_mobile']['checked']))
-{
+if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_phone_mobile" value="'.$search_phone_mobile.'"></td>';
 }
 // Email
-if (!empty($arrayfields['d.email']['checked']))
-{
+if (!empty($arrayfields['d.email']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_email" value="'.$search_email.'"></td>';
 }
 
-if (!empty($arrayfields['d.datefin']['checked']))
-{
+if (!empty($arrayfields['d.datefin']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
@@ -602,26 +557,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['d.datec']['checked']))
-{
+if (!empty($arrayfields['d.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 //Birthday
-if (!empty($arrayfields['d.birth']['checked']))
-{
+if (!empty($arrayfields['d.birth']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['d.tms']['checked']))
-{
+if (!empty($arrayfields['d.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['d.statut']['checked']))
-{
+if (!empty($arrayfields['d.statut']['checked'])) {
 	print '<td class="liste_titre right maxwidthonsmartphone">';
 	$liststatus = array(
 		'-1'=>$langs->trans("Draft"),
@@ -676,8 +627,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$datefin = $db->jdate($obj->datefin);
@@ -705,74 +655,64 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-	{
+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 		print '<td class="center">'.$obj->rowid.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Civility
-	if (!empty($arrayfields['d.civility']['checked']))
-	{
+	if (!empty($arrayfields['d.civility']['checked'])) {
 		print "<td>";
 		print $obj->civility;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Gender
-	if (!empty($arrayfields['d.gender']['checked']))
-	{
+	if (!empty($arrayfields['d.gender']['checked'])) {
 		print '<td>';
 		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Company
-	if (!empty($arrayfields['d.company']['checked']))
-	{
+	if (!empty($arrayfields['d.company']['checked'])) {
 		print "<td>";
 		print $companyname;
 		print "</td>\n";
 	}
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print "<td>".$obj->login."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Moral/Physique
-	if (!empty($arrayfields['d.morphy']['checked']))
-	{
+	if (!empty($arrayfields['d.morphy']['checked'])) {
 		print "<td>".$memberstatic->getmorphylib($obj->morphy)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		$membertypestatic->id = $obj->type_id;
 		$membertypestatic->label = $obj->type;
 		print '<td class="nowrap">';
@@ -781,38 +721,33 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Address
-	if (!empty($arrayfields['d.address']['checked']))
-	{
+	if (!empty($arrayfields['d.address']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->address;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Zip
-	if (!empty($arrayfields['d.zip']['checked']))
-	{
+	if (!empty($arrayfields['d.zip']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Town
-	if (!empty($arrayfields['d.town']['checked']))
-	{
+	if (!empty($arrayfields['d.town']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print "<td>".$obj->state_name."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->country, 'all');
 		print $tmparray['label'];
@@ -820,40 +755,34 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone pro
-	if (!empty($arrayfields['d.phone']['checked']))
-	{
+	if (!empty($arrayfields['d.phone']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone perso
-	if (!empty($arrayfields['d.phone_perso']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_perso']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_perso;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
-	if (!empty($arrayfields['d.phone_mobile']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_mobile;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// EMail
-	if (!empty($arrayfields['d.email']['checked']))
-	{
+	if (!empty($arrayfields['d.email']['checked'])) {
 		print "<td>".dol_print_email($obj->email, 0, 0, 1)."</td>\n";
 	}
 	// End of subscription date
 	$datefin = $db->jdate($obj->datefin);
-	if (!empty($arrayfields['d.datefin']['checked']))
-	{
-		if ($datefin)
-		{
+	if (!empty($arrayfields['d.datefin']['checked'])) {
+		if ($datefin) {
 			print '<td class="nowrap center">';
 			print dol_print_date($datefin, 'day');
 			if ($memberstatic->hasDelay()) {
@@ -861,17 +790,12 @@ while ($i < min($num, $limit))
 				print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap left">';
-			if ($obj->subscription == 'yes')
-			{
+			if ($obj->subscription == 'yes') {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) print " ".img_warning();
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -884,32 +808,28 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['d.datec']['checked']))
-	{
+	if (!empty($arrayfields['d.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Birth
-	if (!empty($arrayfields['d.birth']['checked']))
-	{
+	if (!empty($arrayfields['d.birth']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['d.tms']['checked']))
-	{
+	if (!empty($arrayfields['d.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (!empty($arrayfields['d.statut']['checked']))
-	{
+	if (!empty($arrayfields['d.statut']['checked'])) {
 		print '<td class="nowrap right">';
 		print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
 		print '</td>';
@@ -917,8 +837,7 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td class="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -935,8 +854,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
 	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index ee72c920e2f..819c3499627 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -39,8 +39,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
     $adht = new AdherentType($db);
     $result = $adht->fetch($object->typeid);
 }
@@ -64,8 +63,7 @@ llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id)
-{
+if ($id) {
 	$head = member_prepare_head($object);
 
 	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
@@ -83,8 +81,7 @@ if ($id)
 	print '<table class="border centpercent tableforfield">';
 
     // Login
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-    {
+    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
         print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
     }
 
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 7927c2e3f00..8f9a46228c6 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -33,8 +33,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -77,12 +76,10 @@ $foundphy = $foundmor = 0;
 // Define $data array
 dol_syslog("Count member", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		if ($obj->code == 'phy') $foundphy++;
@@ -93,9 +90,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -106,13 +101,10 @@ dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'use
 
 
 // Print title
-if (!count($data))
-{
+if (!count($data)) {
 	print $langs->trans("NoValidatedMemberYet").'<br>';
 	print '<br>';
-}
-else
-{
+} else {
 	print $langs->trans("MembersByNature").'<br>';
 	print '<br>';
 }
@@ -129,8 +121,7 @@ print '</tr>';
 if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
 if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
 
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 5b51008a9a2..62f4cd63dca 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -34,8 +34,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -68,11 +67,9 @@ print load_fiche_titre($title, '', 'object_group');
 
 dol_mkdir($dir);
 
-if ($mode)
-{
+if ($mode) {
     // Define sql
-    if ($mode == 'memberbycountry')
-    {
+    if ($mode == 'memberbycountry') {
         $label = $langs->trans("Country");
         $tab = 'statscountry';
 
@@ -87,8 +84,7 @@ if ($mode)
         //print $sql;
     }
 
-	if ($mode == 'memberbystate')
-    {
+	if ($mode == 'memberbystate') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("State");
         $tab = 'statsstate';
@@ -105,9 +101,8 @@ if ($mode)
         $sql .= " GROUP BY co.label, co.code, c.nom";
         //print $sql;
     }
-    if ($mode == 'memberbyregion') //
-    {
-        $label = $langs->trans("Country");
+    if ($mode == 'memberbyregion') { //
+		$label = $langs->trans("Country");
         $label2 = $langs->trans("Region"); //département
         $tab = 'statsregion'; //onglet
 
@@ -123,8 +118,7 @@ if ($mode)
         $sql .= " GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
     }
-    if ($mode == 'memberbytown')
-    {
+    if ($mode == 'memberbytown') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("Town");
         $tab = 'statstown';
@@ -148,15 +142,12 @@ if ($mode)
     // Define $data array
     dol_syslog("Count member", LOG_DEBUG);
     $resql = $db->query($sql);
-    if ($resql)
-    {
+    if ($resql) {
         $num = $db->num_rows($resql);
         $i = 0;
-        while ($i < $num)
-        {
+        while ($i < $num) {
             $obj = $db->fetch_object($resql);
-            if ($mode == 'memberbycountry')
-            {
+            if ($mode == 'memberbycountry') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 							'code'=>$obj->code,
@@ -165,9 +156,8 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbyregion') //+
-            {
-                $data[] = array(
+            if ($mode == 'memberbyregion') { //+
+				$data[] = array(
                     'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                     'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 				    'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -176,8 +166,7 @@ if ($mode)
                     'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
 	        }
-            if ($mode == 'memberbystate')
-            {
+            if ($mode == 'memberbystate') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
 				            'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -186,8 +175,7 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbytown')
-            {
+            if ($mode == 'memberbytown') {
                 $data[] = array('label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : $langs->trans("Unknown"))),
                             'label2'=>($obj->label2 ? $obj->label2 : $langs->trans("Unknown")),
@@ -200,9 +188,7 @@ if ($mode)
             $i++;
         }
         $db->free($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -214,19 +200,15 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
-if ($mode && !count($data))
-{
+if ($mode && !count($data)) {
     print $langs->trans("NoValidatedMemberYet").'<br>';
     print '<br>';
-}
-else
-{
+} else {
     if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>';
     elseif ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>';
     elseif ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>';
     elseif ($mode == 'memberbyregion') print $langs->trans("MembersByRegion").'<br>'; //+
-    else
-    {
+    else {
         print $langs->trans("MembersStatisticsDesc").'<br>';
         print '<br>';
         print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
@@ -242,8 +224,7 @@ else
 
 
 // Show graphics
-if (count($arrayjs) && $mode == 'memberbycountry')
-{
+if (count($arrayjs) && $mode == 'memberbycountry') {
     $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
     if (is_readable($color_file)) include_once $color_file;
 
@@ -261,8 +242,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
 
     // loop and dump
     $i = 0;
-    foreach ($data as $val)
-    {
+    foreach ($data as $val) {
         $valcountry = strtoupper($val['code']); // Should be ISO-3166 code (faster)
         //$valcountry=ucfirst($val['label_en']);
         if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }    // fix case of uk (when we use labels)
@@ -291,8 +271,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
     print '<br>';
 }
 
-if ($mode)
-{
+if ($mode) {
     // Print array / Affiche le tableau
     print '<table class="liste centpercent">';
     print '<tr class="liste_titre">';
@@ -303,8 +282,7 @@ if ($mode)
     print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
     print '</tr>';
 
-    foreach ($data as $val)
-    {
+    foreach ($data as $val) {
         $year = $val['year'];
         print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index cb0e6a463e4..9177b4783a2 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -35,8 +35,7 @@ $userid = GETPOST('userid', 'int'); if ($userid < 0) $userid = 0;
 $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -79,12 +78,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscripti
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px1->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -112,12 +109,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscr
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px2->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -175,11 +170,9 @@ print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
     $year = $val['year'];
-    while ($oldyear > $year + 1)
-    {	// If we have empty year
+    while ($oldyear > $year + 1) {	// If we have empty year
         $oldyear--;
         print '<tr class="oddeven" height="24">';
         print '<td class="center">';
@@ -214,8 +207,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 47866fc8981..06b8cecf7f3 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -75,16 +75,14 @@ $errmsg = '';
 $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
-if ($rowid)
-{
+if ($rowid) {
     // Load member
     $result = $object->fetch($rowid);
 
     // Define variables to know what current user can do on users
     $canadduser = ($user->admin || $user->rights->user->user->creer);
     // Define variables to know what current user can do on properties of user linked to edited member
-    if ($object->user_id)
-    {
+    if ($object->user_id) {
         // $user is the user editing, $object->user_id is the user's id linked to the edited member
         $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
         || (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -96,8 +94,7 @@ if ($rowid)
 // Define variables to know what current user can do on members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to know what current user can do on properties of a member
-if ($rowid)
-{
+if ($rowid) {
     $caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -115,47 +112,35 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
  */
 
 // Create third party from a member
-if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-{
-	if ($result > 0)
-	{
+if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+	if ($result > 0) {
 		// Creation of thirdparty
 		$company = new Societe($db);
 		$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'), GETPOST('customercode', 'alpha'));
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$langs->load("errors");
 			setEventMessages($company->error, $company->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			$action = 'addsubscription';
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
-if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-{
+if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer)) {
     $error = 0;
-    if (empty($user->rights->user->user->creer))    // If can edit only itself user, we can link to itself only
-    {
-        if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
-        {
+    if (empty($user->rights->user->user->creer)) {    // If can edit only itself user, we can link to itself only
+		if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id) {
             $error++;
             setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
-        }
+		}
     }
 
-    if (!$error)
-    {
-        if ($_POST["userid"] != $object->user_id)  // If link differs from currently in database
-        {
-            $result = $object->setUserId($_POST["userid"]);
+    if (!$error) {
+        if ($_POST["userid"] != $object->user_id) {  // If link differs from currently in database
+			$result = $object->setUserId($_POST["userid"]);
             if ($result < 0) dol_print_error('', $object->error);
             $_POST['action'] = '';
             $action = '';
@@ -163,21 +148,16 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights
     }
 }
 
-if ($action == 'setsocid')
-{
+if ($action == 'setsocid') {
     $error = 0;
-    if (!$error)
-    {
-        if (GETPOST('socid', 'int') != $object->fk_soc)    // If link differs from currently in database
-        {
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+    if (!$error) {
+        if (GETPOST('socid', 'int') != $object->fk_soc) {    // If link differs from currently in database
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
             $sql .= " WHERE fk_soc = '".GETPOST('socid', 'int')."'";
             $resql = $db->query($sql);
-            if ($resql)
-            {
+            if ($resql) {
                 $obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0)
-                {
+                if ($obj && $obj->rowid > 0) {
                     $othermember = new Adherent($db);
                     $othermember->fetch($obj->rowid);
                     $thirdparty = new Societe($db);
@@ -187,8 +167,7 @@ if ($action == 'setsocid')
                 }
             }
 
-            if (!$error)
-            {
+            if (!$error) {
                 $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
                 if ($result < 0) dol_print_error('', $object->error);
                 $_POST['action'] = '';
@@ -198,8 +177,7 @@ if ($action == 'setsocid')
     }
 }
 
-if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"])
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
     $error = 0;
 
     $langs->load("banks");
@@ -211,16 +189,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $datesubscription = 0;
     $datesubend = 0;
     $paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"])
-    {
+    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) {
         $datesubscription = dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
     }
-    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"])
-    {
+    if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) {
         $datesubend = dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
     }
-    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"])
-    {
+    if ($_POST["paymentyear"] && $_POST["paymentmonth"] && $_POST["paymentday"]) {
         $paymentdate = dol_mktime(0, 0, 0, $_POST["paymentmonth"], $_POST["paymentday"], $_POST["paymentyear"]);
     }
     $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
@@ -237,28 +212,24 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $sendalsoemail = GETPOST("sendmail", 'alpha');
 
     // Check parameters
-    if (!$datesubscription)
-    {
+    if (!$datesubscription) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (GETPOST('end') && !$datesubend)
-    {
+    if (GETPOST('end') && !$datesubend) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (!$datesubend)
-    {
+    if (!$datesubend) {
         $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
     }
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate)
-    {
+    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
         $error++;
         $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
         setEventMessages($errmsg, null, 'errors');
@@ -266,32 +237,23 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Check if a payment is mandatory or not
-    if (!$error && $adht->subscription)	// Member type need subscriptions
-    {
-        if (!is_numeric($amount))
-        {
+    if (!$error && $adht->subscription) {	// Member type need subscriptions
+		if (!is_numeric($amount)) {
             // If field is '' or not a numeric value
             $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
         	setEventMessages($errmsg, null, 'errors');
             $error++;
             $action = 'addsubscription';
-        }
-        else
-        {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none')
-            {
-                if ($_POST["subscription"])
-                {
+		} else {
+            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none') {
+                if ($_POST["subscription"]) {
                     if (!$_POST["label"])     $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !$_POST["operation"]) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
                     if ($_POST["paymentsave"] != 'invoiceonly' && !($_POST["accountid"] > 0)) $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("FinancialAccount"));
-                }
-                else
-                {
+                } else {
                     if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
-                if ($errmsg)
-                {
+                if ($errmsg) {
                 	$error++;
         			setEventMessages($errmsg, null, 'errors');
         			$error++;
@@ -302,55 +264,43 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Record the subscription then complementary actions
-    if (!$error && $action == 'subscription')
-    {
+    if (!$error && $action == 'subscription') {
         $db->begin();
 
         // Create subscription
         $crowid = $object->subscription($datesubscription, $amount, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
-        if ($crowid <= 0)
-        {
+        if ($crowid <= 0) {
             $error++;
             $errmsg = $object->error;
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				// If an invoice was created, it is into $object->invoice
 			}
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
             $action = 'addsubscription';
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	setEventMessages("SubscriptionRecorded", null, 'mesgs');
         }
 
         // Send email
-        if (!$error)
-        {
+        if (!$error) {
             // Send confirmation Email
-            if ($object->email && $sendalsoemail)   // $object is 'Adherent'
-            {
-            	$subject = '';
+            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+				$subject = '';
             	$msg = '';
 
             	// Send subscription email
@@ -368,8 +318,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 
             	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            	{
+            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             		$subject = $arraydefaultmessage->topic;
             		$msg     = $arraydefaultmessage->content;
             	}
@@ -384,8 +333,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $listofpaths = array();
                 $listofnames = array();
                 $listofmimes = array();
-                if (is_object($object->invoice))
-                {
+                if (is_object($object->invoice)) {
                 	$invoicediroutput = $conf->facture->dir_output;
                 	$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
                 	$file = $fileparams['fullname'];
@@ -398,25 +346,19 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
 
                 $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
-                if ($result < 0)
-                {
+                if ($result < 0) {
                 	$errmsg = $object->error;
                 	setEventMessages($object->error, $object->errors, 'errors');
-                }
-                else
-                {
+                } else {
                 	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
                 }
-            }
-            else
-            {
+            } else {
             	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
             }
         }
 
         // Clean some POST vars
-        if (!$error)
-        {
+        if (!$error) {
             $_POST["subscription"] = '';
             $_POST["accountid"] = '';
             $_POST["operation"] = '';
@@ -450,8 +392,7 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if ($rowid > 0)
-{
+if ($rowid > 0) {
     $res = $object->fetch($rowid);
     if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
@@ -480,8 +421,7 @@ if ($rowid > 0)
     print '<table class="border centpercent tableforfield">';
 
 	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 	}
 
@@ -500,11 +440,9 @@ if ($rowid > 0)
 	print '</tr>';
 
 	// Password
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
-		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id))
-		{
+		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
 		    $langs->load("errors");
 		    $htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 		    print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -527,8 +465,7 @@ if ($rowid > 0)
 	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-	{
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<tr><td>'.$langs->trans("Categories").'</td>';
 		print '<td colspan="2">';
 		print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -541,22 +478,16 @@ if ($rowid > 0)
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-	if ($object->datefin)
-	{
+	if ($object->datefin) {
 	    print dol_print_date($object->datefin, 'day');
 	    if ($object->hasDelay()) {
 	        print " ".img_warning($langs->trans("Late"));
 	    }
-	}
-	else
-	{
-	    if (!$adht->subscription)
-	    {
+	} else {
+	    if (!$adht->subscription) {
 	        print $langs->trans("SubscriptionNotRecorded");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
-	    }
-	    else
-	    {
+	    } else {
 	        print $langs->trans("SubscriptionNotReceived");
 	        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
@@ -564,8 +495,7 @@ if ($rowid > 0)
 	print '</td></tr>';
 
 	// Third party Dolibarr
-	if (!empty($conf->societe->enabled))
-	{
+	if (!empty($conf->societe->enabled)) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans("LinkedToDolibarrThirdParty");
@@ -573,8 +503,7 @@ if ($rowid > 0)
 		if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editthirdparty')
-		{
+		if ($action == 'editthirdparty') {
 			$htmlname = 'socid';
 			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 			print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -586,17 +515,12 @@ if ($rowid > 0)
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
-			if ($object->fk_soc)
-			{
+		} else {
+			if ($object->fk_soc) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->fk_soc);
 				print $company->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 		}
@@ -608,28 +532,21 @@ if ($rowid > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans("LinkedToDolibarrUser");
 	print '</td>';
-	if ($action != 'editlogin' && $user->rights->adherent->creer)
-	{
+	if ($action != 'editlogin' && $user->rights->adherent->creer) {
 		print '<td class="right">';
-		if ($user->rights->user->user->creer)
-		{
+		if ($user->rights->user->user->creer) {
 			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
 		}
 		print '</td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2" class="valeur">';
-	if ($action == 'editlogin')
-	{
+	if ($action == 'editlogin') {
 		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
-	}
-	else
-	{
-		if ($object->user_id)
-		{
+	} else {
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
+		} else print $langs->trans("NoDolibarrAccess");
 	}
 	print '</td></tr>';
 
@@ -648,10 +565,8 @@ if ($rowid > 0)
      */
 
     // Button to create a new subscription if member no draft neither resiliated
-    if ($user->rights->adherent->cotisation->creer)
-    {
-        if ($action != 'addsubscription' && $action != 'create_thirdparty')
-        {
+    if ($user->rights->adherent->cotisation->creer) {
+        if ($action != 'addsubscription' && $action != 'create_thirdparty') {
             print '<div class="tabsAction">';
 
             if ($object->statut > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$rowid.'&action=addsubscription">'.$langs->trans("AddSubscription")."</a></div>";
@@ -664,8 +579,7 @@ if ($rowid > 0)
     /*
      * List of subscriptions
      */
-    if ($action != 'addsubscription' && $action != 'create_thirdparty')
-    {
+    if ($action != 'addsubscription' && $action != 'create_thirdparty') {
         $sql = "SELECT d.rowid, d.firstname, d.lastname, d.societe, d.fk_adherent_type as type,";
         $sql .= " c.rowid as crowid, c.subscription,";
         $sql .= " c.datec, c.fk_type as cfk_type,";
@@ -681,8 +595,7 @@ if ($rowid > 0)
 		$sql .= $db->order($sortfield, $sortorder);
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $subscriptionstatic = new Subscription($db);
 
             $num = $db->num_rows($result);
@@ -696,8 +609,7 @@ if ($rowid > 0)
             print_liste_field_titre('DateStart', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
             print_liste_field_titre('DateEnd', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
             print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-            if (!empty($conf->banque->enabled))
-            {
+            if (!empty($conf->banque->enabled)) {
             	print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
             }
             print "</tr>\n";
@@ -707,8 +619,7 @@ if ($rowid > 0)
             $adht = new AdherentType($db);
 
             $i = 0;
-            while ($i < $num)
-            {
+            while ($i < $num) {
                 $objp = $db->fetch_object($result);
 
                 $adh->id = $objp->rowid;
@@ -718,8 +629,7 @@ if ($rowid > 0)
                 $subscriptionstatic->id = $objp->crowid;
 
                 $typeid = ($objp->cfk_type > 0 ? $objp->cfk_type : $adh->typeid);
-                if ($typeid > 0)
-                {
+                if ($typeid > 0) {
                     $adht->fetch($typeid);
                 }
 
@@ -734,19 +644,16 @@ if ($rowid > 0)
                 print '<td class="center">'.dol_print_date($db->jdate($objp->dateh), 'day')."</td>\n";
                 print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day')."</td>\n";
                 print '<td class="right">'.price($objp->subscription).'</td>';
-				if (!empty($conf->banque->enabled))
-				{
+				if (!empty($conf->banque->enabled)) {
 					print '<td class="right">';
-					if ($objp->bid)
-					{
+					if ($objp->bid) {
 						$accountstatic->label = $objp->label;
 						$accountstatic->id = $objp->baid;
 						$accountstatic->number = $objp->number;
 						$accountstatic->account_number = $objp->account_number;
 						$accountstatic->currency_code = $objp->currency_code;
 
-						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0)
-						{
+						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0) {
 							$accountingjournal = new AccountingJournal($db);
 							$accountingjournal->fetch($objp->fk_accountancy_journal);
 
@@ -755,9 +662,7 @@ if ($rowid > 0)
 
                         $accountstatic->ref = $objp->ref;
                         print $accountstatic->getNomUrl(1);
-                    }
-                    else
-                    {
+                    } else {
                         print '&nbsp;';
                     }
                     print '</td>';
@@ -773,21 +678,17 @@ if ($rowid > 0)
             }
 
             print "</table>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty'))
-    {
+    if (($action != 'addsubscription' && $action != 'create_thirdparty')) {
 	    // Shon online payment link
 	    $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	    if ($useonlinepayment)
-	    {
+	    if ($useonlinepayment) {
 	    	print '<br>';
 
 	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -799,8 +700,7 @@ if ($rowid > 0)
     /*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer)
-    {
+    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
         print '<br>';
 
         print load_fiche_titre($langs->trans("NewCotisation"));
@@ -809,14 +709,11 @@ if ($rowid > 0)
         $bankdirect = 0; // 1 means option by default is write to bank direct with no invoice
         $invoiceonly = 0; // 1 means option by default is invoice only
         $bankviainvoice = 0; // 1 means option by default is write to bank via invoice
-        if (GETPOST('paymentsave'))
-        {
+        if (GETPOST('paymentsave')) {
         	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
         	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
         	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
-        }
-        else
-        {
+        } else {
         	if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $bankviainvoice = 1;
         	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) $bankdirect = 1;
         	elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $invoiceonly = 1;
@@ -824,8 +721,7 @@ if ($rowid > 0)
 
         print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax)
-        {
+        if ($conf->use_javascript_ajax) {
         	//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
             print "\n".'<script type="text/javascript" language="javascript">';
             print '$(document).ready(function () {
@@ -861,18 +757,14 @@ if ($rowid > 0)
 
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
-			}
-			else
-			{
+			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) $companyalias = $object->company;
 			}
@@ -883,8 +775,7 @@ if ($rowid > 0)
 				array('label' => $langs->trans("AliasNames"), 'type' => 'text', 'name' => 'companyalias', 'value' => $companyalias, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"')
 			);
 			// If customer code was forced to "required", we ask it at creation to avoid error later
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-			{
+			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
                 $tmpcompany->get_codeclient($tmpcompany, 0);
@@ -922,23 +813,19 @@ if ($rowid > 0)
         $paymentdate = -1;
 
         // Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday'))
-        {
+        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday')) {
             $paymentdate = dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear'));
         }
 
         print '<tr>';
         // Date start subscription
         print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
-        if (GETPOST('reday'))
-        {
+        if (GETPOST('reday')) {
             $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
         }
-        if (!$datefrom)
-        {
+        if (!$datefrom) {
         	$datefrom = $object->datevalid;
-        	if ($object->datefin > 0)
-            {
+        	if ($object->datefin > 0) {
                 $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
             }
         }
@@ -946,20 +833,17 @@ if ($rowid > 0)
         print "</td></tr>";
 
         // Date end subscription
-        if (GETPOST('endday'))
-        {
+        if (GETPOST('endday')) {
             $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
         }
-        if (!$dateto)
-        {
+        if (!$dateto) {
             $dateto = -1; // By default, no date is suggested
         }
         print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
         print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);
         print "</td></tr>";
 
-        if ($adht->subscription)
-        {
+        if ($adht->subscription) {
             // Amount
             print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.GETPOST('subscription').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
@@ -970,11 +854,9 @@ if ($rowid > 0)
             print '"></td></tr>';
 
             // Complementary action
-            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled))
-            {
+            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) {
                 $company = new Societe($db);
-                if ($object->fk_soc)
-                {
+                if ($object->fk_soc) {
                     $result = $company->fetch($object->fk_soc);
                 }
 
@@ -987,20 +869,17 @@ if ($rowid > 0)
                 print '<td>';
                 print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'> '.$langs->trans("None").'<br>';
                 // Add entry into bank accoun
-                if (!empty($conf->banque->enabled))
-                {
+                if (!empty($conf->banque->enabled)) {
                     print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
                     print '> '.$langs->trans("MoreActionBankDirect").'<br>';
                 }
                 // Add invoice with no payments
-                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled))
-                {
+                if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
                     print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionInvoiceOnly");
                     if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else
-					{
+                    else {
                     	print ' (';
                     	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
                     	print $langs->trans("NoThirdPartyAssociatedToMember");
@@ -1009,8 +888,7 @@ if ($rowid > 0)
                     	print '</a>)';
                     }
                     if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
@@ -1018,14 +896,12 @@ if ($rowid > 0)
                     print '<br>';
                 }
                 // Add invoice with payments
-                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled))
-                {
+                if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
                     print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
                     //if (empty($object->fk_soc)) print ' disabled';
                     print '> '.$langs->trans("MoreActionBankViaInvoice");
                     if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
-                    else
-					{
+                    else {
                     	print ' (';
                     	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
                     	print $langs->trans("NoThirdPartyAssociatedToMember");
@@ -1034,8 +910,7 @@ if ($rowid > 0)
                     	print '</a>)';
                     }
                     if (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
-					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
 						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
 						print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product
@@ -1080,12 +955,9 @@ if ($rowid > 0)
 
         print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
         print '<td>';
-        if (!$object->email)
-        {
+        if (!$object->email) {
             print $langs->trans("NoEMail");
-        }
-        else
-        {
+        } else {
             $adht = new AdherentType($db);
             $adht->fetch($object->typeid);
 
@@ -1107,8 +979,7 @@ if ($rowid > 0)
 
             if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            {
+            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             	$subject = $arraydefaultmessage->topic;
             	$msg     = $arraydefaultmessage->content;
             }
@@ -1158,9 +1029,7 @@ if ($rowid > 0)
 
     //print '</td></tr>';
     //print '</table>';
-}
-else
-{
+} else {
     $langs->load("errors");
     print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 02941cb9967..b7e54238c4c 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -66,41 +66,33 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, n
 //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel)
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel) {
 	// Load current object
 	$result = $object->fetch($rowid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->begin();
 
 		$errmsg = '';
 
-		if ($object->fk_bank)
-		{
+		if ($object->fk_bank) {
 			$accountline = new AccountLine($db);
 			$result = $accountline->fetch($object->fk_bank);
 
 			// If transaction consolidated
-			if ($accountline->rappro)
-			{
+			if ($accountline->rappro) {
 				$errmsg = $langs->trans("SubscriptionLinkedToConciliatedTransaction");
-			}
-			else
-			{
+			} else {
 				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 				$accountline->amount = $_POST["amount"];
 				$result = $accountline->update($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$errmsg = $accountline->error;
 				}
 			}
 		}
 
-		if (!$errmsg)
-		{
+		if (!$errmsg) {
 			// Modify values
 			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
 			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
@@ -110,50 +102,37 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$db->commit();
 
 				header("Location: card.php?rowid=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
-			    if ($object->error)
-				{
+			    if ($object->error) {
 					$errmsg = $object->error;
-				}
-				else
-				{
-					foreach ($object->errors as $error)
-					{
+				} else {
+					foreach ($object->errors as $error) {
 						if ($errmsg) $errmsg .= '<br>';
 						$errmsg .= $error;
 					}
 				}
 				$action = '';
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer) {
 	$result = $object->fetch($rowid);
     $result = $object->delete($user);
-    if ($result > 0)
-    {
+    if ($result > 0) {
     	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
     	exit;
-    }
-    else
-    {
+    } else {
     	$mesg = $adh->error;
     }
 }
@@ -173,8 +152,7 @@ llxHeader('', $langs->trans("SubscriptionCard"), 'EN:Module_Foundations|FR:Modul
 dol_htmloutput_errors($errmsg);
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'edit')
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in edit mode
@@ -238,19 +216,14 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
 			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
-			if ($object->fk_bank)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoneF");
 			}
 			print '</td></tr>';
@@ -271,8 +244,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print "\n";
 }
 
-if ($rowid && $action != 'edit')
-{
+if ($rowid && $action != 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in view mode
@@ -287,8 +259,7 @@ if ($rowid && $action != 'edit')
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
     // Confirmation to delete subscription
-    if ($action == 'delete')
-    {
+    if ($action == 'delete') {
 		//$formquestion=array();
         //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
@@ -345,19 +316,14 @@ if ($rowid && $action != 'edit')
     print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank) {
 			print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur">';
-			if ($object->fk_bank)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoneF");
 			}
 			print '</td></tr>';
@@ -377,21 +343,16 @@ if ($rowid && $action != 'edit')
      */
     print '<div class="tabsAction">';
 
-    if ($user->rights->adherent->cotisation->creer)
-	{
-		if (!$bankline->rappro)
-		{
+    if ($user->rights->adherent->cotisation->creer) {
+		if (!$bankline->rappro) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=edit\">".$langs->trans("Modify")."</a></div>";
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.$langs->trans("BankLineConciliated")."\" href=\"#\">".$langs->trans("Modify")."</a></div>";
 		}
 	}
 
     // Delete
-    if ($user->rights->adherent->cotisation->creer)
-    {
+    if ($user->rights->adherent->cotisation->creer) {
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=delete\">".$langs->trans("Delete")."</a></div>\n";
     }
 
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d2fd59b8ce5..509f00d2705 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -110,15 +110,13 @@ $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-	    $search_type = "";
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$search_type = "";
 	    $search_ref = "";
 	    $search_lastname = "";
 	    $search_firstname = "";
@@ -153,13 +151,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription a
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
 $sql .= " WHERE d.rowid = c.fk_adherent";
 $sql .= " AND d.entity IN (".getEntity('adherent').")";
-if (isset($date_select) && $date_select != '')
-{
+if (isset($date_select) && $date_select != '') {
     $sql .= " AND c.dateadh >= '".$date_select."-01-01 00:00:00'";
     $sql .= " AND c.dateadh < '".($date_select + 1)."-01-01 00:00:00'";
 }
-if ($search_ref)
-{
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -183,14 +179,12 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
     $resql = $db->query($sql);
     if ($resql) $nbtotalofrecords = $db->num_rows($resql);
     else dol_print_error($db);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
+    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
     	$offset = 0;
     }
 }
@@ -198,8 +192,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db);
 	exit;
 }
@@ -208,8 +201,7 @@ $num = $db->num_rows($result);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/subscription/card.php?id='.$id);
@@ -247,8 +239,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->cotisation->creer)
-{
+if ($user->rights->adherent->cotisation->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
 
@@ -269,8 +260,7 @@ $objecttmp = new Subscription($db);
 $trackid = 'sub'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
@@ -289,70 +279,59 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 }
 
 // Type
-if (!empty($arrayfields['d.fk_type']['checked']))
-{
+if (!empty($arrayfields['d.fk_type']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 	print'</td>';
 }
 
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
 
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
 
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
 
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	print '';
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.bank']['checked']))
-{
+if (!empty($arrayfields['d.bank']['checked'])) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth150');
 	print '</td>';
 }
 
-if (!empty($arrayfields['c.dateadh']['checked']))
-{
+if (!empty($arrayfields['c.dateadh']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['c.datef']['checked']))
-{
+if (!empty($arrayfields['c.datef']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['d.amount']['checked']))
-{
+if (!empty($arrayfields['d.amount']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input class="flat" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'" size="4">';
 	print '</td>';
@@ -365,14 +344,12 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['c.datec']['checked']))
-{
+if (!empty($arrayfields['c.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['c.tms']['checked']))
-{
+if (!empty($arrayfields['c.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -412,8 +389,7 @@ print "</tr>\n";
 
 
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($result);
 
 	$subscription->ref = $obj->crowid;
@@ -435,17 +411,14 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print '<td>'.$subscription->getNomUrl(1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
     // Type
-    if (!empty($arrayfields['d.fk_type']['checked']))
-	{
+    if (!empty($arrayfields['d.fk_type']['checked'])) {
         print '<td class="nowraponall">';
-        if ($typeid > 0)
-        {
+        if ($typeid > 0) {
         	print $adht->getNomUrl(1);
         }
         print '</td>';
@@ -453,30 +426,26 @@ while ($i < min($num, $limit))
 	}
 
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		$adherent->firstname = '';
 		print '<td>'.$adherent->getNomUrl(-1).'</td>';
 		$adherent->firstname = $obj->firstname;
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->firstname).'">'.$adherent->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->login).'">'.$adherent->login.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		print '<td>';
 		print dol_trunc($obj->note, 128);
 		print '</td>';
@@ -484,11 +453,9 @@ while ($i < min($num, $limit))
 	}
 
 	// Banque
-	if (!empty($arrayfields['d.bank']['checked']))
-	{
+	if (!empty($arrayfields['d.bank']['checked'])) {
 		print '<td class="tdmaxoverflow150">';
-		if ($obj->fk_account > 0)
-		{
+		if ($obj->fk_account > 0) {
 			$accountstatic->id = $obj->fk_account;
 			$accountstatic->fetch($obj->fk_account);
 			//$accountstatic->label=$obj->label;
@@ -499,20 +466,17 @@ while ($i < min($num, $limit))
 	}
 
 	// Date start
-	if (!empty($arrayfields['c.dateadh']['checked']))
-	{
+	if (!empty($arrayfields['c.dateadh']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->dateadh), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date end
-	if (!empty($arrayfields['c.datef']['checked']))
-	{
+	if (!empty($arrayfields['c.datef']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datef), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Price
-	if (!empty($arrayfields['d.amount']['checked']))
-	{
+	if (!empty($arrayfields['d.amount']['checked'])) {
 		print '<td class="right">'.price($obj->subscription).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
@@ -525,16 +489,14 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['c.datec']['checked']))
-	{
+	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['c.tms']['checked']))
-	{
+	if (!empty($arrayfields['c.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
@@ -542,8 +504,7 @@ while ($i < min($num, $limit))
 	}
 	// Action column
 	print '<td class="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -560,8 +521,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
 	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 16b600bfeeb..136c1dab8f4 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -33,8 +32,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 $langs->load("members");
 
 $total = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
     echo '<tr class="oddeven">';
     echo '<td>'.$langs->trans("Subscription").'</td>';
     echo '<td>'.$objectlink->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index c190398c1db..524ed0e466a 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -79,9 +79,8 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-    $search_lastname = "";
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+	$search_lastname = "";
     $search_login = "";
     $search_email = "";
     $type = "";
@@ -124,8 +123,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -138,28 +136,21 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'create';
 	}
 }
 
-if ($action == 'update' && $user->rights->adherent->configurer)
-{
+if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 
 	$object->oldcopy = clone $object;
@@ -180,12 +171,9 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 
 	$ret = $object->update($user);
 
-	if ($ret >= 0 && !count($object->errors))
-	{
+	if ($ret >= 0 && !count($object->errors)) {
 		setEventMessages($langs->trans("MemberTypeModified"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -193,19 +181,15 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->adherent->configurer)
-{
+if ($action == 'confirm_delete' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 	$res = $object->delete();
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("MemberTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -223,8 +207,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), 'EN:Module_Foundations|FR:Modul
 
 
 // List of members type
-if (!$rowid && $action != 'create' && $action != 'edit')
-{
+if (!$rowid && $action != 'create' && $action != 'edit') {
 	//dol_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
@@ -232,8 +215,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
 
@@ -244,8 +226,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		$newcardbutton = '';
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
             $newcardbutton .= dolGetButtonTitle($langs->trans('NewMemberType'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/type.php?action=create');
         }
 
@@ -291,17 +272,16 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			print '</td>';
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
             print '<td class="center">';
-			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); }
-			elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); }
-			else print $langs->trans("MorPhy");
+			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); } elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); } else print $langs->trans("MorPhy");
             print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer)
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
+			else {
 				print '<td class="right">&nbsp;</td>';
+			}
 			print "</tr>";
 			$i++;
 		}
@@ -309,9 +289,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -322,8 +300,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 /* Creation mode                                                              */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object = new AdherentType($db);
 
 	print load_fiche_titre($langs->trans("NewMemberType"), '', 'members');
@@ -398,10 +375,8 @@ if ($action == 'create')
 /* View mode                                                                  */
 /*                                                                            */
 /* ************************************************************************** */
-if ($rowid > 0)
-{
-	if ($action != 'edit')
-	{
+if ($rowid > 0) {
+	if ($action != 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
@@ -409,8 +384,7 @@ if ($rowid > 0)
 		/*
 		 * Confirmation deletion
 		 */
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAMemberType"), $langs->trans("ConfirmDeleteMemberType", $object->label), "confirm_delete", '', 0, 1);
 		}
 
@@ -440,12 +414,9 @@ if ($rowid > 0)
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-		if ($object->duration_value > 1)
-		{
+		if ($object->duration_value > 1) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-		}
-		elseif ($object->duration_value > 0)
-		{
+		} elseif ($object->duration_value > 0) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 		}
 		print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
@@ -472,22 +443,19 @@ if ($rowid > 0)
 		print '<div class="tabsAction">';
 
 		// Edit
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
 
 		// Add
-        if ($user->rights->adherent->configurer && !empty($object->statut))
-		{
+        if ($user->rights->adherent->configurer && !empty($object->statut)) {
             print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
         } else {
 		    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
         }
 
 		// Delete
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
@@ -508,39 +476,30 @@ if ($rowid > 0)
 		$sql .= " WHERE d.fk_adherent_type = t.rowid ";
 		$sql .= " AND d.entity IN (".getEntity('adherent').")";
 		$sql .= " AND t.rowid = ".$object->id;
-		if ($sall)
-		{
+		if ($sall) {
 			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
-		if ($status != '')
-		{
+		if ($status != '') {
 		    $sql .= natural_search('d.statut', $status, 2);
 		}
-		if ($action == 'search')
-		{
-			if (GETPOST('search', 'alpha'))
-			{
+		if ($action == 'search') {
+			if (GETPOST('search', 'alpha')) {
 		  		$sql .= natural_search(array("d.firstname", "d.lastname"), GETPOST('search', 'alpha'));
 		  	}
 		}
-		if (!empty($search_lastname))
-		{
+		if (!empty($search_lastname)) {
 			$sql .= natural_search(array("d.firstname", "d.lastname"), $search_lastname);
 		}
-		if (!empty($search_login))
-		{
+		if (!empty($search_login)) {
 			$sql .= natural_search("d.login", $search_login);
 		}
-		if (!empty($search_email))
-		{
+		if (!empty($search_email)) {
 			$sql .= natural_search("d.email", $search_email);
 		}
-        if ($filter == 'uptodate')
-        {
+        if ($filter == 'uptodate') {
             $sql .= " AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
         }
-        if ($filter == 'outofdate')
-        {
+        if ($filter == 'outofdate') {
             $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
         }
 
@@ -548,14 +507,12 @@ if ($rowid > 0)
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$resql = $db->query($sql);
 		    if ($resql) $nbtotalofrecords = $db->num_rows($result);
 		    else dol_print_error($db);
-		    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-		    {
-		    	$page = 0;
+		    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+				$page = 0;
 		    	$offset = 0;
 		    }
 		}
@@ -563,28 +520,30 @@ if ($rowid > 0)
 		$sql .= " ".$db->plimit($conf->liste_limit + 1, $offset);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 		    $num = $db->num_rows($resql);
 		    $i = 0;
 
 		    $titre = $langs->trans("MembersList");
-		    if ($status != '')
-		    {
-		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
-		        elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); }
-		        elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
-		        elseif ($status == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
-		        elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
-		        elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
-		    }
-		    elseif ($action == 'search')
-		    {
+            if ($status != '') {
+                if ($status == '-1,1') {
+                    $titre = $langs->trans("MembersListQualified");
+                } elseif ($status == '-1') {
+                    $titre = $langs->trans("MembersListToValid");
+                } elseif ($status == '1' && !$filter) {
+                    $titre = $langs->trans("MembersListValid");
+                } elseif ($status == '1' && $filter == 'uptodate') {
+                    $titre = $langs->trans("MembersListUpToDate");
+                } elseif ($status == '1' && $filter == 'outofdate') {
+                    $titre = $langs->trans("MembersListNotUpToDate");
+                } elseif ($status == '0') {
+                    $titre = $langs->trans("MembersListResiliated");
+                }
+		    } elseif ($action == 'search') {
 		        $titre = $langs->trans("MembersListQualified");
 		    }
 
-		    if ($type > 0)
-		    {
+		    if ($type > 0) {
 				$membertype = new AdherentType($db);
 		        $result = $membertype->fetch($type);
 				$titre .= " (".$membertype->label.")";
@@ -598,8 +557,7 @@ if ($rowid > 0)
 		    if (!empty($search_email))		$param .= "&search_email=".$search_email;
 		    if (!empty($filter))			$param .= "&filter=".$filter;
 
-		    if ($sall)
-		    {
+		    if ($sall) {
 		        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
 		    }
 
@@ -649,8 +607,7 @@ if ($rowid > 0)
 		    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 		    print "</tr>\n";
 
-		    while ($i < $num && $i < $conf->liste_limit)
-		    {
+		    while ($i < $num && $i < $conf->liste_limit) {
 		        $objp = $db->fetch_object($resql);
 
 		        $datefin = $db->jdate($objp->datefin);
@@ -661,12 +618,9 @@ if ($rowid > 0)
 
 		        // Lastname
 		        print '<tr class="oddeven">';
-		        if ($objp->company != '')
-		        {
+		        if ($objp->company != '') {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";
-		        }
-		        else
-		        {
+		        } else {
 		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";
 		        }
 
@@ -693,29 +647,20 @@ if ($rowid > 0)
 		        print "</td>";
 
 		        // Date end subscription
-		        if ($datefin)
-		        {
+		        if ($datefin) {
 			        print '<td class="nowrap center">';
-		            if ($datefin < dol_now() && $objp->statut > 0)
-		            {
+		            if ($datefin < dol_now() && $objp->statut > 0) {
 		                print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
-		            }
-		            else
-		            {
+		            } else {
 		                print dol_print_date($datefin, 'day');
 		            }
 		            print '</td>';
-		        }
-		        else
-		        {
+		        } else {
 			        print '<td class="nowrap left">';
-			        if ($objp->subscription == 'yes')
-			        {
+			        if ($objp->subscription == 'yes') {
 		                print $langs->trans("SubscriptionNotReceived");
 		                if ($objp->statut > 0) print " ".img_warning();
-			        }
-			        else
-			        {
+			        } else {
 			            print '&nbsp;';
 			        }
 		            print '</td>';
@@ -723,13 +668,11 @@ if ($rowid > 0)
 
 		        // Actions
 		        print '<td class="center">';
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<a class="editfielda" href="card.php?rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
 				print '&nbsp;';
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
 		        }
 				print "</td>";
@@ -742,13 +685,10 @@ if ($rowid > 0)
             print '</div>';
             print '</form>';
 
-			if ($num > $conf->liste_limit)
-			{
+			if ($num > $conf->liste_limit) {
 			    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 			}
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -759,8 +699,7 @@ if ($rowid > 0)
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index bfb81e8d5c4..433c83d72be 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -53,15 +53,12 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-	if ($action == 'dolibarr2ldap')
-	{
+if (empty($reshook)) {
+	if ($action == 'dolibarr2ldap') {
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$object->listMembersForMemberType('', 1);
 
 			$info = $object->_load_ldap_info();
@@ -73,8 +70,7 @@ if (empty($reshook))
 
 		if ($result >= 0) {
 			setEventMessages($langs->trans("MemberTypeSynchronized"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -126,8 +122,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1)
-{
+if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) {
     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
@@ -150,8 +145,7 @@ print '</tr>';
 // LDAP reading
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
     $info = $object->_load_ldap_info();
     $dn = $object->_load_ldap_dn($info, 1);
     $search = "(".$object->_load_ldap_dn($info, 2).")";
@@ -161,27 +155,19 @@ if ($result > 0)
     //print_r($records);
 
     // Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    {
-        if (!is_array($records))
-        {
+    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+        if (!is_array($records)) {
             print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-        }
-        else
-        {
+        } else {
             $result = show_ldap_content($records, 0, $records['count'], true);
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     }
 
     $ldap->unbind();
     $ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 4c68b82784f..b45c7cf76f5 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -51,99 +51,78 @@ $result = restrictedArea($user, 'adherent', $id, 'adherent_type');
  */
 
 // return to translation display if cancellation
-if ($cancel == $langs->trans("Cancel"))
-{
+if ($cancel == $langs->trans("Cancel")) {
 	$action = '';
 }
 
-if ($action == 'delete' && GETPOST('langtodelete', 'alpha'))
-{
+if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
 }
 
 // Add translation
-if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
 	// update of object
-	if ($_POST["forcelangprod"] == $current_lang)
-	{
+	if ($_POST["forcelangprod"] == $current_lang) {
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
-	}
-	else
-	{
+	} else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
 	}
 
 	// backup into database
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
 // Edit translation
-if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // saving new values in the object
-	{
-		if ($key == $current_lang)
-		{
+	foreach ($object->multilangs as $key => $value) { // saving new values in the object
+		if ($key == $current_lang) {
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
-		}
-		else
-		{
+		} else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
 		}
 	}
 
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
 // Delete translation
-if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$langtodelete = GETPOST('langdel', 'alpha');
 
 
-	if ($object->delMultiLangs($langtodelete, $user) > 0)
-	{
+	if ($object->delMultiLangs($langtodelete, $user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -174,10 +153,8 @@ $titre = $langs->trans("MemberType".$object->type);
 
 // Calculate $cnt_trans
 $cnt_trans = 0;
-if (!empty($object->multilangs))
-{
-    foreach ($object->multilangs as $key => $value)
-    {
+if (!empty($object->multilangs)) {
+    foreach ($object->multilangs as $key => $value) {
         $cnt_trans++;
     }
 }
@@ -201,10 +178,8 @@ dol_fiche_end();
 
 print "\n<div class=\"tabsAction\">\n";
 
-if ($action == '')
-{
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
+if ($action == '') {
+    if ($user->rights->produit->creer || $user->rights->service->creer) {
         print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=add&rowid='.$object->id.'">'.$langs->trans("Add").'</a>';
         if ($cnt_trans > 0) print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/type_translation.php?action=edit&rowid='.$object->id.'">'.$langs->trans("Update").'</a>';
     }
@@ -214,8 +189,7 @@ print "\n</div>\n";
 
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -224,10 +198,8 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print "<br>".($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
 
@@ -252,13 +224,9 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
-{
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+} elseif ($action != 'add') {
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
 
@@ -280,8 +248,7 @@ elseif ($action != 'add')
  * Form to add a new translation
  */
 
-if ($action == 'add' && $user->rights->adherent->configurer)
-{
+if ($action == 'add' && $user->rights->adherent->configurer) {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index b6231a45a10..382f242b7e7 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -61,9 +61,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -107,9 +105,7 @@ if ($action == "save" && empty($cancel))
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         $db->commit();
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
         $db->rollback();
     }
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 77113ff1e13..e7e5edefaab 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -107,9 +107,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -162,15 +160,11 @@ print '<td class="center">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
-}
-else
-{
+} else {
 	if (empty($conf->global->AGENDA_DISABLE_EXT))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 }
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index c5b196146d5..560226438c3 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -59,9 +59,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -73,9 +71,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -87,8 +83,7 @@ if ($action == 'set')
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', $defaultfilter, 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -120,15 +115,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -139,9 +130,7 @@ elseif ($action == 'setmodel')
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -213,9 +202,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -263,8 +250,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$module = new $classname($db, $specimenthirdparty);
             			if (method_exists($module, 'info'))
             				print $module->info($langs);
-            			else
-            				print $module->description;
+            			else print $module->description;
             			print "</td>\n";
 
             			// Active
@@ -276,15 +262,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				    print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             				    print '</a>';
-            			    }
-            			    else
-            			    {
+            			    } else {
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             			    }
             				print "</td>";
-            			}
-            			else
-            			{
+            			} else {
             				print '<td class="center">'."\n";
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
             				print "</td>";
@@ -295,9 +277,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
             			{
             				print img_picto($langs->trans("Default"), 'on');
-            			}
-            			else
-            			{
+            			} else {
             				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             			}
             			print '</td>';
@@ -346,9 +326,7 @@ print '<td class="right">'."\n";
 if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else
-{
+} else {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 3d51bd3158c..c55e4a1afd5 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -54,9 +54,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -68,9 +66,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -80,8 +76,7 @@ if ($action == 'set')
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
     dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -113,15 +108,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -132,9 +123,7 @@ elseif ($action == 'setmodel')
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 7df74ba6a9d..3075be2ada5 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -54,9 +54,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessages($langs->trans("SaveFailed"), null, 'errors');
     }
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index b048dea9565..6c91367f6c2 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -55,8 +55,7 @@ if ($action == 'setbankorder') {
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -67,18 +66,15 @@ if ($action == 'setreportlastnumreleve') {
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-elseif ($action == 'unsetreportlastnumreleve') {
+} elseif ($action == 'unsetreportlastnumreleve') {
     if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 0, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -89,18 +85,15 @@ if ($action == 'setbankcolorizemovement') {
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-elseif ($action == 'unsetbankcolorizemovement') {
+} elseif ($action == 'unsetbankcolorizemovement') {
     if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 0, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -127,9 +120,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -141,8 +132,7 @@ if ($action == 'specimen') {
 
     if ($modele == 'sepamandate') {
         $object = new CompanyBankAccount($db);
-    }
-    else {
+    } else {
         $object = new Account($db);
     }
     $object->initAsSpecimen();
@@ -169,13 +159,11 @@ if ($action == 'specimen') {
         if ($module->write_file($object, $langs) > 0) {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bank&file=SPECIMEN.pdf");
             return;
-        }
-        else {
+        } else {
             setEventMessages($module->error, null, 'errors');
             dol_syslog($module->error, LOG_ERR);
         }
-    }
-    else {
+    } else {
         setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -184,8 +172,7 @@ if ($action == 'specimen') {
 // Activate a model
 if ($action == 'set') {
     $ret = addDocumentModel($value, $type, $label, $scandir);
-}
-elseif ($action == 'del') {
+} elseif ($action == 'del') {
     $ret = delDocumentModel($value, $type);
     if ($ret > 0) {
         if ($conf->global->BANKADDON_PDF == "$value")
@@ -270,8 +257,7 @@ while ($i < $nbofbank) {
         print '<td class="center">';
         print img_picto($langs->trans("Activated"), 'on');
         print '</td>';
-    }
-    else {
+    } else {
         print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;value='.$i.'">';
         print img_picto($langs->trans("Disabled"), 'off');
         print '</a></td>';
@@ -308,8 +294,7 @@ if ($resql) {
         array_push($def, $array[0]);
         $i++;
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -359,8 +344,7 @@ foreach ($dirmodels as $reldir) {
                                 print "</td><td>\n";
                                 if (method_exists($module, 'info'))
                                     print $module->info($langs);
-                                else
-                                    print $module->description;
+                                else print $module->description;
                                 print '</td>';
 
                                 // Active
@@ -370,8 +354,7 @@ foreach ($dirmodels as $reldir) {
                                     print img_picto($langs->trans("Enabled"), 'switch_on');
                                     print '</a>';
                                     print '</td>';
-                                }
-                                else {
+                                } else {
                                     print '<td class="center">'."\n";
                                     print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                                     print "</td>";
@@ -381,8 +364,7 @@ foreach ($dirmodels as $reldir) {
                                 print '<td class="center">';
                                 if ($conf->global->BANKADDON_PDF == $name) {
                                     print img_picto($langs->trans("Default"), 'on');
-                                }
-                                else {
+                                } else {
                                     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                                 }
                                 print '</td>';
@@ -410,8 +392,7 @@ foreach ($dirmodels as $reldir) {
                                 print '<td class="center">';
                                 if ($module->type == 'pdf') {
                                     print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-                                }
-                                else {
+                                } else {
                                     print img_object($langs->trans("PreviewNotAvailable"), 'generic');
                                 }
                                 print '</td>';
@@ -447,9 +428,7 @@ if ($conf->global->BANK_COLORIZE_MOVEMENT) {
     print img_picto($langs->trans("Enabled"), 'switch_on');
     print '</a>';
     print '</td>';
-}
-else
-{
+} else {
     print '<td class="center">'."\n";
     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
     print "</td>";
@@ -508,9 +487,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
     print img_picto($langs->trans("Enabled"), 'switch_on');
     print '</a>';
     print '</td>';
-}
-else
-{
+} else {
     print '<td class="center">'."\n";
     print '<a href="'.$_SERVER["PHP_SELF"].'?action=setreportlastnumreleve">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
     print "</td>";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e577942ab21..250e2cf6162 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -50,8 +50,7 @@ if ($action == 'setbarcodeproducton')
 	{
 	    $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
 	}
-}
-elseif ($action == 'setbarcodeproductoff')
+} elseif ($action == 'setbarcodeproductoff')
 {
 	$res = dolibarr_del_const($db, "BARCODE_PRODUCT_ADDON_NUM", $conf->entity);
 }
@@ -67,8 +66,7 @@ if ($action == 'setcoder')
 
 	$resql = $db->query($sqlp);
 	if (!$resql) dol_print_error($db);
-}
-elseif ($action == 'update')
+} elseif ($action == 'update')
 {
 	$location = GETPOST('GENBARCODE_LOCATION', 'alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_LOCATION", $location, 'chaine', 0, '', $conf->entity);
@@ -80,13 +78,10 @@ elseif ($action == 'update')
 	if ($res > 0)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'updateengine')
+} elseif ($action == 'updateengine')
 {
     $sql = "SELECT rowid, coder";
     $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
@@ -264,20 +259,14 @@ if ($resql)
 						$url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&amp;generator='.urlencode($obj->coder).'&amp;code='.urlencode($obj->example).'&amp;encoding='.urlencode($obj->encoding);
 						//print $url;
 						print '<img src="'.$url.'" title="'.$obj->example.'" border="0">';
-					}
-					else
-					{
+					} else {
 						print $langs->trans("FormatNotSupportedByGenerator");
 					}
-				}
-				else
-				{
+				} else {
 					print 'ErrorClassNotFoundInModule '.$classname.' '.$obj->coder;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ChooseABarCode");
 		}
 		print '</td>';
@@ -392,8 +381,7 @@ if ($conf->product->enabled)
 
 	    		    try {
 	        			dol_include_once($dirroot.$file.'.php');
-	    			}
-	    			catch (Exception $e)
+	    			} catch (Exception $e)
 	    			{
 	    			    dol_syslog($e->getMessage(), LOG_ERR);
 	    			}
@@ -411,9 +399,7 @@ if ($conf->product->enabled)
 	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;value='.$file.'">';
 	    				print img_picto($langs->trans("Activated"), 'switch_on');
 	    				print '</a></td>';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&amp;value='.$file.'">';
 	    				print img_picto($langs->trans("Disabled"), 'switch_off');
 	    				print '</a></td>';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 6d37def3187..46db7dd6c6c 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -57,14 +57,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -95,15 +91,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bom&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -113,9 +105,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -140,17 +130,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "BOM_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_BOM_DRAFT_WATERMARK')
+} elseif ($action == 'set_BOM_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("BOM_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "BOM_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -160,14 +146,10 @@ elseif ($action == 'set_BOM_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_BOM_FREE_TEXT')
+} elseif ($action == 'set_BOM_FREE_TEXT')
 {
 	$freetext = GETPOST("BOM_FREE_TEXT", 'none'); // No alpha here, we want exact string
 
@@ -178,9 +160,7 @@ elseif ($action == 'set_BOM_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -261,9 +241,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->BOM_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -327,9 +305,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -398,9 +374,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -411,9 +385,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->BOM_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -441,9 +413,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -488,9 +458,7 @@ $variablename = 'BOM_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index c6ff9e94749..a45208db3b9 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -83,9 +83,7 @@ if ($action == 'add') {
                             $distinctfkuser[$obj->fk_user] = $obj->fk_user;
                             $i++;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         setEventMessages($db->lasterror(), null, 'errors');
                         $error++;
                     }
@@ -109,8 +107,7 @@ if ($action == 'add') {
                                 if (preg_match('/A/', $boxorder)) $nbboxonleft++;
                                 if (preg_match('/B/', $boxorder)) $nbboxonright++;
                             }
-                        }
-                        else dol_print_error($db);
+                        } else dol_print_error($db);
 
                         $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
                         $sql .= "box_id, position, box_order, fk_user, entity";
@@ -134,9 +131,7 @@ if ($action == 'add') {
     {
         $db->commit();
         $action = '';
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 }
@@ -204,9 +199,7 @@ if ($action == 'switch')
 	if ($resultupdatefrom && $resultupdateto)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -288,23 +281,20 @@ if ($resql)
 						$box_order = "A0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
-					}
-					elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "B0".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
 					}
-				}
-				elseif (dol_strlen($record['box_order']) == 2)
+				} elseif (dol_strlen($record['box_order']) == 2)
 				{
 					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "A".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
 						$resql = $db->query($sql);
-					}
-					elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "B".$record['box_order'];
 						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
@@ -345,9 +335,7 @@ foreach ($boxtoadd as $box)
     if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
     {
         $logo = $box->boximg;
-    }
-    else
-    {
+    } else {
         $logo = preg_replace("/^object_/i", "", $box->boximg);
     }
 
@@ -361,8 +349,7 @@ foreach ($boxtoadd as $box)
     {
     	$langs->load("errors");
     	print $langs->trans("WarningUsingThisBoxSlowDown");
-    }
-	else print ($box->note ? $box->note : '&nbsp;');
+    } else print ($box->note ? $box->note : '&nbsp;');
     print '</td>'."\n";
     print '<td>'.$box->sourcefile.'</td>'."\n";
 
@@ -410,9 +397,7 @@ foreach ($boxactivated as $key => $box)
 	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
 	{
 		$logo = $box->boximg;
-	}
-	else
-	{
+	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
 	}
 
@@ -426,8 +411,7 @@ foreach ($boxactivated as $key => $box)
 	{
 		$langs->load("errors");
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
-	}
-	else print ($box->note ? $box->note : '&nbsp;');
+	} else print ($box->note ? $box->note : '&nbsp;');
 	print '</td>';
 	print '<td class="center">'.(empty($pos_name[$box->position]) ? '' : $langs->trans($pos_name[$box->position])).'</td>';
 	$hasnext = ($key < (count($boxactivated) - 1));
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 8b5e7c433bf..b619f584736 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -60,9 +60,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -83,9 +81,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -181,9 +177,7 @@ foreach ($dirmodels as $reldir)
 							if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
-							}
-							else
-							{
+							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
@@ -259,9 +253,7 @@ $variablename = 'BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 36205697e89..74c49092cb3 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -46,9 +46,7 @@ if ($action == 'setvalue' && $user->admin)
     if ($result1 >= 0 && $result2 >= 0)
     {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -133,9 +131,7 @@ if (!empty($conf->global->CLICKTODIAL_URL))
 	if ($setupcomplete)
 	{
 		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL');
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';
 	}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 76f04d94c15..9acecc11604 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -66,14 +66,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -104,15 +100,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -122,9 +114,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -149,17 +139,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "COMMANDE_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
+} elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("COMMANDE_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -169,14 +155,10 @@ elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_ORDER_FREE_TEXT')
+} elseif ($action == 'set_ORDER_FREE_TEXT')
 {
 	$freetext = GETPOST("ORDER_FREE_TEXT", 'none'); // No alpha here, we want exact string
 
@@ -187,13 +169,10 @@ elseif ($action == 'set_ORDER_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == "setshippableiconinlist") {
+} elseif ($action == "setshippableiconinlist") {
     // Activate Set Shippable Icon In List
     $setshippableiconinlist = GETPOST('value', 'int');
     $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist, 'yesno', 0, '', $conf->entity);
@@ -203,8 +182,7 @@ elseif ($action == "setshippableiconinlist") {
     } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'setribchq')
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
@@ -217,9 +195,7 @@ elseif ($action == 'setribchq')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -234,9 +210,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -251,9 +225,7 @@ elseif ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -334,9 +306,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->COMMANDE_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -400,9 +370,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -471,9 +439,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -484,9 +450,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->COMMANDE_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -519,9 +483,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -594,19 +556,14 @@ if (empty($conf->facture->enabled))
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -643,8 +600,7 @@ if (empty($conf->facture->enabled))
 		}
 	}
 	print "</select>";
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -681,9 +637,7 @@ $variablename = 'ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f33a3ea6f93..f0aaf3fd074 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -84,9 +84,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 		$s = $mysoc->state_id.':'.$mysoc->state_code.':'.$mysoc->state_label;
 		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s, 'chaine', 0, '', $conf->entity);
-	}
-	else
-	{
+	} else {
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
@@ -146,8 +144,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 							{
 								$imgThumbSmall = $reg[1]; // Save only basename
 								dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-							}
-							else dol_syslog($imgThumbSmall);
+							} else dol_syslog($imgThumbSmall);
 
 							// Create mini thumb, Used on menu or for setup page for example
 							$imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
@@ -155,24 +152,18 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 							{
 								$imgThumbMini = $reg[1]; // Save only basename
 								dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-							}
-							else dol_syslog($imgThumbMini);
-						}
-						else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
+							} else dol_syslog($imgThumbMini);
+						} else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
 					} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
 						$error++;
 						$langs->load("errors");
 						$tmparray = explode(':', $result);
 						setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
-					}
-					else
-					{
+					} else {
 						$error++;
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -228,9 +219,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		if (!isset($_REQUEST['lt1']))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0, 'chaine', 0, '', $conf->entity);
-		}
-		else
-		{
+		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC1", GETPOST("clt1", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -240,9 +229,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		if (!isset($_REQUEST['lt2']))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0, 'chaine', 0, '', $conf->entity);
-		}
-		else
-		{
+		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC2", GETPOST("clt2", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -251,9 +238,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 
@@ -287,8 +272,7 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			{
 				$imgThumbSmall = $reg[1]; // Save only basename
 				dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-			}
-			else dol_syslog($imgThumbSmall);
+			} else dol_syslog($imgThumbSmall);
 
 			// Create mini thumbs. Used on menu or for setup page for example
 			$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini', $quality);
@@ -296,22 +280,17 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			{
 				$imgThumbMini = $reg[1]; // Save only basename
 				dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-			}
-			else dol_syslog($imgThumbMini);
+			} else dol_syslog($imgThumbMini);
 
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			dol_syslog($langs->transnoentities("ErrorBadImageFormat"), LOG_INFO);
 		}
-	}
-	else
-	{
+	} else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileDoesNotExists", $_GET["file"]), null, 'errors');
@@ -582,9 +561,7 @@ if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="siren" id="profid1" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -597,9 +574,7 @@ if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="siret" id="profid2" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -612,9 +587,7 @@ if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="ape" id="profid3" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -627,9 +600,7 @@ if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="rcs" id="profid4" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -642,9 +613,7 @@ if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -657,9 +626,7 @@ if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 3ccc2a213ac..4b98d8975eb 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -101,9 +101,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index fd93b0fa83d..620a6fe01ea 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -70,8 +70,7 @@ if ($action == 'activate_delivery')
 	dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: confexped.php");
 	exit;
-}
-elseif ($action == 'disable_delivery')
+} elseif ($action == 'disable_delivery')
 {
 	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON", $conf->entity);
 	header("Location: confexped.php");
@@ -135,9 +134,7 @@ print '<td class="center">';
 if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 {
 	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else
-{
+} else {
 	print '<a href="confexped.php?action=disable_delivery">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index bc22a2020fb..18252d0849c 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -85,9 +85,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 			$constname = "";
 			$constvalue = "";
 			$constnote = "";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -104,9 +102,7 @@ if (!empty($consts) && $action == 'update')
 			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) >= 0)
 			{
 				$nbmodified++;
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -126,9 +122,7 @@ if (!empty($consts) && $action == 'delete')
 			if (dolibarr_del_const($db, $const["rowid"], -1) >= 0)
 			{
 				$nbdeleted++;
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -143,9 +137,7 @@ if ($action == 'delete')
 	if (dolibarr_del_const($db, $rowid, $entity) >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -230,9 +222,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
 	print '<td class="center">';
-}
-else
-{
+} else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
@@ -297,9 +287,7 @@ if ($result)
 			print '<input type="text" class="flat" size="1" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 			print '</td>';
 			print '<td class="center">';
-		}
-		else
-		{
+		} else {
 			print '<td class="center">';
 			print '<input type="hidden" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 		}
@@ -307,9 +295,7 @@ if ($result)
 		if ($conf->use_javascript_ajax)
 		{
 			print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
-		}
-		else
-		{
+		} else {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		}
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ae0c9c89b38..474227349b8 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -62,14 +62,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For contract
+} elseif ($action == 'specimen') // For contract
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -100,15 +96,11 @@ elseif ($action == 'specimen') // For contract
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=contract&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -118,9 +110,7 @@ elseif ($action == 'specimen') // For contract
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -145,17 +135,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "CONTRACT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_other')
+} elseif ($action == 'set_other')
 {
 	$freetext = GETPOST('CONTRACT_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -168,9 +154,7 @@ elseif ($action == 'set_other')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -242,8 +226,7 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -251,9 +234,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->CONTRACT_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -316,9 +297,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -387,9 +366,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -400,9 +377,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->CONTRACT_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -433,9 +408,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -482,9 +455,7 @@ $variablename = 'CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index bb7e82901f5..2937de3ed51 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -96,13 +96,10 @@ if ($action == 'edit')
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
 		    print $langs->trans("AlwaysActive");
-		}
-		elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
+		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print $form->selectyesno($key, $conf->global->$key, 1);
-		}
-		else
-		{
+		} else {
 			print '<input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'">';
 		}
 		print '</td></tr>';
@@ -116,9 +113,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -136,13 +131,10 @@ else
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
 		    print $langs->trans("AlwaysActive");
-		}
-		elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
+		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print yn($conf->global->$key);
-		}
-		else
-		{
+		} else {
 			print $conf->global->$key;
 		}
 		print '</td></tr>';
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 926080cb9b5..f9dae118316 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -58,9 +58,7 @@ if ($action == 'set')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($error, null, 'errors');
 	}
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 094c4a8dd7c..10b6a536e9f 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -150,9 +150,7 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 			$defaulturl = '';
 			$defaultkey = '';
 			$defaultvalue = '';
-		}
-		else
-		{
+		} else {
 	        $db->rollback();
 		    setEventMessages($db->lasterror(), null, 'errors');
 			$action = '';
@@ -169,9 +167,7 @@ if ($action == 'delete')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -197,9 +193,7 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
-}
-else
-{
+} else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -260,9 +254,7 @@ $texthelp = $langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder')
 {
     $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
-}
-else
-{
+} else {
     $texthelp = 'field or alias.field';
     $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
@@ -280,9 +272,7 @@ if ($mode != 'focus' && $mode != 'mandatory')
             $texthelp .= $key.' -> '.$val.'<br>';
         }
         $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
-    }
-    else
-    {
+    } else {
         $texthelp = 'ASC or DESC';
         $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
     }
@@ -321,9 +311,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<td>';
 	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">'; // We see environment, but to change it we must switch on other entity
 	print '</td>';
-}
-else
-{
+} else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
@@ -393,9 +381,7 @@ if ($result)
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
     		print ' &nbsp; ';
     		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
-		}
-		else
-		{
+		} else {
 		    print '<input type="hidden" name="page" value="'.$page.'">';
 		    print '<input type="hidden" name="rowid" value="'.$id.'">';
 		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
@@ -408,9 +394,7 @@ if ($result)
 		print "\n";
 		$i++;
 	}
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 3ee262b464a..2ece442d74f 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -249,9 +249,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	print '</table>';
-}
-else
-{
+} else {
     /*
      * Show parameters
      */
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index cce441c4052..7f468cc1f1a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -697,9 +697,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     	if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
     	{
     		$_POST["country"] = '';
-    	}
-    	else
-    	{
+    	} else {
         	$ok = 0;
         	setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
     	}
@@ -759,8 +757,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 
             if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
             	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            }
-            elseif ($value == 'entity') {
+            } elseif ($value == 'entity') {
             	$_POST[$keycode] = getEntity($tabname[$id]);
             }
 
@@ -769,15 +766,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
             {
             	$sql .= "'".(int) GETPOST('position', 'int')."'";
-            }
-            elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
             elseif ($keycode == 'content') {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            }
-            elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+            } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
-            }
-            else {
+            } else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
 
@@ -791,13 +785,10 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        }
-        else
-        {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -806,8 +797,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     // If verif ok and action modify, modify the line
     if ($ok && GETPOST('actionmodify'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         // Modify entry
         $sql = "UPDATE ".$tabname[$id]." SET ";
@@ -825,8 +815,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 
             if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
             	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            }
-            elseif ($field == 'entity') {
+            } elseif ($field == 'entity') {
             	$_POST[$keycode] = getEntity($tabname[$id]);
             }
 
@@ -835,15 +824,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
             if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
             {
             	$sql .= (int) GETPOST('position', 'int');
-            }
-            elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
             elseif ($keycode == 'content') {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            }
-            elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+            } elseif (in_array($keycode, array('private', 'position', 'scale'))) {
             	$sql .= (int) GETPOST($keycode, 'int');
-            }
-            else {
+            } else {
             	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
             }
 
@@ -870,8 +856,7 @@ if (GETPOST('actioncancel'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
@@ -882,9 +867,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
@@ -893,13 +876,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -913,13 +894,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -933,13 +912,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -953,13 +930,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
+    } elseif ($code) {
     	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
     }
 
@@ -1056,8 +1031,7 @@ if ($id)
         // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
         $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
         $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
-    }
-    else {
+    } else {
         $sql .= " ORDER BY ";
     }
     $sql .= $tabsqlsort[$id];
@@ -1294,16 +1268,13 @@ if ($id)
                     print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
-                }
-                elseif ($value == 'code')
+                } elseif ($value == 'code')
                 {
                     print '<td class="liste_titre">';
                     print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
                     print '</td>';
                     $filterfound++;
-                }
-                else
-                {
+                } else {
                     print '<td class="liste_titre">';
                     print '</td>';
                 }
@@ -1438,9 +1409,7 @@ if ($id)
                     print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
-                }
-                else
-                {
+                } else {
 	              	$tmpaction = 'view';
                     $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -1466,30 +1435,23 @@ if ($id)
                             if ($value == 'element')
                             {
                                 $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-                            }
-                            elseif ($value == 'source')
+                            } elseif ($value == 'source')
                             {
                                 $valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-                            }
-                            elseif ($valuetoshow == 'all') {
+                            } elseif ($valuetoshow == 'all') {
                                 $valuetoshow = $langs->trans('All');
-                            }
-                            elseif ($fieldlist[$field] == 'country') {
+                            } elseif ($fieldlist[$field] == 'country') {
                                 if (empty($obj->country_code))
                                 {
                                     $valuetoshow = '-';
-                                }
-                                else
-                                {
+                                } else {
                                     $key = $langs->trans("Country".strtoupper($obj->country_code));
                                     $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
                                 }
-                            }
-                            elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+                            } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
                                 $valuetoshow = yn($valuetoshow);
                                 $class = "center";
-                            }
-                            elseif ($fieldlist[$field] == 'type_cdr') {
+                            } elseif ($fieldlist[$field] == 'type_cdr') {
                 				if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
                 				elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
                 				elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
@@ -1500,132 +1462,102 @@ if ($id)
                             if ($value == 'private')
                             {
                                 $valuetoshow = yn($elementList[$valuetoshow]);
-                            }
-                            elseif ($fieldlist[$field] == 'libelle_facture') {
+                            } elseif ($fieldlist[$field] == 'libelle_facture') {
                                 $langs->load("bills");
                                 $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
                                 $valuetoshow = nl2br($valuetoshow);
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
                                 $key = $langs->trans("Country".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
                                 $langs->load("propal");
                                 $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
                                 $key = $langs->trans("Action".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+                            } elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
                                 $key = $langs->trans("Currency".strtoupper($obj->code_iso));
                                 $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
                                 $key = $langs->trans("Civility".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
                             	$langs->load('agenda');
                                 $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
                                 $langs->load("bills");
                                 $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
                                 $langs->load("bills");
                                 $key = $langs->trans("PaymentType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+                            } elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
                             	$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
                             	$valuetoshow = $payment_type_list[$valuetoshow];
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
                                 $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
                                 $langs->load("orders");
                                 $key = $langs->trans($obj->code);
                                 $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
                                 $langs->load("sendings");
                                 $key = $langs->trans("SendingMethod".strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
+                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
                             {
                                 $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
                             {
                                 $langs->load('trips');
                                 $key = $langs->trans(strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
                                 $showfield = 0;
-                            }
-                            elseif ($fieldlist[$field] == 'unicode') {
+                            } elseif ($fieldlist[$field] == 'unicode') {
                             	$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+                            } elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+                            } elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
 	                            $langs->load("products");
 	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            }
-                            elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+                            } elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
                             {
                             	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
                                 $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            }
-							elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
+                            } elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
 							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'localtax1_type') {
+							} elseif ($fieldlist[$field] == 'localtax1_type') {
                                 if ($obj->localtax1 != 0)
 							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else
-							        $valuetoshow = '';
+							    else $valuetoshow = '';
 							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'localtax2_type') {
+							} elseif ($fieldlist[$field] == 'localtax2_type') {
 							    if ($obj->localtax2 != 0)
 							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else
-							        $valuetoshow = '';
+							    else $valuetoshow = '';
 							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'taux') {
+							} elseif ($fieldlist[$field] == 'taux') {
                                 $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
 							    $class = "center";
 							} elseif (in_array($fieldlist[$field], array('recuperableonly'))) {
 								$class = "center";
-							}
-							elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
+							} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
                                 $valuetoshow = length_accountg($valuetoshow);
-                            }
-							elseif ($fieldlist[$field] == 'fk_tva')
+                            } elseif ($fieldlist[$field] == 'fk_tva')
 							{
 								foreach ($form->cache_vatrates as $key => $Tab)
 								{
@@ -1635,23 +1567,19 @@ if ($id)
 										break;
 									}
 								}
-							}
-							elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
+							} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
 							{
 								$valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
 								$valuetoshow = $langs->trans($valuetoshow);
-							}
-							elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat')
+							} elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat')
 							{
 								$valuetoshow = $langs->trans($valuetoshow);
-							}
-							elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units')
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units')
 							{
 								$langs->load('other');
 								$key = $langs->trans($obj->label);
 								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$fieldlist[$field]});
-							}
-							elseif ($fieldlist[$field] == 'code' && $id == 3) {
+							} elseif ($fieldlist[$field] == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
 							}
                             $class .= ($class ? ' ' : '').'tddict';
@@ -1672,9 +1600,7 @@ if ($id)
                     $canbemodified = 1;
                     if (isset($obj->code) && $id != 10)
                     {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
-                    	elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
-                    	elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
                     }
 					if ($id == 25 && in_array($obj->code, array('banner', 'blogpost', 'other', 'page')))
 					{
@@ -1709,8 +1635,7 @@ if ($id)
                     // Active
                     print '<td class="nowrap center">';
                     if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else
-                 	{
+                    else {
                  		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
                  		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
                   		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
@@ -1729,8 +1654,7 @@ if ($id)
                         if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
                         //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
                         print '</td>';
-                    }
-                    else print '<td>&nbsp;</td>';
+                    } else print '<td>&nbsp;</td>';
 
                     print "</tr>\n";
                 }
@@ -1740,15 +1664,12 @@ if ($id)
 
         print '</table>';
         print '</div>';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
     print '</form>';
-}
-else
-{
+} else {
     /*
      * Show list of dictionary to show
      */
@@ -1781,9 +1702,7 @@ else
             if (!empty($tabcond[$i]))
             {
                 print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
-            }
-            else
-            {
+            } else {
                 print $langs->trans($tablib[$i]);
             }
             print '</td>';
@@ -1795,9 +1714,7 @@ else
             print '</td>';
             print '<td>'.$tabname[$i].'</td></tr>';
             $lastlineisempty = false;
-        }
-        else
-        {
+        } else {
             if (!$lastlineisempty)
             {
                 $showemptyline = 1;
@@ -1852,8 +1769,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
             print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
             print $langs->trans($hidden);
             print '</td>';
-        }
-	    elseif ($fieldlist[$field] == 'country')
+        } elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id', $fieldlist))
 			{
@@ -1865,8 +1781,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -1875,21 +1790,18 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'region')
+		} elseif ($fieldlist[$field] == 'region')
 		{
 			print '<td>';
 			$formcompany->select_region($region_id, 'region');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'region_id')
+		} elseif ($fieldlist[$field] == 'region_id')
 		{
 			$region_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:0);
 			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
@@ -1908,28 +1820,24 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('source', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'private')
+		} elseif ($fieldlist[$field] == 'private')
 		{
 			print '<td>';
 			print $form->selectyesno("private", (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
+		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
 		{
 			$type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
 			print '<td>';
 			print $type.'<input type="hidden" name="type" value="'.$type.'">';
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement')
+		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement')
 		{
 			print '<td>';
 			$select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
 			print $form->selectarray($fieldlist[$field], $select_list, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'2'));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+		} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
 		    if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
 		    else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
@@ -1938,15 +1846,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			}
 			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
+		} elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
 			$class = "left";
 			if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) $class = "center"; // Fields aligned on right
 			print '<td class="'.$class.'">';
 			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+		} elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 		    print '<td>';
 		    $transfound = 0;
 		    $transkey = '';
@@ -1964,19 +1870,15 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		    if (!$transfound)
 		    {
 		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
-		    }
-            else {
+		    } else {
                 print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
             }
 		    print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+		} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'unit') {
+		} elseif ($fieldlist[$field] == 'unit') {
 			print '<td>';
 			$units = array(
 					'mm' => $langs->trans('SizeUnitmm'),
@@ -1993,8 +1895,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td class="center">';
 			print $form->selectarray($fieldlist[$field], $localtax_typeList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
+		} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
 		{
 			print '<td>';
 			if (!empty($conf->accounting->enabled))
@@ -2002,34 +1903,27 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			    $fieldname = $fieldlist[$field];
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else
-			{
+			} else {
 			    $fieldname = $fieldlist[$field];
 			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_tva')
+		} elseif ($fieldlist[$field] == 'fk_tva')
 		{
 			print '<td>';
 			print $form->load_tva('fk_tva', $obj->taux, $mysoc, new Societe($db), 0, 0, '', false, -1);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
+		} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
 		{
 			print '<td>';
 			print $form->selectExpenseCategories($obj->fk_c_exp_tax_cat);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_range')
+		} elseif ($fieldlist[$field] == 'fk_range')
 		{
 			print '<td>';
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
-		}
-		else
-		{
+		} else {
             $fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
 
 			if ($fieldlist[$field] == 'sortorder')
@@ -2063,8 +1957,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if (!$transfound)
 			{
                 print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
-			}
-            else {
+			} else {
                 print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
             }
 			print '</td>';
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 3c735707c4a..0227db8d969 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -136,8 +136,9 @@ class PrestaShopWebservice
 		{
 			if (isset($curl_params[$defkey]))
 				$curl_options[$defkey] = $curl_params[$defkey];
-			else
+			else {
 				$curl_options[$defkey] = $defaultParams[$defkey];
+			}
 		}
 		foreach ($curl_params as $defkey => $defval)
 			if (!isset($curl_options[$defkey]))
@@ -236,9 +237,9 @@ class PrestaShopWebservice
 				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: '.$msg);
 			}
 			return $xml;
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('HTTP response is empty');
+		}
 	}
 
 	/**
@@ -264,9 +265,7 @@ class PrestaShopWebservice
 				$url .= '&id_shop='.$options['id_shop'];
 			if (isset($options['id_group_shop']))
 				$url .= '&id_group_shop='.$options['id_group_shop'];
-		}
-		else
-		{
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml));
@@ -323,9 +322,9 @@ class PrestaShopWebservice
 						$url_params[$k] = $options[$k];
 			if (count($url_params) > 0)
 				$url .= '?'.http_build_query($url_params);
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given ');
+		}
 
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
 		self::checkStatusCode($request['status_code']); // check the response validity
@@ -356,9 +355,9 @@ class PrestaShopWebservice
 						$url_params[$k] = $options[$k];
 			if (count($url_params) > 0)
 				$url .= '?'.http_build_query($url_params);
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
 		self::checkStatusCode($request['status_code']); // check the response validity
 		return $request['header'];
@@ -387,9 +386,9 @@ class PrestaShopWebservice
 				$url .= '&id_shop='.$options['id_shop'];
 			if (isset($options['id_group_shop']))
 				$url .= '&id_group_shop='.$options['id_group_shop'];
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
 
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
 		self::checkStatusCode($request['status_code']); // check the response validity
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index a229f3c985d..1d764a849be 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -101,8 +101,7 @@ class Dolistore
 	        $trace = $e->getTrace();
 	        if ($trace[0]['args'][0] == 404) die('Bad ID');
 	        elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-	        else
-	        {
+	        else {
 	            print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
 	            print $e->getMessage();
 	        }
@@ -183,8 +182,7 @@ class Dolistore
 			$trace = $e->getTrace();
 			if ($trace[0]['args'][0] == 404) die('Bad ID');
 			elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-			else
-			{
+			else {
 				print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
 				print $e->getMessage();
 			}
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 0c348b25f60..145dfc6cbf8 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -41,9 +41,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -55,9 +53,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -93,14 +89,11 @@ print '<td class="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
-}
-else
-{
+} else {
 	if (empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	elseif (!empty($conf->global->USER_MAIL_REQUIRED))
+	} elseif (!empty($conf->global->USER_MAIL_REQUIRED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 80161eaadc6..21dfb60c96e 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -126,9 +126,7 @@ if (GETPOST('addfilter', 'alpha'))
 	if ($result > 0)
 	{
 		$object->fetchFilters();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -141,9 +139,7 @@ if ($action == 'deletefilter')
 	if ($result > 0)
 	{
 		$object->fetchFilters();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -162,9 +158,7 @@ if (GETPOST('addoperation', 'alpha'))
 	if ($result > 0)
 	{
 		$object->fetchActions();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -181,9 +175,7 @@ if ($action == 'updateoperation')
     if ($result > 0)
     {
         $object->fetchActions();
-    }
-    else
-    {
+    } else {
         setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
     }
 }
@@ -195,9 +187,7 @@ if ($action == 'deleteoperation')
 	if ($result > 0)
 	{
 		$object->fetchActions();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -211,9 +201,7 @@ if ($action == 'confirm_collect')
 	{
 	    $debuginfo = $object->debuginfo;
 	    setEventMessages($object->lastresult, null, 'mesgs');
-	}
-	else
-	{
+	} else {
 	    $debuginfo = $object->debuginfo;
 	    setEventMessages($object->error, null, 'errors');
 	}
@@ -432,25 +420,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			$connection = imap_open($connectstringsource, $object->login, $object->password);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			print $e->getMessage();
 		}
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
-	}
-	else
-	{
+	} else {
 		$morehtml .= 'IMAP functions not available on your PHP';
 	}
 
 	if (!$connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
-	}
-	else
-	{
+	} else {
 		$morehtml .= imap_num_msg($connection);
 	}
 
@@ -582,8 +565,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($res)
 		$arrayoftypes = $hookmanager->resArray;
-	else
-		foreach ($hookmanager->resArray as $k=>$desc)
+	else foreach ($hookmanager->resArray as $k=>$desc)
 			$arrayoftypes[$k] = $desc;
 
 
@@ -614,8 +596,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (in_array($ruleaction['type'], array('recordevent')))
 		{
             print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
-		}
-		elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
+		} elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
 			print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
 		}
 		print '</td>';
@@ -625,9 +606,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		    print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
 		    print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
 		    print '<input type="submit" class="button" name="saveoperation2" value="'.$langs->trans("Save").'"> <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		}
-		else
-		{
+		} else {
 		    print $ruleaction['actionparam'];
 		}
 		print '</td>';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index f180cdf10cf..d2babfeaf5c 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -241,9 +241,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index be9e7091300..21cb83c356a 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -69,12 +69,9 @@ if ($action == 'updateMask')
 	{
 		if ($res > 0)
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("Error"), null, 'errors');
+		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_param')
+} elseif ($action == 'set_param')
 {
 	$freetext = GETPOST('SHIPPING_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -96,9 +93,7 @@ elseif ($action == 'set_param')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -129,15 +124,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expedition&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -147,9 +138,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -174,9 +163,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmodel')
+} elseif ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -249,8 +236,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						}
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -258,9 +244,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -326,9 +310,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -395,9 +377,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -408,9 +388,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->EXPEDITION_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -438,9 +416,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -486,9 +462,7 @@ $variablename = 'SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index d076e77bf44..596428d4c7f 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -63,14 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For fiche inter
+} elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -103,15 +99,11 @@ elseif ($action == 'specimen') // For fiche inter
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -125,9 +117,7 @@ elseif ($action == 'set')
 	{
 		dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value, 'chaine', 0, '', $conf->entity);
 	}
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -152,17 +142,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'setoptions')
+} elseif ($action == 'setoptions')
 {
     $db->begin();
 
@@ -178,9 +164,7 @@ elseif ($action == 'setoptions')
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -263,9 +247,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->EXPENSEREPORT_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -328,9 +310,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -395,9 +375,7 @@ foreach ($dirmodels as $reldir)
 		    					print img_picto($langs->trans("Enabled"), 'switch_on');
 		    					print '</a>';
 		    					print "</td>";
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print '<td class="center">'."\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -408,9 +386,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -434,9 +410,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -484,9 +458,7 @@ $variablename = 'EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 83bb28ca440..ebdc1f7ed59 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -63,8 +63,7 @@ if ($action == 'updateik')
 
 	header('Location: '.$_SERVER['PHP_SELF']);
 	exit;
-}
-elseif ($action == 'delete') // TODO add confirm
+} elseif ($action == 'delete') // TODO add confirm
 {
 	$expIk = new ExpenseReportIk($db);
 	if ($id > 0)
@@ -161,9 +160,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 			{
 				echo '<input id="" class="button" name="save" value="'.$langs->trans('Save').'" type="submit" />';
 				echo '<input class="button" value="'.$langs->trans('Cancel').'" onclick="javascript:history.go(-1)" type="button" />';
-			}
-			else
-			{
+			} else {
 				echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$range->ik->id.'&fk_c_exp_tax_cat='.$range->fk_c_exp_tax_cat.'&fk_range='.$range->rowid.'">'.img_edit().'</a>';
 				if (!empty($range->ik->id)) echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$range->ik->id.'">'.img_delete().'</a>';
 				// TODO add delete link
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index a40e8d95520..337311b85e7 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -100,11 +100,11 @@ if ($action == 'save')
 			$object->fk_user = (int) $fk_user;
 			$object->fk_usergroup = 0;
 			$object->is_for_all = 0;
-		}elseif ($apply_to == 'G') {
+		} elseif ($apply_to == 'G') {
 			$object->fk_usergroup = (int) $fk_usergroup;
 			$object->fk_user = 0;
 			$object->is_for_all = 0;
-		}elseif ($apply_to == 'A') {
+		} elseif ($apply_to == 'A') {
 			$object->is_for_all = 1;
 			$object->fk_user = 0;
 			$object->fk_usergroup = 0;
@@ -122,8 +122,7 @@ if ($action == 'save')
 		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
-}
-elseif ($action == 'delete')
+} elseif ($action == 'delete')
 {
 	// TODO add confirm
 	$res = $object->delete($user);
@@ -228,9 +227,7 @@ foreach ($rules as $rule)
 		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
 		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
 		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
-	}
-	else
-	{
+	} else {
 		if ($rule->is_for_all > 0) echo $tab_apply['A'];
 		elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
 		elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
@@ -242,12 +239,9 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
-	}
-	else
-	{
+	} else {
 		if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
-		else
-		{
+		else {
 			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
 			if ($key != $langs->trans($key)) echo $langs->trans($key);
 			else echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
@@ -260,9 +254,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
-	}
-	else
-	{
+	} else {
 		echo $tab_rules_type[$rule->code_expense_rules_type];
 	}
 	echo '</td>';
@@ -272,9 +264,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
-	}
-	else
-	{
+	} else {
 		echo dol_print_date($rule->dates, 'day');
 	}
 	echo '</td>';
@@ -284,9 +274,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
-	}
-	else
-	{
+	} else {
 		echo dol_print_date($rule->datee, 'day');
 	}
 	echo '</td>';
@@ -296,9 +284,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
-	}
-	else
-	{
+	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
 	echo '</td>';
@@ -308,9 +294,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
-	}
-	else
-	{
+	} else {
 		echo yn($rule->restrictive, 1, 1);
 	}
 	echo '</td>';
@@ -321,9 +305,7 @@ foreach ($rules as $rule)
 	{
 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$rule->id.'">'.img_delete().'</a>';
-	}
-	else
-	{
+	} else {
 		echo '<input type="submit" class="button" value="'.$langs->trans('Update').'" />&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>';
 	}
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 8aa1a425778..3d81ab01c43 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -60,9 +60,7 @@ if ($result)
         preg_match('/([0-9]+)$/i', $obj->name, $reg);
         if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -92,9 +90,7 @@ if ($action == 'add' || GETPOST("modify"))
 				exit;
 	        }
             */
-		}
-		else
-		{
+		} else {
 			// Ajoute boite box_external_rss dans definition des boites
 	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, note)";
 			$sql .= " VALUES ('box_external_rss.php','".$db->escape(GETPOST("norss", 'int').' ('.GETPOST($external_rss_title, 'alpha')).")')";
@@ -113,9 +109,7 @@ if ($action == 'add' || GETPOST("modify"))
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -161,9 +155,7 @@ if ($_POST["delete"])
 			}
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db, "sql=".$sql);
 			exit;
@@ -178,9 +170,7 @@ if ($_POST["delete"])
             $db->commit();
             header("Location: external_rss.php");
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -292,9 +282,7 @@ if ($resql)
 	    if ($result > 0 && empty($rss->error))
 	    {
 			print '<font class="ok">'.$langs->trans("Online").'</div>';
-		}
-		else
-		{
+		} else {
 			print '<font class="error">'.$langs->trans("Offline");
 			$langs->load("errors");
 			if ($rssparser->error) print ' - '.$langs->trans($rssparser->error);
@@ -331,9 +319,7 @@ if ($resql)
 
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 1a484ec8c7e..f25a87b6a12 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -71,13 +71,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -108,15 +105,11 @@ elseif ($action == 'specimen')
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -125,9 +118,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -151,15 +142,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     // TODO Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
     dolibarr_set_const($db, "FACTURE_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'setribchq')
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
@@ -172,13 +161,10 @@ elseif ($action == 'setribchq')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
+} elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FACTURE_DRAFT_WATERMARK', 'alpha');
 
@@ -189,14 +175,10 @@ elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_INVOICE_FREE_TEXT')
+} elseif ($action == 'set_INVOICE_FREE_TEXT')
 {
 	$freetext = GETPOST('INVOICE_FREE_TEXT', 'none'); // No alpha here, we want exact string
 
@@ -207,13 +189,10 @@ elseif ($action == 'set_INVOICE_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'setforcedate')
+} elseif ($action == 'setforcedate')
 {
 	$forcedate = GETPOST('forcedate', 'alpha');
 
@@ -224,13 +203,10 @@ elseif ($action == 'setforcedate')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'setDefaultPDFModulesByType')
+} elseif ($action == 'setDefaultPDFModulesByType')
 {
     $invoicetypemodels = GETPOST('invoicetypemodels');
 
@@ -247,9 +223,7 @@ elseif ($action == 'setDefaultPDFModulesByType')
         if (!$error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        }
-        else
-        {
+        } else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -349,9 +323,7 @@ foreach ($dirmodels as $reldir)
                             if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else
-                            {
+                            } else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
@@ -462,9 +434,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -534,9 +504,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -547,9 +515,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->FACTURE_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -582,9 +548,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -690,15 +654,11 @@ if (!empty($conf->banque->enabled))
                 $i++;
             }
             print "</select>";
-        }
-        else
-        {
+        } else {
         	print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
         }
     }
-}
-else
-{
+} else {
     print $langs->trans("BankModuleNotActive");
 }
 print "</td></tr>";
@@ -776,9 +736,7 @@ $variablename = 'INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 223045db2e9..68f8e15e81c 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -246,10 +246,9 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra
     print '<input type="hidden" name="action" value="setModuleOptions">';
     if ($type == 'textarea') {
         print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-	}elseif ($type == 'input') {
+	} elseif ($type == 'input') {
         print '<input '.$metascompil.'  />';
-    }
-	else {
+    } else {
 		// custom
 		print $type;
     }
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 00995a302a5..e98d02d9f9c 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -126,9 +126,7 @@ if (GETPOST('save', 'alpha'))
 	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -146,9 +144,7 @@ print '<br>';
 if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
-}
-else
-{
+} else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre">';
     print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
@@ -170,8 +166,7 @@ else
         if ($value == 0)
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        }
-        elseif ($value == 1)
+        } elseif ($value == 1)
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
         }
@@ -211,9 +206,7 @@ else
         $readonly = ($mode == 'dolibarr_readonly' ? 1 : 0);
         $editor = new DolEditor('formtestfield', isset($conf->global->FCKEDITOR_TEST) ? $conf->global->FCKEDITOR_TEST : 'Test', '', 200, $mode, 'In', true, $uselocalbrowser, 1, 120, 8, $readonly);
         $editor->Create();
-    }
-    else
-    {
+    } else {
         print '<div style="border: 1px solid #888;" contenteditable="true">';
         print $conf->global->FCKEDITOR_TEST;
         print '</div>';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 055384c0084..c28ebcab4b2 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -63,14 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For fiche inter
+} elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -101,15 +97,11 @@ elseif ($action == 'specimen') // For fiche inter
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=ficheinter&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -119,9 +111,7 @@ elseif ($action == 'specimen') // For fiche inter
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -146,17 +136,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "FICHEINTER_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_FICHINTER_FREE_TEXT')
+} elseif ($action == 'set_FICHINTER_FREE_TEXT')
 {
 	$freetext = GETPOST('FICHINTER_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -166,14 +152,10 @@ elseif ($action == 'set_FICHINTER_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
+} elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FICHINTER_DRAFT_WATERMARK', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -183,14 +165,10 @@ elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
+} elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
 {
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
@@ -200,9 +178,7 @@ elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
@@ -324,9 +300,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->FICHEINTER_ADDON == $classname)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
@@ -388,9 +362,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -457,9 +429,7 @@ foreach ($dirmodels as $reldir)
 		    					print img_picto($langs->trans("Enabled"), 'switch_on');
 		    					print '</a>';
 		    					print "</td>";
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print "<td align=\"center\">\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -470,9 +440,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -498,9 +466,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -544,9 +510,7 @@ $variablename = 'FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index a661f3a8e9a..0a118dfe065 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -64,9 +64,7 @@ if ($action == 'set')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -182,9 +180,7 @@ if ($geoip)
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
 		else print $langs->trans("Error");
-	}
-	else
-	{
+	} else {
 		print '<br>'.$ip.' -> ';
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index aafe01bf5bd..5ad46e5bab6 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -64,14 +64,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For contract
+} elseif ($action == 'specimen') // For contract
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -102,15 +98,11 @@ elseif ($action == 'specimen') // For contract
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=holiday&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -120,9 +112,7 @@ elseif ($action == 'specimen') // For contract
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -147,17 +137,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "HOLIDAY_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_other')
+} elseif ($action == 'set_other')
 {
 	$freetext = GETPOST('HOLIDAY_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "HOLIDAY_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -170,9 +156,7 @@ elseif ($action == 'set_other')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -245,8 +229,7 @@ foreach ($dirmodels as $reldir)
 						// Show example of numbering model
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
-						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-						elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
 						else print $tmp;
 						print '</td>'."\n";
 
@@ -254,9 +237,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->HOLIDAY_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -331,9 +312,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -403,9 +382,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -416,9 +393,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->HOLIDAY_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -449,9 +424,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -501,9 +474,7 @@ $variablename = 'HOLIDAY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 1b088f0c2b9..b6233f13146 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -189,22 +189,17 @@ if ($action == 'update')
 				if ($result > 0)
 				{
 					dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity);
-				}
-				elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result))
+				} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result))
 				{
 					$error++;
 					$langs->load("errors");
 					$tmparray = explode(':', $result);
 					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
-				}
-				else
-				{
+				} else {
 					$error++;
 					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index bd24e793374..951b93f908c 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -76,9 +76,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -214,9 +212,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerPort").'</td><td>';
 if (!empty($conf->global->LDAP_SERVER_PORT))
 {
 	print '<input size="25" type="text" name="port" value="'.$conf->global->LDAP_SERVER_PORT.'">';
-}
-else
-{
+} else {
 	print '<input size="25" type="text" name="port" value="389">';
 }
 print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
@@ -248,9 +244,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (!empty($conf->global->LDAP_ADMIN_PASS))
 {
 	print '<input size="25" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">'; // je le met en visible pour test
-}
-else
-{
+} else {
 	print '<input size="25" type="text" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
 }
 print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
@@ -295,18 +289,14 @@ if (function_exists("ldap_connect"))
 					print img_picto('', 'info').' ';
 					print '<font class="ok">'.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
-				}
-				else
-				{
+				} else {
 					print img_picto('', 'error').' ';
 					print '<font class="error">'.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
 					print $langs->trans("Error").' '.$ldap->error;
 					print '<br>';
 				}
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'warning').' ';
 				print '<font class="warning">'.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'</font>';
 				print '<br>';
@@ -319,18 +309,14 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion3").'</font>';
 				print '<br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion2").'</font>';
 				print '<br>';
 			}
 
 			$unbind = $ldap->unbind();
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'</font>';
 			print '<br>';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 834bde4eea5..54de74c6371 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -78,9 +78,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -292,9 +290,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -306,9 +302,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index fb49c947411..4e0c430fb90 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -70,9 +70,7 @@ if ($action == 'setvalue' && $user->admin)
     {
     	$db->commit();
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
     	$db->rollback();
     	dol_print_error($db);
     }
@@ -233,9 +231,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -247,9 +243,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index f6fa74cb79d..0cd09d27f7e 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -95,9 +95,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -415,9 +413,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -429,9 +425,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 6628dd4d144..371437e1640 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -68,9 +68,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -215,9 +213,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -229,9 +225,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 7781cf45676..d5778fbfb1c 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -89,9 +89,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -357,8 +355,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 	$objectclass = $conf->global->LDAP_USER_OBJECT_CLASS;
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
-}
-elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
+} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
 {
 	$butlabel = $langs->trans("LDAPTestSearch");
 	$testlabel = 'testsearchuser';
@@ -395,9 +392,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -409,9 +404,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
@@ -476,9 +469,7 @@ if (function_exists("ldap_connect"))
 					}
 					$liste[$key] = $label;
 				}
-			}
-			else
-		    {
+			} else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
 
@@ -490,9 +481,7 @@ if (function_exists("ldap_connect"))
 			print "required_fields: ".implode(',', $required_fields)."<br>\n";
 			print "=> ".count($liste)." records<br>\n";
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 0646c7f6d46..67106282a47 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -162,9 +162,7 @@ if ($action == 'edit')
 
     print '</form>';
     print '<br>';
-}
-else
-{
+} else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -203,9 +201,7 @@ if (empty($mysoc->country_code))
 	$langs->load("errors");
 	$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
-}
-else
-{
+} else {
 	// Show examples
 	print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', '');
 
@@ -252,8 +248,7 @@ else
 	            $vat_rates[$i] = $obj->vat_rate;
 	        }
 	    }
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	if (count($vat_rates))
 	{
@@ -269,9 +264,7 @@ else
 	            print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 	        }
 	    }
-	}
-	else
-	{
+	} else {
 	    // More examples if not specific vat rate found
 	    // This example must be kept for test purpose with current value because value used (2/7, 10/3, and vat 0, 10)
 	    // were calculated to show all possible cases of rounding. If we change this, examples becomes useless or show the same rounding rule.
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 4cd8f4841e5..66f3a44cdcf 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -63,9 +63,7 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -80,9 +78,7 @@ if ($action == 'set_DELIVERY_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -118,15 +114,11 @@ if ($action == 'specimen')
         {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
             return;
-        }
-        else
-        {
+        } else {
             setEventMessages($module->error, $module->errors, 'errors');
             dol_syslog($module->error, LOG_ERR);
         }
-    }
-    else
-    {
+    } else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -240,8 +232,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						}
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -249,9 +240,7 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else
-                        {
+                        } else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -316,9 +305,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -383,9 +370,7 @@ foreach ($dirmodels as $reldir)
 		    					print img_picto($langs->trans("Enabled"), 'switch_on');
 		    					print '</a>';
 		    					print "</td>";
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print "<td align=\"center\">\n";
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		    					print "</td>";
@@ -396,9 +381,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
@@ -417,9 +400,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -462,9 +443,7 @@ $variablename = 'DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 45202de342b..651782bb23b 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -63,9 +63,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -107,9 +105,7 @@ foreach ($list as $key)
 	if (!empty($conf->accounting->enabled))
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-	}
-	else
-	{
+	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 921a4a6338c..7690ca02afa 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -65,9 +65,7 @@ if ($action == 'setvalue')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 05c36128e8d..cbc908f973f 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -65,9 +65,7 @@ if ($action == 'update' || $action == 'add')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -99,9 +97,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
     {
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
-    }
-    else
-    {
+    } else {
         include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
         $mailmanspip = new MailmanSpip($db);
 
@@ -118,9 +114,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
         }
@@ -131,9 +125,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
         }
@@ -211,9 +203,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_MAILMAN">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 5502d44dae0..ebbd549ecf8 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -169,9 +169,7 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_SMTP_PORT").hide();
                             jQuery("#smtp_server_mess").show();
                             jQuery("#smtp_port_mess").show();';
-		}
-		else
-		{
+		} else {
             print '
                             jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
                             jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
@@ -286,9 +284,7 @@ if ($action == 'edit')
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE);
-	}
-	else
-	{
+	} else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -304,9 +300,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-	}
-	else
-	{
+	} else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -318,9 +312,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="'.$mainserver.'" autocomplete="off">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -336,9 +328,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-	}
-	else
-	{
+	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -350,9 +340,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -370,9 +358,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="'.$mainstmpid.'">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$mainstmpid.'">';
@@ -391,9 +377,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="'.$mainsmtppw.'" autocomplete="off">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$mainsmtppw.'">';
@@ -408,10 +392,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS) ? $conf->global->MAIN_MAIL_EMAIL_TLS : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -421,10 +403,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// DKIM
@@ -434,10 +414,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_DKIM_ENABLED', (!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
     // DKIM Domain
@@ -496,9 +474,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	dol_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -538,9 +514,7 @@ else
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
 	}
 
@@ -548,9 +522,7 @@ else
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 	}
 
@@ -573,10 +545,8 @@ else
 		if (function_exists('openssl_open'))
 		{
 			print yn($conf->global->MAIN_MAIL_EMAIL_TLS);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -586,10 +556,8 @@ else
 		if (function_exists('openssl_open'))
 		{
 			print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 	print '</td></tr>';
 
 
@@ -602,10 +570,8 @@ else
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 
 	    // Domain
@@ -653,24 +619,20 @@ else
 			}
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
 	print '<td>';
 	if ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'robot')
 	{
 		print $langs->trans('RobotEmail');
-	}
-	elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
+	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
 	{
 		print $langs->trans('UserEmail');
-	}
-	elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
+	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
 	{
 		print $langs->trans('CompanyEmail').' '.dol_escape_htmltag('<'.$mysoc->email.'>');
-	}
-	else {
+	} else {
 		$id = preg_replace('/senderprofile_/', '', $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE);
 		if ($id > 0)
 		{
@@ -698,9 +660,7 @@ else
 	{
 		print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -721,9 +681,7 @@ else
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 	}
 
@@ -795,8 +753,7 @@ else
 		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
 		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
-		else
-		{
+		else {
 			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
 
 			if ($mail->error) {
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 84a0d2a0893..f78ef0277bb 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -156,9 +156,7 @@ if ($action == 'edit')
 			               jQuery("#smtp_server_mess").show();
 			               jQuery("#smtp_port_mess").show();
 			               ';
-		}
-		else
-		{
+		} else {
 			print '
 			               jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").prop("disabled", true);
 			               jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").prop("disabled", true);
@@ -236,9 +234,7 @@ if ($action == 'edit')
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE_EMAILING', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_EMAILING);
-	}
-	else
-	{
+	} else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_EMAILING];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -255,9 +251,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
-	}
-	else
-	{
+	} else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -269,9 +263,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -288,9 +280,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
-	}
-	else
-	{
+	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -302,9 +292,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -322,9 +310,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_EMAILING" size="32" value="'.$mainstmpid.'">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_EMAILING" value="'.$mainstmpid.'">';
@@ -341,9 +327,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="'.$mainsmtppw.'">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_EMAILING" value="'.$mainsmtppw.'">';
@@ -359,10 +343,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -373,10 +355,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
     print '</table>';
@@ -390,9 +370,7 @@ if ($action == 'edit')
     print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'common_emailing', '', -1);
 
     print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -414,9 +392,7 @@ else
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '').'</td></tr>';
 		}
 
@@ -424,9 +400,7 @@ else
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
 		}
 
@@ -449,10 +423,8 @@ else
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 
 		// STARTTLS
@@ -462,10 +434,8 @@ else
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 	}
 
@@ -506,9 +476,7 @@ else
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
 
@@ -539,8 +507,7 @@ else
 
 		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
-		else
-		{
+		else {
 			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
 
 			if ($mail->error) {
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 1c50ebf0949..bf841a03abe 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -171,8 +171,7 @@ if (empty($reshook))
 		$resql = $db->query($sql);
 		if ($resql) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error").' '.$db->lasterror(), null, 'errors');
 		}
 	}
@@ -281,9 +280,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -450,8 +447,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 37d1f903b4a..1467c2907a7 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -122,9 +122,7 @@ if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
     	$helpsubstit .= $key.' -> '.$val.'<br>';
     	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
     }
-}
-else
-{
+} else {
     $tmp = FormMail::getAvailableSubstitKey('formemailwithlines');
     $tmp['__(AnyTranslationKey)__'] = 'Translation';
     $helpsubstit = $langs->trans("AvailableVariables").':<br>';
@@ -278,11 +276,9 @@ if (empty($reshook))
                 elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
                 elseif ($keycode == 'content') {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-                }
-                elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+                } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
                 	$sql .= (int) GETPOST($keycode, 'int');
-                }
-                else {
+                } else {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
                 }
 
@@ -296,13 +292,10 @@ if (empty($reshook))
             {
                 setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
             	$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
-            }
-            else
-            {
+            } else {
                 if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-                }
-                else {
+                } else {
                     dol_print_error($db);
                 }
             }
@@ -337,11 +330,9 @@ if (empty($reshook))
                 elseif (GETPOST($keycode) == '0' && $keycode == 'langcode') $sql .= "''"; // langcode must be '' if not defined so the unique key that include lang will work
                 elseif ($keycode == 'content') {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-                }
-                elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+                } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
                 	$sql .= (int) GETPOST($keycode, 'int');
-                }
-                else {
+                } else {
                 	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
                 }
 
@@ -355,9 +346,7 @@ if (empty($reshook))
             if ($resql)
             {
             	setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
                 setEventMessages($db->error(), null, 'errors');
             }
         }
@@ -376,9 +365,7 @@ if (empty($reshook))
             if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
             {
                 setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -505,8 +492,7 @@ foreach ($fieldlist as $field => $value)
 		{
 			if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
 			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
-		}
-		else print $valuetoshow;
+		} else print $valuetoshow;
 		print '</td>';
 	}
 }
@@ -573,12 +559,9 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 	// Input field
 	if ($tmpfieldlist == 'topic') {
 		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
-	}
-	elseif ($tmpfieldlist == 'joinfiles') {
+	} elseif ($tmpfieldlist == 'joinfiles') {
 		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
-	}
-	else
-	{
+	} else {
 		if ($context != 'hide') {
 			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 			$okforextended = true;
@@ -586,9 +569,7 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 				$okforextended = false;
 			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
-		}
-		else
-			print '&nbsp;';
+		} else print '&nbsp;';
 	}
 	print '</td>';
 	if ($tmpfieldlist == 'topic') {
@@ -660,8 +641,7 @@ if ($resql)
         	print '<td class="liste_titre">';
         	print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
         	print '</td>';
-        }
-        elseif ($value == 'fk_user')
+        } elseif ($value == 'fk_user')
         {
         	print '<td class="liste_titre">';
         	$restrictid = array();
@@ -669,13 +649,11 @@ if ($resql)
         	//var_dump($restrictid);
         	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
         	print '</td>';
-        }
-        elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+        } elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
         elseif ($value == 'type_template')
         {
         	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
-        }
-        elseif (!in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
+        } elseif (!in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
     if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
     // Action column
@@ -801,9 +779,7 @@ if ($resql)
                 }
 
                 print "</tr>\n";
-            }
-            else
-            {
+            } else {
             	$keyforobj = 'type_template';
             	if (!in_array($obj->$keyforobj, array_keys($elementList)))
             	{
@@ -945,8 +921,7 @@ if ($resql)
             $i++;
         }
     }
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -988,25 +963,19 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($user->admin)
 			{
 				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
-			}
-			else
-			{
+			} else {
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
 					print $user->getNomUrl(1); // Me
 					$forcedvalue = $user->id;
-				}
-				else
-				{
+				} else {
 					if ($obj && !empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
 					{
 						$fuser = new User($db);
 						$fuser->fetch($obj->{$fieldlist[$field]});
 						print $fuser->getNomUrl(1);
 						$forcedvalue = $fuser->id;
-					}
-					else
-					{
+					} else {
 						$forcedvalue = $obj->{$fieldlist[$field]};
 					}
 				}
@@ -1014,8 +983,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" value="'.$forcedvalue.'" name="'.$keyname.'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			if (!empty($conf->global->MAIN_MULTILANGS))
@@ -1023,9 +991,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$selectedlang = GETPOSTISSET('langcode') ?GETPOST('langcode', 'aZ09') : $langs->defaultlang;
 				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
-			}
-			else
-			{
+			} else {
 				if (!empty($obj->{$fieldlist[$field]}))
 				{
 					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
@@ -1045,18 +1011,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				// Current tempalte type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
-			}
-			else
-			{
+			} else {
 				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
 			}
 			print '</td>';
-		}
-		elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
+		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
-		else
-		{
+		else {
 			$size = ''; $class = ''; $classtd = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
 			if ($fieldlist[$field] == 'label') $class = 'maxwidth100';
@@ -1072,15 +1034,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				if (empty($user->admin))
 				{
 					print $form->selectyesno($fieldlist[$field], '1', 1);
-				}
-				else
-				{
+				} else {
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
 					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 				}
-			}
-			else
-			{
+			} else {
 				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 856ad50c28b..0b19285a072 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -96,9 +96,7 @@ if ($action == 'update' && !$cancel)
 				if ($result > 0)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$error++;
 					setEventMessages($langs->trans("FailedToInitializeMenu").' '.$key, null, 'errors');
 					$db->rollback();
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index ef58c1042d4..d92a3b30504 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -103,9 +103,7 @@ if ($action == 'update')
             if (is_numeric(GETPOST('menuIdParent', 'alpha')))
             {
             	$menu->fk_menu = GETPOST('menuIdParent', 'alpha');
-            }
-            else
-            {
+            } else {
     	       	if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
     	       	else $menu->fk_menu = -1;
             	$menu->fk_mainmenu = $mainmenu;
@@ -116,23 +114,17 @@ if ($action == 'update')
             if ($result > 0)
             {
 	            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
 	            setEventMessages($menu->error, $menu->errors, 'errors');
             }
-        }
-        else
-        {
+        } else {
 	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
         $action = "edit";
 
         header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
         exit;
-    }
-    else
-    {
+    } else {
         header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
         exit;
     }
@@ -221,9 +213,7 @@ if ($action == 'add')
         if (is_numeric(GETPOST('menuId', 'alpha', 3)))
         {
         	$menu->fk_menu = GETPOST('menuId', 'alpha', 3);
-        }
-        else
-        {
+        } else {
             if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
             else $menu->fk_menu = -1;
             $menu->fk_mainmenu = $mainmenu;
@@ -235,9 +225,7 @@ if ($action == 'add')
         {
             header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".GETPOST('menu_handler', 'aZ09'));
             exit;
-        }
-        else
-        {
+        } else {
             $action = 'create';
 	        setEventMessages($menu->error, $menu->errors, 'errors');
         }
@@ -260,9 +248,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
 	    setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
         llxFooter();
         exit;
-    }
-    else
-    {
+    } else {
         $this->db->rollback();
 
         $reload = 0;
@@ -358,9 +344,7 @@ if ($action == 'create')
     {
         print $langs->trans('Left');
         print '<input type="hidden" name="type" value="left">';
-    }
-    else
-    {
+    } else {
         print '<select name="type" class="flat" id="topleft">';
         print '<option value="">&nbsp;</option>';
         print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
@@ -381,9 +365,7 @@ if ($action == 'create')
     if ($parent_rowid)
     {
         print '<td>'.$parent_rowid.'<input type="hidden" name="menuId" value="'.$parent_rowid.'"></td>';
-    }
-    else
-    {
+    } else {
         print '<td><input type="text" class="minwidth300" id="menuId" name="menuId" value="'.(GETPOST("menuId", 'int') ?GETPOST("menuId", 'int') : '').'"></td>';
     }
     print '<td>'.$langs->trans('DetailMenuIdParent');
@@ -425,8 +407,7 @@ if ($action == 'create')
 	print '</div>';
 
     print '</form>';
-}
-elseif ($action == 'edit')
+} elseif ($action == 'edit')
 {
     print load_fiche_titre($langs->trans("ModifMenu"), '', 'title_setup');
     print '<br>';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 97f0246ac88..590b6eb8034 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -118,9 +118,7 @@ if ($action == 'up')
 	$sql .= " WHERE m.rowid = ".$previous['rowid']; // Descend celui du dessus
 	dol_syslog("admin/menus/index.php ".$sql);
 	$db->query($sql);
-}
-
-elseif ($action == 'down')
+} elseif ($action == 'down')
 {
 	$current = array();
 	$next = array();
@@ -174,9 +172,7 @@ elseif ($action == 'down')
 	$sql .= " WHERE m.rowid = ".$next['rowid'];
 	dol_syslog("admin/menus/index.php ".$sql);
 	$db->query($sql);
-}
-
-elseif ($action == 'confirm_delete' && $confirm == 'yes')
+} elseif ($action == 'confirm_delete' && $confirm == 'yes')
 {
 	$db->begin();
 
@@ -191,9 +187,7 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 
 		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 
 		$reload = 0;
@@ -408,9 +402,7 @@ if ($conf->use_javascript_ajax)
 	}
 
 	print '</div>';
-}
-else
-{
+} else {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorFeatureNeedJavascript"), null, 'errors');
 }
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index ed35f48d90e..6d88153611d 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -41,8 +41,7 @@ if ($action == 'activate_hidemenu')
 	dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", '1', 'chaine', 0, '', $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
-}
-elseif ($action == 'disable_hidemenu')
+} elseif ($action == 'disable_hidemenu')
 {
 	dolibarr_del_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]);
@@ -94,9 +93,7 @@ print '<td class="center">';
 if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
 {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_hidemenu">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else
-{
+} else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_hidemenu">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print "</td>";
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index d5bf12f1061..1cfd1c550c6 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -105,8 +105,7 @@ foreach ($modulesdir as $dir)
 						continue;
 		        	}
 
-		            try
-		            {
+		            try {
 		                $res = include_once $dir.$file;
 		                if (class_exists($modName))
 						{
@@ -140,9 +139,7 @@ foreach ($modulesdir as $dir)
 		    					        if ($publisher)
 		    					        {
 		    					            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-		    					        }
-		    					        else
-		    					        {
+		    					        } else {
 		    					            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 		    					        }
 		    					    }
@@ -180,20 +177,15 @@ foreach ($modulesdir as $dir)
 		    			            else $categ[$specialstring] = 1;
 		    						$j++;
 		    			            $i++;
-		    					}
-		    					else dol_syslog("Module ".get_class($objMod)." not qualified");
-							}
-		            		catch (Exception $e)
+		    					} else dol_syslog("Module ".get_class($objMod)." not qualified");
+							} catch (Exception $e)
 		            		{
 		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            		}
-						}
-		            	else
-						{
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					}
-		            catch (Exception $e)
+					} catch (Exception $e)
 		            {
 		                 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            }
@@ -201,9 +193,7 @@ foreach ($modulesdir as $dir)
 		    }
 		}
 		closedir($handle);
-	}
-	else
-	{
+	} else {
 		dol_syslog("htdocs/admin/modulehelp.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -331,9 +321,7 @@ if ($mode == 'desc')
         if (!empty($objMod->editor_url) && !preg_match('/dolibarr\.org/i', $objMod->editor_url)) $textexternal .= ($objMod->editor_name != 'dolibarr' ? ' - ' : '').img_picto('', 'globe').' <a href="'.$editor_url.'" target="_blank">'.$objMod->editor_url.'</a>';
         $text .= $textexternal;
         $text .= '<br>';
-    }
-    else
-    {
+    } else {
         $text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
     }
 
@@ -364,8 +352,7 @@ if ($mode == 'feature')
     		$i++;
     	}
     	$text .= ')';
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -378,8 +365,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').$val;
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -388,8 +374,7 @@ if ($mode == 'feature')
     if (dol_is_file($filedata))
     {
         $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -407,8 +392,7 @@ if ($mode == 'feature')
            		$i++;
         	}
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -416,8 +400,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -425,8 +408,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -439,8 +421,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val['label']);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -449,9 +430,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
     	$yesno = 'Yes';
-    }
-    else
-    {
+    } else {
     	$yesno = 'No';
     }
     require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
@@ -479,8 +458,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -510,8 +488,7 @@ if ($mode == 'feature')
         	$text .= ($i ? ', ' : '').($val);
         	$i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -524,8 +501,7 @@ if ($mode == 'feature')
         	$text .= ($i ? ', ' : '').($val[1]);
         	$i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -533,8 +509,7 @@ if ($mode == 'feature')
     if (isset($objMod->menu) && !empty($objMod->menu)) // objMod can be an array or just an int 1
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -547,8 +522,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -561,8 +535,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index ab2889368cd..ef5596d9815 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -125,9 +125,7 @@ if ($action == 'install')
 		$langs->load("Error");
 		setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
 		$error++;
-	}
-	else
-	{
+	} else {
 		if (!$error && !preg_match('/\.zip$/i', $original_file))
 		{
 			$langs->load("errors");
@@ -173,9 +171,7 @@ if ($action == 'install')
 				$langs->load("errors");
 				setEventMessages($langs->trans($result['error'], $original_file), null, 'errors');
 				$error++;
-			}
-			else
-			{
+			} else {
 				// Now we move the dir of the module
 				$modulename = preg_replace('/module_/', '', $original_file);
 				$modulename = preg_replace('/\-([0-9][0-9\.]*)\.zip$/i', '', $modulename);
@@ -230,9 +226,7 @@ if ($action == 'install')
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFailToRenameFile", $_FILES['fileinstall']['tmp_name'], $newfile), null, 'errors');
 			$error++;
 		}
@@ -248,8 +242,7 @@ if ($action == 'set' && $user->admin)
 {
 	$resarray = activateModule($value);
 	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else
-	{
+	else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -264,14 +257,12 @@ if ($action == 'set' && $user->admin)
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
-}
-elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
+} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
 {
 	$result = unActivateModule($value);
 	if ($result) setEventMessages($result, null, 'errors');
@@ -341,8 +332,7 @@ foreach ($modulesdir as $dir)
 						continue;
 					}
 
-					try
-					{
+					try {
 						$res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
 						if (class_exists($modName))
 						{
@@ -375,9 +365,7 @@ foreach ($modulesdir as $dir)
 										if ($publisher)
 										{
 											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-										}
-										else
-										{
+										} else {
 											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 										}
 									}
@@ -430,20 +418,15 @@ foreach ($modulesdir as $dir)
 									else $categ[$specialstring] = 1;
 									$j++;
 									$i++;
-								}
-								else dol_syslog("Module ".get_class($objMod)." not qualified");
-							}
-							catch (Exception $e)
+								} else dol_syslog("Module ".get_class($objMod)." not qualified");
+							} catch (Exception $e)
 							{
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
-						}
-						else
-						{
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
@@ -451,9 +434,7 @@ foreach ($modulesdir as $dir)
 			}
 		}
 		closedir($handle);
-	}
-	else
-	{
+	} else {
 		dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -706,8 +687,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			if (!empty($objMod->disabled))
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
-			}
-			elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
+			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
 			{
 				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) $codeenabledisable .= $langs->trans("Used");
 				else {
@@ -715,15 +695,12 @@ if ($mode == 'common' || $mode == 'commonkanban')
 					//print $langs->trans("Required");
 				}
 				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
-			}
-			else
-			{
+			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
-				}
-				else {
+				} else {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
@@ -751,49 +728,36 @@ if ($mode == 'common' || $mode == 'commonkanban')
 						{
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-						}
-						else
-						{
+						} else {
 							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 							{
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
-							}
-							else
-							{
+							} else {
 								$urltouse = $urlpage;
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							}
 						}
 					}
-				}
-				elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
 				{
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
-				}
-				else
-				{
+				} else {
 					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
-			}
-			else
-			{
+			} else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
 			}
-		}
-		else	// Module not yet activated
+		} else // Module not yet activated
 		{
 			// Set $codeenabledisable
 			if (!empty($objMod->always_enabled))
 			{
 				// Should never happened
-			}
-			elseif (!empty($objMod->disabled))
+			} elseif (!empty($objMod->disabled))
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
-			}
-			else
-			{
+			} else {
 				// Module qualified for activation
 				$warningmessage = '';
 				if (!empty($arrayofwarnings[$modName]))
@@ -856,9 +820,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			{
 				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
 				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
-			}
-			else
-			{
+			} else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
 			print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
@@ -1027,9 +989,7 @@ if ($mode == 'deploy')
 		{
 			$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 			$allowfromweb = -1;
-		}
-		else
-		{
+		} else {
 			if ($dirins_ok)
 			{
 				if (!is_writable(dol_osencode($dirins)))
@@ -1038,16 +998,12 @@ if ($mode == 'deploy')
 					$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins), 0, 0, '1', 'warning');
 					$allowfromweb = 0;
 				}
-			}
-			else
-			{
+			} else {
 				$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 				$allowfromweb = 0;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'));
 		$allowfromweb = 0;
 	}
@@ -1067,9 +1023,7 @@ if ($mode == 'deploy')
 		if ($allowfromweb == 1)
 		{
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
 			print '<b>'.$langs->trans("StepNb", 1).'</b>: ';
 			print $langs->trans("FindPackageFromWebSite", $fullurl).'<br>';
@@ -1149,9 +1103,7 @@ if ($mode == 'deploy')
 					print ' ';
 					print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
 				}
-			}
-			else
-			{
+			} else {
 				print ' ('.$langs->trans("UploadDisabled").')';
 			}
 
@@ -1161,9 +1113,7 @@ if ($mode == 'deploy')
 			print '<br>';
 
 			print '<div class="center"><div class="logo_setup"></div></div>';
-		}
-		else
-		{
+		} else {
 			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
 			print '<b>'.$langs->trans("StepNb", 4).'</b>: ';
 			print $langs->trans("SetupIsReadyForUse").'<br>';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 9c59b5cf6da..de1a6888de0 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -58,14 +58,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -96,15 +92,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mrp&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -114,9 +106,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -141,17 +131,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "MRP_MO_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
+} elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("MRP_MO_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "MRP_MO_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -161,14 +147,10 @@ elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_MRP_MO_FREE_TEXT')
+} elseif ($action == 'set_MRP_MO_FREE_TEXT')
 {
 	$freetext = GETPOST("MRP_MO_FREE_TEXT", 'none'); // No alpha here, we want exact string
 
@@ -179,9 +161,7 @@ elseif ($action == 'set_MRP_MO_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -262,9 +242,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->MRP_MO_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -328,9 +306,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -399,9 +375,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -412,9 +386,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->MRP_MO_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -442,9 +414,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -489,9 +459,7 @@ $variablename = 'MRP_MO_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 4ba581398ee..a7e073f08d2 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -53,9 +53,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -66,9 +64,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -96,11 +92,9 @@ if ($action == 'add_currency')
 		{
 			if ($currency->addRate($rate)) setEventMessages($langs->trans('RecordSaved'), array());
 			else setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
-		}
-		else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
+		} else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
 	}
-}
-elseif ($action == 'update_currency')
+} elseif ($action == 'update_currency')
 {
 	$error = 0;
 
@@ -125,8 +119,7 @@ elseif ($action == 'update_currency')
 				}
 			}
 		}
-	}
-	elseif (GETPOST('deletecurrency', 'alpha'))
+	} elseif (GETPOST('deletecurrency', 'alpha'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$currency = new MultiCurrency($db);
@@ -137,17 +130,14 @@ elseif ($action == 'update_currency')
 			else setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
 		}
 	}
-}
-elseif ($action == 'setapilayer')
+} elseif ($action == 'setapilayer')
 {
     if (GETPOSTISSET('modify_apilayer'))
     {
         dolibarr_set_const($db, 'MULTICURRENCY_APP_ID', GETPOST('MULTICURRENCY_APP_ID', 'alpha'));
         dolibarr_set_const($db, 'MULTICURRENCY_APP_SOURCE', GETPOST('MULTICURRENCY_APP_SOURCE', 'alpha'));
         //dolibarr_set_const($db, 'MULTICURRENCY_ALTERNATE_SOURCE', GETPOST('MULTICURRENCY_ALTERNATE_SOURCE', 'alpha'));
-    }
-    else
-    {
+    } else {
         $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
         if ($result > 0) {
         	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index ba92aa1ec21..a32cd0fa1f5 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -84,9 +84,7 @@ if ($action == 'settemplates')
 		$db->commit();
 
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -106,9 +104,7 @@ if ($action == 'setvalue' && $user->admin)
     	$db->commit();
 
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
     	$db->rollback();
 
     	setEventMessages($langs->trans("Error"), null, 'errors');
@@ -140,8 +136,7 @@ if ($action == 'setfixednotif' && $user->admin)
 				$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
 				$newval = GETPOST($shortkey.'_key');
 				//print $newkey.' - '.$newval.'<br>';
-	    	}
-	    	elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
+	    	} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
 	    	{
 	    		// Add a new entry
 	    		$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
@@ -160,9 +155,7 @@ if ($action == 'setfixednotif' && $user->admin)
     	$db->commit();
 
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-	{
+    } else {
 		$db->rollback();
 
         setEventMessages($langs->trans("Error"), null, 'errors');
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 785a77ac043..85cd9284535 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -119,9 +119,7 @@ foreach ($list as $key)
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
         print '</td></tr>';
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index d8c65f9a2c5..a78913b7e16 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -78,9 +78,7 @@ if ($action == 'setconst' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -98,9 +96,7 @@ if ($action == 'setvalue' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -153,8 +149,7 @@ if ($mode == 'setup' && $user->admin)
             $urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltocheckperms = 'https://github.com/settings/applications/';
-        }
-        elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
+        } elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
         {
             $OAUTH_SERVICENAME = 'Google';
             // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
@@ -164,23 +159,19 @@ if ($mode == 'setup' && $user->admin)
             $urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
             $urltocheckperms = 'https://security.google.com/settings/security/permissions';
-        }
-        elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
+        } elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
         {
         	$OAUTH_SERVICENAME = 'StripeTest';
         	$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
         	$urltodelete = '';
         	$urltocheckperms = '';
-        }
-        elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+        } elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
         {
         	$OAUTH_SERVICENAME = 'StripeLive';
         	$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
         	$urltodelete = '';
         	$urltocheckperms = '';
-        }
-        else
-		{
+        } else {
 			$urltorenew = '';
 			$urltodelete = '';
 			$urltocheckperms = '';
@@ -194,11 +185,9 @@ if ($mode == 'setup' && $user->admin)
         require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
         // Dolibarr storage
         $storage = new DoliStorage($db, $conf);
-        try
-        {
+        try {
             $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             // Return an error if token not found
         }
@@ -221,13 +210,10 @@ if ($mode == 'setup' && $user->admin)
                 if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
                 {
                     $expiredat = $langs->trans("Never");
-                }
-                elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
+                } elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
                 {
                     $expiredat = $langs->trans("Unknown");
-                }
-                else
-                {
+                } else {
                     $expiredat = dol_print_date($endoflife, "dayhour");
                 }
             }
@@ -372,8 +358,7 @@ if ($mode == 'test' && $user->admin)
             } else {
                 setEventMessages($printer->error, $printer->errors, 'errors');
             }
-        }
-        else {
+        } else {
             print $langs->trans('PleaseConfigureDriverfromList');
         }
     }
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index a5b494b62e2..85d7e140a6d 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -56,9 +56,7 @@ if ($action == 'updateMask')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -183,9 +181,7 @@ foreach ($dirmodels as $reldir)
                             if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else
-                            {
+                            } else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 496a32923f7..ece44f66677 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -92,8 +92,7 @@ if ($action == 'activate_pdfsecurity')
 	dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
-}
-elseif ($action == 'disable_pdfsecurity')
+} elseif ($action == 'disable_pdfsecurity')
 {
 	dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION", $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -189,9 +188,7 @@ for ($i = 1; $i <= 6; $i++)
 	{
 		$pid = $langs->transcountry("ProfId".$i, $mysoc->country_code);
 		if ($pid == '-') $pid = false;
-	}
-	else
-	{
+	} else {
 		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	}
 	if ($pid)
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 0486edebeec..d5bc8fd938b 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -229,9 +229,7 @@ if ($result)
 			print '<td class="center">';
 			print img_picto($langs->trans("Active"), 'tick');
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">'.img_edit_add().'</a>';
 			print '</td>';
@@ -247,8 +245,7 @@ if ($result)
 
         $i++;
     }
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index e9795304ad3..e4a27a51c65 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -70,8 +70,7 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-	}
-	else $error++;
+	} else $error++;
 
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
@@ -100,9 +99,7 @@ if ($action == "set")
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 73703829b8c..4855a164412 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -52,8 +52,7 @@ $type = 'propal';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $error = 0;
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstpropal = GETPOST('maskconstpropal', 'alpha');
 	$maskpropal = GETPOST('maskpropal', 'alpha');
 	if ($maskconstpropal) $res = dolibarr_set_const($db, $maskconstpropal, $maskpropal, 'chaine', 0, '', $conf->entity);
@@ -63,14 +62,10 @@ if ($action == 'updateMask')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 
 	$propal = new Propal($db);
@@ -90,8 +85,7 @@ elseif ($action == 'specimen')
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
@@ -100,21 +94,15 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=propal&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-elseif ($action == 'setribchq')
-{
+} elseif ($action == 'setribchq') {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
 
@@ -126,14 +114,10 @@ elseif ($action == 'setribchq')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
-{
+} elseif ($action == 'set_PROPALE_DRAFT_WATERMARK') {
 	$draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha');
 
 	$res = dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -142,14 +126,10 @@ elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'set_PROPOSAL_FREE_TEXT')
-{
+} elseif ($action == 'set_PROPOSAL_FREE_TEXT') {
 	$freetext = GETPOST('PROPOSAL_FREE_TEXT', 'none'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "PROPOSAL_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -159,14 +139,10 @@ elseif ($action == 'set_PROPOSAL_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'setdefaultduration')
-{
+} elseif ($action == 'setdefaultduration') {
 	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
@@ -174,59 +150,38 @@ elseif ($action == 'setdefaultduration')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
-{
+} elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') {
     $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
     if (!$res > 0) $error++;
 
-    if (!$error)
-    {
+    if (!$error) {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
         if ($conf->global->PROPALE_ADDON_PDF == "$value") dolibarr_del_const($db, 'PROPALE_ADDON_PDF', $conf->entity);
 	}
-}
-
-elseif ($action == 'setdoc')
-{
-    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
-	{
+} elseif ($action == 'setdoc') {
+    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		$conf->global->PROPALE_ADDON_PDF = $value;
 	}
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
@@ -310,9 +265,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->PROPALE_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -376,9 +329,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -448,9 +399,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print "<td align=\"center\">\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -461,9 +410,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->PROPALE_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -496,9 +443,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -571,19 +516,14 @@ if (empty($conf->facture->enabled))
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -620,8 +560,7 @@ if (empty($conf->facture->enabled))
 		}
 	}
 	print "</select>";
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -685,9 +624,7 @@ $variablename = 'PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 8730f148c07..d1b23c485ab 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -89,9 +89,7 @@ if ($action == 'addprinter' && $user->admin) {
         {
             $db->commit();
             setEventMessages($langs->trans("PrinterAdded", $printername), null);
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -115,9 +113,7 @@ if ($action == 'deleteprinter' && $user->admin) {
         {
             $db->commit();
             setEventMessages($langs->trans("PrinterDeleted", $printername), null);
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 312038d3fcc..7bcd054f13e 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -72,12 +72,9 @@ if ($action == 'updateMask')
 	{
 		if ($res > 0)
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("Error"), null, 'errors');
+		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_param')
+} elseif ($action == 'set_param')
 {
 	$freetext = GETPOST('RECEPTION_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "RECEPTION_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
@@ -99,9 +96,7 @@ elseif ($action == 'set_param')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -132,15 +127,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=reception&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -150,9 +141,7 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -177,9 +166,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmodel')
+} elseif ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "RECEPTION_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -254,8 +241,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-						}
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -263,9 +249,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->RECEPTION_ADDON_NUMBER == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -331,9 +315,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -401,9 +383,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -414,9 +394,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->RECEPTION_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -446,9 +424,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 3efdd05bdc7..e9cb6b8f554 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -91,9 +91,7 @@ if (empty($conf->use_javascript_ajax))
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 			'0'=>$langs->trans("No"),
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index d9d61673c5e..4dcb83c32e6 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -45,9 +45,7 @@ if ($action == 'setgeneraterule')
 	if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity))
 	{
 		dol_print_error($db);
-	}
-	else
-	{
+	} else {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
@@ -91,8 +89,7 @@ if ($action == 'activate_encrypt')
                 $i++;
             }
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
 	//print $error." ".$sql;
     //exit;
@@ -101,14 +98,11 @@ if ($action == 'activate_encrypt')
 		$db->commit();
 		header("Location: security.php");
 	    exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db, '');
 	}
-}
-elseif ($action == 'disable_encrypt')
+} elseif ($action == 'disable_encrypt')
 {
 	//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 	//Do not allow "disable encryption" as passwords cannot be decrypted
@@ -131,13 +125,10 @@ if ($action == 'activate_encryptdbpassconf')
 		//dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 		header("Location: security.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('InstrucToEncodePass', dol_encode($dolibarr_main_db_pass)), null, 'warnings');
 	}
-}
-elseif ($action == 'disable_encryptdbpassconf')
+} elseif ($action == 'disable_encryptdbpassconf')
 {
 	$result = encodedecode_dbpassconf(0);
 	if ($result > 0)
@@ -148,9 +139,7 @@ elseif ($action == 'disable_encryptdbpassconf')
 		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
 		header("Location: security.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('InstrucToClearPass', $dolibarr_main_db_pass), null, 'warnings');
 	}
 }
@@ -160,8 +149,7 @@ if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 	dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1', 'chaine', 0, '', $conf->entity);
 	header("Location: security.php");
 	exit;
-}
-elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
+} elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 {
 	dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", $conf->entity);
 	header("Location: security.php");
@@ -268,8 +256,7 @@ foreach ($arrayhandler as $key => $module)
         // Show example of numbering module
         print '<td class="nowrap">';
         $tmp = $module->getExample();
-        if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
-        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+        if (preg_match('/^Error/', $tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
         else print $tmp;
         print '</td>'."\n";
 
@@ -277,9 +264,7 @@ foreach ($arrayhandler as $key => $module)
         if ($conf->global->USER_PASSWORD_GENERATED == $key)
         {
             print img_picto('', 'tick');
-        }
-        else
-        {
+        } else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
         }
         print "</td></tr>\n";
@@ -435,9 +420,7 @@ if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 		//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 	  	//Do not allow "disable encryption" as passwords cannot be decrypted
 	  	print '<a href="security.php?action=disable_encrypt">'.$langs->trans("Disable").'</a>';
-	}
-	else
-	{
+	} else {
 		print '-';
 	}
 	print "</td>";
@@ -462,9 +445,7 @@ if (empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass))
 {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningPassIsEmpty"));
-}
-else
-{
+} else {
 	if (empty($dolibarr_main_db_encrypted_pass))
 	{
 		print '<a href="security.php?action=activate_encryptdbpassconf">'.$langs->trans("Activate").'</a>';
@@ -515,9 +496,7 @@ if (GETPOST('info', 'int') > 0)
     if (function_exists('password_hash'))
     {
         print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
-    }
-    else
-    {
+    } else {
         print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
     }
     print 'MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO."<br>\n";
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index f642cd64182..363340445c2 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -50,9 +50,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
@@ -61,14 +59,10 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-
-elseif ($action == 'updateform')
+} elseif ($action == 'updateform')
 {
 	$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	$res2 = dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", GETPOST("MAIN_SESSION_TIMEOUT", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -118,21 +112,15 @@ if (function_exists("imagecreatefrompng"))
 	if (!empty($conf->use_javascript_ajax))
 	{
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA');
-	}
-	else
-	{
+	} else {
 		if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
-}
-else
-{
+} else {
     $desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
     print $desc;
 }
@@ -145,15 +133,11 @@ print '<td class="right">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS');
-}
-else
-{
+} else {
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 09cc0debfd5..91c4003ec92 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -122,9 +122,7 @@ if ($action == 'send' && !$_POST['cancel'])
 		{
 			setEventMessages($langs->trans("SmsSuccessfulySent", $smsfrom, $sendto), null, 'mesgs');
 			setEventMessages($smsfile->error, $smsfile->errors, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ResultKo"), null, 'errors');
 			setEventMessages($smsfile->error, $smsfile->errors, 'errors');
 		}
@@ -205,9 +203,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
 
 	print '<table class="noborder centpercent">';
@@ -264,9 +260,7 @@ else
 	if (count($listofmethods) && !empty($conf->global->MAIN_SMS_SENDMODE))
 	{
 	    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
-	}
-	else
-	{
+	} else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index d2a92aed9e8..b848dccd998 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -48,9 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -62,9 +60,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 2ed43e97efd..34c83dbd434 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -73,9 +73,7 @@ if ($action == 'update' || $action == 'add')
      	if (!$error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        }
-        else
-        {
+        } else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -153,9 +151,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
     $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index ef592df3767..e859a991635 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -48,9 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -62,9 +60,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -119,9 +115,7 @@ if (!empty($conf->facture->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
     }
-}
-else
-{
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module30Name"));
 }
 print "</td>\n</tr>\n";
@@ -139,9 +133,7 @@ if (!empty($conf->commande->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
     }
-}
-else
-{
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module25Name"));
 }
 print "</td>\n</tr>\n";
@@ -161,9 +153,7 @@ if (!empty($conf->expedition->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
     }
-}
-else
-{
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
@@ -181,9 +171,7 @@ if (!empty($conf->expedition->enabled))
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
     }
-}
-else
-{
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
@@ -221,9 +209,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
     }
-}
-else
-{
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
@@ -242,9 +228,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
         $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
         print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
     }
-}
-else
-{
+} else {
     print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
@@ -279,9 +263,7 @@ if (!empty($conf->reception->enabled))
     }
 	print "</td>\n</tr>\n";
 	$found++;
-}
-else
-{
+} else {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ReStockOnDispatchOrder").'</td>';
     print '<td class="right">';
@@ -293,9 +275,7 @@ else
             $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
             print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
         }
-	}
-	else
-	{
+	} else {
 		print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 	}
 	print "</td>\n</tr>\n";
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 977b99d0c99..59613f6af5b 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -70,9 +70,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -109,15 +107,11 @@ if ($action == 'specimen')  // For invoices
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -127,9 +121,7 @@ if ($action == 'specimen')  // For invoices
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -154,8 +146,7 @@ elseif ($action == 'setdoc')
     {
         $ret = addDocumentModel($value, $type, $label, $scandir);
     }
-}
-elseif ($action == 'unsetdoc')
+} elseif ($action == 'unsetdoc')
 {
     dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
 }
@@ -185,9 +176,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -263,8 +252,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
                             $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        }
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -272,9 +260,7 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else
-                        {
+                        } else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -340,9 +326,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -409,9 +393,7 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
                         print "</td>";
-                    }
-                    else
-                    {
+                    } else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -424,9 +406,7 @@ foreach ($dirmodels as $reldir)
                         //print img_picto($langs->trans("Default"),'on');
                         // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    }
-                    else
-                    {
+                    } else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
@@ -487,9 +467,7 @@ $variablename = 'SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index db9b3e257f6..a390e4a4522 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -68,14 +68,10 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -107,15 +103,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -125,9 +117,7 @@ elseif ($action == 'specimen')  // For orders
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -152,23 +142,17 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     // TODO Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
     dolibarr_set_const($db, "COMMANDE_SUPPLIER_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'addcat')
+} elseif ($action == 'addcat')
 {
     $fourn = new Fournisseur($db);
     $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
-}
-
-elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
+} elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
     $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'none'); // No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED', 'alpha');
@@ -196,9 +180,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 
     	// Insert
     	$newmodule->insert_permissions(1);
-    }
-    else
-    {
+    } else {
     	// Remove all rights with Permission1190
     	$newmodule->delete_permissions();
 
@@ -217,9 +199,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -295,8 +275,7 @@ foreach ($dirmodels as $reldir)
                         $tmp = $module->getExample();
                         if (preg_match('/^Error/', $tmp)) {
                             $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>';
-                        }
-                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -304,9 +283,7 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else
-                        {
+                        } else {
                             print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         }
                         print '</td>';
@@ -370,9 +347,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -429,15 +404,11 @@ foreach ($dirmodels as $reldir)
                             print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                             print '</a>';
-                        }
-                        else
-                        {
+                        } else {
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                         }
                         print "</td>";
-                    }
-                    else
-                    {
+                    } else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -448,9 +419,7 @@ foreach ($dirmodels as $reldir)
                     if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
                     {
                         print img_picto($langs->trans("Default"), 'on');
-                    }
-                    else
-                    {
+                    } else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
@@ -553,9 +522,7 @@ $variablename = 'SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -572,9 +539,7 @@ print '<td class="center">';
 if ($conf->reception->enabled)
 {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
-}
-else
-{
+} else {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
 	} else {
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 5d7a0d0b8d5..da74784505a 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -57,12 +57,10 @@ if ($action == 'updateMask')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -71,9 +69,7 @@ if ($action == 'updateMask')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -98,9 +94,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -131,23 +125,15 @@ elseif ($action == 'specimen')
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
-}
-
-
-
-elseif ($action == 'setparams')
+} elseif ($action == 'setparams')
 {
        $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
        if (!$res > 0) $error++;
@@ -206,9 +192,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -282,9 +266,7 @@ foreach ($dirmodels as $reldir)
                             if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
                             {
                                 print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else
-                            {
+                            } else {
                                 print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                             }
                             print '</td>';
@@ -398,9 +380,7 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
                         print "</td>";
-                    }
-                    else
-                    {
+                    } else {
                         print '<td class="center">'."\n";
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
                         print "</td>";
@@ -413,9 +393,7 @@ foreach ($dirmodels as $reldir)
                         //print img_picto($langs->trans("Default"),'on');
                         // Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-                    }
-                    else
-                    {
+                    } else {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
                     }
                     print '</td>';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index c1007623a54..5f35f3af310 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -60,9 +60,7 @@ if ($action == 'updateMask')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -98,15 +96,11 @@ if ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_proposal&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -122,9 +116,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -140,9 +132,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -156,9 +146,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -167,18 +155,14 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
 if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
         if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$value") dolibarr_del_const($db, 'SUPPLIER_PROPOSAL_ADDON_PDF', $conf->entity);
 	}
-}
-
-elseif ($action == 'setdoc')
+} elseif ($action == 'setdoc')
 {
     if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -191,9 +175,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -278,9 +260,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
@@ -343,9 +323,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -414,9 +392,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print "<td align=\"center\">\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -427,9 +403,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -462,9 +436,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -511,9 +483,7 @@ $variablename = 'SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
     print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -543,22 +513,16 @@ if ($conf->banque->enabled)
     if (!empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
-    }
-    else
-    {
+    } else {
         if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL))
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;value=1">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        }
-        else
-        {
+        } else {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL&amp;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
         }
     }
     print '</td></tr>';
-}
-else
-{
+} else {
     print '<tr class="oddeven"><td>';
     print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
 }
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 16b273cd6db..f2d9e5aef60 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -126,9 +126,7 @@ if ($action == 'set')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
@@ -155,9 +153,7 @@ if ($action == 'setlevel')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -230,8 +226,7 @@ foreach ($syslogModules as $moduleName)
 		    {
     			if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
     			elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
-		    }
-			else $value = (isset($option['default']) ? $option['default'] : '');
+		    } else $value = (isset($option['default']) ? $option['default'] : '');
 
 			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (!empty($option['example'])) print '<br>'.$langs->trans("Example").': '.$option['example'];
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 3d0dddd6d10..615d353bbf1 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -200,9 +200,7 @@ if ($showpromotemessage)
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
             print '</textarea>';
-        }
-        else
-        {
+        } else {
             print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index c52af371dbc..31c5b887122 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -173,9 +173,7 @@ foreach ($configfileparameters as $key)
 		if ($newkey == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
-		}
-		else
-		{
+		} else {
 			// Label
 			print "<td>".$configfilelib[$i].'</td>';
 			// Key
@@ -219,9 +217,7 @@ if (empty($conf->multicompany->enabled))
 {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
-}
-else
-{
+} else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 323d9b4c115..4530b7671a5 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -61,18 +61,15 @@ if (preg_match('/mysql/i', $conf->db->type))
 {
 	$sql = "SHOW TABLE STATUS";
 	$base = 1;
-}
-elseif ($conf->db->type == 'pgsql')
+} elseif ($conf->db->type == 'pgsql')
 {
 	$sql = "SELECT conname, contype FROM pg_constraint;";
 	$base = 2;
-}
-elseif ($conf->db->type == 'mssql')
+} elseif ($conf->db->type == 'mssql')
 {
 	//$sqls[0] = "";
 	//$base=3;
-}
-elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
+} elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
 {
 	//$sql = "SELECT name, type FROM sqlite_master";
 	$base = 4;
@@ -82,9 +79,7 @@ elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
 if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else
-{
+} else {
 	if ($base == 1)
 	{
         print '<div class="div-table-responsive-no-min">';
@@ -120,9 +115,7 @@ else
 				if (isset($obj->Engine) && $obj->Engine == "MyISAM")
 				{
 				    print '<td><a class="reposition" href="database-tables.php?action=convert&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' InnoDB</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<td>&nbsp;</td>';
 				}
 				print '<td>'.$obj->Row_format.'</td>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index ef62c9aa34e..6b08fc4fe8f 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -73,9 +73,7 @@ $arraylist = array('listofvars', 'listofstatus');
 if (!count($listofvars) && !count($listofstatus))
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else
-{
+} else {
 	foreach ($arraylist as $listname)
 	{
 		print '<br>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 90f788f3825..59b16d8ad93 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -49,8 +49,7 @@ if (preg_match('/mysql/i', $conf->db->type))
 {
 	$sql = "SHOW TABLE STATUS LIKE '".$db->escape($table)."'";
 	$base = 1;
-}
-elseif ($conf->db->type == 'pgsql')
+} elseif ($conf->db->type == 'pgsql')
 {
 	$sql = "SELECT conname,contype FROM pg_constraint";
 	$base = 2;
@@ -59,9 +58,7 @@ elseif ($conf->db->type == 'pgsql')
 if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else
-{
+} else {
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 0796d934a74..6c2d4f6cfef 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -76,9 +76,7 @@ if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
     // Compare version with last install database version (upgrades never occured)
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_INSTALL));
-}
-else
-{
+} else {
     // Compare version with last upgrade database version
     if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
@@ -107,14 +105,10 @@ if (function_exists('curl_init'))
 
             // Show version
             print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
-        }
-        else
-        {
+        } else {
             print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
     }
 }
@@ -365,9 +359,7 @@ foreach ($configfileparameters as $key => $value)
 		if (strpos($newkey, 'separator') !== false)
 		{
 			print '<td colspan="3">&nbsp;</td>';
-		}
-		else
-		{
+		} else {
 			// Label
 			print "<td>".$value.'</td>';
 			// Key
@@ -391,8 +383,7 @@ foreach ($configfileparameters as $key => $value)
 					}
 					++$i;
 				}
-			}
-			elseif ($newkey == 'dolibarr_main_instance_unique_id')
+			} elseif ($newkey == 'dolibarr_main_instance_unique_id')
 			{
 			    //print $conf->file->instance_unique_id;
 			    global $dolibarr_main_cookie_cryptkey;
@@ -402,9 +393,7 @@ foreach ($configfileparameters as $key => $value)
 			        print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
 			    }
 			    print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
-			}
-			else
-			{
+			} else {
 			    print ${$newkey};
 			}
 			if ($newkey == 'dolibarr_main_url_root' && ${$newkey} != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
@@ -441,9 +430,7 @@ if (empty($conf->multicompany->enabled))
 {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
-}
-else
-{
+} else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index b1124e88add..e1f85ca77ce 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -98,9 +98,7 @@ if (dol_is_file($xmlfile))
     print '<input type="radio" name="target" value="local"'.((!GETPOST('target') || GETPOST('target') == 'local') ? 'checked="checked"' : '').'"> '.$langs->trans("LocalSignature").' = ';
     print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print '<br>';
-}
-else
-{
+} else {
     print '<input type="radio" name="target" value="local"> '.$langs->trans("LocalSignature").' = ';
     print '<input name="xmlshortfile" class="flat minwidth400" value="'.dol_escape_htmltag($xmlshortfile).'">';
     print ' <span class="warning">('.$langs->trans("AvailableOnlyOnPackagedVersions").')</span>';
@@ -111,9 +109,7 @@ if ($enableremotecheck)
 {
     print '<input type="radio" name="target" value="remote"'.(GETPOST('target') == 'remote' ? 'checked="checked"' : '').'> '.$langs->trans("RemoteSignature").' = ';
     print '<input name="xmlremote" class="flat minwidth400" value="'.dol_escape_htmltag($xmlremote).'"><br>';
-}
-else
-{
+} else {
     print '<input type="radio" name="target" value="remote" disabled="disabled"> '.$langs->trans("RemoteSignature").' = '.$xmlremote;
     if (!GETPOST('xmlremote')) print ' <span class="warning">('.$langs->trans("FeatureAvailableOnlyOnStable").')</span>';
     print '<br>';
@@ -140,9 +136,7 @@ if (GETPOST('target') == 'local')
     		}
     	}
         $xml = simplexml_load_file($xmlfile);
-    }
-    else
-    {
+    } else {
         print $langs->trans('XmlNotFound').': '.$xmlfile;
         $error++;
     }
@@ -157,9 +151,7 @@ if (GETPOST('target') == 'remote')
         $xmlfile = $xmlarray['content'];
         //print "xmlfilestart".$xmlfile."xmlfileend";
         $xml = simplexml_load_string($xmlfile);
-    }
-    else
-    {
+    } else {
         $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
         setEventMessages($errormsg, null, 'errors');
         $error++;
@@ -270,9 +262,7 @@ if (!$error && $xml)
 	            $out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
 	            $out .= "</tr>\n";
 	        }
-        }
-        else
-        {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -325,9 +315,7 @@ if (!$error && $xml)
             $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
-        }
-        else
-        {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -380,9 +368,7 @@ if (!$error && $xml)
             $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
-        }
-        else
-        {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -393,14 +379,10 @@ if (!$error && $xml)
         if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
         {
             setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-        }
-        else
-        {
+        } else {
             setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
         }
-    }
-    else
-    {
+    } else {
         print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
         $error++;
     }
@@ -433,16 +415,12 @@ if (!$error && $xml)
     		$resultcode = 'warning';
     		$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     		$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    	}
-    	else
-    	{
+    	} else {
     		$resultcode = 'ok';
     		$resultcomment = 'Success';
     		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     	}
-    }
-    else
-    {
+    } else {
     	$resultcode = 'error';
     	$resultcomment = 'Error';
     	$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 61de00287e9..1e5de3b9a46 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -69,9 +69,7 @@ foreach ($modulesdir as $dir)
 					{
 						// File duplicate
 						print "Warning duplicate file found : ".$file." (Found ".$dir.$file.", already found ".$modules_fullpath[$file].")<br>";
-					}
-					else
-					{
+					} else {
 						// File to load
 						$res = include_once $dir.$file;
 						if (class_exists($modName))
@@ -84,14 +82,11 @@ foreach ($modulesdir as $dir)
 								$modules_files[$objMod->numero] = $file;
 								$modules_fullpath[$file] = $dir.$file;
 								$picto[$objMod->numero] = (isset($objMod->picto) && $objMod->picto) ? $objMod->picto : 'generic';
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
-						}
-						else
-						{
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
@@ -124,9 +119,7 @@ foreach ($sortorder as $numero=>$name)
 	{
 	   	if (preg_match('/^\//', $picto[$numero])) print img_picto($alt, $picto[$numero], 'width="14px"', 1);
 	   	else print img_object($alt, $picto[$numero], 'width="14px"');
-	}
-	else
-	{
+	} else {
 	  	print img_object($alt, $picto[$numero], 'width="14px"');
 	}
 	print ' '.$modules[$numero]->getName();
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index dd77c41a673..33295044a3e 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -63,8 +63,7 @@ print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test = !function_exists('xdebug_is_enabled');
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug"));
 	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
 }
@@ -75,8 +74,7 @@ print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("Syslog"));
 	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
@@ -87,8 +85,7 @@ print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+else {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar"));
     //print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
 }
@@ -104,14 +101,11 @@ if ($test)
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("MemcachedAvailableAndSetup");
 		print ' '.$langs->trans("MoreInformation").' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup");
 		print ' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
 	}
-}
-else print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
+} else print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
 print '</br>';
 
 // OPCode cache
@@ -147,9 +141,7 @@ if (!$foundcache && $test)
 	{
 		$foundcache++;
 		print img_picto('', 'tick.png').' '.$langs->trans("APCInstalled");
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'warning').' '.$langs->trans("APCCacheInstalledButDisabled");
 	}
 }
@@ -162,9 +154,7 @@ if (ini_get('opcache.preload'))
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print ini_get('opcache.preload');
-}
-else
-{
+} else {
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print $langs->trans("No");
@@ -468,9 +458,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	if ($test)
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("YouUseBestDriver", $conf->db->type);
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'warning.png').' '.$langs->trans("YouDoNotUseBestDriver", $conf->db->type, 'mysqli');
 	}
 	print '<br>';
@@ -495,14 +483,10 @@ if ($resql)
 		if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE');
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 		}
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 	}
 	print '<br>';
@@ -525,14 +509,10 @@ if ($resql)
 		if (empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE');
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 		}
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 	}
 	print '<br>';
@@ -545,9 +525,7 @@ print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
 if (!in_array($conf->browser->name, array('chrome', 'opera', 'safari', 'firefox')))
 {
 	print img_picto('', 'warning.png').' '.$langs->trans("BrowserIsKO", $conf->browser->name);
-}
-else
-{
+} else {
 	print img_picto('', 'tick.png').' '.$langs->trans("BrowserIsOK", $conf->browser->name);
 }
 print '<br>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 04439d11710..0f7016dd9d7 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -85,13 +85,10 @@ $arrayphpminversionwarning = array(5, 6, 0);
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
-}
-elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
+} elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray());
 }
 
@@ -102,9 +99,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["main
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk");
 }
 
@@ -114,9 +109,7 @@ print '<tr><td>Sessions support</td><td>';
 if (!function_exists("session_id"))
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
 }
 
@@ -126,9 +119,7 @@ print '<tr><td>UTF-8 support</td><td>';
 if (!function_exists("utf8_encode"))
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8");
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportUTF8");
 }
 
@@ -228,9 +219,7 @@ foreach ($phparray as $key => $value)
 			print $valtoshow;
 			print '</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i = 0;
@@ -345,9 +334,7 @@ function getTableColumn($name, array $list)
 	if (in_array($name, $list))
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
-	}
-	else
-	{
+	} else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
@@ -381,9 +368,7 @@ function getTableColumnFunction(array $functions)
 	if ($result)
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
-	}
-	else
-	{
+	} else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 5e4e9eff82f..aef15f11f5d 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -108,17 +108,13 @@ xdebug.auto_trace=0
 	         XDebug with same port than in php.ini<br>
 	         Allow Remote debug=yes or prompt<br>'."\n";
 		print "<br>\n";
-	}
-	else
-	{
+	} else {
 		print socket_strerror(socket_last_error());
 		echo "Failed to connect to address=".$address." port=".$port."<br>\n";
 		echo "There is no Remote debug server at this address.\n";
 	}
 	socket_close($socket);
-}
-else
-{
+} else {
 	print "Can't test if PHPDebug is OK as PHP socket functions are not enabled.";
 }
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index f9bb8f39641..687b43a6918 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -130,9 +130,7 @@ print load_fiche_titre($langs->trans('TaxSetup'), $linkback, 'title_setup');
 if (empty($mysoc->tva_assuj))
 {
 	print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
-}
-else
-{
+} else {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -150,9 +148,7 @@ else
 		print '<td class="nowrap right">';
 		print $langs->trans("NotAvailableWhenAjaxDisabled");
 		print "</td>";
-	}
-	else
-	{
+	} else {
 		print '<td width="120">';
 		$listval = array(
 			'0'=>$langs->trans(""),
@@ -205,9 +201,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -217,9 +211,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -232,9 +224,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
@@ -244,9 +234,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 981ce2a0ccf..e27eb53ef2b 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -63,9 +63,7 @@ if ($action == 'updateMask') {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'setmod') {
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 6b8a23c94fc..dfe5b47379c 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -179,9 +179,7 @@ if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
-}
-else
-{
+} else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 1ad21490e4b..112cc111e29 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -56,9 +56,7 @@ if ($action == 'delete')
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-	else
-	{
+	} else {
 		$file = $conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -187,9 +185,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
     {
         $fullpathofmysqldump = $db->getPathOfDump();
-    }
-    else
-    {
+    } else {
         $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
     }
     print '<br>';
@@ -338,9 +334,7 @@ if (in_array($type, array('pgsql'))) {
     print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
     if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
         $fullpathofpgdump = $db->getPathOfDump();
-    }
-    else
-    {
+    } else {
         $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
     }
     print '<br>';
@@ -433,9 +427,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     	'id' => 'radio_compression_none',
     	'label' => $langs->trans("None")
     );
-}
-else
-{
+} else {
 	$compression['none'] = array(
 		'function' => '',
 		'id' => 'radio_compression_none',
@@ -463,9 +455,7 @@ foreach ($compression as $key => $val)
 		if ($key == 'gz') $checked = ' checked';
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-	}
-	else
-	{
+	} else {
 		// Disabled export format
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
@@ -583,8 +573,7 @@ foreach ($filecompression as $key => $val)
     	if ($key == 'gz') $checked = ' checked';
         print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
         print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-    }
-    else	// Disabled export format
+    } else // Disabled export format
     {
         print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
         print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index e9885e82bfe..224bbc14b56 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -105,8 +105,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
         <label for="radio_dump_mysql">MySQL (mysql)</label>
     </div>
         <?php
-    }
-    elseif (in_array($type, array('pgsql')))
+    } elseif (in_array($type, array('pgsql')))
     {
         ?>
     <div class="formelementrow">
@@ -114,9 +113,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
         <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
     </div>
         <?php
-    }
-    else
-    {
+    } else {
         print 'No method available with database '.$label;
     }
     ?>
@@ -161,8 +158,7 @@ if (in_array($type, array('mysql', 'mysqli')))
     //else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
     print '</div>';
     print '</fieldset>';
-}
-elseif (in_array($type, array('pgsql')))
+} elseif (in_array($type, array('pgsql')))
 {
     print '<fieldset id="postgresql_options">';
     print '<legend>Restore PostgreSQL</legend>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index dc0f7a27f8a..408d82404dc 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -203,9 +203,7 @@ if ($errormsg)
     $resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
 
     $_SESSION["commandbackupresult"] = $resultstring;
-}
-else
-{
+} else {
 	if ($what)
 	{
         setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index de10759c92d..85e3b2b2e5c 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -44,8 +44,7 @@ $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "date";
-if ($page < 0) { $page = 0; }
-elseif (empty($page)) $page = 0;
+if ($page < 0) { $page = 0; } elseif (empty($page)) $page = 0;
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
@@ -120,14 +119,12 @@ if ($compression == 'zip')
     	if ($ret == -2) {
     		$langs->load("errors");
     		$errormsg = $langs->trans("ErrNoZipEngine");
-    	}
-    	else {
+    	} else {
     		$langs->load("errors");
     		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
     	}
     }
-}
-elseif (in_array($compression, array('gz', 'bz')))
+} elseif (in_array($compression, array('gz', 'bz')))
 {
 	$userlogin = ($user->login ? $user->login : 'unknown');
 
@@ -145,9 +142,7 @@ elseif (in_array($compression, array('gz', 'bz')))
         $langs->load("errors");
         dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
         $errormsg = 'Error tar generation return '.$retval;
-    }
-    else
-    {
+    } else {
         if ($compression == 'gz')
         {
             $cmd = "gzip -f ".$outputdir."/".$file;
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index f57a16332df..e9d06885dfd 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -146,9 +146,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	{
 	    $db->commit();
 		dol_syslog($text, LOG_WARNING);
-	}
-	else
-	{
+	} else {
 		$error++;
 		dol_syslog($securityevent->error, LOG_ERR);
 		$db->rollback();
@@ -325,8 +323,7 @@ if ($result)
 			$userstatic->id = $obj->fk_user;
 			$userstatic->login = $obj->login;
 			print $userstatic->getLoginUrl(1);
-		}
-		else print '&nbsp;';
+		} else print '&nbsp;';
 		print '</td>';
 
 		// Description
@@ -379,9 +376,7 @@ if ($result)
 
 	print "</form>";
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 253f4919092..07f9f1ef47c 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -115,8 +115,7 @@ if ($action == 'purge')
 {
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeSessions'), $langs->trans('ConfirmPurgeSessions'), 'confirm_purge', $formquestion, 'no', 2);
-}
-elseif ($action == 'lock')
+} elseif ($action == 'lock')
 {
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('LockNewSessions'), $langs->trans('ConfirmLockNewSessions', $user->login), 'confirm_lock', $formquestion, 'no', 1);
@@ -171,9 +170,7 @@ if ($savehandler == 'files')
 		print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoSessionFound", $savepath, $openbasedir).'</td></tr>';
 	}
 	print "</table>";
-}
-else
-{
+} else {
 	print $langs->trans("NoSessionListWithThisHandler");
 }
 
@@ -187,9 +184,7 @@ print '<div class="tabsAction">';
 if (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=lock">'.$langs->trans("LockNewSessions").'</a>';
-}
-else
-{
+} else {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=confirm_unlock">'.$langs->trans("UnlockNewSessions").'</a>';
 }
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 260b4afe2d0..67f07a4eb24 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -98,14 +98,10 @@ if (function_exists('curl_init'))
 
 			// Show version
 			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b><br>';
-		}
-		else
-		{
+		} else {
 			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b><br>';
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">'.$langs->trans("Check").'</a><br>';
 	}
 }
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index e509f96c001..4751d287986 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -105,16 +105,12 @@ if ($action == 'update')
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
 			$action = '';
@@ -154,16 +150,12 @@ if ($action == 'add')
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
-		}
-		else
-		{
+		} else {
 		    $db->rollback();
 		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		    {
 		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-		    }
-		    else
-		    {
+		    } else {
 		        setEventMessages($db->lasterror(), null, 'errors');
             }
 			$action = '';
@@ -179,9 +171,7 @@ if ($action == 'delete')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -210,9 +200,7 @@ if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
     $enabledisablehtml .= '</a>';
-}
-else
-{
+} else {
     // Button on, click to disable
     $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
     $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
@@ -347,9 +335,7 @@ if ($mode == 'overwrite')
     		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
     		{
     			print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
-    		}
-    		else
-    		{
+    		} else {
     			print dol_escape_htmltag($obj->transvalue);
     		}
     		print '</td>';
@@ -361,9 +347,7 @@ if ($mode == 'overwrite')
     			print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
     			print ' &nbsp; ';
     			print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
 				print ' &nbsp; ';
     			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
@@ -406,9 +390,7 @@ if ($mode == 'searchkey')
     if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
     {
         setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
-    }
-    else
-    {
+    } else {
         // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
         $i = 0;
         foreach ($modulesdir as $keydir => $tmpsearchdir)
@@ -536,8 +518,7 @@ if ($mode == 'searchkey')
                 print '&nbsp;&nbsp;';
                 $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
                 print $form->textwithpicto('', $htmltext, 1, 'info');
-            }
-            elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+            } elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
             {
             	//print $key.'-'.$val;
                 print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
@@ -551,9 +532,7 @@ if ($mode == 'searchkey')
 
             	print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto('FixOnTransifex', 'globe').'</a>';
             }
-        }
-        else
-        {
+        } else {
             $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
             print $form->textwithpicto('', $htmltext, 1, 'warning');
         }
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 60cbadcdd3a..f866b418131 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -55,9 +55,7 @@ if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
-}
-
-elseif ($action == 'del_default')
+} elseif ($action == 'del_default')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -84,31 +82,24 @@ elseif ($action == 'setdoc')
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
-}
-elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
-}
-
-elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -121,9 +112,7 @@ elseif ($action == 'sethideinactiveuser')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -163,15 +152,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_MAIL_REQUIRED');
-}
-else
-{
+} else {
 	if (empty($conf->global->USER_MAIL_REQUIRED))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -187,15 +172,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_HIDE_INACTIVE_IN_COMBOBOX');
-}
-else
-{
+} else {
 	if (empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -224,9 +205,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -294,9 +273,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -307,9 +284,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->USER_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -335,9 +310,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 4f556ff19b3..490c79a3363 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -52,9 +52,7 @@ if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
-}
-
-elseif ($action == 'del_default')
+} elseif ($action == 'del_default')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -81,31 +79,24 @@ elseif ($action == 'setdoc')
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
-}
-elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
-}
-
-elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
+} elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
     $code = $reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -146,9 +137,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -216,9 +205,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -229,9 +216,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->USERGROUP_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -257,9 +242,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index dd7fd353ea2..235f9eae850 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -138,8 +138,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         	$fieldnamekey = $listfield[$f];
 	        setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 	        break;
-    	}
-		elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
+    	} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
 	    {
 			$ok = 0;
     	    $fieldnamekey = $listfield[$f];
@@ -212,13 +211,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	unset($_POST); // Clean $_POST array, we keep only
-        }
-        else
-        {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -227,8 +223,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
     // Si verif ok et action modify, on modifie la ligne
     if ($ok && GETPOST('actionmodify', 'alpha'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         $db->begin();
 
@@ -273,9 +268,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             	{
             		$error++;
             		setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
-            	}
-            	else
-            	{
+            	} else {
 	                @rename($srcfile, $destfile);
 
 		            // We must now rename $website->ref into $newname inside files
@@ -287,9 +280,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		            }
             	}
             }
-        }
-        else
-        {
+        } else {
         	$error++;
             setEventMessages($db->lasterror(), null, 'errors');
         }
@@ -297,9 +288,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         if (!$error)
         {
         	$db->commit();
-        }
-        else
-        {
+        } else {
         	$db->rollback();
         }
     }
@@ -313,8 +302,7 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     $website = new Website($db);
     $website->fetch($rowid);
@@ -337,9 +325,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 	        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 	        {
 	            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-	        }
-	        else
-	        {
+	        } else {
 	            dol_print_error($db);
 	        }
 	    }
@@ -348,9 +334,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 	    {
 	    	dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
 	    }
-    }
-    else
-    {
+    } else {
     	dol_print_error($db, 'Failed to load website with id '.$rowid);
     }
 }
@@ -358,8 +342,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid ='".$rowid."'";
@@ -375,8 +358,7 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
         $sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid ='".$rowid."'";
@@ -475,8 +457,7 @@ if ($id)
            		{
            			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
            			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-           		}
-            	else print $valuetoshow;
+           		} else print $valuetoshow;
                 print '</td>';
             }
             if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
@@ -586,9 +567,7 @@ if ($id)
 
                     print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
                     print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-                }
-                else
-                {
+                } else {
 	              	$tmpaction = 'view';
                     $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
                     $reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@@ -636,8 +615,7 @@ if ($id)
 
             print '</form>';
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -676,12 +654,9 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->$fieldname) ? $obj->$fieldname : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 7d16aa3963b..6f0cffa41c8 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -121,9 +121,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 99185cce733..7d2bf379282 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -134,8 +134,7 @@ foreach ($workflowcodes as $key => $params)
 		if ($family == 'create')
 		{
 			print $langs->trans("AutomaticCreation");
-		}
-		elseif (preg_match('/classify_(.*)/', $family, $reg))
+		} elseif (preg_match('/classify_(.*)/', $family, $reg))
 		{
 			print $langs->trans("AutomaticClassification");
 			if ($reg[1] == 'proposal') print ' - '.$langs->trans('Proposal');
@@ -143,9 +142,7 @@ foreach ($workflowcodes as $key => $params)
 			if ($reg[1] == 'supplier_proposal') print ' - '.$langs->trans('SupplierProposal');
 			if ($reg[1] == 'supplier_order') print ' - '.$langs->trans('SupplierOrder');
 			if ($reg[1] == 'reception') print ' - '.$langs->trans('Reception');
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Description");
 		}
 		print '</td>';
@@ -166,17 +163,13 @@ foreach ($workflowcodes as $key => $params)
    	if (!empty($conf->use_javascript_ajax))
    	{
    		print ajax_constantonoff($key);
-   	}
-   	else
-   	{
+   	} else {
    		if (!empty($conf->global->$key))
    		{
    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'">';
   			print img_picto($langs->trans("Activated"), 'switch_on');
    			print '</a>';
-   		}
-   		else
-   		{
+   		} else {
    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'">';
   			print img_picto($langs->trans("Disabled"), 'switch_off');
    			print '</a>';
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index d0a0e79c855..8cc22578f2a 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -54,9 +54,7 @@ if ($action == 'setproductionmode')
 				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			// Delete the cache file otherwise it does not update
 			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
 			if ($result < 0)
@@ -71,9 +69,7 @@ if ($action == 'setproductionmode')
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;
 	    }
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -119,9 +115,7 @@ if ($production_mode)
     print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
     print '</a></td>';
-}
-else
-{
+} else {
     print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i + 1).'&status=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
     print '</a></td>';
@@ -165,9 +159,7 @@ if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/e
 {
     $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
     print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-}
-else
-{
+} else {
     print $langs->trans("NotAvailableWithThisDistribution");
 }
 
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 5e051420748..83bd00555d6 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -250,8 +250,7 @@ class DolibarrApi
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
 			$featuresarray = explode("&", $resource);
-		}
-		elseif (preg_match('/\|/', $resource)) {
+		} elseif (preg_match('/\|/', $resource)) {
 			$featuresarray = explode("|", $resource);
 		}
 
@@ -317,9 +316,7 @@ class DolibarrApi
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
-	    {
+	    } else {
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }
 	    return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 339ddfd2ad6..a6d0d72b8de 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -128,8 +128,7 @@ class DolibarrApiAccess implements iAuthenticate
 						$conf->setValues($db);
 					}
 				}
-			}
-			else {
+			} else {
 				throw new RestException(503, 'Error when fetching user api_key :'.$db->error_msg);
 			}
 
@@ -157,9 +156,7 @@ class DolibarrApiAccess implements iAuthenticate
 			if ($fuser->admin) {
 				static::$role = 'admin';
             }
-        }
-		else
-		{
+        } else {
 		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 74aeec42dc1..078d631aa3d 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -122,9 +122,7 @@ class Login
     		{
     			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
     		}
-		}
-		else
-		{
+		} else {
             $token = $tmpuser->api_key;
 		}
 
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index fd6432b553f..5dade088fd0 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -878,9 +878,7 @@ class Setup extends DolibarrApi
         			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
         		}
         	}
-        }
-        else
-        {
+        } else {
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
 
@@ -1484,14 +1482,10 @@ class Setup extends DolibarrApi
     		if (dol_is_file($xmlfile))
     		{
     			$xml = simplexml_load_file($xmlfile);
-    		}
-    		else
-    		{
+    		} else {
     			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		$xmlarray = getURLContent($xmlremote);
 
     		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
@@ -1500,9 +1494,7 @@ class Setup extends DolibarrApi
     			$xmlfile = $xmlarray['content'];
     			//print "xmlfilestart".$xmlfile."endxmlfile";
     			$xml = simplexml_load_string($xmlfile);
-    		}
-    		else
-    		{
+    		} else {
     			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
     		}
@@ -1609,9 +1601,7 @@ class Setup extends DolibarrApi
     					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
     					$out .= "</tr>\n";
     				}
-    			}
-    			else
-    			{
+    			} else {
     				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1659,9 +1649,7 @@ class Setup extends DolibarrApi
     				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
     				$out .= '<td class="right"></td>'."\n";
     				$out .= "</tr>\n";
-    			}
-    			else
-    			{
+    			} else {
     				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1709,9 +1697,7 @@ class Setup extends DolibarrApi
     				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
     				$out .= '<td class="right"></td>'."\n";
     				$out .= "</tr>\n";
-    			}
-    			else
-    			{
+    			} else {
     				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
     			$out .= '</table>';
@@ -1722,14 +1708,10 @@ class Setup extends DolibarrApi
     			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
     			{
     				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			}
-    			else
-    			{
+    			} else {
     				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
     			}
-    		}
-    		else
-    		{
+    		} else {
     			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
     		}
 
@@ -1751,24 +1733,19 @@ class Setup extends DolibarrApi
     				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
     				$outcurrentchecksum = $checksumget;
-    			}
-    			else
-    			{
+    			} else {
     				$resultcode = 'ok';
     				$resultcomment = 'Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     				$outcurrentchecksum = $checksumget;
     			}
-    		}
-    		else
-    		{
+    		} else {
     			$resultcode = 'error';
     			$resultcomment = 'Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     			$outcurrentchecksum = $checksumget;
     		}
-    	}
-    	else {
+    	} else {
     		throw new RestException(404, 'No signature file known');
     	}
 
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index c5edbc74d66..0cc50b07302 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -202,14 +202,11 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname."Api for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname.'Api')] = $classname.'Api';
-                                    }
-                                    elseif (class_exists($classname))
+                                    } elseif (class_exists($classname))
                                     {
                                         //dol_syslog("Found API by index.php: classname=".$classname." for module ".$dir." into ".$dir_part.$file_searched);
                                         $listofapis[strtolower($classname)] = $classname;
-                                    }
-                                    else
-                                    {
+                                    } else {
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
                                 }
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 752d569c7d1..c1afe7ba472 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -87,9 +87,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 110d662c9e8..540de545baf 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -314,18 +314,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($user->rights->asset->write)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
 			if ($user->rights->asset->delete)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 7c9d91d79e7..30f2a64bb0a 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -351,8 +351,7 @@ class Asset extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -395,28 +394,23 @@ class Asset extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -469,9 +463,7 @@ class Asset extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index bfb0c7d073a..db2407a9376 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -154,16 +154,12 @@ class AssetType extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -223,16 +219,12 @@ class AssetType extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -263,9 +255,7 @@ class AssetType extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -303,9 +293,7 @@ class AssetType extends CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -344,9 +332,7 @@ class AssetType extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 		return $assettypes;
@@ -390,8 +376,7 @@ class AssetType extends CommonObject
 							$assetstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $assetstatic;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
@@ -400,9 +385,7 @@ class AssetType extends CommonObject
 			$this->asset = $ret;
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 4724173cd19..d2890ea5b19 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -144,9 +144,7 @@ if ($object->id)
 	$relativepathwithnofile = 'asset/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 39fd0e0761d..0f6624f1254 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -253,9 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -388,8 +386,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 8df5ffe8c40..a2c6bab3f90 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -107,8 +107,7 @@ if ($action == 'add' && $user->rights->asset->write)
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -128,15 +127,11 @@ if ($action == 'add' && $user->rights->asset->write)
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'create';
 	}
 }
@@ -162,9 +157,7 @@ if ($action == 'update' && $user->rights->asset->write)
 	if ($ret >= 0 && !count($object->errors))
 	{
 		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -182,9 +175,7 @@ if ($action == 'confirm_delete' && $user->rights->asset->write)
 		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -308,8 +299,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 			if ($user->rights->asset->write)
 				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
-				print '<td class="right">&nbsp;</td>';
+			else print '<td class="right">&nbsp;</td>';
 			print "</tr>";
 			$i++;
 		}
@@ -317,9 +307,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -367,8 +355,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_code_asset
 		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
@@ -578,8 +565,7 @@ if ($rowid > 0)
 			print '<td>';
 			print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			// Accountancy_code_asset
 			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index fd27abb6ceb..87aaeb6d46f 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -67,9 +67,7 @@ if ($resql)
 		$found = $notfound;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 5facd5d1bbf..ecc7c4fee6c 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -137,9 +137,7 @@ if ($resql)
 		$found = $notfound;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
@@ -164,9 +162,7 @@ if (!empty($number))
             print $txt;
             dol_syslog($txt, LOG_ERR);
             print '</body>'."\n";
-        }
-        else
-        {
+        } else {
             $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
             dol_syslog($txt);
             print '<body onload="javascript:history.go(-1);">'."\n";
@@ -188,8 +184,7 @@ if (!empty($number))
             print '</body>'."\n";
         }
     }
-}
-else {
+} else {
     print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
 }
 
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index d2afa5e6871..a70e6f8a04b 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -71,8 +71,7 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 
 					try {
 						dol_include_once($dirroot.$file.'.php');
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -109,15 +108,11 @@ if ($action == 'initbarcodeproducts')
 			if ($resql)
 			{
 				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($db);
 			}
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT rowid, ref, fk_product_type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product";
 			$sql .= " WHERE barcode IS NULL or barcode = ''";
@@ -150,9 +145,7 @@ if ($action == 'initbarcodeproducts')
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($db);
 			}
@@ -167,9 +160,7 @@ if ($action == 'initbarcodeproducts')
 		{
 			//$db->rollback();
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -220,8 +211,7 @@ if ($conf->societe->enabled)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbno = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe";
 	$resql = $db->query($sql);
@@ -229,8 +219,7 @@ if ($conf->societe->enabled)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
 
@@ -274,8 +263,7 @@ if ($conf->product->enabled || $conf->product->service)
 
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product";
 	$resql = $db->query($sql);
@@ -283,8 +271,7 @@ if ($conf->product->enabled || $conf->product->service)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
 
@@ -294,9 +281,7 @@ if ($conf->product->enabled || $conf->product->service)
 		$objproduct = new Product($db);
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
 		$disabled = 0;
-	}
-	else
-	{
+	} else {
 		$disabled = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
 		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 5cd988a5bed..8c883e55e75 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -161,9 +161,7 @@ if ($action == 'builddoc')
 					setEventMessages('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), null, 'errors');
 					setEventMessages($module->error, null, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, null, 'errors');
 			}
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 1ef35942d1e..1b6ff1fa021 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -51,9 +51,7 @@ if (preg_match('/set_(.*)/', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -65,9 +63,7 @@ if (preg_match('/del_(.*)/', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 66cc3b44848..ab36caedba4 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -133,15 +133,11 @@ if ($action === 'downloadblockchain') {
 			{
 				$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
 				$firstid = $obj->rowid;
-			}
-			else
-			{	// If not data found for filter, we do not need previoushash neither firstid
+			} else {	// If not data found for filter, we do not need previoushash neither firstid
 				$previoushash = 'nodata';
 				$firstid = '';
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($db->lasterror, null, 'errors');
 		}
@@ -211,9 +207,7 @@ if ($action === 'downloadblockchain') {
 					$statusofrecord = 'Valid';
 					if ($loweridinerror > 0) $statusofrecordnote = 'ValidButFoundAPreviousKO';
 					else $statusofrecordnote = '';
-				}
-				else
-				{
+				} else {
 					$statusofrecord = 'KO';
 					$statusofrecordnote = 'LineCorruptedOrNotMatchingPreviousOne';
 					$loweridinerror = $obj->rowid;
@@ -245,9 +239,7 @@ if ($action === 'downloadblockchain') {
 			}
 
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -263,9 +255,7 @@ $form = new Form($db);
 if (GETPOST('withtab', 'alpha'))
 {
 	$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
-}
-else
-{
+} else {
 	$title = $langs->trans("BrowseBlockedLog");
 }
 
@@ -279,9 +269,7 @@ if (!is_array($blocks))
 	if ($blocks == -2)
 	{
 		setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
-	}
-	else
-	{
+	} else {
 		dol_print_error($block_static->db, $block_static->error, $block_static->errors);
 		exit;
 	}
@@ -440,9 +428,7 @@ if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
 
 	// TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests
 	// to find the $loweridinerror.
-}
-else
-{
+} else {
 	// This is version that optimize the memory (but will not report errors that are outside the filter range)
 	$loweridinerror = 0;
 	$checkresult = array();
@@ -510,9 +496,7 @@ if (is_array($blocks))
 		   	{
 		   		if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut4');
 		   		else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
-		   	}
-		   	else
-		   	{
+		   	} else {
 		   		print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4');
 		   	}
 
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 936ad5edb9c..64992bb33d6 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -52,18 +52,15 @@ if ($auth->fetch(0, $signature) <= 0) {
 
 if (!empty($hash)) {
 	echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
-}
-elseif (!empty($newblock)) {
+} elseif (!empty($newblock)) {
 	if ($auth->checkBlock($newblock)) {
 		$auth->addBlock($newblock);
 		$auth->update($user);
 
 		echo 'blockadded';
-	}
-	else {
+	} else {
 		echo 'blockalreadyadded';
 	}
-}
-else {
+} else {
 	echo 'idontunderstandwhatihavetodo';
 }
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index eaf1b17ed08..e83a71ea9b7 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -51,8 +51,7 @@ if ($block->fetch($id) > 0)
 {
 	$objtoshow = $block->object_data;
 	print formatObject($objtoshow, '');
-}
-else {
+} else {
 	print 'Error, failed to get unalterable log with id '.$id;
 }
 
@@ -94,18 +93,14 @@ function formatObject($objtoshow, $prefix)
 					var_dump(@get_class($val));
 					var_dump($val);*/
 					$s .= dol_print_date($val, 'dayhour');
-				}
-				else
-				{
+				} else {
 					$s .= $val;
 				}
 				$s .= '</td></tr>';
-			}
-			elseif (is_array($val))
+			} elseif (is_array($val))
 			{
 				$s .= formatObject($val, ($prefix ? $prefix.' > ' : '').$key);
-			}
-			elseif (is_object($val))
+			} elseif (is_object($val))
 			{
 				$s .= formatObject($val, ($prefix ? $prefix.' > ' : '').$key);
 			}
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 234aeceb2a6..69967d503a1 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -128,8 +128,7 @@ class BlockedLogAuthority
 
 		if (!in_array($block, $blocks)) {
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
     }
@@ -179,15 +178,11 @@ class BlockedLogAuthority
 				$this->tms = $this->db->jdate($obj->tms);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -232,15 +227,11 @@ class BlockedLogAuthority
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -276,9 +267,7 @@ class BlockedLogAuthority
 			$this->db->commit();
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -316,8 +305,7 @@ class BlockedLogAuthority
 			echo $block->signature.' '.$url.' '.$res.'<br>';
 			if ($res === 'blockalreadyadded' || $res === 'blockadded') {
 				$block->setCertified();
-			}
-			else {
+			} else {
 				$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
 				return -1;
 			}
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index be017f22600..44311f1a580 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -201,8 +201,7 @@ class BlockedLog
 			$object = new Facture($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
 		}
@@ -212,99 +211,80 @@ class BlockedLog
 			$object = new FactureFournisseur($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment') {
+		} elseif ($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 			$object = new Paiement($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_supplier') {
+		} elseif ($this->element === 'payment_supplier') {
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
 			$object = new PaiementFourn($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_donation') {
+		} elseif ($this->element === 'payment_donation') {
 			require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 
 			$object = new PaymentDonation($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_various') {
+		} elseif ($this->element === 'payment_various') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 
 			$object = new PaymentVarious($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'don' || $this->element === 'donation') {
+		} elseif ($this->element === 'don' || $this->element === 'donation') {
 			require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 			$object = new Don($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'subscription') {
+		} elseif ($this->element === 'subscription') {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
 			$object = new Subscription($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'cashcontrol') {
+		} elseif ($this->element === 'cashcontrol') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 
 			$object = new CashControl($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->action == 'MODULE_SET')
+		} elseif ($this->action == 'MODULE_SET')
 		{
 			return '<i class="opacitymedium">System to track events into unalterable logs were enabled</i>';
-		}
-		elseif ($this->action == 'MODULE_RESET')
+		} elseif ($this->action == 'MODULE_RESET')
 		{
 			if ($this->signature == '0000000000') {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled after some recording were done. We saved a special Fingerprint to track the chain as broken.</i>';
-			}
-			else
-			{
+			} else {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled. This is possible because no record were done yet.</i>';
 			}
 		}
@@ -361,24 +341,19 @@ class BlockedLog
 		if ($object->element == 'payment' || $object->element == 'payment_supplier')
 		{
 			$this->date_object = $object->datepaye;
-		}
-		elseif ($object->element == 'payment_salary')
+		} elseif ($object->element == 'payment_salary')
 		{
 			$this->date_object = $object->datev;
-		}
-		elseif ($object->element == 'payment_donation' || $object->element == 'payment_various')
+		} elseif ($object->element == 'payment_donation' || $object->element == 'payment_various')
 		{
 			$this->date_object = $object->datepaid ? $object->datepaid : $object->datep;
-		}
-		elseif ($object->element == 'subscription')
+		} elseif ($object->element == 'subscription')
 		{
 			$this->date_object = $object->dateh;
-		}
-		elseif ($object->element == 'cashcontrol')
+		} elseif ($object->element == 'cashcontrol')
 		{
 			$this->date_object = $object->date_creation;
-		}
-		else {
+		} else {
 			$this->date_object = $object->date;
 		}
 		// ref
@@ -477,13 +452,11 @@ class BlockedLog
 							$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
 						}
 					}
-				}
-				elseif (!is_object($value)) $this->object_data->{$key} = $value;
+				} elseif (!is_object($value)) $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'invoice_supplier')
+		} elseif ($this->element == 'invoice_supplier')
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -495,8 +468,7 @@ class BlockedLog
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation' || $this->element == 'payment_various')
+		} elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation' || $this->element == 'payment_various')
 		{
 			$datepayment = $object->datepaye ? $object->datepaye : ($object->datepaid ? $object->datepaid : $object->datep);
 			$paymenttypeid = $object->paiementid ? $object->paiementid : ($object->paymenttype ? $object->paymenttype : $object->type_payment);
@@ -528,18 +500,15 @@ class BlockedLog
 				{
 					include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 					$tmpobject = new FactureFournisseur($this->db);
-				}
-				elseif ($this->element == 'payment')
+				} elseif ($this->element == 'payment')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$tmpobject = new Facture($this->db);
-				}
-				elseif ($this->element == 'payment_donation')
+				} elseif ($this->element == 'payment_donation')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 					$tmpobject = new Don($this->db);
-				}
-				elseif ($this->element == 'payment_various')
+				} elseif ($this->element == 'payment_various')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 					$tmpobject = new PaymentVarious($this->db);
@@ -572,8 +541,7 @@ class BlockedLog
 						$this->errors[] = $this->error;
 						dol_syslog("Failed to fetch thirdparty for object with id ".$tmpobject->id, LOG_ERR);
 						return -1;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->error = $tmpobject->error;
 						$this->errors = $tmpobject->errors;
@@ -620,14 +588,12 @@ class BlockedLog
 			$this->object_data->amount = $totalamount;
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'payment_salary')
+		} elseif ($this->element == 'payment_salary')
 		{
 			$this->object_data->amounts = array($object->amount);
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'subscription')
+		} elseif ($this->element == 'subscription')
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -639,8 +605,7 @@ class BlockedLog
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		else 	// Generic case
+		} else // Generic case
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -713,15 +678,11 @@ class BlockedLog
 				$this->certified		= ($obj->certified == 1);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -864,15 +825,11 @@ class BlockedLog
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -953,9 +910,7 @@ class BlockedLog
 	 		{
 	 			$previoussignature = $obj->signature;
 	 		}
-	 	}
-	 	else
-	 	{
+	 	} else {
 	 		dol_print_error($this->db);
 	 		exit;
 	 	}
@@ -995,16 +950,13 @@ class BlockedLog
 		if ($element == 'all') {
 	 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
-		}
-		elseif ($element == 'not_certified') {
+		} elseif ($element == 'not_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
-		}
-		elseif ($element == 'just_certified') {
+		} elseif ($element == 'just_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
-		}
-		else {
+		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND element='".$element."' AND fk_object=".(int) $fk_object;
 		}
@@ -1097,8 +1049,7 @@ class BlockedLog
 		{
 			$obj = $this->db->fetch_object($res);
 			if ($obj) $result = true;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".$result);
 
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index a5b66b9886f..a764a2cd5ae 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -45,9 +45,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -216,9 +214,7 @@ if ($object->id > 0)
     	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	}
-    	else
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c98dee97f51..202373dd302 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -176,9 +176,7 @@ if (empty($reshook))
     		{
     			setEventMessages($bomline->error, $bomline->errors, 'errors');
     			$action = '';
-    		}
-    		else
-    		{
+    		} else {
     			unset($_POST['idprod']);
     			unset($_POST['qty']);
     			unset($_POST['qty_frozen']);
@@ -216,9 +214,7 @@ if (empty($reshook))
 		{
 			setEventMessages($bomline->error, $bomline->errors, 'errors');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			unset($_POST['idprod']);
 			unset($_POST['qty']);
 			unset($_POST['qty_frozen']);
@@ -620,9 +616,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		if ($permissiontoadd)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		}
-	    		else
-	    		{
+	    		} else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 	    		}
     		}
@@ -635,9 +629,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    			if (is_array($object->lines) && count($object->lines) > 0)
 	    			{
 	    				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				$langs->load("errors");
 	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    			}
@@ -688,9 +680,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		if ($permissiontodelete)
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index a7dca41fff6..45aedbe8ee2 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -141,9 +141,7 @@ if ($object->id)
 	$relativepathwithnofile = 'bom/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e2bafbecb48..3ff2b2138b4 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -196,11 +196,8 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					}
-					else $nbok++;
-				}
-				else
-				{
+					} else $nbok++;
+				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -212,9 +209,7 @@ if (empty($reshook))
 				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -251,11 +246,8 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					}
-					else $nbok++;
-				}
-				else
-				{
+					} else $nbok++;
+				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -267,9 +259,7 @@ if (empty($reshook))
 				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -364,9 +354,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -500,8 +488,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index d21d82b5ca9..f61df86fe69 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -164,8 +164,7 @@ class Boms extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve bom list');
         }
         if (!count($obj_ret)) {
@@ -228,9 +227,7 @@ class Boms extends DolibarrApi
         if ($this->bom->update($id, DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->bom->error);
         }
     }
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 790487b4032..9ec55ae2f4a 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -381,14 +381,11 @@ class BOM extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -513,16 +510,12 @@ class BOM extends CommonObject
 	        if ($numref != "")
 	        {
 	            return $numref;
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = $obj->error;
 	            //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 	            return "";
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
 	        return "";
 	    }
@@ -567,9 +560,7 @@ class BOM extends CommonObject
 	    {
 	        $this->fetch_product();
 	        $num = $this->getNextNumRef($this->product);
-	    }
-	    else
-	    {
+	    } else {
 	        $num = $this->ref;
 	    }
 	    $this->newref = dol_sanitizeFileName($num);
@@ -650,9 +641,7 @@ class BOM extends CommonObject
 	    {
 	        $this->db->commit();
 	        return 1;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->db->rollback();
 	        return -1;
 	    }
@@ -788,8 +777,7 @@ class BOM extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -895,9 +883,7 @@ class BOM extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -919,9 +905,7 @@ class BOM extends CommonObject
 	        $this->error = $this->error;
 	        $this->errors = $this->errors;
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1222,14 +1206,11 @@ class BOMLine extends CommonObjectLine
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -1343,8 +1324,7 @@ class BOMLine extends CommonObjectLine
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1437,9 +1417,7 @@ class BOMLine extends CommonObjectLine
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index eeffb625381..e8fbbac28d2 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -99,9 +99,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 	{
 		// hide products in closed warehouse, but show products for internal transfer
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-	}
-	else
-	{
+	} else {
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 	}
 
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index bc0c0c37fc2..2d8501130dc 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -44,9 +44,7 @@ if ($action == 'setvalue')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 93283cab815..0f8c3763228 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,9 +41,7 @@ function printDropdownBookmarksList()
     if (!empty($_SERVER["QUERY_STRING"]))
     {
         $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
-    }
-    else
-    {
+    } else {
         global $sortfield, $sortorder;
         $tmpurl = '';
         // No urlencode, all param $url will be urlencoded later
@@ -122,9 +120,7 @@ function printDropdownBookmarksList()
     		}
     		$searchForm .= '</select>';
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 385dd506031..69c7207a817 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -100,23 +100,17 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 			if (empty($backtopage)) $backtopage = ($urlsource ? $urlsource : ((!empty($url) && !preg_match('/^http/i', $url)) ? $url : DOL_URL_ROOT.'/bookmarks/list.php'));
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else
-		{
+		} else {
 			if ($object->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
 				setEventMessages($langs->transnoentities("WarningBookmarkAlreadyExists"), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 			$action = $invertedaction;
 		}
-	}
-	else
-	{
+	} else {
 		$action = $invertedaction;
 	}
 }
@@ -265,9 +259,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	{
 		$liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow"));
 		print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target);
-	}
-	else
-	{
+	} else {
 		if ($object->target == 0) print $langs->trans("ReplaceWindow");
 		if ($object->target == 1) print $langs->trans("OpenANewWindow");
 	}
@@ -277,17 +269,13 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	if ($action == 'edit' && $user->admin)
 	{
 		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	}
-	else
-	{
+	} else {
 		if ($object->fk_user > 0)
 		{
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user);
 			print $fuser->getNomUrl(1);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Public");
 		}
 	}
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 2667208fc44..5fab4496f6e 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -127,9 +127,7 @@ class Bookmark extends CommonObject
 
             $this->db->free($resql);
             return $this->id;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -174,17 +172,13 @@ class Bookmark extends CommonObject
                 $this->id = $id;
                 $this->db->commit();
                 return $id;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->errno = $this->db->lasterrno();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $this->db->rollback();
@@ -218,9 +212,7 @@ class Bookmark extends CommonObject
         if ($this->db->query($sql))
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -242,9 +234,7 @@ class Bookmark extends CommonObject
         if ($resql)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -320,8 +310,7 @@ class Bookmark extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 5dd1718b263..a132b708c20 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -72,9 +72,7 @@ if ($action == 'delete')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -115,9 +113,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -230,9 +226,7 @@ while ($i < min($num, $limit))
 		}
 		$tmpuser = $cacheOfUsers[$obj->fk_user];
 		print $tmpuser->getNomUrl(1);
-	}
-	else
-	{
+	} else {
 		print $langs->trans("Public");
 	}
 	print "</td>\n";
@@ -252,9 +246,7 @@ while ($i < min($num, $limit))
 	if ($user->rights->bookmark->supprimer)
 	{
 		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$obj->rowid.'">'.img_delete().'</a>';
-	}
-	else
-	{
+	} else {
 		print "&nbsp;";
 	}
 	print "</td>";
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 7c72858387a..dfd6e99a9ea 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -68,9 +68,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -149,9 +147,7 @@ if (!empty($conf->stock->enabled))
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
-	}
-	else
-	{
+	} else {
 	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -169,9 +165,7 @@ if (!empty($conf->stock->enabled))
 	{
 		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 41ba5ffcb39..799c95b6b5b 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -36,9 +36,7 @@ if (isset($_SESSION['serObjFacturation']))
 {
     $obj_facturation = unserialize($_SESSION['serObjFacturation']);
     unset($_SESSION['serObjFacturation']);
-}
-else
-{
+} else {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
 }
@@ -72,9 +70,7 @@ if (in_array(
 	))
 {
 	include $page.'.php';
-}
-else
-{
+} else {
 	dol_print_error('', 'menu param '.$page.' is not inside allowed list');
 }
 
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 164d229cf8d..cc71d1c20d8 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -129,9 +129,7 @@ class Auth
                 $this->login($aLogin);
                 $this->passwd($aPasswd);
                 $ret = 0;
-            }
-            else
-            {
+            } else {
                 $ret = -1;
             }
         }
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 10573f9d917..2fc93b0d155 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -294,13 +294,10 @@ class Facturation
         if (!$aId)
         {
             return $this->id;
-        }
-        elseif ($aId == 'RESET')
+        } elseif ($aId == 'RESET')
         {
             $this->id = null;
-        }
-        else
-        {
+        } else {
             $this->id = $aId;
         }
     }
@@ -317,13 +314,10 @@ class Facturation
         if (is_null($aRef))
         {
             return $this->ref;
-        }
-        elseif ($aRef == 'RESET')
+        } elseif ($aRef == 'RESET')
         {
             $this->ref = null;
-        }
-        else
-        {
+        } else {
             $this->ref = $aRef;
         }
     }
@@ -339,13 +333,10 @@ class Facturation
         if (is_null($aQte))
         {
             return $this->qte;
-        }
-        elseif ($aQte == 'RESET')
+        } elseif ($aQte == 'RESET')
         {
             $this->qte = null;
-        }
-        else
-        {
+        } else {
             $this->qte = $aQte;
         }
     }
@@ -362,13 +353,10 @@ class Facturation
         if (is_null($aStock))
         {
             return $this->stock;
-        }
-        elseif ($aStock == 'RESET')
+        } elseif ($aStock == 'RESET')
         {
             $this->stock = null;
-        }
-        else
-        {
+        } else {
             $this->stock = $aStock;
         }
     }
@@ -385,13 +373,10 @@ class Facturation
         if (is_null($aRemisePercent))
         {
             return $this->remise_percent;
-        }
-        elseif ($aRemisePercent == 'RESET')
+        } elseif ($aRemisePercent == 'RESET')
         {
             $this->remise_percent = null;
-        }
-        else
-        {
+        } else {
             $this->remise_percent = $aRemisePercent;
         }
     }
@@ -582,13 +567,10 @@ class Facturation
         if (is_null($aTotalTtc))
         {
             return $this->prix_total_ttc;
-        }
-        elseif ($aTotalTtc == 'RESET')
+        } elseif ($aTotalTtc == 'RESET')
         {
             $this->prix_total_ttc = null;
-        }
-        else
-        {
+        } else {
             $this->prix_total_ttc = $aTotalTtc;
         }
     }
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index 3c4a4dd6c7a..48032c3e840 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -80,9 +80,7 @@ if (GETPOST('filtre', 'alpha')) {
 			$i++;
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -115,9 +113,7 @@ if (GETPOST('filtre', 'alpha')) {
 			$i++;
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -130,18 +126,13 @@ if ($nbr_enreg > 1)
 	if ($nbr_enreg > $conf_taille_listes)
 	{
 		$top_liste_produits = '----- '.$conf_taille_listes.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
-	}
-	else
-	{
+	} else {
 		$top_liste_produits = '----- '.$nbr_enreg.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
 	}
-}
-elseif ($nbr_enreg == 1)
+} elseif ($nbr_enreg == 1)
 {
 	$top_liste_produits = '----- 1 '.$langs->transnoentitiesnoconv("ProductFound").' -----';
-}
-else
-{
+} else {
 	$top_liste_produits = '----- '.$langs->transnoentitiesnoconv("NoProductFound").' -----';
 }
 
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 98ed2bf0173..99e1ed2f942 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -55,9 +55,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 		$sql .= " AND (p.ref LIKE '".$db->escape($search)."%' OR p.label LIKE '".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
 		$sql .= ")";
-	}
-	else
-	{
+	} else {
 		$sql .= " AND (p.ref LIKE '%".$db->escape($search)."%' OR p.label LIKE '%".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
 		$sql .= ")";
@@ -98,9 +96,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 			$resultat .= '</ul>';
 
 			print $resultat;
-		}
-		else
-		{
+		} else {
 			$langs->load("cashdesk");
 
 			print '<ul class="dhtml_bloc">';
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 6a7a9bae366..c62e31b1e3f 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -50,8 +50,7 @@ switch ($action)
 			if ($_POST['hdnSource'] == 'LISTE')
 			{
 				$sql .= " AND p.rowid = ".((int) GETPOST('selProduit', 'int'));
-			}
-			elseif ($_POST['hdnSource'] == 'REF')
+			} elseif ($_POST['hdnSource'] == 'REF')
 			{
 				$sql .= " AND p.ref = '".$db->escape(GETPOST('txtRef', 'alpha'))."'";
 			}
@@ -101,8 +100,7 @@ switch ($action)
 					        if (isset($prod->multiprices_tva_tx[$societe->price_level])) $tva_tx = $prod->multiprices_tva_tx[$societe->price_level];
 					        if (isset($prod->multiprices_recuperableonly[$societe->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$societe->price_level];
 					    }
-					}
-					elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+					} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					{
 					    require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -123,9 +121,7 @@ switch ($action)
 					            $tva_npr = $prodcustprice->lines[0]->recuperableonly;
 					            if (empty($tva_tx)) $tva_npr = 0;
 					        }
-					    }
-					    else
-					    {
+					    } else {
 					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					    }
 					}
@@ -162,35 +158,26 @@ switch ($action)
 					if ($_POST['hdnSource'] == 'LISTE')
 					{
 						$filtre = $ret['ref'];
-					}
-					elseif ($_POST['hdnSource'] == 'REF')
+					} elseif ($_POST['hdnSource'] == 'REF')
 					{
 						$filtre = $_POST['txtRef'];
 					}
 
 					$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$filtre;
-				}
-				else
-				{
+				} else {
 					$obj_facturation->raz();
 
 					if ($_POST['hdnSource'] == 'REF')
 					{
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$_POST['txtRef'];
-					}
-					else
-					{
+					} else {
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
-		}
-		else
-		{
+		} else {
 			$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 		}
 
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 6c74b268ec9..9d8bfc9b735 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -75,9 +75,7 @@ if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 if (!empty($mysoc->logo_small))
 {
 	print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
-}
-else
-{
+} else {
 	print '<div class="logopos">'.$mysoc->name.'</div>';
 }
 ?>
@@ -113,8 +111,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -203,9 +200,7 @@ if ($_GET['err'] < 0)
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').pwdPassword.focus();');
 	echo ('</script>');
-}
-else
-{
+} else {
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').txtUsername.focus();');
 	echo ('</script>');
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 251b3f2e997..204af8f51f7 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -116,14 +116,10 @@ if ($retour >= 0)
 
 		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	// Load translation files required by the page
     $langs->loadLangs(array("other", "errors"));
 	$retour = $langs->trans("ErrorBadLoginPassword");
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index f1e19b4df20..0d81f6e947e 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -169,24 +169,21 @@ for ($i = 0; $i < $nbtoshow; $i++)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
 			print '</div>';
 			print '<div class="inline-block" style="margin: 6px;">';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
 			print '</div>';
 			print '<div class="inline-block" style="margin: 6px;">';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete"), $langs->transnoentitiesnoconv("CashDesk")).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
 			print '</div>';
 			print '<div class="clearboth">';
 			print '<div class="inline-block" style="margin: 6px;">';
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index 6fffbd3ed52..bd73954f6a0 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -49,8 +49,7 @@ $tab = (!empty($_SESSION['poscart']) ? $_SESSION['poscart'] : array());
 
 $tab_size = count($tab);
 if ($tab_size <= 0) print '<div class="center">'.$langs->trans("NoArticle").'</div><br>';
-else
-{
+else {
     for ($i = 0; $i < $tab_size; $i++)
     {
         echo ('<div class="cadre_article">'."\n");
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 3b38aba3159..6fe42b35aa4 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -40,9 +40,7 @@ $langs->loadLangs(array("main", "bills", "banks"));
 // Affichage de la tva par taux
 if ($obj_facturation->montantTva()) {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
-}
-else
-{
+} else {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.$langs->trans("NoVAT").'</td></tr>');
 }
 ?>
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index bc67350bbf1..b2711479596 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -96,9 +96,7 @@ switch ($action)
 			$encaisse = $obj_facturation->montantEncaisse();
 
 			$obj_facturation->montantRendu($encaisse - $total);
-		}
-		else
-		{
+		} else {
 		    //$txtDatePaiement=$_POST['txtDatePaiement'];
 		    $datePaiement = dol_mktime(0, 0, 0, $_POST['txtDatePaiementmonth'], $_POST['txtDatePaiementday'], $_POST['txtDatePaiementyear']);
 		    $txtDatePaiement = dol_print_date($datePaiement, 'dayrfc');
@@ -252,17 +250,13 @@ switch ($action)
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
 
 			$id = $invoice->id;
-		}
-		else
-		{
+		} else {
 		    $resultcreate = $invoice->create($user, 0, 0);
 			if ($resultcreate > 0)
 			{
@@ -330,15 +324,11 @@ switch ($action)
                   			//print 'set paid';exit;
                     	}
                     }
-				}
-				else
-				{
+				} else {
 				    setEventMessages($invoice->error, $invoice->errors, 'errors');
 				    $error++;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
@@ -349,9 +339,7 @@ switch ($action)
 		{
 			$db->commit();
 			$redirection = 'affIndex.php?menutpl=validation_ok&facid='.$id; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice'; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 6dd313692db..eb8af1ee44a 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -47,9 +47,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -61,9 +59,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
          setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -107,15 +103,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
-}
-else
-{
+} else {
 	if (empty($conf->global->CATEGORIE_RECURSIV_ADD))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 67adacb5aae..8eb6c3d8eda 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -88,39 +88,31 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		}
-		elseif ($idProdOrigin)
+		} elseif ($idProdOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idCompanyOrigin)
+		} elseif ($idCompanyOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idSupplierOrigin)
+		} elseif ($idSupplierOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idMemberOrigin)
+		} elseif ($idMemberOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idContactOrigin)
+		} elseif ($idContactOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
 			exit;
-		}
-		elseif ($idProjectOrigin)
+		} elseif ($idProjectOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
 			exit;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 			exit;
 		}
@@ -155,9 +147,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			$action = 'confirmed';
 			$_POST["addcat"] = '';
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -173,38 +163,31 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		}
-		elseif ($backtopage)
+		} elseif ($backtopage)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		elseif ($idProdOrigin)
+		} elseif ($idProdOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idCompanyOrigin)
+		} elseif ($idCompanyOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idSupplierOrigin)
+		} elseif ($idSupplierOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idMemberOrigin)
+		} elseif ($idMemberOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idContactOrigin)
+		} elseif ($idContactOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idProjectOrigin)
+		} elseif ($idProjectOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d6eff682908..1cbaf4cbe14 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -179,8 +179,7 @@ class Categories extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -243,9 +242,7 @@ class Categories extends DolibarrApi
         if ($this->category->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->category->error);
         }
     }
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index cf0fa1cd697..762e0f10f78 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -315,13 +315,10 @@ class Categorie extends CommonObject
 		if ($id > 0)
 		{
 			$sql .= " WHERE rowid = ".$id;
-		}
-		elseif (!empty($ref_ext))
+		} elseif (!empty($ref_ext))
 		{
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
 			if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);
 		}
@@ -360,14 +357,10 @@ class Categorie extends CommonObject
 				if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -481,21 +474,15 @@ class Categorie extends CommonObject
                 {
     				$this->db->commit();
     				return $id;
-                }
-                else
-              	{
+                } else {
                 	$this->db->rollback();
                     return -3;
                 }
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -572,9 +559,7 @@ class Categorie extends CommonObject
 			$this->db->commit();
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_print_error($this->db);
 			return -1;
@@ -659,9 +644,7 @@ class Categorie extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -720,9 +703,7 @@ class Categorie extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -746,23 +727,17 @@ class Categorie extends CommonObject
 			{
 			    $this->db->commit();
 			    return 1;
-			}
-			else
-			{
+			} else {
 			    $this->db->rollback();
 			    return -2;
 			}
-		}
-		else
-		{
+		} else {
 		    $this->db->rollback();
 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $this->db->lasterrno();
 				return -3;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 			}
 			return -1;
@@ -813,15 +788,11 @@ class Categorie extends CommonObject
 			{
 			    $this->db->commit();
 			    return 1;
-			}
-			else
-			{
+			} else {
 			    $this->db->rollback();
                 return -2;
 			}
-		}
-		else
-		{
+		} else {
 		    $this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -872,18 +843,14 @@ class Categorie extends CommonObject
 			    if ($onlyids)
 			    {
 			    	$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
-			    }
-			    else
-			    {
+			    } else {
 				    $obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
 				    $obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
 				    $objs[] = $obj;
 			    }
 			}
 			return $objs;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1008,8 +975,7 @@ class Categorie extends CommonObject
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1044,9 +1010,7 @@ class Categorie extends CommonObject
 				$cats[] = $cat;
 			}
 			return $cats;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1078,9 +1042,7 @@ class Categorie extends CommonObject
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1120,19 +1082,15 @@ class Categorie extends CommonObject
         if (is_string($markafterid))
         {
             $markafterid = explode(',', $markafterid);
-        }
-        elseif (is_numeric($markafterid))
+        } elseif (is_numeric($markafterid))
         {
             if ($markafterid > 0)
             {
                 $markafterid = array($markafterid);
-            }
-            else
-            {
+            } else {
                 $markafterid = array();
             }
-        }
-        elseif (!is_array($markafterid))
+        } elseif (!is_array($markafterid))
         {
             $markafterid = array();
         }
@@ -1168,9 +1126,7 @@ class Categorie extends CommonObject
 				$this->cats[$obj->rowid]['ref_ext'] = $obj->ref_ext;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1314,9 +1270,7 @@ class Categorie extends CommonObject
 				$cats[$rec['rowid']] = $cat;
 			}
 			return $cats;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1378,9 +1332,7 @@ class Categorie extends CommonObject
 			}
 			dol_syslog(get_class($this)."::already_exists no category with same name=".$this->label." and same parent ".$this->fk_parent." than category id=".$this->id, LOG_DEBUG);
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1432,9 +1384,7 @@ class Categorie extends CommonObject
 			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
 			        $linkend = '</a>';
 			        $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
-				}
-				else
-				{
+				} else {
 					$w[] = "<a href='".DOL_URL_ROOT."/".$url."?catid=".$cat->id."'>".($addpicto ? img_object('', 'category') : '').$cat->label."</a>";
 				}
 			}
@@ -1475,9 +1425,7 @@ class Categorie extends CommonObject
 				}
 			}
 			return $parents;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1556,15 +1504,11 @@ class Categorie extends CommonObject
     				    $cats[] = $cat;
     				}
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($this->db);
 		        return -1;
 		    }
-		}
-        else
-        {
+		} else {
     		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
     		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
     		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
@@ -1585,9 +1529,7 @@ class Categorie extends CommonObject
     					$cats[] = $cat;
     				}
     			}
-    		}
-    		else
-    		{
+    		} else {
     			dol_print_error($this->db);
     			return -1;
     		}
@@ -1635,8 +1577,7 @@ class Categorie extends CommonObject
 				$nom = '%'.str_replace('*', '%', $nom).'%';
 			if (!$case)
 				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
-			else
-				$sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
 		}
 		if ($id)
 		{
@@ -1654,9 +1595,7 @@ class Categorie extends CommonObject
 			}
 
 			return $cats;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1881,9 +1820,7 @@ class Categorie extends CommonObject
 	                $sql2 .= " SET label='".$this->db->escape($this->label)."',";
 	                $sql2 .= " description='".$this->db->escape($this->description)."'";
 	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            }
-	            else
-	            {
+	            } else {
 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
 	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
 	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1894,8 +1831,7 @@ class Categorie extends CommonObject
 	                $this->error = $this->db->lasterror();
 	                return -1;
 	            }
-	        }
-	        elseif (isset($this->multilangs["$key"]))
+	        } elseif (isset($this->multilangs["$key"]))
 	        {
 	            if ($this->db->num_rows($result)) // si aucune ligne dans la base
 	            {
@@ -1903,9 +1839,7 @@ class Categorie extends CommonObject
 	                $sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
 	                $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
 	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            }
-	            else
-	            {
+	            } else {
 	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
 	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
 	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
@@ -1963,9 +1897,7 @@ class Categorie extends CommonObject
 	            $this->multilangs["$obj->lang"]["description"] = $obj->description;
 	        }
 	        return 1;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
 	        return -1;
 	    }
@@ -2057,8 +1989,7 @@ class Categorie extends CommonObject
 			if (intval($searchCategory) == -2)
 			{
 				$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
-			}
-			elseif (intval($searchCategory) > 0)
+			} elseif (intval($searchCategory) > 0)
 			{
 				$searchCategorySqlList[] = " ".$rowIdName
 										." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type
@@ -2069,9 +2000,7 @@ class Categorie extends CommonObject
 		if (!empty($searchCategorySqlList))
 		{
 			return " AND (".implode(' AND ', $searchCategorySqlList).")";
-		}
-		else
-		{
+		} else {
 			return "";
 		}
 	}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 48bd82b9326..53a343046b7 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -90,8 +90,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
 
 	if ($parent != "-1")
 		$object->fk_parent = $parent;
-	else
-		$object->fk_parent = "";
+	else $object->fk_parent = "";
 
 
 	if (empty($object->label))
@@ -109,14 +108,10 @@ if ($action == 'update' && $user->rights->categorie->creer)
 		{
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index db6f5a2eec4..ccdd8be58b9 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -55,7 +55,9 @@ if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategor
 elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
 elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
 elseif ($type == Categorie::TYPE_WEBSITE_PAGE)	$title = $langs->trans('WebsitePagesCategoriesArea');
-else 											$title = $langs->trans(ucfirst($type).'sCategoriesArea');
+else {
+	$title = $langs->trans(ucfirst($type).'sCategoriesArea');
+}
 
 $arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
@@ -122,8 +124,7 @@ if ($catname || $id > 0)
 		print "\t</tr>\n";
 	}
 	print "</table>";
-}
-else print '&nbsp;';
+} else print '&nbsp;';
 
 
 print '</div></div></div>';
@@ -193,9 +194,7 @@ if ($nbofentries > 0)
 	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data, $data[0], 0);
 	print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 07e5d56d268..ba09852d61b 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -179,9 +179,7 @@ if ($object->id)
 		{
 			print '<a class="butAction hideonsmartphone" href="'.$_SERVER['PHP_SELF'].'?action=ajout_photo&amp;id='.$object->id.'&amp;type='.$type.'">';
 			print $langs->trans("AddPhoto").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip hideonsmartphone" href="#">';
 			print $langs->trans("AddPhoto").'</a>';
 		}
@@ -231,9 +229,7 @@ if ($object->id)
     			if ($obj['photo_vignette'])
     			{
     				$filename = $obj['photo_vignette'];
-    			}
-    			else
-    			{
+    			} else {
     				$filename = $obj['photo'];
     			}
 
@@ -280,9 +276,7 @@ if ($object->id)
 			print '<div class="opacitymedium">'.$langs->trans("NoPhotoYet")."</div>";
 		}
 	}
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index c3f87e404b7..ea36ce40edd 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -292,8 +292,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
+} elseif ($action != 'add')
 {
     if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 803b4ae34ab..6c2a71fe21e 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -103,47 +103,40 @@ if ($id > 0 && $removeelem > 0)
 		$tmpobject = new Product($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'product';
-	}
-	elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+	} elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
 	{
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'supplier';
-	}
-	elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
+	} elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
 	{
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'customer';
-	}
-	elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
+	} elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$tmpobject = new Adherent($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'member';
-	}
-	elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) {
+	} elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$tmpobject = new Contact($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'contact';
-    }
-    elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
+    } elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
     {
         require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
         $tmpobject = new Account($db);
         $result = $tmpobject->fetch($removeelem);
         $elementtype = 'account';
-    }
-    elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
+    } elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
     {
         require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
         $tmpobject = new Project($db);
         $result = $tmpobject->fetch($removeelem);
         $elementtype = 'project';
-    }
-	elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
+    } elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$tmpobject = new User($db);
@@ -161,9 +154,7 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	{
 		header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -180,15 +171,11 @@ if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory'
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("WasAddedSuccessfully", $newobject->ref), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -330,15 +317,12 @@ $cats = $object->get_filles();
 if ($cats < 0)
 {
 	dol_print_error($db, $cats->error, $cats->errors);
-}
-elseif (count($cats) < 1)
+} elseif (count($cats) < 1)
 {
 	print '<tr class="oddeven">';
 	print '<td colspan="3" class="opacitymedium">'.$langs->trans("NoSubCat").'</td>';
 	print '</tr>';
-}
-else
-{
+} else {
 	$categstatic = new Categorie($db);
 
 	$fulltree = $categstatic->get_full_arbo($type, $object->id, 1);
@@ -407,9 +391,7 @@ else
 
 		print '</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr class="pair">';
 		print '<td colspan="3">';
 		print '<table class="nobordernopadding">';
@@ -450,9 +432,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 	if ($prods < 0)
 	{
 		dol_print_error($db, $prods->error, $prods->errors);
-	}
-	else
-	{
+	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
 		if ($showclassifyform)
@@ -514,9 +494,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -533,9 +511,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	if ($socs < 0)
 	{
 		dol_print_error($db, $socs->error, $socs->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -575,9 +551,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -594,9 +568,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 	if ($socs < 0)
 	{
 		dol_print_error($db, $socs->error, $socs->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -635,9 +607,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -657,9 +627,7 @@ if ($type == Categorie::TYPE_MEMBER)
 	if ($prods < 0)
 	{
 		dol_print_error($db, $prods->error, $prods->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -700,9 +668,7 @@ if ($type == Categorie::TYPE_MEMBER)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -720,9 +686,7 @@ if ($type == Categorie::TYPE_CONTACT)
 	if ($contacts < 0)
 	{
 		dol_print_error($db, $contacts->error, $contacts->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -764,9 +728,7 @@ if ($type == Categorie::TYPE_CONTACT)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -786,9 +748,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
     if ($accounts < 0)
     {
         dol_print_error($db, $accounts->error, $accounts->errors);
-    }
-    else
-    {
+    } else {
     	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
     	print '<input type="hidden" name="token" value="'.newToken().'">';
     	print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -828,9 +788,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
                 }
                 print "</tr>\n";
             }
-        }
-        else
-        {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
         }
         print "</table>\n";
@@ -850,9 +808,7 @@ if ($type == Categorie::TYPE_PROJECT)
 	if ($objects < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -893,9 +849,7 @@ if ($type == Categorie::TYPE_PROJECT)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -913,9 +867,7 @@ if ($type == Categorie::TYPE_USER)
 	if ($users < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -953,9 +905,7 @@ if ($type == Categorie::TYPE_USER)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -976,9 +926,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 	if ($objects < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else
-	{
+	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
@@ -1019,9 +967,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index c570e12ba31..0c457fb6f47 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -94,9 +94,7 @@ if ($action == 'add')
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 
@@ -129,14 +127,10 @@ if ($action == 'delete')
 
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 716e02ae678..55cca00d7d7 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -172,9 +172,7 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		if ($id > 0) {
 			//$object->fetch($id);
             if (!empty($object->socpeopleassigned)) {
@@ -242,9 +240,7 @@ if (empty($reshook) && $action == 'add')
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-	}
-	else
-	{
+	} else {
 		$object->type_code = GETPOST('actioncode', 'aZ09');
 	}
 
@@ -262,14 +258,11 @@ if (empty($reshook) && $action == 'add')
 			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs))
 			{
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
-			}
-			else
-			{
+			} else {
 				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
 				{
 					$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
-				}
-				else {
+				} else {
 					$cactioncomm->fetch($object->type_code);
 					$object->label = $cactioncomm->label;
 				}
@@ -389,19 +382,14 @@ if (empty($reshook) && $action == 'add')
 				{
 					dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
 					header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
-				}
-				elseif ($idaction)
+				} elseif ($idaction)
 				{
 					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
-				}
-				else
-				{
+				} else {
 					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
 				}
 				exit;
-			}
-			else
-			{
+			} else {
 				// If error
 				$db->rollback();
 				$langs->load("errors");
@@ -409,9 +397,7 @@ if (empty($reshook) && $action == 'add')
 				setEventMessages($error, null, 'errors');
 				$action = 'create'; $donotclearsession = 1;
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create'; $donotclearsession = 1;
@@ -488,8 +474,7 @@ if (empty($reshook) && $action == 'update')
 			{
 				if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']] = $val;
 			}
-		}
-		else {
+		} else {
 			$assignedtouser = (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : 0);
 			if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
 		}
@@ -516,9 +501,7 @@ if (empty($reshook) && $action == 'update')
 			$error++; $donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-		}
-		else
-		{
+		} else {
 			$result = $cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
 		if (empty($object->userownerid))
@@ -606,9 +589,7 @@ if (empty($reshook) && $action == 'update')
 				unset($_SESSION['assignedtouser']);
 
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
@@ -645,9 +626,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
 		{
 			header("Location: index.php");
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -755,9 +734,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
     {
         header("Location: ".$backtopage);
         exit;
-    }
-    else
-    {
+    } else {
         $action = '';
     }
 }
@@ -957,8 +934,7 @@ if ($action == 'create')
 	$percent = -1;
 	if (isset($_GET['status']) || isset($_POST['status'])) $percent = GETPOST('status');
 	elseif (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent = GETPOST('percentage');
-	else
-	{
+	else {
 		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0';
 		elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100;
 	}
@@ -980,9 +956,7 @@ if ($action == 'create')
 		if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
 		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 1; // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	}
-	else
-	{
+	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1034,9 +1008,7 @@ if ($action == 'create')
 			$societe->fetch(GETPOST('socid', 'int'));
 			print $societe->getNomUrl(1);
 			print '<input type="hidden" id="socid" name="socid" value="'.GETPOST('socid', 'int').'">';
-		}
-		else
-		{
+		} else {
 			$events = array();
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			//For external user force the company to user company
@@ -1265,9 +1237,7 @@ if ($id > 0)
 		    if ($object->type_code != 'AC_OTH_AUTO')
 		    {
 		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
-		    }
-		    else
-		    {
+		    } else {
                 print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
 		    }
 			print '</td></tr>';
@@ -1397,9 +1367,7 @@ if ($id > 0)
 	    		}
 	    	}
 	    	$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	    }
-	    else
-	    {
+	    } else {
 	    	if (!empty($_SESSION['assignedtouser']))
 	    	{
 	    		$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1522,9 +1490,7 @@ if ($id > 0)
 			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
 
 			    print '</td>';
-			}
-			else
-			{
+			} else {
 			    print '<td>';
 			    print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
 			    print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
@@ -1563,9 +1529,7 @@ if ($id > 0)
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		dol_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 
@@ -1708,9 +1672,7 @@ if ($id > 0)
 				}
 			}
 			$_SESSION['assignedtouser'] = json_encode($listofuserid);
-		}
-		else
-		{
+		} else {
 			if (!empty($_SESSION['assignedtouser']))
 			{
 				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1796,9 +1758,7 @@ if ($id > 0)
 						print '<div class="paddingright"></div>';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 			}
 			print '</td></tr>';
@@ -1855,9 +1815,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
 
@@ -1865,9 +1823,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=clone&object='.$object->element.'&id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ToClone").'</a></div>';
 			}
 
@@ -1875,9 +1831,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete))
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
 			}
 		}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index d21b392088a..2cda34a494b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -431,14 +431,11 @@ class ActionComm extends CommonObject
             {
                 $this->type_id = $cactioncomm->id;
                 $this->type_code = $cactioncomm->code;
-            }
-            elseif ($result == 0)
+            } elseif ($result == 0)
             {
                 $this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
                 return -1;
-            }
-            else
-			{
+            } else {
                 $this->error = $cactioncomm->error;
                 return -1;
             }
@@ -592,15 +589,11 @@ class ActionComm extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -664,9 +657,7 @@ class ActionComm extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -780,9 +771,7 @@ class ActionComm extends CommonObject
                 $this->fetchResources();
             }
             $this->db->free($resql);
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -827,9 +816,7 @@ class ActionComm extends CommonObject
             }
 
         	return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -882,9 +869,7 @@ class ActionComm extends CommonObject
             }
 
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -966,15 +951,11 @@ class ActionComm extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1120,16 +1101,12 @@ class ActionComm extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::update ".join(',', $this->errors), LOG_ERR);
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1188,9 +1165,7 @@ class ActionComm extends CommonObject
             }
             $db->free($resql);
             return $resarray;
-        }
-        else
-        {
+        } else {
             return $db->lasterror();
         }
     }
@@ -1249,9 +1224,7 @@ class ActionComm extends CommonObject
     		$this->db->free($resql);
     		if (empty($load_state_board)) return $response;
     		else return 1;
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($this->db);
     		$this->error = $this->db->error();
     		return -1;
@@ -1301,9 +1274,7 @@ class ActionComm extends CommonObject
                 if (!empty($obj->fk_user_mod)) $this->date_modification = $this->db->jdate($obj->datem);
             }
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -1432,16 +1403,14 @@ class ActionComm extends CommonObject
 		    $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		    $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
 		    */
-		}
-		else $linkclose .= ' class="'.$classname.'"';
+		} else $linkclose .= ' class="'.$classname.'"';
 
 		$url = '';
 		if ($option == 'birthday')
 			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
 		elseif ($option == 'holiday')
             $url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
-		else
-			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		else $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
@@ -1464,9 +1433,7 @@ class ActionComm extends CommonObject
             $libelle = $label;
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
             $libelleshort = '';
-        }
-        else
-        {
+        } else {
             $libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
             if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
             if ($maxlength < 0) $libelleshort = $this->ref;
@@ -1707,9 +1674,7 @@ class ActionComm extends CommonObject
                     {
                         $dateend = $this->db->jdate($obj->datep2)
                                  - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
-                    }
-                    else
-                    {
+                    } else {
                         // use start date as fall-back to avoid import erros on empty end date
                         $dateend = $datestart;
                     }
@@ -1765,9 +1730,7 @@ class ActionComm extends CommonObject
 				{
 					$eventarray = $hookmanager->resArray;
 				}
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 return -1;
             }
@@ -1800,16 +1763,13 @@ class ActionComm extends CommonObject
 
                             $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
                             $timestampEnd   = dol_stringtotime($obj->date_end." 12:00:00", 0);
-                        }
-                        elseif ($obj->halfday == 1)
+                        } elseif ($obj->halfday == 1)
                         {
                             $event['fulldayevent'] = false;
 
                             $timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);
                             $timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
-                        }
-                        else
-                        {
+                        } else {
                             $event['fulldayevent'] = true;
 
                             $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
@@ -1843,9 +1803,7 @@ class ActionComm extends CommonObject
                         {
                             // 2 = leave wait for approval
                             $event['summary'] = $title." - ".$obj->lastname." (wait for approval)";
-                        }
-                        else
-                        {
+                        } else {
                             // 3 = leave approved
                             $event['summary'] = $title." - ".$obj->lastname;
                         }
@@ -1870,9 +1828,7 @@ class ActionComm extends CommonObject
                 $title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
                 $desc = $more;
                 $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
-            }
-            else
-            {
+            } else {
                 $title = 'Dolibarr actions '.$mysoc->name;
                 $desc = $langs->transnoentities('ListOfActions');
                 $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
@@ -1890,16 +1846,13 @@ class ActionComm extends CommonObject
             if ($result >= 0)
             {
                 if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-                else
-                {
+                else {
                 	$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
                     dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
                     dol_delete_file($outputfiletmp, 0, 1);
                     $result = -1;
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
                 dol_delete_file($outputfiletmp, 0, 1);
                 $langs->load("errors");
@@ -2042,9 +1995,7 @@ class ActionComm extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index f987d551766..d3f4fb3f238 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -200,28 +200,23 @@ class ActionCommReminder extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Done');
 			elseif ($status == 0) return $langs->trans('ToDo');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index a8cb6b5de8f..20b88dd73d7 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -175,8 +175,7 @@ class AgendaEvents extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Agenda Event list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index c8041c4ea16..147a6ff7ef0 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -104,15 +104,11 @@ class CActionComm
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
-			{
+            } else {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -208,9 +204,7 @@ class CActionComm
             if ($idorcode == 'id') $this->liste_array = $repid;
             if ($idorcode == 'code') $this->liste_array = $repcode;
             return $this->liste_array;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index e985b8ea09e..b806dde94f9 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -179,16 +179,13 @@ class ICal
 								$tmpkey = '';
 								$tmpvalue = '';
 							}
-						}
-                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
+						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
                     	{
                     		if (preg_match('/=$/', $value))
                     		{
                     			$tmpkey = $key;
                     			$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
-                    		}
-                    		else
-                    		{
+                    		} else {
                     			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
                     		}
                     	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
@@ -236,9 +233,7 @@ class ICal
         	if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
         	{
         		list($key, $value) = array($key, $value);
-        	}
-        	else
-        	{
+        	} else {
         		list($key, $value) = $this->ical_dt_date($key, $value);
         	}
         }
@@ -377,9 +372,7 @@ class ICal
         {
             usort($temp, array(&$this, "ical_dtstart_compare"));
             return $temp;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 9e770f70a93..fa4387b0861 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -215,9 +215,7 @@ if ($object->id > 0)
 			}
 		}
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	}
-	else
-	{
+	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -263,9 +261,7 @@ if ($object->id > 0)
 	$permission = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index b480586bc6a..e0ded511928 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -95,9 +95,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -460,13 +458,11 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
     if (empty($reshook))
     {
 		$s .= $hookmanager->resPrint;
-    }
-    elseif ($reshook > 1)
+    } elseif ($reshook > 1)
 	{
     	$s = $hookmanager->resPrint;
     }
-}
-else 									// If javascript off
+} else // If javascript off
 {
 	$newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
@@ -512,24 +508,18 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
 	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            }
-            else
-            {
+            } else {
 	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -553,9 +543,7 @@ if ($action == 'show_day')
     $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
-}
-else
-{
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
@@ -651,9 +639,7 @@ if ($resql)
         $event->date_start_in_calendar >= $lastdaytoshow)
         {
             // This record is out of visible range
-        }
-        else
-        {
+        } else {
             if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
             if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
@@ -666,8 +652,7 @@ if ($resql)
             // Loop on each day covered by action to prepare an index to show on calendar
             $loop = true; $j = 0;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-            {
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -675,17 +660,14 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
 
             //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
             //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
         }
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -701,9 +683,7 @@ if ($showbirthday)
     {
         $sql .= ' AND MONTH(birthday) = '.$month;
         $sql .= ' AND DAY(birthday) = '.$day;
-    }
-    else
-    {
+    } else {
         $sql .= ' AND MONTH(birthday) = '.$month;
     }
     $sql .= ' ORDER BY birthday';
@@ -741,18 +721,14 @@ if ($showbirthday)
 
             $loop = true;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-            {
+            do {
                 $eventarray[$daykey][] = $event;
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
             $i++;
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -769,12 +745,10 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
     {
         // Request only leaves for the current selected day
         $sql .= " AND '".$year."-".$month."-".$day."' BETWEEN x.date_debut AND x.date_fin";
-    }
-    elseif ($action == 'show_week')
+    } elseif ($action == 'show_week')
     {
         // TODO: Add filter to reduce database request
-    }
-    elseif ($action == 'show_month')
+    } elseif ($action == 'show_month')
     {
         // TODO: Add filter to reduce database request
     }
@@ -807,8 +781,7 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             {
                 // Show no symbol for leave with state "leave approved"
                 $event->percentage = -1;
-            }
-            elseif ($obj->status == 2)
+            } elseif ($obj->status == 2)
             {
                 // Show TO-DO symbol for leave with state "leave wait for approval"
                 $event->percentage = 0;
@@ -817,13 +790,10 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             if ($obj->halfday == 1)
             {
                 $event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-            }
-            elseif ($obj->halfday == -1)
+            } elseif ($obj->halfday == -1)
             {
                 $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-            }
-            else
-            {
+            } else {
                 $event->label = $obj->lastname;
             }
 
@@ -832,14 +802,11 @@ if ($conf->global->AGENDA_SHOW_HOLIDAYS)
             $jour   = date('d', $event->date_start_in_calendar);
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
 
-            do
-            {
+            do {
                 $eventarray[$daykey][] = $event;
 
                 $daykey += 60 * 60 * 24;
-            }
-
-            while ($daykey <= $event->date_end_in_calendar);
+            } while ($daykey <= $event->date_end_in_calendar);
 
             $i++;
         }
@@ -881,8 +848,7 @@ if (count($listofextcals))
                     {
                         $datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
                         $datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
-                    }
-                    elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
+                    } elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
                     {
                         $datecurstart = $icalevent['DTSTART']['unixtime'];
                         $datecurend = $icalevent['DTEND']['unixtime'];
@@ -902,9 +868,7 @@ if (count($listofextcals))
                         }
                         // datecurstart and datecurend are now GMT date
                         //var_dump($datecurstart); var_dump($datecurend); exit;
-                    }
-                    else
-                    {
+                    } else {
                         // Not a recongized record
                         dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
                         continue;
@@ -928,9 +892,7 @@ if (count($listofextcals))
                             {
                                 $newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
                                 $newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
-                            }
-                            else
-                            {
+                            } else {
                                 $newevent['DTSTART'] = $datecurstart;
                                 $newevent['DTEND'] = $datecurend;
                             }
@@ -948,13 +910,11 @@ if (count($listofextcals))
                         {
                             $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w');
                             $datecurend = dol_time_plus_duree($datecurend, $interval, 'w');
-                        }
-                        elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
+                        } elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
                         {
                             $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm');
                             $datecurend = dol_time_plus_duree($datecurend, $interval, 'm');
-                        }
-                        elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
+                        } elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
                         {
                             $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y');
                             $datecurend = dol_time_plus_duree($datecurend, $interval, 'y');
@@ -991,8 +951,7 @@ if (count($listofextcals))
                     //print dol_print_date($dateend,'dayhour','gmt');
                     $event->fulldayevent = 1;
                     $addevent = true;
-                }
-                elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
+                } elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
                 {
                     $datestart = $icalevent['DTSTART'];
                     $dateend = $icalevent['DTEND'];
@@ -1003,8 +962,7 @@ if (count($listofextcals))
                     $addevent = true;
                     //var_dump($offsettz);
                     //var_dump(dol_print_date($datestart, 'dayhour', 'gmt'));
-                }
-                elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
+                } elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
                 {
                     $datestart = $icalevent['DTSTART']['unixtime'];
                     $dateend = $icalevent['DTEND']['unixtime'];
@@ -1066,9 +1024,7 @@ if (count($listofextcals))
                         //print 'x'.$datestart.'-'.$dateend;exit;
                         //print 'x'.$datestart.'-'.$dateend;exit;
                         // This record is out of visible range
-                    }
-                    else
-                    {
+                    } else {
                         if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
                         if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
 
@@ -1083,14 +1039,12 @@ if (count($listofextcals))
                         // daykey must be date that represent day box in calendar so must be a user time
                         $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
                         $daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, true, 0);
-                        do
-                        {
+                        do {
                             //if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
                             $eventarray[$daykey][] = $event;
                             $daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day
                             if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) $loop = false;
-                        }
-                        while ($loop);
+                        } while ($loop);
                     }
                 }
             }
@@ -1159,8 +1113,7 @@ if (empty($action) || $action == 'show_month')      // View by month
         {
             $labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
             print $langs->trans($labelshort[$numdayinweek]);
-        }
-        else print $langs->trans("Day".$numdayinweek);
+        } else print $langs->trans("Day".$numdayinweek);
         print '  </td>'."\n";
         $i++;
     }
@@ -1171,23 +1124,18 @@ if (empty($action) || $action == 'show_month')      // View by month
 
     // In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month)
     //var_dump($eventarray);
-    for ($iter_week = 0; $iter_week < 6; $iter_week++)
-    {
+    for ($iter_week = 0; $iter_week < 6; $iter_week++) {
         echo " <tr>\n";
-        for ($iter_day = 0; $iter_day < 7; $iter_day++)
-        {
-        	/* Show days before the beginning of the current month (previous month)  */
-            if ($tmpday <= 0)
-            {
+        for ($iter_day = 0; $iter_day < 7; $iter_day++) {
+            if ($tmpday <= 0) {
+                /* Show days before the beginning of the current month (previous month)  */
                 $style = 'cal_other_month cal_past';
-        		if ($iter_day == 6) $style .= ' cal_other_month_right';
+                if ($iter_day == 6) $style .= ' cal_other_month_right';
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
-            }
-            /* Show days of the current month */
-            elseif ($tmpday <= $max_day_in_month)
-            {
+            } elseif ($tmpday <= $max_day_in_month) {
+                /* Show days of the current month */
                 $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
                 $style = 'cal_current_month';
                 if ($iter_day == 6) $style .= ' cal_current_month_right';
@@ -1199,10 +1147,8 @@ if (empty($action) || $action == 'show_month')      // View by month
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
-            }
-            /* Show days after the current month (next month) */
-            else
-			{
+            } else {
+                /* Show days after the current month (next month) */
                 $style = 'cal_other_month';
                 if ($iter_day == 6) $style .= ' cal_other_month_right';
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
@@ -1219,9 +1165,8 @@ if (empty($action) || $action == 'show_month')      // View by month
 	print '<input type="hidden" name="actionmove" value="mupdate">';
 	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	print '<input type="hidden" name="newdate" id="newdate">';
-}
-elseif ($action == 'show_week') // View by week
-{
+} elseif ($action == 'show_week') {
+    // View by week
     $newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
@@ -1237,8 +1182,7 @@ elseif ($action == 'show_week') // View by week
     print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
     print ' <tr class="liste_titre">';
     $i = 0;
-    while ($i < 7)
-    {
+    while ($i < 7) {
         echo '  <td align="center">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))."</td>\n";
         $i++;
     }
@@ -1246,8 +1190,7 @@ elseif ($action == 'show_week') // View by week
 
     echo " <tr>\n";
 
-    for ($iter_day = 0; $iter_day < 7; $iter_day++)
-    {
+    for ($iter_day = 0; $iter_day < 7; $iter_day++) {
         // Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
 		$tmparray = dol_getdate($curtime, true);
@@ -1274,8 +1217,7 @@ elseif ($action == 'show_week') // View by week
     echo '<input type="hidden" name="actionmove" value="mupdate">';
     echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
     echo '<input type="hidden" name="newdate" id="newdate">';
-}
-else    // View by day
+} else // View by day
 {
     $newparam = $param; // newparam is for birthday links
     $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
@@ -1349,9 +1291,7 @@ else    // View by day
 		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 1);
 
 		print '</div>';
-    }
-    else
-    {
+    } else {
     	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
     	show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
@@ -1472,8 +1412,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 	                    // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
 	                    if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
-                    }
-                    elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
+                    } elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
                     {
                     	$numical++;
                     	if (!empty($event->icalname)) {
@@ -1485,13 +1424,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
                     	$color = ($event->icalcolor ? $event->icalcolor : -1);
                     	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
-                    }
-                    elseif ($event->type_code == 'BIRTHDAY')
+                    } elseif ($event->type_code == 'BIRTHDAY')
                     {
                     	$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unmovable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-                    }
-                    else
-               	    {
+                    } else {
                     	$numother++;
                     	$color = ($event->icalcolor ? $event->icalcolor : -1);
                     	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1515,9 +1451,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     	if (isset($colorindexused[$idusertouse]))
                     	{
                     		$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-                    	}
-                    	else
-                    	{
+                    	} else {
                    			$colorindex = $nextindextouse;
                    			$colorindexused[$idusertouse] = $colorindex;
                     		if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1532,8 +1466,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if ($event->type_code == 'AC_OTH_AUTO')
                     {
                         $cssclass .= " unmovable";
-                    }
-                    elseif ($event->type_code == 'ICALEVENT')
+                    } elseif ($event->type_code == 'ICALEVENT')
                     {
                         $cssclass .= " unmovable";
                     } elseif ($event->date_end_in_calendar && date('Ymd', $event->date_start_in_calendar) != date('Ymd', $event->date_end_in_calendar)) {
@@ -1544,8 +1477,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                         {
                             $cssclass .= " unmovable";
                         }
-                    }
-                    else {
+                    } else {
                         if ($user->rights->agenda->allactions->create ||
                             (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
                         {
@@ -1579,9 +1511,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
                     {
                     	print 'border: 2px solid #'.$colortouse.';';
-                    }
-                    else
-                    {
+                    } else {
                     	print 'background: #'.$colortouse.';';
                     	print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
                     }
@@ -1600,12 +1530,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if ($event->type_code == 'BIRTHDAY') // It's a birthday
                     {
                         print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'birthday', 'contact');
-                    }
-					elseif ($event->type_code == 'HOLIDAY')
+                    } elseif ($event->type_code == 'HOLIDAY')
                     {
                         print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'holiday', 'user');
-                    }
-                    elseif ($event->type_code != 'BIRTHDAY' && $event->type_code != 'HOLIDAY')
+                    } elseif ($event->type_code != 'BIRTHDAY' && $event->type_code != 'HOLIDAY')
                     {
                         // Picto
                         if (empty($event->fulldayevent))
@@ -1648,9 +1576,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
                                 $daterange .= dol_print_date($event->date_end_in_calendar, '%H:%M'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
                             }
-                        }
-                        else
-						{
+                        } else {
                             if ($showinfo)
                             {
                                 print $langs->trans("EventOnFullDay")."<br>\n";
@@ -1705,8 +1631,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $thirdparty = new Societe($db);
                                 $thirdparty->fetch($thirdparty_id);
                                 $cachethirdparties[$thirdparty_id] = $thirdparty;
-                            }
-                            else $thirdparty = $cachethirdparties[$thirdparty_id];
+                            } else $thirdparty = $cachethirdparties[$thirdparty_id];
                             if (!empty($thirdparty->id)) $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
                         }
                         if (!empty($contact_id) && $contact_id > 0)
@@ -1716,8 +1641,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                                 $contact = new Contact($db);
                                 $contact->fetch($contact_id);
                                 $cachecontacts[$contact_id] = $contact;
-                            }
-                            else $contact = $cachecontacts[$contact_id];
+                            } else $contact = $cachecontacts[$contact_id];
                             if ($linerelatedto) $linerelatedto .= '&nbsp;';
                             if (!empty($contact->id)) $linerelatedto .= $contact->getNomUrl(1, '', 0);
                         }
@@ -1754,9 +1678,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '</td></tr></table>';
                     print '</div><!-- end event '.$i.' -->'."\n";
                     $i++;
-                }
-                else
-                {
+                } else {
                 	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
                     print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');
                     print ($filtert ? '&search_filtert='.$filtert : '');
@@ -1817,9 +1739,7 @@ function dol_color_minus($color, $minus, $minusunit = 16)
     	$newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
     	$newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
     	$newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
-	}
-	else
-	{
+	} else {
 	    // Not yet implemented
 	}
 	return $newcolor;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index be841ea8506..467275d5fc0 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -58,9 +58,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -212,12 +210,12 @@ if (empty($reshook) && !empty($massaction))
 			break;
 	}
 
-	if(isset($percent))
+	if (isset($percent))
 	{
 		foreach ($toselect as $toselectid)
 		{
 			$result = $object->updatePercent($toselectid, $percent);
-			if($result < 0)
+			if ($result < 0)
 			{
 				dol_print_error($db);
 				break;
@@ -325,24 +323,18 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
                 $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
-            }
-            else
-            {
+            } else {
                 $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -466,8 +458,7 @@ if ($resql)
     if (empty($reshook))
     {
 		$s .= $hookmanager->resPrint;
-    }
-    elseif ($reshook > 1)
+    } elseif ($reshook > 1)
 	{
     	$s = $hookmanager->resPrint;
     }
@@ -617,8 +608,7 @@ if ($resql)
 			{
 				$userstatic->fetch($obj->fk_user_action);
 				print $userstatic->getNomUrl(-1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 
@@ -633,8 +623,7 @@ if ($resql)
 			{
 				if ($actioncomm->type_picto) {
 					$imgpicto = img_picto('', $actioncomm->type_picto);
-				}
-				else {
+				} else {
 					if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
@@ -702,8 +691,7 @@ if ($resql)
 				$societestatic->email = $obj->socemail;
 
 				print $societestatic->getNomUrl(1, '', 28);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 
@@ -725,8 +713,7 @@ if ($resql)
                             $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
                             $contactList[] = $contact->getNomUrl(1, '', 0);
                         }
-                    }
-                    else {
+                    } else {
                         // use cache
                         $contactList[] = $contactListCache[$socpeopleassigned['id']];
                     }
@@ -734,8 +721,7 @@ if ($resql)
                 if (!empty($contactList)) {
                     print implode(', ', $contactList);
                 }
-            }
-            elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+            } elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
 				$contactstatic->email = $obj->email;
@@ -746,9 +732,7 @@ if ($resql)
 				$contactstatic->phone_perso = $obj->phone_perso;
 				$contactstatic->country_id = $obj->country_id;
 				print $contactstatic->getNomUrl(1, '', 0);
-			}
-			else
-			{
+			} else {
 				print "&nbsp;";
 			}
 			print '</td>';
@@ -806,9 +790,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 6dfbc6c7f9c..a769d709c4d 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -93,9 +93,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -329,8 +327,7 @@ if ($conf->use_javascript_ajax)
 	    if (empty($reshook))
 	    {
 			$s .= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
@@ -372,18 +369,14 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
         }
     }
@@ -406,9 +399,7 @@ if ($action == 'show_day')
     $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
-}
-else
-{
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, 1, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
@@ -490,9 +481,7 @@ if ($resql)
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
-        }
-        else
-        {
+        } else {
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
@@ -509,9 +498,7 @@ if ($resql)
         {
             // This record is out of visible range
         	unset($event);
-        }
-        else
-		{
+        } else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
@@ -527,8 +514,7 @@ if ($resql)
             // Loop on each day covered by action to prepare an index to show on calendar
             $loop = true; $j = 0;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-			{
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -536,17 +522,14 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
 
             //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
             //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
         }
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -808,8 +791,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				{
 					$nummytasks++; $cssclass = 'family_mytasks';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
-				}
-				elseif ($event->type_code == 'ICALEVENT')
+				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (!empty($event->icalname))
@@ -822,13 +804,10 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				}
-				elseif ($event->type_code == 'BIRTHDAY')
+				} elseif ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-				}
-				else
-				{
+				} else {
 					$numother++; $cssclass = 'family_other';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
 				}
@@ -840,9 +819,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-					}
-					else
-					{
+					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -960,9 +937,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
@@ -1025,8 +1000,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		elseif (count($cases1[$h]) > 1)
+		} elseif (count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
@@ -1038,8 +1012,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		elseif (count($cases2[$h]) > 1)
+		} elseif (count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f2cce5c8023..ef2c60e5ae6 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -94,9 +94,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -376,8 +374,7 @@ if ($conf->use_javascript_ajax)
 	    if (empty($reshook))
 	    {
 			$s .= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
@@ -431,24 +428,18 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
   	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            }
-            else
-            {
+            } else {
   	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -472,9 +463,7 @@ if ($action == 'show_day')
     $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
     $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
     $sql .= ')';
-}
-else
-{
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
@@ -557,9 +546,7 @@ if ($resql)
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
-        }
-        else
-		{
+        } else {
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
@@ -576,9 +563,7 @@ if ($resql)
         {
             // This record is out of visible range
             unset($event);
-        }
-        else
-		{
+        } else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
         	$event->fetch_userassigned(); // This load $event->userassigned
 
@@ -594,8 +579,7 @@ if ($resql)
             // Loop on each day covered by action to prepare an index to show on calendar
             $loop = true; $j = 0;
             $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-			{
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -603,8 +587,7 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } while ($loop);
 
             //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
             //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
@@ -612,9 +595,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -713,16 +694,13 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		    {
 			    $event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
-				foreach ($listofuserid as $userid => $tmp)
-				{
+				foreach ($listofuserid as $userid => $tmp) {
 				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
 				}
 		    }
 		}
-	}
-	/* Use this list to have for all users */
-	else
-	{
+	} else {
+		/* Use this list to have for all users */
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
@@ -730,8 +708,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		if ($usergroup > 0)	$sql .= " AND ug.fk_usergroup = ".$usergroup;
 		//print $sql;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 		    $num = $db->num_rows($resql);
 		    $i = 0;
 		    if ($num)
@@ -743,8 +720,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 					$i++;
 		        }
 		    }
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
 	foreach ($usernamesid as $id)
@@ -992,8 +968,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
 
 					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
-				}
-				elseif ($event->type_code == 'ICALEVENT')
+				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (!empty($event->icalname))
@@ -1006,13 +981,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				}
-				elseif ($event->type_code == 'BIRTHDAY')
+				} elseif ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-				}
-				else
-				{
+				} else {
 					$numother++;
 					$color = ($event->icalcolor ? $event->icalcolor : -1);
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1038,9 +1010,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-					}
-					else
-					{
+					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1158,9 +1128,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
@@ -1224,8 +1192,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
+		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
@@ -1237,8 +1204,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
+		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 82477d307fc..35c0f7a890e 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -186,8 +186,7 @@ if ($resql)
 				print '</td>';
 				print '<td class="center">'.dol_print_date(dol_filemtime($file), 'dayhour').'</td>';
 				print '<td class="center">'.dol_print_size(dol_filesize($file)).'</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
@@ -202,9 +201,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 4ff16cd7c03..b3b11a95a36 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -330,9 +330,7 @@ if ($object->id > 0)
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
-	}
-	else
-	{
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -349,9 +347,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print "</td>";
@@ -370,9 +366,7 @@ if ($object->id > 0)
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else
-		{
+		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -478,9 +472,7 @@ if ($object->id > 0)
         if ($action == 'editshipping')
         {
             $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        }
-        else
-        {
+        } else {
             $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
         }
         print "</td>";
@@ -517,9 +509,7 @@ if ($object->id > 0)
         {
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
-        }
-        else
-        {
+        } else {
             print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
         }
         print '</td>';
@@ -546,9 +536,7 @@ if ($object->id > 0)
 	    if ($action == 'editlevel')
 	    {
 	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
-	    }
-	    else
-	    {
+	    } else {
 	        print $object->getLibProspLevel();
 	    }
         print "</td>";
@@ -731,9 +719,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -817,9 +803,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -960,9 +944,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1021,9 +1003,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1092,15 +1072,11 @@ if ($object->id > 0)
 				if ($objp->frequency && $objp->date_last_gen > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_last_gen), 'day').'</td>';
-				}
-				else
-				{
+				} else {
 					if ($objp->dc > 0)
 					{
 						print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day').'</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="right"><b>!!!</b></td>';
 					}
 				}
@@ -1129,9 +1105,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1194,9 +1168,7 @@ if ($object->id > 0)
 				if ($objp->df > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="right"><b>!!!</b></td>';
 				}
 				print '<td class="right" style="min-width: 60px">';
@@ -1221,9 +1193,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1288,9 +1258,7 @@ if ($object->id > 0)
     			if (empty($user->rights->facture->creer))
     			{
     			    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
-    			else
-    			{
+    			} else {
     				$langs->load("bills");
     				$langs->load("orders");
 
@@ -1300,8 +1268,7 @@ if ($object->id > 0)
     				    {
     					    if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
     					    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    				    }
-    				    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+    				    } else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
     				}
 
     				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
@@ -1316,9 +1283,7 @@ if ($object->id > 0)
     		if ($user->rights->agenda->myactions->create)
     		{
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
-    		}
-    		else
-    		{
+    		} else {
     			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
     		}
     	}
@@ -1342,9 +1307,7 @@ if ($object->id > 0)
         // List of done actions
 		show_actions_done($conf, $langs, $db, $object);
 	}
-}
-else
-{
+} else {
 	$langs->load("errors");
 	print $langs->trans('ErrorRecordNotFound');
 }
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 8c9a63d97e2..d3075916367 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -170,9 +170,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index af5b4ac41a5..b542a110832 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -209,22 +209,17 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
 		}
 		print "</table></div><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -297,22 +292,17 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
             {
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
             }
-        }
-        else
-        {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table></div><br>";
 
         $db->free($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -379,8 +369,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 				print '</td>';
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-				}
-				else {
+				} else {
 					print '<td class="nowrap right">'.price($obj->total_ttc).'</td></tr>';
 				}
 				$i++;
@@ -389,23 +378,18 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
             {
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table>";
 		print "</div><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -472,8 +456,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
                 print '</td>';
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-				}
-				else {
+				} else {
 					print '<td class="nowrap right">'.price($obj->total_ttc).'</td></tr>';
 				}
                 $i++;
@@ -482,14 +465,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
  			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
             {
                 print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
             }
-        }
-        else
-        {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table>";
@@ -570,9 +550,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 			}
 
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print "</table>";
@@ -629,9 +607,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
@@ -717,9 +693,7 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TOD
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -805,8 +779,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="right">'.price($obj->total_ht).'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right">'.price($obj->total_ttc).'</td>';
 				}
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
@@ -817,17 +790,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td class=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -913,8 +883,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
 				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
 					print '<td class="right">'.price($obj->total_ht).'</td>';
-				}
-				else {
+				} else {
 					print '<td class="right">'.price($obj->total_ttc).'</td>';
 				}
 				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>'."\n";
@@ -925,17 +894,14 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td class=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index d4db9fc6ea9..da24f7bcb4f 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -87,9 +87,7 @@ if (empty($template_id)) {
 if ($result < 0)
 {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-}
-else
-{
+} else {
 	if (!empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
 	}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e3cb5a9ad97..ea81c4e35b9 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -93,17 +93,13 @@ if (empty($reshook))
 		if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -120,14 +116,11 @@ if (empty($reshook))
 			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 			$action = '';
-		}
-		elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+		} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 		{
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 			if ($object->statut == 0)
@@ -235,9 +228,7 @@ if (empty($reshook))
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else
-							{
+							} else {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
@@ -316,9 +307,7 @@ if (empty($reshook))
 							if (!$resql2)
 							{
 								dol_print_error($db);
-							}
-							else
-							{
+							} else {
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false)
 								{
@@ -350,9 +339,7 @@ if (empty($reshook))
                         	}
 
                         	//test if CHECK READ change statut prospect contact
-						}
-						else
-						{
+						} else {
 							// Mail failed
 							$nbko++;
 
@@ -369,9 +356,7 @@ if (empty($reshook))
 
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
 				}
 
@@ -381,16 +366,12 @@ if (empty($reshook))
 					$statut = 2; // Status 'sent partially' (because at least one error)
 					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					if ($nbok >= $num)
 					{
 						$statut = 3; // Send to everybody
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-					}
-					else
-					{
+					} else {
 						$statut = 2; // Status 'sent partially' (because not send to everybody)
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
@@ -403,9 +384,7 @@ if (empty($reshook))
 				{
 					dol_print_error($db);
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog($db->error());
 				dol_print_error($db);
 			}
@@ -472,9 +451,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 				$action = '';
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 				$action = 'test';
 			}
@@ -611,9 +588,7 @@ if (empty($reshook))
 
 			setEventMessages($mesg, $mesgs, 'errors');
 			$action = "edit";
-		}
-		else
-		{
+		} else {
 			$action = "edit";
 		}
 	}
@@ -627,9 +602,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -645,14 +618,10 @@ if (empty($reshook))
     			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
     			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
     			exit;
-            }
-            else
-            {
+            } else {
                 setEventMessages($object->error, $object->errors, 'errors');
             }
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -675,15 +644,11 @@ if (empty($reshook))
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -783,9 +748,7 @@ if ($action == 'create')
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	if ($object->id > 0)
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -801,13 +764,11 @@ else
 		if ($action == 'valid')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
-		}
-		// Confirm reset
+		} // Confirm reset
 		elseif ($action == 'reset')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
-		}
-		// Confirm delete
+		} // Confirm delete
 		elseif ($action == 'delete')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
@@ -841,8 +802,7 @@ else
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
 					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
 					$_GET["action"] = '';
-				}
-				elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 				{
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
@@ -855,9 +815,7 @@ else
 					    setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
-				}
-				else
-				{
+				} else {
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
 				    if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 
@@ -939,9 +897,7 @@ else
     				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
     				{
     					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-    				}
-    				else
-    				{
+    				} else {
     					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
     				}
 			    }
@@ -949,9 +905,7 @@ else
 				if ($text)
     			{
     			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
-    			}
-    			else
-    			{
+    			} else {
     				print $nbemail;
     			}
 			}
@@ -998,9 +952,7 @@ else
 					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
@@ -1012,9 +964,7 @@ else
 				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
 
@@ -1023,13 +973,10 @@ else
 					if ($object->nbemail <= 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					elseif (empty($user->rights->mailing->valider))
+					} elseif (empty($user->rights->mailing->valider))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
 					}
 				}
@@ -1039,13 +986,10 @@ else
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
+					} elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
 					}
 				}
@@ -1060,9 +1004,7 @@ else
 					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
 					}
 				}
@@ -1072,9 +1014,7 @@ else
 					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 				}
@@ -1153,9 +1093,7 @@ else
 					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					print '<br>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			print '</td></tr>';
@@ -1176,14 +1114,11 @@ else
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
-			}
-			else print dol_htmlentitiesbr($object->body);
+			} else print dol_htmlentitiesbr($object->body);
 			print '</div>';
 
 			dol_fiche_end();
-		}
-		else
-		{
+		} else {
 			/*
 			 * Mailing en mode edition (CKeditor or HTML source)
 			 */
@@ -1229,9 +1164,7 @@ else
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 					{
 						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					}
-					else
-					{
+					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
@@ -1239,9 +1172,7 @@ else
 				if ($text)
 				{
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
-				}
-				else
-				{
+				} else {
 					print $nbemail;
 				}
 			}
@@ -1315,9 +1246,7 @@ else
 					$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"), 'delete.png', '', '', 1).'" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
 					$out .= '<br></div>';
 				}
-			}
-			else
-			{
+			} else {
 				$out .= $langs->trans("NoAttachedFiles").'<br>';
 			}
 			// Add link to add file
@@ -1366,9 +1295,7 @@ else
 			print '</form>';
 			print '<br>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d8d9873b88b..27e0c2e5b0c 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -160,9 +160,7 @@ if (GETPOST('exportcsv', 'int'))
 		}
 
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	exit;
@@ -181,15 +179,11 @@ if ($action == 'delete')
 			$obj->update_nb($id);
 
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			header("Location: list.php");
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -293,9 +287,7 @@ if ($object->fetch($id) >= 0)
 			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 			{
 				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-			}
-			else
-			{
+			} else {
 				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
@@ -303,9 +295,7 @@ if ($object->fetch($id) >= 0)
 		if ($text)
 		{
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
-		}
-		else
-		{
+		} else {
 			print $nbemail;
 		}
 	}
@@ -405,9 +395,7 @@ if ($object->fetch($id) >= 0)
 					{
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
-					}
-					else
-					{
+					} else {
 					    print '<div '.$bctag[$var].'>';
 					}
 
@@ -420,8 +408,7 @@ if ($object->fetch($id) >= 0)
 
 					try {
 						$nbofrecipient = $obj->getNbOfRecipients('');
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -430,9 +417,7 @@ if ($object->fetch($id) >= 0)
 					if ($nbofrecipient >= 0)
 					{
 						print $nbofrecipient;
-					}
-					else
-					{
+					} else {
 						print $langs->trans("Error").' '.img_error($obj->error);
 					}
 					print '</div>';
@@ -442,8 +427,7 @@ if ($object->fetch($id) >= 0)
 					{
     					try {
     						$filter = $obj->formFilter();
-    					}
-    					catch (Exception $e)
+    					} catch (Exception $e)
     					{
     						dol_syslog($e->getMessage(), LOG_ERR);
     					}
@@ -456,9 +440,7 @@ if ($object->fetch($id) >= 0)
 					if ($allowaddtarget)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
-					}
-					else
-					{
+					} else {
 					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
@@ -632,31 +614,24 @@ if ($object->fetch($id) >= 0)
                 if (empty($obj->source_id) || empty($obj->source_type))
                 {
                     print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
-                }
-                else
-                {
+                } else {
                     if ($obj->source_type == 'member')
                     {
 						$objectstaticmember->fetch($obj->source_id);
                         print $objectstaticmember->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'user')
+                    } elseif ($obj->source_type == 'user')
                     {
 						$objectstaticuser->fetch($obj->source_id);
                         print $objectstaticuser->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'thirdparty')
+                    } elseif ($obj->source_type == 'thirdparty')
                     {
 						$objectstaticcompany->fetch($obj->source_id);
                         print $objectstaticcompany->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'contact')
+                    } elseif ($obj->source_type == 'contact')
                     {
                     	$objectstaticcontact->fetch($obj->source_id);
                     	print $objectstaticcontact->getNomUrl(1);
-                    }
-                    else
-                    {
+                    } else {
                         print $obj->source_url;
                     }
                 }
@@ -676,9 +651,7 @@ if ($object->fetch($id) >= 0)
 					print '<td class="nowrap right">';
 					print $object::libStatutDest($obj->statut, 2, '');
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					// Date sent
 					print '<td class="center">'.$obj->date_envoi.'</td>';
 
@@ -704,9 +677,7 @@ if ($object->fetch($id) >= 0)
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			if ($object->statut < 2)
 			{
 			    print '<tr><td colspan="9" class="opacitymedium">';
@@ -720,9 +691,7 @@ if ($object->fetch($id) >= 0)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 7700ca6ee43..983ad374980 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -165,9 +165,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -221,9 +219,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -284,9 +280,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -351,9 +345,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -411,9 +403,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -453,9 +443,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -689,9 +677,7 @@ class AdvanceTargetingMailing extends CommonObject
 				if (!empty($arrayquery['contact_no_email']))
 				{
 					$tmpwhere .= "(t.email IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
-				}
-				else
-				{
+				} else {
 					$tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
 				}
 				$sqlwhere[] = $tmpwhere;
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index b9782515735..e6f928d539f 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -314,9 +314,7 @@ class FormAdvTargetEmailing extends Form
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -400,9 +398,7 @@ class FormAdvTargetEmailing extends Form
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 56a115a2fea..1bb4864876c 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -144,18 +144,14 @@ class Mailing extends CommonObject
 			if ($this->update($user) > 0)
 			{
 				$this->db->commit();
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
 
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -186,9 +182,7 @@ class Mailing extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -253,15 +247,11 @@ class Mailing extends CommonObject
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::fetch Erreur -1");
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::fetch Erreur -2");
 			return -2;
 		}
@@ -368,9 +358,7 @@ class Mailing extends CommonObject
 							);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
@@ -386,9 +374,7 @@ class Mailing extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -412,9 +398,7 @@ class Mailing extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -437,9 +421,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return $this->delete_targets();
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -462,9 +444,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return 0;
 		}
@@ -490,9 +470,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -512,8 +490,7 @@ class Mailing extends CommonObject
 	    if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
 	    elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
 	    elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
-	    else
-	    {
+	    else {
 	        $this->error = 'BadValueForParameterMode';
 	        return -2;
 	    }
@@ -523,9 +500,7 @@ class Mailing extends CommonObject
 	    {
 	        $obj = $this->db->fetch_object($resql);
 	        if ($obj) return $obj->nb;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $this->db->lasterror();
 	        return -1;
 	    }
@@ -585,8 +560,7 @@ class Mailing extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 6b765d9451f..cf439e4314b 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -129,9 +129,7 @@ if (is_resource($handle))
                             }
 
                             $db->free($result);
-                        }
-                        else
-                        {
+                        } else {
                             dol_print_error($db);
                         }
                         print '</tr>';
@@ -191,16 +189,12 @@ if ($result) {
             print '</tr>';
 	        $i++;
 	    }
-    }
-    else
-    {
+    } else {
         print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8119224bbfa..d22dd130507 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -130,9 +130,7 @@ if ($filteremail)
 	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "m.rowid";
-}
-else
-{
+} else {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
@@ -274,9 +272,7 @@ if ($resql)
 		if ($filteremail)
 		{
 			print $email::libStatutDest($obj->sendstatut, 2);
-		}
-		else
-		{
+		} else {
 			print $email->LibStatut($obj->statut, 5);
 		}
 		print '</td>';
@@ -297,9 +293,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 6d80626242d..cd5d5c9ace9 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -152,9 +152,7 @@ if ($_socid > 0)
 		}
 		$db->free($resql);
 		print "</table>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 28fdc7845d2..e737aa1d8c3 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -161,9 +161,7 @@ if (empty($reshook))
 		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
@@ -204,9 +202,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Delete proposal
+	} // Delete proposal
 	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
@@ -217,9 +213,7 @@ if (empty($reshook))
 			$langs->load("errors");
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Remove line
+	} // Remove line
 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$result = $object->deleteline($lineid);
@@ -241,9 +235,7 @@ if (empty($reshook))
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit();
-	}
-
-	// Validation
+	} // Validation
 	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$result = $object->valid($user);
@@ -269,9 +261,7 @@ if (empty($reshook))
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate' && $usercancreate)
+	} elseif ($action == 'setdate' && $usercancreate)
 	{
 		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 
@@ -285,21 +275,17 @@ if (empty($reshook))
 			if ($result < 0)
 				dol_print_error($db, $object->error);
 		}
-	}
-	elseif ($action == 'setecheance' && $usercancreate)
+	} elseif ($action == 'setecheance' && $usercancreate)
 	{
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-	elseif ($action == 'setdate_livraison' && $usercancreate)
+	} elseif ($action == 'setdate_livraison' && $usercancreate)
 	{
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-
-	// Positionne ref client
+	} // Positionne ref client
 	elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
@@ -307,15 +293,11 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set incoterm
+	} // Set incoterm
 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate)
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// Create proposal
+	} // Create proposal
 	elseif ($action == 'add' && $usercancreate)
 	{
 		$object->socid = $socid;
@@ -549,9 +531,8 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				} 			// Standard creation
-				else
-				{
+				} // Standard creation
+				else {
 					$id = $object->create($user);
 				}
 
@@ -602,24 +583,18 @@ if (empty($reshook))
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
-					}
-					else
-					{
+					} else {
 						$db->rollback();
 						$action = 'create';
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
 				}
 			}
 		}
-	}
-
-	// Classify billed
+	} // Classify billed
 	elseif ($action == 'classifybilled' && $usercanclose)
 	{
 		$db->begin();
@@ -634,14 +609,10 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-
-	// Close proposal
+	} // Close proposal
 	elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		if (!(GETPOST('statut', 'int') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
@@ -662,16 +633,12 @@ if (empty($reshook))
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 				}
 			}
 		}
-	}
-
-	// Reopen proposal
+	} // Reopen proposal
 	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED)
@@ -688,15 +655,11 @@ if (empty($reshook))
 			if (!$error)
 			{
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
-	}
-
-	// add lines from objectlinked
+	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
 	    && $user->rights->propal->creer
 	    && $object->statut == Propal::STATUS_DRAFT
@@ -712,8 +675,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -765,8 +727,7 @@ if (empty($reshook))
 	                } else {
 	                    $error++;
 	                }
-	            }
-	            else {
+	            } else {
 	                $error++;
 	            }
 	        }
@@ -805,9 +766,7 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-
-	elseif ($action == "setabsolutediscount" && $usercancreate) {
+	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -816,9 +775,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Add line
+	} // Add line
 	elseif ($action == 'addline' && $usercancreate) {
 		// Set if we used free entry or predefined product
 		$predef = '';
@@ -830,9 +787,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -924,8 +879,7 @@ if (empty($reshook))
 					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
 					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 					}
-				}
-				// If price per customer
+				} // If price per customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
@@ -947,8 +901,7 @@ if (empty($reshook))
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
 					}
-				}
-				// If price per quantity
+				} // If price per quantity
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 				{
 					if ($prod->prices_by_qty[0])	// yes, this product has some prices per quantity
@@ -964,17 +917,14 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
 							break;
 						}
 					}
-				}
-				// If price per quantity and customer
+				} // If price per quantity and customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 				{
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) // yes, this product has some prices per quantity
@@ -990,9 +940,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1008,8 +956,7 @@ if (empty($reshook))
 				if (!empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 				elseif ($tmpvat != $tmpprodvat) {
 					if ($price_base_type != 'HT') {
@@ -1180,9 +1127,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Update a line within proposal
+	} // Update a line within proposal
 	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
 	{
 		// Define info_bits
@@ -1319,62 +1264,38 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	elseif ($action == 'classin' && $usercancreate) {
+	} elseif ($action == 'classin' && $usercancreate) {
         // Set project
         $object->setProject(GETPOST('projectid', 'int'));
-	}
-
-	// Delivery time
+	} // Delivery time
 	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));
-	}
-
-	// Origin of the commercial proposal
+	} // Origin of the commercial proposal
 	elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));
-	}
-
-	// Terms of payment
+	} // Terms of payment
 	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate) {
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == 'setremiseabsolue' && $usercancreate) {
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
-	}
-
-	// Payment choice
+	} // Payment choice
 	elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	// bank account
+	} // bank account
 	elseif ($action == 'setbankaccount' && $usercancreate) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-
-	// shipping method
+	} // shipping method
 	elseif ($action == 'setshippingmethod' && $usercancreate) {
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-	}
-
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
@@ -1412,18 +1333,14 @@ if (empty($reshook))
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-
-		// Toggle the status of a contact
+		} // Toggle the status of a contact
 		elseif ($action == 'swapstatut') {
 			if ($object->fetch($id) > 0) {
 				$result = $object->swapContactStatus(GETPOST('ligne'));
 			} else {
 				dol_print_error($db);
 			}
-		}
-
-		// Delete a contact
+		} // Delete a contact
 		elseif ($action == 'deletecontact') {
 			$object->fetch($id);
 			$result = $object->delete_contact($lineid);
@@ -1533,9 +1450,7 @@ if ($action == 'create')
 				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
@@ -1908,24 +1823,16 @@ if ($action == 'create')
 		}
 
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
-	}
-
-	// Confirm delete
+	} // Confirm delete
 	elseif ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);
-	}
-
-	// Confirm reopen
+	} // Confirm reopen
 	elseif ($action == 'reopen') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1);
-	}
-
-	// Confirmation delete product/service line
+	} // Confirmation delete product/service line
 	elseif ($action == 'ask_deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
-	}
-
-	// Confirm validate proposal
+	} // Confirm validate proposal
 	elseif ($action == 'validate') {
 		$error = 0;
 
@@ -2309,9 +2216,7 @@ if ($action == 'create')
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else
-		{
+		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -2478,9 +2383,7 @@ if ($action == 'create')
 					if ($usercanvalidate)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
-					}
-					else
-						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
+					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 				}
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2503,8 +2406,7 @@ if ($action == 'create')
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
@@ -2556,9 +2458,7 @@ if ($action == 'create')
 						if ($usercanclose)
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
-						}
-						else
-						{
+						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
 					}
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 87c91d0f621..8efc4aa5c19 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -220,8 +220,7 @@ class Proposals extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -456,9 +455,7 @@ class Proposals extends DolibarrApi
 		$updateRes = $this->propal->deleteline($lineid);
 		if ($updateRes > 0) {
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(405, $this->propal->error);
 		}
 	}
@@ -588,9 +585,7 @@ class Proposals extends DolibarrApi
 		if ($this->propal->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->propal->error);
 		}
 	}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3c7cfe0006c..63e3864245b 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -390,9 +390,7 @@ class Propal extends CommonObject
 			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
 			{
 				$price = $prod->multiprices[$this->thirdparty->price_level];
-			}
-			else
-			{
+			} else {
 				$price = $prod->price;
 			}
 
@@ -473,22 +471,16 @@ class Propal extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -561,9 +553,7 @@ class Propal extends CommonObject
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -715,23 +705,17 @@ class Propal extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-		else
-		{
+        } else {
 			dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -917,17 +901,13 @@ class Propal extends CommonObject
 
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action");
 			return -2;
 		}
@@ -959,15 +939,11 @@ class Propal extends CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1141,8 +1117,7 @@ class Propal extends CommonObject
                 					$error++;
                 				}
                 			}
-                		}
-                		else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+                		} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
                 		{
                 			$origin_id = $tmp_origin_id;
                 			$ret = $this->add_object_linked($origin, $origin_id);
@@ -1169,9 +1144,7 @@ class Propal extends CommonObject
                         if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
                         {   // Convert into object this->lines[$i].
                             $line = (object) $this->lines[$i];
-                        }
-                        else
-                        {
+                        } else {
                             $line = $this->lines[$i];
                         }
 						// Reset fk_parent_line for line that are not child lines or special product
@@ -1267,16 +1240,12 @@ class Propal extends CommonObject
 							if ($result < 0) { $error++; }
 							// End call triggers
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -1286,15 +1255,11 @@ class Propal extends CommonObject
 				$this->db->commit();
 				dol_syslog(get_class($this)."::create done id=".$this->id);
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1374,9 +1339,7 @@ class Propal extends CommonObject
 			$object->ref_client = '';
 
 			// TODO Change product price if multi-prices
-		}
-		else
-		{
+		} else {
 		    $objsoc->fetch($object->socid);
 		}
 
@@ -1444,9 +1407,7 @@ class Propal extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1500,8 +1461,7 @@ class Propal extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
-		}
-		else $sql .= " WHERE p.rowid=".$rowid;
+		} else $sql .= " WHERE p.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1611,9 +1571,7 @@ class Propal extends CommonObject
 
 			$this->error = "Record Not Found";
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1707,9 +1665,7 @@ class Propal extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1837,9 +1793,7 @@ class Propal extends CommonObject
 			$this->db->free($result);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -1887,9 +1841,7 @@ class Propal extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($soc);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -1962,9 +1914,7 @@ class Propal extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2026,9 +1976,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2088,9 +2036,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2150,9 +2096,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2213,9 +2157,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2224,9 +2166,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2286,9 +2226,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2297,9 +2235,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2355,9 +2291,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2366,9 +2300,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -2425,9 +2357,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2493,9 +2423,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2561,9 +2489,7 @@ class Propal extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2656,9 +2582,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->statut = $this->oldcopy->statut;
 				$this->date_cloture = $this->oldcopy->date_cloture;
 				$this->note_private = $this->oldcopy->note_private;
@@ -2666,9 +2590,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2717,9 +2639,7 @@ class Propal extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2784,9 +2704,7 @@ class Propal extends CommonObject
 
 		    $this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2852,13 +2770,10 @@ class Propal extends CommonObject
 					if ($shortlist == 1)
 					{
 						$ga[$obj->propalid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
+					} else {
 						$ga[$i]['id'] = $obj->propalid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2868,9 +2783,7 @@ class Propal extends CommonObject
 				}
 			}
 			return $ga;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2910,10 +2823,8 @@ class Propal extends CommonObject
 				if ($objecttype == 'facture')
 				{
 					$linkedInvoices[] = $object;
-				}
-				// Cas des factures liees par un autre objet (ex: commande)
-				else
-				{
+				} // Cas des factures liees par un autre objet (ex: commande)
+				else {
 					$this->fetchObjectLinked($object, $objecttype);
 					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid)
 					{
@@ -2964,13 +2875,10 @@ class Propal extends CommonObject
 					}
 				}
 				return $ga;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else return $ga;
+		} else return $ga;
 	}
 
 	/**
@@ -3067,30 +2975,22 @@ class Propal extends CommonObject
 						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
 						$this->db->commit();
 						return 1;
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						$this->db->rollback();
 						return 0;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3144,9 +3044,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3155,9 +3053,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3216,9 +3112,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3227,9 +3121,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3286,9 +3178,7 @@ class Propal extends CommonObject
 				}
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3423,9 +3313,7 @@ class Propal extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3503,9 +3391,7 @@ class Propal extends CommonObject
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
-			}
-			else
-			{
+			} else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3564,9 +3450,7 @@ class Propal extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3616,16 +3500,12 @@ class Propal extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
 			return "";
@@ -3673,14 +3553,11 @@ class Propal extends CommonObject
 
 			if ($option == '') {
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'compta') {  // deprecated
+			} elseif ($option == 'compta') {  // deprecated
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'expedition') {
+			} elseif ($option == 'expedition') {
 				$url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'document') {
+			} elseif ($option == 'document') {
 				$url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id.$get_params;
 			}
 
@@ -4028,14 +3905,10 @@ class PropaleLigne extends CommonObjectLine
 				$this->db->free($result);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -4084,9 +3957,7 @@ class PropaleLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4173,9 +4044,7 @@ class PropaleLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4227,9 +4096,7 @@ class PropaleLigne extends CommonObjectLine
 			$this->db->commit();
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4276,9 +4143,7 @@ class PropaleLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4355,9 +4220,7 @@ class PropaleLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4390,9 +4253,7 @@ class PropaleLigne extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index da86625b78f..c2f60516f1c 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -55,8 +55,7 @@ if ($id > 0 || !empty($ref))
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 		$error++;
-	}
-	elseif ($ret < 0)
+	} elseif ($ret < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$error++;
@@ -65,9 +64,7 @@ if ($id > 0 || !empty($ref))
 if (!$error)
 {
 	$object->fetch_thirdparty();
-}
-else
-{
+} else {
 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
 	exit;
 }
@@ -89,31 +86,23 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
+} // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->propale->creer)
 {
 	if ($object->id > 0)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-}
-
-// Deletes a contact
+} // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 {
 	$result = $object->delete_contact($lineid);
@@ -122,9 +111,7 @@ elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index d9d12c5efb4..70c67566091 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -179,9 +179,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->propal->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index a320d2b83b9..9e138c52cbe 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -163,9 +163,7 @@ if ($resql)
     //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -220,8 +218,7 @@ if (!empty($conf->propal->enabled))
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
 			}
@@ -310,8 +307,7 @@ if ($resql)
 	}
 	print "</table>";
 	print "</div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -394,17 +390,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table>";
 			print "</div><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 76914e2c13a..6710ac56b58 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -414,9 +414,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfProposals').' - '.$soc->name;
 		if (empty($search_societe)) $search_societe = $soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfProposals');
 	}
 
@@ -1028,9 +1026,7 @@ if ($resql)
 			{
 				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
 				print '</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1042,9 +1038,7 @@ if ($resql)
 			{
 				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
 				print '</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1169,8 +1163,7 @@ if ($resql)
 				if ($nbofsalesrepresentative > 3)   // We print only number
 				{
 					print $nbofsalesrepresentative;
-				}
-				elseif ($nbofsalesrepresentative > 0)
+				} elseif ($nbofsalesrepresentative > 0)
 				{
 					$userstatic = new User($db);
 					$j = 0;
@@ -1192,9 +1185,7 @@ if ($resql)
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
-			}
-			else
-			{
+			} else {
 				print '&nbsp';
 			}
 			print '</td>';
@@ -1279,9 +1270,7 @@ if ($resql)
 	$delallowed = $user->rights->propal->creer;
 
 	print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index add31f13f08..00a79f3c1be 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -112,9 +112,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
 }
@@ -152,9 +150,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
 }
@@ -192,9 +188,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -347,8 +341,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index ff0beef4037..b49f334dadd 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -223,9 +223,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			}
 			print "</table><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index b3b852c591a..e393f5fce56 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -83,9 +83,7 @@ if ($socid > 0)
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else
-{
+} else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 09f5e46f94b..284c248f1f0 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -83,9 +83,7 @@ if ($socid > 0)
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else
-{
+} else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index dc41845516a..a7517c9cb60 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -70,15 +70,11 @@ if (GETPOST('action', 'aZ09') == 'setremise')
 	    {
     		header("Location: ".$backtopage);
     		exit;
-	    }
-	    else
-	    {
+	    } else {
     		header("Location: remise.php?id=".$_GET["id"]);
     		exit;
 	    }
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -252,16 +248,12 @@ if ($socid > 0)
 	    			print '</tr>';
 	    			$i++;
 	    		}
-			}
-			else
-			{
+			} else {
 			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -311,16 +303,12 @@ if ($socid > 0)
 					print '</tr>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index c312591aeec..ffd4c1738c0 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -105,9 +105,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 		{
 			$newdiscount1->description = $discount->description;
 			$newdiscount2->description = $discount->description;
-		}
-		else
-		{
+		} else {
 			$newdiscount1->description = $discount->description.' (1)';
 			$newdiscount2->description = $discount->description.' (2)';
 		}
@@ -150,9 +148,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -189,22 +185,16 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 			    {
 			        header("Location: ".$backtopage.'&discountid='.$discountid);
 			        exit;
-			    }
-				else
-				{
+			    } else {
 				    header("Location: remx.php?id=".$id);
 				    exit;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($soc->error, $soc->errors, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("AmountHT")), null, 'errors');
 	}
 }
@@ -224,9 +214,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 		$db->commit();
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($discount->error, $discount->errors, 'errors');
 		$db->rollback();
 	}
@@ -300,9 +288,7 @@ if ($socid > 0)
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -332,9 +318,7 @@ if ($socid > 0)
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -489,8 +473,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -498,8 +481,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -507,9 +489,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -535,8 +515,7 @@ if ($socid > 0)
 	    				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
 	    				print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
 	    				print '</td>';
-	    			}
-	    			else print '<td>&nbsp;</td>';
+	    			} else print '<td>&nbsp;</td>';
 	    			print '</tr>';
 
 	    			if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -546,9 +525,7 @@ if ($socid > 0)
 	    			}
 	    			$i++;
 	    		}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -569,9 +546,7 @@ if ($socid > 0)
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, '', 0);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -646,8 +621,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -655,8 +629,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -664,9 +637,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -692,8 +663,7 @@ if ($socid > 0)
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
 						print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
 						print '</td>';
-					}
-					else print '<td>&nbsp;</td>';
+					} else print '<td>&nbsp;</td>';
 					print '</tr>';
 
 					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -703,9 +673,7 @@ if ($socid > 0)
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -726,9 +694,7 @@ if ($socid > 0)
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -857,8 +823,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -866,8 +831,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
+	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -875,9 +839,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -906,9 +868,7 @@ if ($socid > 0)
 	    			print '</tr>';
 	    			$i++;
 	    		}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -916,9 +876,7 @@ if ($socid > 0)
 
 			print "</table>";
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1035,8 +993,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -1044,8 +1001,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -1053,9 +1009,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("Invoice"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -1083,9 +1037,7 @@ if ($socid > 0)
 					print '</tr>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1093,9 +1045,7 @@ if ($socid > 0)
 
 			print "</table>";
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d10bd79cde0..3efb94855a7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -154,9 +154,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -167,9 +165,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -187,9 +183,7 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				setEventMessages($langs->trans('OrderReopened', $object->ref), null);
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -203,9 +197,7 @@ if (empty($reshook))
 		{
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -234,9 +226,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -502,17 +492,14 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'classifybilled' && $usercancreate)
+	} elseif ($action == 'classifybilled' && $usercancreate)
 	{
 		$ret = $object->classifyBilled($user);
 
 		if ($ret < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	elseif ($action == 'classifyunbilled' && $usercancreate)
+	} elseif ($action == 'classifyunbilled' && $usercancreate)
 	{
 		$ret = $object->classifyUnBilled();
 		if ($ret < 0) {
@@ -527,17 +514,13 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setremise' && $usercancreate) {
+	} elseif ($action == 'setremise' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise'));
 		if ($result < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setabsolutediscount' && $usercancreate) {
+	} elseif ($action == 'setabsolutediscount' && $usercancreate) {
 		if (GETPOST('remise_id')) {
 			if ($object->id > 0) {
 				$object->insert_discount(GETPOST('remise_id'));
@@ -545,9 +528,7 @@ if (empty($reshook))
 				dol_print_error($db, $object->error);
 			}
 		}
-	}
-
-	elseif ($action == 'setdate' && $usercancreate) {
+	} elseif ($action == 'setdate' && $usercancreate) {
 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
 
@@ -555,22 +536,16 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate_livraison' && $usercancreate)
-	{
-	    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+	} elseif ($action == 'setdate_livraison' && $usercancreate) {
+	    // print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 	    $datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 	    $object->fetch($id);
 	    $result = $object->set_date_livraison($user, $datedelivery);
-	    if ($result < 0)
-	    {
+	    if ($result < 0) {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-
-	elseif ($action == 'setmode' && $usercancreate) {
+	} elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -584,21 +559,15 @@ if (empty($reshook))
 	// Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	elseif ($action == 'setavailability' && $usercancreate) {
+	} elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability(GETPOST('availability_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'setdemandreason' && $usercancreate) {
+	} elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->demand_reason(GETPOST('demand_reason_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'setconditions' && $usercancreate) {
+	} elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
@@ -651,13 +620,9 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate) {
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise_percent'));
-	}
-
-	elseif ($action == 'setremiseabsolue' && $usercancreate) {
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
 	}
 
@@ -677,9 +642,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -727,9 +690,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -797,9 +758,7 @@ if (empty($reshook))
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
 				}
@@ -819,9 +778,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -844,9 +801,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1159,9 +1114,7 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
+	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -1169,9 +1122,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1206,9 +1157,7 @@ if (empty($reshook))
 
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1222,9 +1171,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1261,16 +1208,12 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
+	} elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
 		$result = $object->cloture($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -1278,9 +1221,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1351,8 +1292,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -1404,8 +1344,7 @@ if (empty($reshook))
 	                } else {
 	                    $error++;
 	                }
-	            }
-	            else {
+	            } else {
 	                $error++;
 	            }
 	        }
@@ -1535,12 +1474,10 @@ if ($action == 'create' && $usercancreate)
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
-			}
-			elseif ($element == 'propal') {
+			} elseif ($element == 'propal') {
 				$element = 'comm/propal';
 				$subelement = 'propal';
-			}
-			elseif ($element == 'contract') {
+			} elseif ($element == 'contract') {
 				$element = $subelement = 'contrat';
 			}
 
@@ -1586,9 +1523,7 @@ if ($action == 'create' && $usercancreate)
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id  = $soc->cond_reglement_id;
 		$mode_reglement_id  = $soc->mode_reglement_id;
 		$fk_account         = $soc->fk_account;
@@ -1626,8 +1561,7 @@ if ($action == 'create' && $usercancreate)
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
 	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid))
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
-	else
-		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	else print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
 	// Thirdparty
@@ -1959,9 +1893,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -1991,9 +1923,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2033,9 +1963,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2389,9 +2317,7 @@ if ($action == 'create' && $usercancreate)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 			print '</td></tr>';
@@ -2563,8 +2489,7 @@ if ($action == 'create' && $usercancreate)
 					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index ab0abb3d151..cc7db3db852 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -223,8 +223,7 @@ class Orders extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -569,9 +568,7 @@ class Orders extends DolibarrApi
         if ($this->commande->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
         	throw new RestException(500, $this->commande->error);
         }
     }
@@ -699,7 +696,7 @@ class Orders extends DolibarrApi
         $result = $this->commande->set_reopen(DolibarrApiAccess::$user);
         if ($result < 0) {
             throw new RestException(405, $this->commande->error);
-        }elseif ($result == 0) {
+        } elseif ($result == 0) {
             throw new RestException(304);
         }
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3496a9299fe..1c3c44dce93 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -406,16 +406,12 @@ class Commande extends CommonOrder
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
 			return "";
 		}
@@ -468,9 +464,7 @@ class Commande extends CommonOrder
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($soc);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -581,9 +575,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -668,9 +660,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -711,9 +701,7 @@ class Commande extends CommonOrder
 			$result = $this->call_trigger('ORDER_REOPEN', $user);
 			if ($result < 0) $error++;
 			// End call triggers
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -726,9 +714,7 @@ class Commande extends CommonOrder
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
@@ -783,15 +769,11 @@ class Commande extends CommonOrder
 
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 
 				$this->db->rollback();
@@ -861,9 +843,7 @@ class Commande extends CommonOrder
 				$this->statut = self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
@@ -872,9 +852,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1100,8 +1078,7 @@ class Commande extends CommonOrder
 										$error++;
 									}
 								}
-							}
-							else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 							{
 								$origin_id = $tmp_origin_id;
 								$ret = $this->add_object_linked($origin, $origin_id);
@@ -1147,8 +1124,7 @@ class Commande extends CommonOrder
 								//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 								$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 							}
-						}
-						else dol_print_error($resqlcontact);
+						} else dol_print_error($resqlcontact);
 					}
 
 					if (!$error)
@@ -1169,23 +1145,17 @@ class Commande extends CommonOrder
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						return -1 * $error;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->db->rollback();
 			return -1;
@@ -1288,9 +1258,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1421,10 +1389,8 @@ class Commande extends CommonOrder
 					$this->valid($user);
 				}
 				return $ret;
-			}
-			else return -1;
-		}
-		else return -1;
+			} else return -1;
+		} else return -1;
 	}
 
 
@@ -1504,9 +1470,7 @@ class Commande extends CommonOrder
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 			$label = trim($label);
@@ -1665,23 +1629,17 @@ class Commande extends CommonOrder
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -1920,15 +1878,11 @@ class Commande extends CommonOrder
 					return -3;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Order with id '.$id.' not found sql='.$sql;
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1992,22 +1946,16 @@ class Commande extends CommonOrder
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2132,9 +2080,7 @@ class Commande extends CommonOrder
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -2197,9 +2143,7 @@ class Commande extends CommonOrder
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2244,9 +2188,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2275,8 +2217,7 @@ class Commande extends CommonOrder
 		{
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2362,36 +2303,26 @@ class Commande extends CommonOrder
 						{
 							$this->db->commit();
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							$this->error = $this->db->lasterror();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						$this->error = $line->error;
 						return -1;
 					}
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -1;
 		}
@@ -2450,9 +2381,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2518,9 +2447,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2581,9 +2508,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2592,9 +2517,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -2647,9 +2570,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2658,9 +2579,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -2717,13 +2636,10 @@ class Commande extends CommonOrder
 					if ($shortlist == 1)
 					{
 						$ga[$obj->cid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
+					} else {
 						$ga[$i]['id'] = $obj->cid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2732,9 +2648,7 @@ class Commande extends CommonOrder
 				}
 			}
 			return $ga;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2788,9 +2702,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2799,9 +2711,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Command status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2860,9 +2770,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2871,9 +2779,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'order status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2929,9 +2835,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2940,9 +2844,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -2984,9 +2886,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
@@ -2995,9 +2895,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3039,9 +2937,7 @@ class Commande extends CommonOrder
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
@@ -3050,9 +2946,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3160,9 +3054,7 @@ class Commande extends CommonOrder
 			if ($price_base_type == 'TTC')
 			{
 				$subprice = $pu_ttc;
-			}
-			else
-			{
+			} else {
 				$subprice = $pu_ht;
 			}
 			$remise = 0;
@@ -3265,17 +3157,13 @@ class Commande extends CommonOrder
 
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this)."::updateline Order status makes operation forbidden";
 			$this->errors = array('OrderStatusMakeOperationForbidden');
 			return -2;
@@ -3369,9 +3257,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -3503,9 +3389,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -3570,9 +3454,7 @@ class Commande extends CommonOrder
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3626,38 +3508,31 @@ class Commande extends CommonOrder
 		    $labelStatus = $langs->trans('StatusOrderCanceled');
 		    $labelStatusShort = $langs->trans('StatusOrderCanceledShort');
 		    $statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_DRAFT) {
+		} elseif ($status == self::STATUS_DRAFT) {
 		    $labelStatus = $langs->trans('StatusOrderDraft');
 		    $labelStatusShort = $langs->trans('StatusOrderDraftShort');
 		    $statusType = 'status0';
-		}
-		elseif ($status == self::STATUS_VALIDATED) {
+		} elseif ($status == self::STATUS_VALIDATED) {
 		    $labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
 		    $statusType = 'status1';
-		}
-		elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
+		} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
 		    $labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+		} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderToBill');
 		    $labelStatusShort = $langs->trans('StatusOrderToBillShort');
 		    $statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+		} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
 		    $statusType = 'status6';
-		}
-		elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+		} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderDelivered');
 		    $labelStatusShort = $langs->trans('StatusOrderDelivered');
 		    $statusType = 'status6';
-		}
-		else {
+		} else {
 		    $labelStatus = $langs->trans('Unknown');
 		    $labelStatusShort = '';
 		    $statusType = '';
@@ -3819,9 +3694,7 @@ class Commande extends CommonOrder
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3895,9 +3768,7 @@ class Commande extends CommonOrder
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
-			}
-			else
-			{
+			} else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3955,9 +3826,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4208,9 +4077,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4296,9 +4163,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4343,9 +4208,7 @@ class OrderLine extends CommonOrderLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4440,9 +4303,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4489,9 +4350,7 @@ class OrderLine extends CommonOrderLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4574,9 +4433,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4615,9 +4472,7 @@ class OrderLine extends CommonOrderLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index cbb93b940de..5af5fb23060 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -78,8 +78,7 @@ class CommandeStats extends Stats
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
-		}
-		elseif ($mode == 'supplier')
+		} elseif ($mode == 'supplier')
 		{
 			$object = new CommandeFournisseur($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 6b9e3ae039a..2d11feeeee2 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -63,16 +63,12 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -84,9 +80,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -101,8 +95,7 @@ elseif ($action == 'deletecontact' && $user->rights->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -206,9 +199,7 @@ if ($id > 0 || !empty($ref))
 		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		    if ($res) break;
 		}
-	}
-	else
-	{
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1e445a602f7..f78d6ce2e84 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -184,9 +184,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 9d188cda104..27d38378bcb 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -182,14 +182,10 @@ if ($id > 0 || !empty($ref))
 		$permtoedit = $user->rights->commande->creer;
 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 13d67c942ed..96476caeeed 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -173,9 +173,7 @@ if ($resql)
     //if ($totalinprocess != $total)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -232,9 +230,7 @@ if (!empty($conf->commande->enabled))
                 print '</td></tr>';
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table></div><br>";
@@ -323,8 +319,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 $max = 10;
 
@@ -410,8 +405,7 @@ if (!empty($conf->commande->enabled))
 		}
 
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 /*
@@ -495,8 +489,7 @@ if (!empty($conf->commande->enabled))
 			}
 		}
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8b7000d8f23..5770df78a82 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -395,9 +395,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfOrders').' - '.$soc->name;
 		if (empty($search_company)) $search_company = $soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfOrders');
 	}
 	if (strval($search_status) == '0')
@@ -541,9 +539,7 @@ if ($resql)
 		{
 			print $form->selectyesno('validate_invoices', 0, 1, 1);
 			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else
-		{
+		} else {
 			print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
@@ -962,8 +958,7 @@ if ($resql)
 								{
 									$notshippable++;
 								}
-							}
-							else {  // Detailed code, looks bugged
+							} else {  // Detailed code, looks bugged
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
@@ -1310,9 +1305,7 @@ if ($resql)
 	$delallowed = $user->rights->commande->creer;
 
 	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index f230f7935a5..c3d82821249 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -83,9 +83,7 @@ if ($action == 'create')
 	{
 		$error++;
 		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
-	}
-	else
-	{
+	} else {
 		$origin = GETPOST('origin');
 		$originid = GETPOST('originid');
 	}
@@ -209,9 +207,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 							if ($db->query($sql))
 							{
 								$db->commit();
-							}
-							else
-							{
+							} else {
 								$db->rollback();
 							}
 						}
@@ -256,16 +252,12 @@ if (($action == 'create' || $action == 'add') && !$error)
 										{
 											$result = $object->insert_discount($discountid);
 											//$result=$discount->link_to_invoice($lineid,$id);
-										}
-										else
-										{
+										} else {
 											setEventMessages($discount->error, $discount->errors, 'errors');
 											$error++;
 											break;
 										}
-									}
-									else
-									{
+									} else {
 										// Positive line
 										$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 										// Date start
@@ -320,9 +312,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 										if ($result > 0)
 										{
 											$lineid = $result;
-										}
-										else
-										{
+										} else {
 											$lineid = 0;
 											$error++;
 											break;
@@ -334,17 +324,13 @@ if (($action == 'create' || $action == 'add') && !$error)
 										}
 									}
 								}
-							}
-							else
-							{
+							} else {
 								setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
 								$error++;
 							}
 							$ii++;
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
@@ -358,9 +344,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 			$db->commit();
 			header('Location: '.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$id);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -729,9 +713,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 4e7ed481882..0910e4ee7ad 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -114,9 +114,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
     if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
     if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
@@ -157,9 +155,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
     if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
     if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
@@ -198,9 +194,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -381,8 +375,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index faf2feeb7a0..0c20e46e316 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -334,9 +334,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                    $nofile['sens'] = $objd->sens;
 
 		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
-		                }
-		                else
-		                {
+		                } else {
 		                    foreach ($files as $key => $file)
 		                    {
 		                    	$file['id'] = $objd->id;
@@ -383,15 +381,12 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 
 		            $i++;
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($db);
 		    }
 
 		    $db->free($resd);
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors');
 			$error++;
 		}
@@ -491,9 +486,7 @@ if ($result && $action == "dl" && !$error)
         dol_delete_file($zipname);
 
         exit();
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
     }
 }
@@ -625,9 +618,7 @@ if (!empty($date_start) && !empty($date_stop))
         if (empty($TData))
         {
             print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td></tr>';
-        }
-        else
-        {
+        } else {
             // Sort array by date ASC to calculate balance
 
             $totalET_debit = 0;
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index f380d8b4ee5..0129d1e5f43 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -81,13 +81,11 @@ if ($currentInvId)																	// Here to breakdown
 			$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
 			$result += $remainAmount; // result must be deduced by
 			$currentAmount += $remainAmount; // curAmount put to curRemain
-		} else
-		{
+		} else {
 			$currentAmount = $currentRemain;
 			$result += $currentRemain;
 		}
-	} else
-	{
+	} else {
 		// Reset the substraction for this amount
 		$result += price2num($currentAmount);
 		$currentAmount = 0;
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 05f89e1bc6f..767c8f8709b 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -138,12 +138,10 @@ if ($id > 0 || !empty($ref)) {
 		$moreparam = '&num='.urlencode($num); ;
 		$relativepathwithnofile = $id."/statement/".dol_sanitizeFileName($num)."/";
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	Header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 1f6e5e6620c..72a7e33d3f2 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -50,9 +50,7 @@ if (!$year_start)
 {
 	$year_start = $year_current - 2;
 	$year_end = $year_current;
-}
-else
-{
+} else {
 	$year_end = $year_start + 2;
 }
 
@@ -107,9 +105,7 @@ if ($resql)
 		$encaiss[$row[1]] = $row[0];
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -135,9 +131,7 @@ if ($resql)
 		$decaiss[$row[1]] = -$row[0];
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -157,9 +151,7 @@ if (!empty($id))
     if (!preg_match('/,/', $id))
     {
         dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    }
-    else
-    {
+    } else {
         $bankaccount = new Account($db);
         $listid = explode(',', $id);
         foreach ($listid as $key => $aId)
@@ -170,9 +162,7 @@ if (!empty($id))
             if ($key < (count($listid) - 1)) print ', ';
         }
     }
-}
-else
-{
+} else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -257,8 +247,7 @@ if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 	if ($obj) $balance = $obj->total;
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -280,9 +269,7 @@ if ($result < 0)
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
-}
-else
-{
+} else {
 	// Calcul de $min et $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -298,9 +285,7 @@ else
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	$log = "graph.php: min=".$min." max=".$max;
@@ -338,9 +323,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -425,9 +408,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 7d059734126..0af1f84d9f6 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -68,9 +68,7 @@ if ($fielvalue)
 {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
-}
-else
-{
+} else {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque');
 }
@@ -241,16 +239,12 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
                     }
                 }
             }
-        }
-        else
-        {
+        } else {
             $error++;
             $langs->load("errors");
             setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
         }
-    }
-    else
-    {
+    } else {
         $error++;
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
@@ -286,9 +280,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
     if (price2num($_POST["addcredit"]) > 0)
     {
         $amount = price2num($_POST["addcredit"]);
-    }
-    else
-    {
+    } else {
         $amount = - price2num($_POST["adddebit"]);
     }
 
@@ -337,14 +329,10 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
             setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
             exit;
-        }
-        else
-        {
+        } else {
             setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else
-    {
+    } else {
         $action = 'addline';
     }
 }
@@ -468,9 +456,7 @@ if ($id > 0 || !empty($ref))
             }
         }
     }
-}
-else
-{
+} else {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
 
@@ -674,9 +660,7 @@ if ($resql)
 	        if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
 	        print $liste;
 	        if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
-	    }
-	    else
-	    {
+	    } else {
 	        dol_print_error($db);
 	    }
 
@@ -792,14 +776,11 @@ if ($resql)
 			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// If direct entries is done using miscellaneous payments
 			{
 			    $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
-			}
-			else												// If direct entries is not done using miscellaneous payments
+			} else // If direct entries is not done using miscellaneous payments
 			{
                 $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
-		}
-		else
-		{
+		} else {
             $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
 		}
 	}
@@ -1039,15 +1020,12 @@ if ($resql)
                 	if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
                 	{
                 		$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
-                	}
-                	// If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
-                	else
-                	{
+                	} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
+                	else {
                 		$balance = $objforbalance->previoustotal;
                 	}
                 }
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             $balancecalculated = true;
 
@@ -1128,9 +1106,7 @@ if ($resql)
         {
         	$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
         	$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
-        }
-		else
-		{
+        } else {
 			$balancebefore = price2num($balance, 'MT'); // balancebefore = balance of previous line (sort is asc)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
@@ -1141,9 +1117,7 @@ if ($resql)
             $bankaccounttmp->fetch($objp->bankid);
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
-        }
-        else
-        {
+        } else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -1207,63 +1181,53 @@ if ($resql)
     	    		$banktransferstatic->id = $links[$key]['url_id'];
     	    		$banktransferstatic->ref = $links[$key]['label'];
     	    		print ' '.$banktransferstatic->getNomUrl(0);
-    	    	}
-    	    	elseif ($links[$key]['type'] == 'payment')
+    	    	} elseif ($links[$key]['type'] == 'payment')
     	        {
     	            $paymentstatic->id = $links[$key]['url_id'];
     	            $paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
     	            print ' '.$paymentstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_supplier')
+    	        } elseif ($links[$key]['type'] == 'payment_supplier')
     	        {
     	            $paymentsupplierstatic->id = $links[$key]['url_id'];
     	            $paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
     	            print ' '.$paymentsupplierstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_sc')
+    	        } elseif ($links[$key]['type'] == 'payment_sc')
     	        {
     	            print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
     	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
     	            //print $langs->trans("SocialContributionPayment");
     	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_vat')
+    	        } elseif ($links[$key]['type'] == 'payment_vat')
     	        {
     	            $paymentvatstatic->id = $links[$key]['url_id'];
     	            $paymentvatstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentvatstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_salary')
+    	        } elseif ($links[$key]['type'] == 'payment_salary')
     	        {
     	            $paymentsalstatic->id = $links[$key]['url_id'];
     	            $paymentsalstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentsalstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_loan')
+    	        } elseif ($links[$key]['type'] == 'payment_loan')
     	        {
     	            print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
     	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
     	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_donation')
+    	        } elseif ($links[$key]['type'] == 'payment_donation')
     	        {
     	            print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
     	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
     	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_expensereport')
+    	        } elseif ($links[$key]['type'] == 'payment_expensereport')
     	        {
     	            $paymentexpensereportstatic->id = $links[$key]['url_id'];
     	            $paymentexpensereportstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_various')
+    	        } elseif ($links[$key]['type'] == 'payment_various')
     	        {
     	            $paymentvariousstatic->id = $links[$key]['url_id'];
     	            $paymentvariousstatic->ref = $links[$key]['url_id'];
     	            print ' '.$paymentvariousstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'banktransfert')
+    	        } elseif ($links[$key]['type'] == 'banktransfert')
     	        {
     	            // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
     	            if ($objp->amount > 0)
@@ -1278,9 +1242,7 @@ if ($resql)
     	                $bankstatic->label = $objp->bankref;
     	                print $bankstatic->getNomUrl(1, '');
     	                print ')';
-    	            }
-    	            else
-    	            {
+    	            } else {
     	                $bankstatic->id = $objp->bankid;
     	                $bankstatic->label = $objp->bankref;
     	                print ' ('.$langs->trans("TransferFrom").' ';
@@ -1293,21 +1255,15 @@ if ($resql)
     	                print ')';
     	            }
     	            //var_dump($links);
-    	        }
-    	        elseif ($links[$key]['type'] == 'company')
+    	        } elseif ($links[$key]['type'] == 'company')
     	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'user')
+    	        } elseif ($links[$key]['type'] == 'user')
     	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'member')
+    	        } elseif ($links[$key]['type'] == 'member')
     	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'sc')
-    	        {
-    	        }
-    	        else
+    	        } elseif ($links[$key]['type'] == 'sc')
     	        {
+    	        } else {
     	            // Show link with label $links[$key]['label']
     	            if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
     	            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
@@ -1316,9 +1272,7 @@ if ($resql)
     	                // Label generique car entre parentheses. On l'affiche en le traduisant
     	                if ($reg[1] == 'paiement') $reg[1] = 'Payment';
     	                print ' '.$langs->trans($reg[1]);
-    	            }
-    	            else
-    	            {
+    	            } else {
     	                print ' '.$links[$key]['label'];
     	            }
     	            print '</a>';
@@ -1395,9 +1349,7 @@ if ($resql)
 				$companystatic->code_compta = $objp->code_compta;
 				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 				print $companystatic->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -1449,14 +1401,10 @@ if ($resql)
     			if ($balancebefore >= 0)
     			{
     				print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			}
-    			else
-    			{
+    			} else {
     				print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
     			}
-    		}
-    		else
-    		{
+    		} else {
     			print '<td class="right">-</td>';
     		}
     		if (!$i) $totalarray['nbfield']++;
@@ -1469,14 +1417,10 @@ if ($resql)
     			if ($balance >= 0)
     			{
     				print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
-    			}
-    			else
-    			{
+    			} else {
     				print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
     			}
-    		}
-    		else
-    		{
+    		} else {
     			print '<td class="right">-</td>';
     		}
     		if (!$i) $totalarray['nbfield']++;
@@ -1522,17 +1466,13 @@ if ($resql)
     	    print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	    print img_edit();
     	    print '</a>';
-    	}
-    	else
-    	{
+    	} else {
     	    if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
     	    {
     	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	        print img_edit();
     	        print '</a>';
-    	    }
-    	    else
-    	    {
+    	    } else {
     	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
     	        print img_view();
     	        print '</a>';
@@ -1582,16 +1522,14 @@ if ($resql)
 	        {
 	            if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 	            else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-	        }
-	        elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+	        } elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
 	        elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
 	        elseif ($i == $posconciliatecol)
 	        {
 	        	print '<td class="center">';
 	        	if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
 	        	print '</td>';
-	        }
-	        else print '<td></td>';
+	        } else print '<td></td>';
 	    }
 	    print '</tr>';
 	}
@@ -1609,9 +1547,7 @@ if ($resql)
 
     print '</form>';
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 042117808d5..8559096477d 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -89,9 +89,7 @@ if ($result)
 	print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
 	print '<td class="liste_total right">'.price($total).'</td>';
 	print '<td colspan="2" class="liste_total right">'.price($totalnb ?price2num($total / $totalnb, 'MT') : 0).'</td></tr>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 593893878e0..c99f303210b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -99,9 +99,7 @@ if ($action == 'add')
 	if (empty($account_number) || $account_number == '-1')
 	{
 		$object->account_number = '';
-	}
-	else
-	{
+	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -155,8 +153,7 @@ if ($action == 'add')
 			$_GET["id"] = $id; // Force chargement page en mode visu
 
 			$action = '';
-		}
-		else {
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 
@@ -167,9 +164,7 @@ if ($action == 'add')
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -205,9 +200,7 @@ if ($action == 'update')
 	if (empty($account_number) || $account_number == '-1')
 	{
 		$object->account_number = '';
-	}
-	else
-	{
+	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -259,9 +252,7 @@ if ($action == 'update')
 			$object->setCategories($categories);
 
 			$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit'; // Force chargement page edition
@@ -271,9 +262,7 @@ if ($action == 'update')
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -290,9 +279,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -383,8 +370,7 @@ if ($action == 'create')
 	if (isset($_POST["account_country_id"]))
 	{
 		$selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
-	}
-	elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+	} elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
 	$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
@@ -398,9 +384,7 @@ if ($action == 'create')
 	if ($selectedcode)
 	{
 		$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -544,9 +528,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number") ?GETPOST('account_number', 'alpha') : $object->account_number).'"></td></tr>';
 	}
@@ -571,16 +553,14 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-/* ************************************************************************** */
-/*                                                                            */
-/* Visu et edition                                                            */
-/*                                                                            */
-/* ************************************************************************** */
-else
-{
-	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
-	{
+} else {
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* Visu et edition                                                            */
+	/*                                                                            */
+	/* ************************************************************************** */
+
+	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') {
 		$object = new Account($db);
 		if ($_GET["id"])
 		{
@@ -886,9 +866,7 @@ else
 		if ($selectedcode)
 		{
 			print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
-		}
-		else
-		{
+		} else {
 			print $countrynotdefined;
 		}
 		print '</td></tr>';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 308dad5dbca..0f71134d08a 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -132,9 +132,7 @@ if ($result)
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
 			print "</td>";
-		}
-		else
-		{
+		} else {
 			print "<td >".$objp->label."</td>";
 			print '<td class="center">';
 			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 3fcbffba3b2..adb170ee81d 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -343,9 +343,9 @@ class Account extends CommonObject
 				$string .= $this->code_guichet.' ';
 			} elseif ($val == 'BankAccountNumberKey') {
 				$string .= $this->cle_rib.' ';
-			}elseif ($val == 'BIC') {
+			} elseif ($val == 'BIC') {
 				$string .= $this->bic.' ';
-			}elseif ($val == 'IBAN') {
+			} elseif ($val == 'IBAN') {
 				$string .= $this->iban.' ';
 			}
 		}
@@ -403,9 +403,7 @@ class Account extends CommonObject
 		{
 			$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
 			return $rowid;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -437,8 +435,7 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_url";
 		if ($fk_bank > 0) {
 			$sql .= " WHERE fk_bank = ".$fk_bank;
-		}
-		else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$type."'";
+		} else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$type."'";
 		}
 		$sql .= " ORDER BY type, label";
 
@@ -464,8 +461,7 @@ class Account extends CommonObject
 				$lines[$i]['fk_bank'] = $obj->fk_bank;
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $lines;
 	}
@@ -509,9 +505,7 @@ class Account extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$oper = $obj->code;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db, 'Failed to get payment type code');
 				return -1;
 			}
@@ -720,20 +714,15 @@ class Account extends CommonObject
 					if ($result < 0) $error++;
 					// End call triggers
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $langs->trans("ErrorBankLabelAlreadyExists");
 				$error++;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$error++;
 			}
@@ -743,9 +732,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -836,9 +823,7 @@ class Account extends CommonObject
 				if ($result < 0) $error++;
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -848,9 +833,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -907,9 +890,7 @@ class Account extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1006,14 +987,10 @@ class Account extends CommonObject
 				$this->fetch_optionals();
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror;
 			$this->errors[] = $this->error;
 			return -1;
@@ -1113,9 +1090,7 @@ class Account extends CommonObject
 						dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = "Error ".$this->db->lasterror();
 			}
@@ -1125,9 +1100,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1192,8 +1165,7 @@ class Account extends CommonObject
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj->nb <= 1) $can_be_deleted = true; // Juste le solde
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $can_be_deleted;
@@ -1291,9 +1263,7 @@ class Account extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1330,9 +1300,7 @@ class Account extends CommonObject
 				$this->nb["banklines"] = $obj->nb;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1366,8 +1334,7 @@ class Account extends CommonObject
 		{
 			$obj = $db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		return $nb;
 	}
@@ -1414,8 +1381,7 @@ class Account extends CommonObject
 		if ($mode == 'transactions')
 		{
 			$url = DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id;
-		}
-		elseif ($mode == 'receipts')
+		} elseif ($mode == 'receipts')
 		{
 			$url = DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id;
 		}
@@ -1475,9 +1441,7 @@ class Account extends CommonObject
 		if ($this->error_number == 0)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -1896,9 +1860,7 @@ class AccountLine extends CommonObject
 			}
 			$this->db->free($result);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -1985,8 +1947,7 @@ class AccountLine extends CommonObject
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -2014,9 +1975,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2053,9 +2012,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2085,9 +2042,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			return -1;
@@ -2151,9 +2106,7 @@ class AccountLine extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2189,14 +2142,11 @@ class AccountLine extends CommonObject
 				{
 					return 1;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		return 0;
 	}
 
@@ -2256,14 +2206,11 @@ class AccountLine extends CommonObject
 				{
 					return 1;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		return 0;
 	}
 
@@ -2333,9 +2280,7 @@ class AccountLine extends CommonObject
 				//$this->date_rappro       = $obj->daterappro;    // Not yet managed
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2476,9 +2421,7 @@ class AccountLine extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index ad75559b362..3293f746033 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -225,9 +225,7 @@ class BankAccounts extends DolibarrApi
         if ($accountto->currency_code == $accountfrom->currency_code)
         {
             $amount_to = $amount;
-        }
-        else
-        {
+        } else {
             if (!$amount_to || empty($amount_to))
             {
                 throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
@@ -303,9 +301,7 @@ class BankAccounts extends DolibarrApi
                     'message' => 'Internal wire transfer created successfully.'
                 )
             );
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             throw new RestException(500, $accountfrom->error.' '.$accountto->error);
         }
@@ -338,9 +334,7 @@ class BankAccounts extends DolibarrApi
         if ($account->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $account->error);
         }
     }
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 6af394ad4b4..65c7e7ce2ea 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -169,9 +169,7 @@ class PaymentVarious extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -244,9 +242,7 @@ class PaymentVarious extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -430,9 +426,7 @@ class PaymentVarious extends CommonObject
 					if ($bank_line_id > 0)
 					{
 						$this->update_fk_bank($bank_line_id);
-					}
-					else
-					{
+					} else {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -461,22 +455,17 @@ class PaymentVarious extends CommonObject
 				$result = $this->call_trigger('PAYMENT_VARIOUS_CREATE', $user);
 				if ($result < 0) $error++;
 				// End call triggers
-			}
-			else $error++;
+			} else $error++;
 
 			if (!$error)
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -499,9 +488,7 @@ class PaymentVarious extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -535,30 +522,25 @@ class PaymentVarious extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
@@ -616,8 +598,7 @@ class PaymentVarious extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -676,9 +657,7 @@ class PaymentVarious extends CommonObject
 				$this->date_modif = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -705,9 +684,7 @@ class PaymentVarious extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index d003463e5af..09cd81d4198 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -137,12 +137,10 @@ if ($id > 0 || !empty($ref)) {
         $permtoedit = $user->rights->banque->modifier;
         $param = '&id='.$object->id;
         include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-else {
+} else {
     Header('Location: index.php');
     exit;
 }
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 347353be84f..296211bf35c 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -84,9 +84,7 @@ if ($result < 0)
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
-}
-else
-{
+} else {
 	// Calcul $min and $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -102,9 +100,7 @@ else
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	if (empty($min)) $min = dol_now() - 3600 * 24;
@@ -151,9 +147,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -174,9 +168,7 @@ else
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -199,9 +191,7 @@ else
 			if ($day > time())
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else
-			{
+			} else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -294,9 +284,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -317,9 +305,7 @@ else
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -343,9 +329,7 @@ else
 			if ($day > $now)
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else
-			{
+			} else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -431,9 +415,7 @@ else
 				$amounts[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -459,9 +441,7 @@ else
 			if ($day > ($max + 86400))
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else
-			{
+			} else {
 				$datas[$i] = 0 + $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -557,9 +537,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -591,9 +569,7 @@ else
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -674,9 +650,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		$sql = "SELECT date_format(b.datev,'%m')";
@@ -699,9 +673,7 @@ else
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -770,16 +742,12 @@ if ($account)
 		{
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
     		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
-		}
-		else
-		{
+		} else {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.$moreparam.'">'.$langs->trans("BackToAccount").'</a>';
 			print $langs->trans("AllAccounts");
 			//print $morehtml;
 		}
-	}
-	else
-	{
+	} else {
 	    $bankaccount = new Account($db);
 		$listid = explode(',', $account);
 		foreach ($listid as $key => $id)
@@ -790,9 +758,7 @@ if ($account)
 			if ($key < (count($listid) - 1)) print ', ';
 		}
 	}
-}
-else
-{
+} else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -808,9 +774,7 @@ if ($mode == 'showalltime')
 	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'">';
 	print $langs->trans("GoBack");
 	print '</a>';
-}
-else
-{
+} else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.'">';
 	print $langs->trans("ShowAllTimeBalance");
 	print '</a>';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index bf8dc6f5649..d2b3e6099dd 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -76,15 +76,15 @@ if ($user->rights->banque->consolidate && $action == 'donext')
 {
     $al = new AccountLine($db);
     $al->dateo_next($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'doprev')
+} elseif ($user->rights->banque->consolidate && $action == 'doprev')
 {
     $al = new AccountLine($db);
     $al->dateo_previous($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'dvnext')
+} elseif ($user->rights->banque->consolidate && $action == 'dvnext')
 {
     $al = new AccountLine($db);
     $al->datev_next($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'dvprev')
+} elseif ($user->rights->banque->consolidate && $action == 'dvprev')
 {
     $al = new AccountLine($db);
     $al->datev_previous($_GET["rowid"]);
@@ -99,9 +99,7 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
     	{
         	dol_print_error($db);
     	}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("MissingIds"), null, 'errors');
 	}
 }
@@ -120,9 +118,7 @@ if ($user->rights->banque->modifier && $action == "update")
 	if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta())	// We ask to change bank account
 	{
 		$actarget->fetch(GETPOST('accountid', 'int'));
-	}
-	else
-	{
+	} else {
 		$actarget->fetch($id);
 	}
 
@@ -191,9 +187,7 @@ if ($user->rights->banque->modifier && $action == "update")
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -229,9 +223,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
         {
 	        setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -324,9 +316,7 @@ if ($result)
         if (!$objp->rappro && !$bankline->getVentilExportCompta())
         {
         	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
-        }
-        else
-        {
+        } else {
         	print $acct->getNomUrl(1, 'transactions', 'reflabel');
         }
         print '</td>';
@@ -350,8 +340,7 @@ if ($result)
                     print $langs->trans("Payment");
                     print '</a>';*/
                     print $paymenttmp->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'payment_supplier') {
+                } elseif ($links[$key]['type'] == 'payment_supplier') {
                     require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
                     $paymenttmp = new PaiementFourn($db);
                     $paymenttmp->fetch($links[$key]['url_id']);
@@ -361,79 +350,66 @@ if ($result)
                     print $langs->trans("Payment");
                     print '</a>';*/
                     print $paymenttmp->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'company') {
+                } elseif ($links[$key]['type'] == 'company') {
                     $societe = new Societe($db);
                     $societe->fetch($links[$key]['url_id']);
                     print $societe->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'sc') {
+                } elseif ($links[$key]['type'] == 'sc') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('SocialContribution'), 'bill').' ';
                     print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_sc') {
+                } elseif ($links[$key]['type'] == 'payment_sc') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Payment'), 'payment').' ';
                     print $langs->trans("SocialContributionPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_vat') {
+                } elseif ($links[$key]['type'] == 'payment_vat') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('VAT'), 'payment').' ';
                     print $langs->trans("VATPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_salary') {
+                } elseif ($links[$key]['type'] == 'payment_salary') {
                     print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('PaymentSalary'), 'payment').' ';
                     print $langs->trans("SalaryPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_loan') {
+                } elseif ($links[$key]['type'] == 'payment_loan') {
                     print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('LoanPayment'), 'payment').' ';
                     print $langs->trans("PaymentLoan");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'loan') {
+                } elseif ($links[$key]['type'] == 'loan') {
                     print '<a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Loan'), 'bill').' ';
                     print $langs->trans("Loan");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'member') {
+                } elseif ($links[$key]['type'] == 'member') {
                     print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Member'), 'user').' ';
                     print $links[$key]['label'];
                     print '</a>';
-                }
-				elseif ($links[$key]['type'] == 'payment_donation') {
+                } elseif ($links[$key]['type'] == 'payment_donation') {
                     print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Donation'), 'payment').' ';
                     print $langs->trans("DonationPayment");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'banktransfert') {
+                } elseif ($links[$key]['type'] == 'banktransfert') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('Transaction'), 'payment').' ';
                     print $langs->trans("TransactionOnTheOtherAccount");
                     print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'user') {
+                } elseif ($links[$key]['type'] == 'user') {
                     print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('User'), 'user').' ';
                     print $langs->trans("User");
                     print '</a>';
-                }
-				elseif ($links[$key]['type'] == 'payment_various') {
+                } elseif ($links[$key]['type'] == 'payment_various') {
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('VariousPayment'), 'payment').' ';
                     print $langs->trans("VariousPayment");
                     print '</a>';
-                }
-                else {
+                } else {
                     print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
                     print img_object('', 'generic').' ';
                     print $links[$key]['label'];
@@ -463,9 +439,7 @@ if ($result)
                 print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
             }
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
         }
         print "</tr>";
@@ -479,9 +453,7 @@ if ($result)
             print '<td>';
             print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>'.$objp->emetteur.'</td>';
         }
         print "</tr>";
@@ -495,9 +467,7 @@ if ($result)
         	print '<td>';
         	print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
         	print '</td>';
-        }
-        else
-        {
+        } else {
         	print '<td>'.$objp->banque.'</td>';
         }
         print "</tr>";
@@ -517,9 +487,7 @@ if ($result)
                 print img_edit_add()."</a>";
             }
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>';
             print dol_print_date($db->jdate($objp->do), "day");
             print '</td>';
@@ -541,9 +509,7 @@ if ($result)
                 print img_edit_add()."</a>";
             }
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>';
             print dol_print_date($db->jdate($objp->dv), "day");
             print '</td>';
@@ -560,24 +526,18 @@ if ($result)
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
-            }
-            else
-            {
+            } else {
                 print $objp->label;
             }
             print '">';
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>';
             if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
-            }
-            else
-            {
+            } else {
                 print $objp->label;
             }
             print '</td>';
@@ -591,9 +551,7 @@ if ($result)
             print '<td>';
             print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>';
             print price($objp->amount);
             print '</td>';
@@ -649,16 +607,12 @@ if ($result)
                 {
                     print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
                     print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
-                }
-                else
-                {
+                } else {
                     print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
                 }
                 if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
                 print '</td>';
-            }
-            else
-            {
+            } else {
                 print '<td>'.$objp->num_releve.'&nbsp;</td>';
             }
             print '</tr>';
@@ -669,9 +623,7 @@ if ($result)
                 print '<td>';
                 print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
                 print '</td>';
-            }
-            else
-            {
+            } else {
                 print '<td>'.yn($objp->rappro).'</td>';
             }
             print '</tr>';
@@ -694,8 +646,7 @@ if ($result)
     }
 
     $db->free($result);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index b1c76c529ad..882244518f7 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -212,8 +212,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 
@@ -487,9 +486,7 @@ foreach ($accounts as $key=>$type)
     		$accountingaccount = new AccountingAccount($db);
     		$accountingaccount->fetch('', $objecttmp->account_number, 1);
     		print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-    	}
-    	else
-    	{
+    	} else {
     		print $objecttmp->account_number;
     	}
     	print '</td>';
@@ -505,9 +502,7 @@ foreach ($accounts as $key=>$type)
     		$accountingjournal = new AccountingJournal($db);
     		$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
     		print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-    	}
-    	else
-    	{
+    	} else {
     		print '';
     	}
     	print '</td>';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ee02e6a6e8e..ba5896d6d7d 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -125,8 +125,7 @@ if ($_GET["rel"] == 'prev')
 			$found = true;
 		}
 	}
-}
-elseif ($_GET["rel"] == 'next')
+} elseif ($_GET["rel"] == 'next')
 {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
@@ -147,8 +146,7 @@ elseif ($_GET["rel"] == 'next')
 			$found = true;
 		}
 	}
-}
-else {
+} else {
 	// On veut le releve num
 	$found = true;
 }
@@ -295,17 +293,13 @@ if (empty($numref))
 			if (!isset($objp->numr))
 			{
 				//
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven">';
 				print '<td>';
 				if ($action != 'editbankreceipt' || $objp->numr != $brref)
 				{
 					print '<a href="releve.php?num='.$objp->numr.'&account='.$object->id.'">'.$objp->numr.'</a>';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="text" name="newbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="submit" class="button" name="actionnewbankreceipt" value="'.$langs->trans("Rename").'">';
@@ -355,14 +349,10 @@ if (empty($numref))
 		print '</form>';
 
 		print "\n</div>\n";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	/**
 	 *   Show list of record into a bank statement
 	 */
@@ -488,58 +478,50 @@ else
 					$paymentstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_supplier')
+				} elseif ($links[$key]['type'] == 'payment_supplier')
 				{
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentsupplierstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_sc')
+				} elseif ($links[$key]['type'] == 'payment_sc')
 				{
 					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print $langs->trans("SocialContributionPayment");
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_vat')
+				} elseif ($links[$key]['type'] == 'payment_vat')
 				{
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvatstatic->getNomUrl(1);
-				}
-				elseif ($links[$key]['type'] == 'payment_salary')
+				} elseif ($links[$key]['type'] == 'payment_salary')
 				{
 					print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print $langs->trans("Payment");
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_donation')
+				} elseif ($links[$key]['type'] == 'payment_donation')
 				{
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentdonationstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_loan')
+				} elseif ($links[$key]['type'] == 'payment_loan')
 				{
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentloanstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_various')
+				} elseif ($links[$key]['type'] == 'payment_various')
 				{
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvariousstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'banktransfert') {
+				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0)
 					{
@@ -553,9 +535,7 @@ else
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
 						print ')';
-					}
-					else
-					{
+					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print ' ('.$langs->trans("from").' ';
@@ -567,35 +547,30 @@ else
 						print $bankstatic->getNomUrl(1, 'transactions');
 						print ')';
 					}
-				}
-				elseif ($links[$key]['type'] == 'company') {
+				} elseif ($links[$key]['type'] == 'company') {
                     $societestatic->id = $links[$key]['url_id'];
                     $societestatic->name = $links[$key]['label'];
                     print $societestatic->getNomUrl(1, 'company', 24);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'member') {
+				} elseif ($links[$key]['type'] == 'member') {
 					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowMember'), 'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'user') {
+				} elseif ($links[$key]['type'] == 'user') {
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowUser'), 'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'sc') {
+				} elseif ($links[$key]['type'] == 'sc') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowBill'), 'bill').' ';
 					print $langs->trans("SocialContribution");
 					print '</a>';
 					$newline = 0;
-				}
-				else {
+				} else {
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					print $links[$key]['label'];
 					print '</a>';
@@ -625,9 +600,7 @@ else
 						print "<br>-&nbsp;<i>".$objc->label."</i>";
 						$ii++;
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 			}
@@ -638,9 +611,7 @@ else
 			{
 				$totald = $totald + abs($objp->amount);
 				print '<td class="nowrap right">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
-			}
-			else
-			{
+			} else {
 				$totalc = $totalc + abs($objp->amount);
 				print '<td>&nbsp;</td><td class="nowrap right">'.price($objp->amount)."</td>\n";
 			}
@@ -652,9 +623,7 @@ else
 				print '<td class="center"><a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&account='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?account='.$object->id.'&num='.$numref).'">';
 				print img_edit();
 				print "</a></td>";
-			}
-			else
-			{
+			} else {
 				print "<td class=\"center\">&nbsp;</td>";
 			}
 			print "</tr>";
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index aa4c39e55ee..7228c38fe50 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -87,9 +87,7 @@ if ($action == 'add')
 		if ($accountto->currency_code == $accountfrom->currency_code)
 		{
 			$amountto = $amount;
-		}
-		else
-		{
+		} else {
 			if (!$amountto)
 			{
 				$error++;
@@ -130,15 +128,11 @@ if ($action == 'add')
 				$mesgs = $langs->trans("TransferFromToDone", '<a href="bankentries_list.php?id='.$accountfrom->id.'&sortfield=b.datev,b.dateo,b.rowid&sortorder=desc">'.$accountfrom->label."</a>", '<a href="bankentries_list.php?id='.$accountto->id.'">'.$accountto->label."</a>", $amount, $langs->transnoentities("Currency".$conf->currency));
 				setEventMessages($mesgs, null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors');
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 		    $error++;
 			setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
 		}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index b8d259cdc8d..cf494b77a90 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -72,9 +72,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	if ($vline)
 	{
 		$viewline = $vline;
-	}
-	else
-	{
+	} else {
 		$viewline = 20;
 	}
 
@@ -290,8 +288,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					if ($obj->family == 'invoice') {
 						$mc->getInfo($obj->entity);
 						print "<td>".$mc->label."</td>";
-					}
-					else {
+					} else {
 						print "<td></td>";
 					}
 				}
@@ -304,9 +301,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -326,9 +321,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	print "</table>";
     print "</div>";
-}
-else
-{
+} else {
 	print $langs->trans("ErrorBankAccountNotFound");
 }
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c4fdc3be56a..071a5abf0a9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -163,9 +163,7 @@ if (empty($reshook))
 				$urltogo = ($backtopage ? $backtopage : DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 				header("Location: ".$urltogo);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -198,22 +196,16 @@ if (empty($reshook))
 					$db->commit();
 					header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 					exit;
-				}
-				else
-				{
+				} else {
 					$object->error = $accountline->error;
 					$db->rollback();
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 		}
 	}
@@ -375,8 +367,7 @@ if ($action == 'create')
         print '<td>';
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
         print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
 		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
@@ -391,14 +382,11 @@ if ($action == 'create')
         if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
         {
             print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
-        }
-        else
-        {
+        } else {
             print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
         }
         print '</td></tr>';
-    }
-    else // For external software
+    } else // For external software
     {
         print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
         print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
@@ -564,14 +552,10 @@ if ($id)
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index d81b9bdd41a..7a89fd77986 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -149,9 +149,7 @@ if ($object->id)
 	$permission = $user->rights->banque->modifier;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 5f68440809c..d02f75819e4 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -75,9 +75,7 @@ if (!GETPOST('typeid'))
 		$part = explode(':', $val);
 		if ($part[0] == 'v.fk_typepayment') $typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$typeid = GETPOST('typeid');
 }
 
@@ -313,8 +311,7 @@ if ($result)
 
 				$accountstatic->label = $obj->blabel;
 				print $accountstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -373,9 +370,7 @@ if ($result)
 	print '</form>';
 
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 3780fbc1afe..b14b77d5264 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -107,8 +107,7 @@ if (GETPOST('cancel', 'alpha'))
 {
 	if ($action == 'valid') {
 		$action = 'view';
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -144,8 +143,7 @@ if ($action == "start")
 		$action = 'create';
 		$error++;
 	}
-}
-elseif ($action == "add")
+} elseif ($action == "add")
 {
 	if (GETPOST('opening', 'alpha') == '')
 	{
@@ -177,9 +175,7 @@ elseif ($action == "add")
 		{
 			$db->commit();
 			$action = "view";
-		}
-		else
-		{
+		} else {
 			$db->rollback;
 			$action = "view";
 		}
@@ -217,9 +213,7 @@ if ($action == "valid")	// validate = close
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("CashFenceDone"), null);
 		$db->commit();
 	}
@@ -253,9 +247,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
         setEventMessages("RecordDeleted", null, 'mesgs');
         header("Location: ".$backurlforlist);
         exit;
-    }
-    else
-    {
+    } else {
         if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
         else setEventMessages($object->error, null, 'errors');
     }
@@ -282,8 +274,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		$syear = $object->year_close;
 		$smonth = $object->month_close;
 		$sday = $object->day_close;
-	}
-	elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
+	} elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
 	{
 		$posmodule = GETPOST('posmodule', 'alpha');
 		$terminalid = GETPOST('posnumber', 'alpha');
@@ -327,11 +318,8 @@ if ($action == "create" || $action == "start" || $action == 'close')
     			{
     				$obj = $db->fetch_object($resql);
     				if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
-    			}
-    			else dol_print_error($db);
-			}
-			else
-			{
+    			} else dol_print_error($db);
+			} else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
 			    $error++;
 			}
@@ -350,8 +338,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			if ($key == 'cash')       $sql .= " AND cp.code = 'LIQ'";
 			elseif ($key == 'cheque') $sql .= " AND cp.code = 'CHQ'";
 			elseif ($key == 'card')   $sql .= " AND cp.code = 'CB'";
-			else
-			{
+			else {
 				dol_print_error('Value for key = '.$key.' not supported');
 				exit;
 			}
@@ -371,8 +358,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 					$theoricalamountforterminal[$terminalid][$key] = price2num($theoricalamountforterminal[$terminalid][$key] + $obj->total);
 					$theoricalnbofinvoiceforterminal[$terminalid][$key] = $obj->nb;
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 
@@ -388,14 +374,11 @@ if ($action == "create" || $action == "start" || $action == 'close')
 	    if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    {
 		    print '<input type="hidden" name="action" value="add">';
-	    }
-	    elseif ($action == 'close')
+	    } elseif ($action == 'close')
 	    {
 	    	print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
-	    }
-		else
-	    {
+	    } else {
 	    	print '<input type="hidden" name="action" value="start">';
 	    }
 
@@ -469,9 +452,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		if ($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1')
 		{
 			print '';
-		}
-		else
-		{
+		} else {
 			print '<input type="submit" name="add" class="button" value="'.$langs->trans("Start").'">';
 		}
 		print '</td>';
@@ -569,8 +550,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			{
 				$object->fetch($id);
 				print $object->opening;
-			}
-			else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+			} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 			print '">';
 			print '</td>';
 			// Amount per payment type
@@ -608,8 +588,7 @@ if (empty($action) || $action == "view" || $action == "close")
 
     if ($result <= 0) {
     	print $langs->trans("ErrorRecordNotFound");
-    }
-    else {
+    } else {
     	$head = array();
     	$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
     	$head[0][1] = $langs->trans("CashControl");
@@ -706,14 +685,11 @@ if (empty($action) || $action == "view" || $action == "close")
 	    	if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    	{
 	    		print '<input type="hidden" name="action" value="add">';
-	    	}
-	    	elseif ($action == 'close')
+	    	} elseif ($action == 'close')
 	    	{
 	    		print '<input type="hidden" name="action" value="valid">';
 	    		print '<input type="hidden" name="id" value="'.$id.'">';
-	    	}
-	    	else
-	    	{
+	    	} else {
 	    		print '<input type="hidden" name="action" value="start">';
 	    	}
 
@@ -860,8 +836,7 @@ if (empty($action) || $action == "view" || $action == "close")
 	    		{
 	    			$object->fetch($id);
 	    			print $object->opening;
-	    		}
-	    		else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+	    		} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 	    		print '">';
 	    		print '</td>';
 	    		// Amount per payment type
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index a98c9ea83f5..0279ad5143c 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -259,9 +259,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 81a19389244..0f60be3c3a8 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -404,8 +404,7 @@ class CashControl extends CommonObject
 		     $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		     if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 		     */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 1ea06eba9e9..f2d8e38fb15 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -172,9 +172,7 @@ if ($resql)
             $bankaccounttmp->fetch($objp->bankid);
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
-        }
-        else
-        {
+        } else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -208,8 +206,7 @@ if ($resql)
 		print $bankaccount->getNomUrl(1);
 		if ($cashcontrol->posmodule == "takepos") {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber;
-		}
-		else {
+		} else {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH';
 		}
 		if ($objp->code == 'CHQ') {
@@ -311,9 +308,7 @@ if ($resql)
     print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index c64797b801c..968c93fd25f 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -106,9 +106,7 @@ if ($mode != 'sconly')
 {
     $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
-}
-else
-{
+} else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
 }
 
@@ -220,8 +218,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 		            $accountstatic->label = $obj->blabel;
 		            print $accountstatic->getNomUrl(1);
-		        }
-		        else print '&nbsp;';
+		        } else print '&nbsp;';
 		        print '</td>';
 		    }
 			// Paid
@@ -243,9 +240,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
         if (!empty($conf->banque->enabled)) print '<td></td>';
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -337,8 +332,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 			            $accountstatic->label = $obj->blabel;
 			            print $accountstatic->getNomUrl(1);
-			        }
-			        else print '&nbsp;';
+			        } else print '&nbsp;';
 			        print '</td>';
 			    }
 
@@ -359,9 +353,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		    print "</table>";
 		    $db->free($result);
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -372,19 +364,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 {
 	$j = 1;
 	$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
 {
 	$j = 1;
 	$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
 {
 	$j = 2;
 	$numlt = 3;
-}
-else
-{
+} else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -454,9 +442,7 @@ while ($j < $numlt)
 
 			print "</table>";
 			$db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -549,8 +535,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 			            $accountstatic->label = $obj->blabel;
 			            print $accountstatic->getNomUrl(1);
-			        }
-			        else print '&nbsp;';
+			        } else print '&nbsp;';
 			        print '</td>';
 			    }
 
@@ -568,9 +553,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
             $db->free($result);
 
             print "<br>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 6c1439d5466..5632e8ebc1a 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -196,9 +196,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 463d9ea699f..4d3ec6b1ee6 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -70,15 +70,11 @@ if ($action == 'validate' && $user->rights->deplacement->creer)
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else
-        {
+        } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-}
-
-elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
+} elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
 {
     $object->fetch($id);
     if ($object->statut == Deplacement::STATUS_VALIDATED)
@@ -88,29 +84,21 @@ elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else
-        {
+        } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
     }
-}
-
-elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
+} elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
 {
     $result = $object->delete($id);
     if ($result >= 0)
     {
         header("Location: index.php");
         exit;
-    }
-    else
-    {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-
-elseif ($action == 'add' && $user->rights->deplacement->creer)
+} elseif ($action == 'add' && $user->rights->deplacement->creer)
 {
     if (!GETPOST('cancel', 'alpha'))
     {
@@ -149,26 +137,18 @@ elseif ($action == 'add' && $user->rights->deplacement->creer)
             {
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                 exit;
-            }
-            else
-            {
+            } else {
 	            setEventMessages($object->error, $object->errors, 'errors');
                 $action = 'create';
             }
-        }
-        else
-        {
+        } else {
             $action = 'create';
         }
-    }
-    else
-    {
+    } else {
         header("Location: index.php");
         exit;
     }
-}
-
-// Update record
+} // Update record
 elseif ($action == 'update' && $user->rights->deplacement->creer)
 {
     if (!GETPOST('cancel', 'alpha'))
@@ -189,36 +169,27 @@ elseif ($action == 'update' && $user->rights->deplacement->creer)
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else
-        {
+        } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else
-    {
+    } else {
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         exit;
     }
-}
-
-// Set into a project
+} // Set into a project
 elseif ($action == 'classin' && $user->rights->deplacement->creer)
 {
     $object->fetch($id);
     $result = $object->setProject(GETPOST('projectid', 'int'));
     if ($result < 0) dol_print_error($db, $object->error);
-}
-
-// Set fields
+} // Set fields
 elseif ($action == 'setdated' && $user->rights->deplacement->creer)
 {
     $dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
     $object->fetch($id);
     $result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
     if ($result < 0) dol_print_error($db, $object->error);
-}
-elseif ($action == 'setkm' && $user->rights->deplacement->creer)
+} elseif ($action == 'setkm' && $user->rights->deplacement->creer)
 {
     $object->fetch($id);
     $result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
@@ -313,8 +284,7 @@ if ($action == 'create')
 	print '</div>';
 
     print '</form>';
-}
-elseif ($id)
+} elseif ($id)
 {
     $result = $object->fetch($id);
     if ($result > 0)
@@ -412,9 +382,7 @@ elseif ($id)
             print '</form>';
 
             print '</div>';
-        }
-        else
-        {
+        } else {
             /*
              * Confirm delete trip
              */
@@ -492,9 +460,7 @@ elseif ($id)
                 if ($action == 'classify')
                 {
                     $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-                }
-                else
-                {
+                } else {
                     $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
                 }
                 print '</td>';
@@ -528,9 +494,7 @@ elseif ($id)
 	            if ($user->rights->deplacement->creer)
 	            {
 	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-	            }
-	            else
-	            {
+	            } else {
 	                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 	            }
             }
@@ -540,9 +504,7 @@ elseif ($id)
                 if ($user->rights->deplacement->creer)
                 {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
-                }
-                else
-                {
+                } else {
                     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
                 }
             }
@@ -552,9 +514,7 @@ elseif ($id)
                 if ($user->rights->deplacement->creer)
                 {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
-                }
-                else
-                {
+                } else {
                     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
                 }
             }
@@ -562,17 +522,13 @@ elseif ($id)
             if ($user->rights->deplacement->supprimer)
             {
                 print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            }
-            else
-            {
+            } else {
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
             }
 
             print '</div>';
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index ec4610179e2..69baf710b95 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -199,16 +199,12 @@ class Deplacement extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -267,9 +263,7 @@ class Deplacement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -312,9 +306,7 @@ class Deplacement extends CommonObject
 			$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -338,9 +330,7 @@ class Deplacement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -375,30 +365,25 @@ class Deplacement extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
@@ -460,9 +445,7 @@ class Deplacement extends CommonObject
                 $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
                 $i++;
             }
-        }
-        else
-        {
+        } else {
         	dol_print_error($this->db);
         }
 
@@ -507,9 +490,7 @@ class Deplacement extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 2cef0b3e6cd..889eb390ca2 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -123,9 +123,7 @@ if ($object->id)
     $permission = $user->rights->deplacement->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 9d45bafd20f..0cea847f9ce 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -192,14 +192,11 @@ if ($result)
 
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index a4cc8f24019..78c1f32556d 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -196,9 +196,7 @@ if ($resql)
     print "</table>";
     print "</form>\n";
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index cf745b784fc..7707cb40786 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -167,9 +167,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -294,8 +292,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index cad443940f4..cc3a0769e70 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -238,9 +238,7 @@ if (empty($reshook))
 					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
 					$action = "create";
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -252,9 +250,7 @@ if (empty($reshook))
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
 	   			exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				$error++;
@@ -279,18 +275,15 @@ if (empty($reshook))
 	if ($action == 'setconditions' && $user->rights->facture->creer)
 	{
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-	// Set mode
+	} // Set mode
 	elseif ($action == 'setmode' && $user->rights->facture->creer)
 	{
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-	// Set project
+	} // Set project
 	elseif ($action == 'classin' && $user->rights->facture->creer)
 	{
 		$object->setProject(GETPOST('projectid', 'int'));
-	}
-	// Set bank account
+	} // Set bank account
 	elseif ($action == 'setref' && $user->rights->facture->creer)
 	{
 		//var_dump(GETPOST('ref', 'alpha'));exit;
@@ -300,47 +293,37 @@ if (empty($reshook))
 			$object->titre = GETPOST('ref', 'alpha'); // deprecated
 			$object->title = GETPOST('ref', 'alpha');
 			$object->ref = $object->title;
-		}
-		else dol_print_error($db, $object->error, $object->errors);
-	}
-	// Set bank account
+		} else dol_print_error($db, $object->error, $object->errors);
+	} // Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-	// Set frequency and unit frequency
+	} // Set frequency and unit frequency
 	elseif ($action == 'setfrequency' && $user->rights->facture->creer)
 	{
 		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
-	}
-	// Set next date of execution
+	} // Set next date of execution
 	elseif ($action == 'setdate_when' && $user->rights->facture->creer)
 	{
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
 		if (!empty($date)) $object->setNextDate($date);
-	}
-	// Set max period
+	} // Set max period
 	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
 	{
 		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
-	}
-	// Set auto validate
+	} // Set auto validate
 	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
 	{
 		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
-    }
-    // Set generate pdf
+    } // Set generate pdf
 	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
 	{
 		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
-	}
-    // Set model pdf
+	} // Set model pdf
 	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
 	{
 		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
-	}
-
-	// Set status disabled
+	} // Set status disabled
 	elseif ($action == 'disable' && $user->rights->facture->creer)
 	{
 		$db->begin();
@@ -356,15 +339,11 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set status enabled
+	} // Set status enabled
 	elseif ($action == 'enable' && $user->rights->facture->creer)
 	{
 		$db->begin();
@@ -380,19 +359,14 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	}
@@ -418,20 +392,15 @@ if (empty($reshook))
 			{
 				$db->commit();
 				$object->fetch($object->id); // Reload lines
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras')
+	} elseif ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
@@ -466,9 +435,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -570,17 +537,14 @@ if (empty($reshook))
 				{
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 				elseif ($tmpvat != $tmpprodvat)
 				{
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else
-					{
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -603,9 +567,7 @@ if (empty($reshook))
 					}
 
 					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-				}
-				else
-				{
+				} else {
 					$desc = $prod->description;
 				}
 
@@ -640,9 +602,7 @@ if (empty($reshook))
 
 				$type = $prod->type;
 				$fk_unit = $prod->fk_unit;
-			}
-			else
-			{
+			} else {
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
@@ -672,9 +632,7 @@ if (empty($reshook))
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
-			}
-			else
-			{
+			} else {
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
 
@@ -738,18 +696,14 @@ if (empty($reshook))
 
 					unset($_POST['situations']);
 					unset($_POST['progress']);
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 
 				$action = '';
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -947,9 +901,7 @@ if (empty($reshook))
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1144,9 +1096,7 @@ if ($action == 'create')
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1198,14 +1148,10 @@ if ($action == 'create')
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else
-	{
+	} else {
 		dol_print_error('', "Error, no invoice ".$object->id);
 	}
-}
-else
-{
+} else {
 	/*
 	 * View mode
 	 */
@@ -1328,9 +1274,7 @@ else
 			if ($action == 'editconditions')
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			}
-			else
-			{
+			} else {
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 			}
 		} else {
@@ -1350,9 +1294,7 @@ else
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-		}
-		else
-		{
+		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -1459,9 +1401,7 @@ else
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else
-		{
+		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -1486,9 +1426,7 @@ else
             }
             $select = 'select;'.implode(',', $list);
             print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
-        }
-        else
-        {
+        } else {
             print $object->modelpdf;
         }
         print "</td>";
@@ -1536,15 +1474,11 @@ else
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($object->frequency > 0)
 			{
 				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NotARecurringInvoiceTemplate");
 			}
 		}
@@ -1555,9 +1489,7 @@ else
 		if ($action == 'date_when' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
-		}
-		else
-		{
+		} else {
 			print $langs->trans("NextDateToExecution");
 		}
 		print '</td><td>';
@@ -1569,9 +1501,7 @@ else
 		if (!$object->isMaxNbGenReached())
 		{
 			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
-		}
-		else
-		{
+		} else {
 			print img_info($langs->trans("MaxNumberOfGenerationReached"));
 		}
 		print '</td>';
@@ -1582,18 +1512,14 @@ else
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("MaxPeriodNumber");
 		}
 		print '</td><td>';
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-		}
-		else
-		{
+		} else {
 			print '';
 		}
 		print '</td>';
@@ -1603,8 +1529,7 @@ else
 		print '<tr><td>';
 		if ($action == 'auto_validate' || $object->frequency > 0)
 			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		else
-			print $langs->trans("StatusOfGeneratedInvoices");
+		else print $langs->trans("StatusOfGeneratedInvoices");
 		print '</td><td>';
 		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
 		if ($action == 'auto_validate' || $object->frequency > 0)
@@ -1619,8 +1544,7 @@ else
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0)
 				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-			else
-				print $langs->trans("StatusOfGeneratedDocuments");
+			else print $langs->trans("StatusOfGeneratedDocuments");
 			print '</td>';
 			print '<td>';
 			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
@@ -1630,9 +1554,7 @@ else
 			}
 			print '</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1733,21 +1655,15 @@ else
 				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-				else
-				{
+				} else {
 					if (empty($object->frequency) || $object->date_when <= $today)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
 		}
@@ -1757,9 +1673,7 @@ else
 			if (empty($object->suspended))
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=disable&id='.$object->id.'">'.$langs->trans("Disable").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=enable&id='.$object->id.'">'.$langs->trans("Enable").'</a></div>';
 			}
 		}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index b7cfb8272d1..2f4faf93c13 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -188,9 +188,7 @@ if (empty($reshook))
        		setEventMessages($object->error, $object->errors, 'errors');
        		$action = '';
         }
-	}
-
-	// Change status of invoice
+	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercancreate) {
 		$result = $object->fetch($id);
 
@@ -203,9 +201,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Delete invoice
+	} // Delete invoice
 	elseif ($action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->fetch($id);
 		$object->fetch_thirdparty();
@@ -233,9 +229,7 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	}
-
-	// Delete line
+	} // Delete line
 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -267,17 +261,13 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	}
-
-	// Delete link of credit note to invoice
+	} // Delete link of credit note to invoice
 	elseif ($action == 'unlinkdiscount' && $usercancreate)
 	{
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	}
-
-	// Validation
+	} // Validation
 	elseif ($action == 'valid' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -335,32 +325,24 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'set_thirdparty' && $usercancreate)
+	} elseif ($action == 'set_thirdparty' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('fk_soc', $socid, '', null, 'int', '', $user, 'BILL_MODIFY');
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 		exit();
-	}
-
-	elseif ($action == 'classin' && $usercancreate)
+	} elseif ($action == 'classin' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
-	}
-
-	elseif ($action == 'setmode' && $usercancreate)
+	} elseif ($action == 'setmode' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
@@ -373,36 +355,25 @@ if (empty($reshook))
 	    if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
 	    $result = $object->update($user);
 	    if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
 	    if ($result < 0)
 	        dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
 	    if ($result < 0)
 	        dol_print_error($db, $object->error);
-	}
-
-
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
-	}
-
-	elseif ($action == 'setinvoicedate' && $usercancreate)
+	} elseif ($action == 'setinvoicedate' && $usercancreate)
 	{
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
@@ -421,9 +392,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setdate_pointoftax' && $usercancreate)
+	} elseif ($action == 'setdate_pointoftax' && $usercancreate)
 	{
 		$object->fetch($id);
 		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -432,9 +401,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setconditions' && $usercancreate)
+	} elseif ($action == 'setconditions' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
@@ -450,9 +417,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setpaymentterm' && $usercancreate)
+	} elseif ($action == 'setpaymentterm' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
@@ -464,9 +429,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setrevenuestamp' && $usercancreate)
+	} elseif ($action == 'setrevenuestamp' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->revenuestamp = GETPOST('revenuestamp');
@@ -494,27 +457,19 @@ if (empty($reshook))
 				if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Set incoterm
+	} // Set incoterm
 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// bank account
+	} // bank account
 	elseif ($action == 'setbankaccount' && $usercancreate)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate)
+	} elseif ($action == 'setremisepercent' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->set_remise($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	} elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -570,21 +525,15 @@ if (empty($reshook))
 			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setref' && $usercancreate)
+	} elseif ($action == 'setref' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('ref', GETPOST('ref'), '', null, '', '', $user, 'BILL_MODIFY');
-	}
-
-	elseif ($action == 'setref_client' && $usercancreate)
+	} elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
-	}
-
-	// Classify to validated
+	} // Classify to validated
 	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
@@ -618,9 +567,7 @@ if (empty($reshook))
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
 				{
@@ -695,16 +642,12 @@ if (empty($reshook))
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				if (count($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Go back to draft status (unvalidate)
+	} // Go back to draft status (unvalidate)
 	elseif ($action == 'confirm_modif' && $usercanunvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
@@ -785,9 +728,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Classify "paid"
+	} // Classify "paid"
 	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercanissuepayment)
 	{
 		$object->fetch($id);
@@ -816,9 +757,7 @@ if (empty($reshook))
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
 		}
-	}
-
-	// Convertir en reduc
+	} // Convertir en reduc
 	elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -971,25 +910,19 @@ if (empty($reshook))
 					if ($result >= 0)
 					{
 						$db->commit();
-					}
-					else
-					{
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
 				} else {
 					$db->commit();
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
 		}
-	}
-
-	// Delete payment
+	} // Delete payment
 	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -1005,9 +938,7 @@ if (empty($reshook))
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 			}
 		}
-	}
-
-	/*
+	} /*
 	 * Insert new invoice in database
 	 */
 	elseif ($action == 'add' && $usercancreate)
@@ -1175,9 +1106,7 @@ if (empty($reshook))
 							            {
 							                $searchPreviousInvoice = false; // find, exit;
 							                break;
-							            }
-							            else
-							            {
+							            } else {
 							                $lineIndex--; // go to previous invoice in cycle
 							            }
 							        }
@@ -1365,8 +1294,7 @@ if (empty($reshook))
 				if (in_array($object->type, $retainedWarrantyInvoiceAvailableType)) {
 					$object->retained_warranty = GETPOST('retained_warranty', 'int');
 					$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-				}
-				else {
+				} else {
 					$object->retained_warranty = 0;
 					$object->retained_warranty_fk_cond_reglement = 0;
 				}
@@ -1469,14 +1397,11 @@ if (empty($reshook))
 									$amount_ttc_diff += $am;
 									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
 								}
-							}
-							else
-							{
+							} else {
 								if ($typeamount == 'amount')
 								{
 									$amountdeposit[0] = $valuedeposit;
-								}
-								elseif ($typeamount == 'variable')
+								} elseif ($typeamount == 'variable')
 								{
 									if ($result > 0)
 									{
@@ -1724,9 +1649,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				}
-				else
-				{   // If some invoice's lines coming from page
+				} else {   // If some invoice's lines coming from page
 					$id = $object->create($user);
 
 					for ($i = 1; $i <= $NBLINES; $i++) {
@@ -1852,9 +1775,7 @@ if (empty($reshook))
 				if ($id <= 0)
 				{
 					$mesg = $object->error;
-				}
-				else
-				{
+				} else {
 					$nextSituationInvoice = new Facture($db);
 					$nextSituationInvoice->fetch($id);
 
@@ -1894,18 +1815,14 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 			exit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
 			$_GET["originid"] = $_POST["originid"];
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Add a new line
+	} // Add a new line
 	elseif ($action == 'addline' && $usercancreate)
 	{
 		$langs->load('errors');
@@ -1921,9 +1838,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -1970,9 +1885,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
 				}
 				$error++;
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -1998,9 +1911,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -2056,17 +1967,14 @@ if (empty($reshook))
 				{
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 				elseif ($tmpvat != $tmpprodvat)
 				{
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else
-					{
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -2233,9 +2141,7 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -2292,16 +2198,14 @@ if (empty($reshook))
 		        setEventMessages($mesg, null, 'warnings');
 		        $error++;
 		        $result = -1;
-		    }
-		    elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
+		    } elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
 		    {
 		        $mesg = $langs->trans("CantBeLessThanMinPercent");
 		        setEventMessages($mesg, null, 'warnings');
 		        $error++;
 		        $result = -1;
 		    }
-		}
-		elseif (GETPOST('progress') < $percent)
+		} elseif (GETPOST('progress') < $percent)
 		{
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
 			setEventMessages($mesg, null, 'warnings');
@@ -2356,9 +2260,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
 				}
 				$error++;
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -2443,9 +2345,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
+	} elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
 	{
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
@@ -2458,18 +2358,13 @@ if (empty($reshook))
                     $mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
                     setEventMessages($mesg, null, 'warnings');
 					$result = -1;
-				} else
-					$object->update_percent($line, $_POST['all_progress']);
+				} else $object->update_percent($line, $_POST['all_progress']);
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
-	}
-
-	// Outing situation invoice from cycle
+	} // Outing situation invoice from cycle
 	elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
 	{
 	    $object->fetch($id, '', '', '', true);
@@ -2539,9 +2434,7 @@ if (empty($reshook))
                                     {
                                         $searchPreviousInvoice = false; // find, exit;
                                         break;
-                                    }
-                                    else
-                                    {
+                                    } else {
                                         $lineIndex--; // go to previous invoice in cycle
                                     }
                                 }
@@ -2568,25 +2461,17 @@ if (empty($reshook))
                     {
                         setEventMessages($langs->trans('Updated'), '', 'mesgs');
                         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                    }
-                    else
-                    {
+                    } else {
                         setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
                     }
-	            }
-	            else
-	            {
+	            } else {
 	                setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
 	            }
-	        }
-	        else
-	        {
+	        } else {
 	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
 	        }
 	    }
-	}
-
-	// add lines from objectlinked
+	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
 	    && $usercancreate
 	    && $object->statut == Facture::STATUS_DRAFT
@@ -2602,8 +2487,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -2645,8 +2529,7 @@ if (empty($reshook))
                     $array_options = $originLine->array_options;
                     if ($object->type == Facture::TYPE_SITUATION) {
                         $situation_percent = 0;
-                    }
-                    else {
+                    } else {
                         $situation_percent = 100;
                     }
                     $fk_prev_id = '';
@@ -2660,8 +2543,7 @@ if (empty($reshook))
                     } else {
                         $error++;
                     }
-                }
-                else {
+                } else {
                     $error++;
                 }
 	        }
@@ -2874,9 +2756,7 @@ if ($action == 'create')
 				//Replicate extrafields
 				$expesrc->fetch_optionals();
 				$object->array_options = $expesrc->array_options;
-			}
-			else
-			{
+			} else {
 				$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0));
 				$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
 				$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
@@ -2894,9 +2774,7 @@ if ($action == 'create')
 				$object->array_options = $objectsrc->array_options;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_id;
 		$mode_reglement_id 	= $soc->mode_reglement_id;
 		$fk_account        	= $soc->fk_account;
@@ -2908,14 +2786,12 @@ if ($action == 'create')
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
-	if(empty($cond_reglement_id))
-	{
+	if (empty($cond_reglement_id)) {
 		$cond_reglement_id = GETPOST("cond_reglement_id");
 	}
 
 	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
-	if(empty($mode_reglement_id))
-	{
+	if (empty($mode_reglement_id)) {
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
@@ -2923,8 +2799,7 @@ if ($action == 'create')
 	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		print ajax_combobox('fac_replacement');
 		print ajax_combobox('fac_avoir');
@@ -2990,9 +2865,7 @@ if ($action == 'create')
 		print ')';
 		print '</td>';
 		print '</tr>'."\n";
-	}
-	else
-	{
+	} else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
 		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -3215,9 +3088,7 @@ if ($action == 'create')
 			print $desc;
 			print '</div></div>';
 		}
-	}
-	else
-	{
+	} else {
 	    if (!empty($conf->global->INVOICE_USE_SITUATION))
 	    {
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -3322,9 +3193,7 @@ if ($action == 'create')
 
     			print '</div></div>';
     		}
-		}
-		else
-		{
+		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			else $tmp = '<input type="radio" name="type" id="radio_creditnote" value="2" > ';
@@ -3691,8 +3560,7 @@ if ($action == 'create')
 	}
 
 	print '<br>';
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	/*
 	 * Show object in view mode
@@ -3801,9 +3669,7 @@ elseif ($id > 0 || !empty($ref))
 					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, $langs->trans("NoStockAction"), 0, $forcecombo))
 				);
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', $formquestion, "yes", 1);
-			}
-			else
-			{
+			} else {
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', '', 'no', 1);
 			}
 		} else {
@@ -4140,8 +4006,7 @@ elseif ($id > 0 || !empty($ref))
 		foreach ($facidavoir as $id) {
 			if ($i == 0)
 				print ' ';
-			else
-				print ',';
+			else print ',';
 			$facavoir = new Facture($db);
 			$facavoir->fetch($id);
 			print $facavoir->getNomUrl(1);
@@ -4285,9 +4150,7 @@ elseif ($id > 0 || !empty($ref))
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 	}
 	print '</td></tr>';
@@ -4350,9 +4213,7 @@ elseif ($id > 0 || !empty($ref))
 	if ($action == 'editbankaccount')
 	{
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-	}
-	else
-	{
+	} else {
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -4373,9 +4234,7 @@ elseif ($id > 0 || !empty($ref))
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else
-		{
+		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -4389,7 +4248,7 @@ elseif ($id > 0 || !empty($ref))
 			$displayWarranty = false;
 		}
 
-		if($displayWarranty) {
+		if ($displayWarranty) {
 			// Retained Warranty
 			print '<tr class="retained-warranty-lines"  ><td>';
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
@@ -4409,9 +4268,7 @@ elseif ($id > 0 || !empty($ref))
 		        print '<input name="retained_warranty" type="number" step="0.01" min="0" max="100" value="'.$object->retained_warranty.'" >';
 		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		        print '</form>';
-		    }
-		    else
-		    {
+		    } else {
 		        print price($object->retained_warranty).'%';
 		    }
 		    print '</td></tr>';
@@ -4444,9 +4301,7 @@ elseif ($id > 0 || !empty($ref))
 		        $form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 		        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		        print '</form>';
-		    }
-		    else
-		    {
+		    } else {
 		        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->retained_warranty_fk_cond_reglement, 'none');
 		        if (!$displayWarranty) {
 		            print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" ');
@@ -4479,9 +4334,7 @@ elseif ($id > 0 || !empty($ref))
                 print '<input name="retained_warranty_date_limit" type="date" step="1" min="'.dol_print_date($object->date, '%Y-%m-%d').'" value="'.dol_print_date($defaultDate, '%Y-%m-%d').'" >';
                 print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 print '</form>';
-            }
-            else
-            {
+            } else {
                 print dol_print_date($object->retained_warranty_date_limit, 'day');
             }
             print '</td></tr>';
@@ -4843,8 +4696,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		if ($object->type != Facture::TYPE_DEPOSIT)
 			print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-		else
-			print $langs->trans('AlreadyPaid');
+		else print $langs->trans('AlreadyPaid');
 		print ' :</td><td class="right'.(($totalpaye > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 		$resteapayeraffiche = $resteapayer;
@@ -4939,9 +4791,7 @@ elseif ($id > 0 || !empty($ref))
 		    if ($object->type == Facture::TYPE_SITUATION)
 		    {
 		        $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
-		    }
-		    else
-		    {
+		    } else {
 		        // Because one day retained warranty could be used on standard invoices
 		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
 		    }
@@ -4956,8 +4806,7 @@ elseif ($id > 0 || !empty($ref))
 		    print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 		    print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
 		}
-	}
-	else // Credit note
+	} else // Credit note
 	{
 		$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
@@ -5130,9 +4979,7 @@ elseif ($id > 0 || !empty($ref))
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Modify').'</span>';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
 				}
 			}
@@ -5171,8 +5018,7 @@ elseif ($id > 0 || !empty($ref))
 					} else {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 			}
@@ -5190,14 +5036,10 @@ elseif ($id > 0 || !empty($ref))
 						} else {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('MakeWithdrawRequest').'</span>';
 						}
-					}
-					else
-					{
+					} else {
 						//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 				}
 			}
@@ -5231,9 +5073,7 @@ elseif ($id > 0 || !empty($ref))
 					if ($resteapayer == 0)
 					{
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a>';
 					}
 				}
@@ -5272,17 +5112,13 @@ elseif ($id > 0 || !empty($ref))
 				{
 					// If one payment or one credit note was linked to this invoice
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
-				}
-				else
-				{
+				} else {
 					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED))
 					{
 						if ($objectidnext)
 						{
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ClassifyCanceled').'</span>';
-						}
-						else
-						{
+						} else {
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 						}
 					}
@@ -5344,9 +5180,7 @@ elseif ($id > 0 || !empty($ref))
 			    if (($object->total_ttc - $totalcreditnotes) == 0)
 			    {
 			        print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
-			    }
-			    else
-			    {
+			    } else {
 			        print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
 			    }
 			}
@@ -5369,26 +5203,19 @@ elseif ($id > 0 || !empty($ref))
 				//var_dump($isErasable);
 				if ($isErasable == -4) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -3) {
+				} elseif ($isErasable == -3) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -2) {
+				} elseif ($isErasable == -2) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -1) {
+				} elseif ($isErasable == -1) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable <= 0)	// Any other cases
+				} elseif ($isErasable <= 0)	// Any other cases
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($objectidnext)
+				} elseif ($objectidnext)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 				}
 			} else {
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 85da9cd5c37..c1ed5b809da 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -244,8 +244,7 @@ class Invoices extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve invoice list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -548,9 +547,7 @@ class Invoices extends DolibarrApi
     	$updateRes = $this->invoice->deleteline($lineid);
     	if ($updateRes > 0) {
     		return $this->get($id);
-    	}
-    	else
-    	{
+    	} else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
@@ -1041,14 +1038,11 @@ class Invoices extends DolibarrApi
             $discount = new DiscountAbsolute($this->db);
             if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
                 $discount->description = '(CREDIT_NOTE)';
-            }
-            elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
+            } elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
                 $discount->description = '(DEPOSIT)';
-            }
-            elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
+            } elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
                 $discount->description = '(EXCESS RECEIVED)';
-            }
-            else {
+            } else {
                 throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
             }
 
@@ -1124,18 +1118,14 @@ class Invoices extends DolibarrApi
                     if ($result >= 0)
                     {
                         $this->db->commit();
-                    }
-                    else
-                    {
+                    } else {
                         $this->db->rollback();
                         throw new RestException(500, 'Could not set paid');
                     }
                 } else {
                     $this->db->commit();
                 }
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 throw new RestException(500, 'Discount creation error');
             }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 71be89f30f5..581e63be08a 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -336,8 +336,7 @@ class FactureRec extends CommonInvoice
 					if ($result_insert < 0)
 					{
 						$error++;
-					}
-					else {
+					} else {
 					    $objectline = new FactureLigneRec($this->db);
 					    if ($objectline->fetch($result_insert))
 					    {
@@ -377,8 +376,7 @@ class FactureRec extends CommonInvoice
 					                $error++;
 					            }
 					        }
-					    }
-					    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 					    {
 					        $origin_id = $tmp_origin_id;
 	    					$ret = $this->add_object_linked($origin, $origin_id);
@@ -394,22 +392,16 @@ class FactureRec extends CommonInvoice
 				if ($error)
 				{
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return $this->id;
 				}
-			}
-			else
-			{
+			} else {
 			    $this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -460,9 +452,7 @@ class FactureRec extends CommonInvoice
 	        }
 	        $this->db->commit();
 	        return 1;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $this->db->lasterror();
 	        $this->db->rollback();
 	        return -2;
@@ -584,16 +574,12 @@ class FactureRec extends CommonInvoice
 					return -3;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
 				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -722,9 +708,7 @@ class FactureRec extends CommonInvoice
 
 			$this->db->free($result);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -766,15 +750,11 @@ class FactureRec extends CommonInvoice
 				// Delete extrafields
                 $res = $this->deleteExtraFields();
                 if ($res < 0) $error = -4;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$error = -2;
 		}
@@ -783,9 +763,7 @@ class FactureRec extends CommonInvoice
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
-		{
+		} else {
 	        $this->db->rollback();
 	        return $error;
 		}
@@ -860,9 +838,7 @@ class FactureRec extends CommonInvoice
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -969,9 +945,7 @@ class FactureRec extends CommonInvoice
 				$this->id = $facid;
 				$this->update_price();
 				return $lineId;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
@@ -1045,9 +1019,7 @@ class FactureRec extends CommonInvoice
 	        if ($price_base_type == 'HT')
 	        {
 	            $pu = $pu_ht;
-	        }
-	        else
-	        {
+	        } else {
 	            $pu = $pu_ttc;
 	        }
 
@@ -1131,9 +1103,7 @@ class FactureRec extends CommonInvoice
 	            $this->id = $facid;
 	            $this->update_price();
 	            return 1;
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = $this->db->lasterror();
 	            return -1;
 	        }
@@ -1226,8 +1196,7 @@ class FactureRec extends CommonInvoice
 
 			if ($num)
 				$this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
-			else
-				$this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			else $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
 
 			$saventity = $conf->entity;
 
@@ -1288,9 +1257,7 @@ class FactureRec extends CommonInvoice
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
 					$this->errors[] = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity;
@@ -1303,9 +1270,7 @@ class FactureRec extends CommonInvoice
 					dol_syslog("createRecurringInvoices Process invoice template ".$facturerec->ref." is finished with a success generation");
 					$nb_create++;
 					$this->output .= $langs->trans("InvoiceGeneratedFromTemplate", $facture->ref, $facturerec->ref)."\n";
-				}
-				else
-				{
+				} else {
 					$db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 				}
 
@@ -1323,8 +1288,7 @@ class FactureRec extends CommonInvoice
 			}
 
 			$conf->entity = $saventity; // Restore entity context
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		$this->output = trim($this->output);
 
@@ -1430,69 +1394,54 @@ class FactureRec extends CommonInvoice
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$prefix = 'Short';
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($recur)
 			{
@@ -1500,25 +1449,20 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			$prefix = '';
 			if ($recur)
@@ -1526,25 +1470,20 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 5 || $mode == 6)
+		} elseif ($mode == 5 || $mode == 6)
 		{
 			$prefix = '';
 			if ($mode == 5) $prefix = 'Short';
@@ -1553,19 +1492,15 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
@@ -1654,16 +1589,14 @@ class FactureRec extends CommonInvoice
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
-				}
-				elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2)    // UP is negative (free line)
 				{
 					$line->subprice = -100;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
 					$line->remise_percent = 0;
-				}
-				elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1671,8 +1604,7 @@ class FactureRec extends CommonInvoice
 					$line->total_ttc = 59.8;
 					$line->total_tva = 9.8;
 					$line->remise_percent = 50;
-				}
-				else    // (product line)
+				} else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1761,9 +1693,7 @@ class FactureRec extends CommonInvoice
             $this->frequency = $frequency;
             if (!empty($unit)) $this->unit_frequency = $unit;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1794,9 +1724,7 @@ class FactureRec extends CommonInvoice
             $this->date_when = $date;
             if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1827,9 +1755,7 @@ class FactureRec extends CommonInvoice
         {
             $this->nb_gen_max = $nb;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1858,9 +1784,7 @@ class FactureRec extends CommonInvoice
         {
             $this->auto_validate = $validate;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1889,9 +1813,7 @@ class FactureRec extends CommonInvoice
         {
             $this->generate_pdf = $validate;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1920,9 +1842,7 @@ class FactureRec extends CommonInvoice
         {
             $this->modelpdf = $model;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2067,9 +1987,7 @@ class FactureLigneRec extends CommonInvoiceLine
 
     		$this->db->free($result);
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -3;
     	}
@@ -2149,9 +2067,7 @@ class FactureLigneRec extends CommonInvoiceLine
     		}
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fd6a6d32642..28f0883bb90 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -678,8 +678,7 @@ class Facture extends CommonInvoice
 				                $error++;
 				            }
 				        }
-				    }
-				    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -726,8 +725,7 @@ class Facture extends CommonInvoice
 				        //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 				        $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 				    }
-				}
-				else dol_print_error($resqlcontact);
+				} else dol_print_error($resqlcontact);
 			}
 
 			/*
@@ -787,8 +785,7 @@ class Facture extends CommonInvoice
 						break;
 					}
 				}
-			}
-			elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
+			} elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
 			{
 				$fk_parent_line = 0;
 
@@ -987,29 +984,21 @@ class Facture extends CommonInvoice
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						return -4;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1094,8 +1083,7 @@ class Facture extends CommonInvoice
 		{
 			$this->error = $facture->error;
 			$this->errors = $facture->errors;
-		}
-		elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
+		} elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$this->fetchObjectLinked('', '', $this->id, 'facture');
 
@@ -1240,9 +1228,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1367,10 +1353,8 @@ class Facture extends CommonInvoice
 			if (!$error)
 			{
 				return 1;
-			}
-			else return -1;
-		}
-		else return -1;
+			} else return -1;
+		} else return -1;
 	}
 
 	/**
@@ -1645,16 +1629,12 @@ class Facture extends CommonInvoice
 					return -3;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Invoice with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1775,9 +1755,7 @@ class Facture extends CommonInvoice
 			}
 			$this->db->free($result);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1815,9 +1793,7 @@ class Facture extends CommonInvoice
 				       )
 					{
 					    $this->tab_previous_situation_invoice[] = $invoice;
-					}
-					else
-					{
+					} else {
 					    $this->tab_next_situation_invoice[] = $invoice;
 					}
 				}
@@ -1933,9 +1909,7 @@ class Facture extends CommonInvoice
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2021,23 +1995,17 @@ class Facture extends CommonInvoice
 
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $facligne->error;
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $facligne->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -3;
 		}
@@ -2063,8 +2031,7 @@ class Facture extends CommonInvoice
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 		if (empty($ref_client))
 			$sql .= ' SET ref_client = NULL';
-		else
-			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		else $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
@@ -2094,9 +2061,7 @@ class Facture extends CommonInvoice
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2260,23 +2225,17 @@ class Facture extends CommonInvoice
 
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." sql=".$sql;
 					$this->db->rollback();
 					return -6;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." sql=".$sql;
 				$this->db->rollback();
 				return -4;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2321,9 +2280,7 @@ class Facture extends CommonInvoice
 	            $result = $this->call_trigger('BILL_PAYED', $user);
 	            if ($result < 0) $error++;
 	            // End call triggers
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
@@ -2332,15 +2289,11 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -2376,9 +2329,7 @@ class Facture extends CommonInvoice
             $result = $this->call_trigger('BILL_UNPAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
@@ -2388,9 +2339,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2445,16 +2394,12 @@ class Facture extends CommonInvoice
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -2;
@@ -2563,8 +2508,7 @@ class Facture extends CommonInvoice
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		{
 			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
@@ -2572,9 +2516,7 @@ class Facture extends CommonInvoice
 				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -2803,9 +2745,7 @@ class Facture extends CommonInvoice
 				    $this->setFinal($user);
                 }
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 
@@ -2813,9 +2753,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2942,15 +2880,11 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3069,9 +3003,7 @@ class Facture extends CommonInvoice
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -3212,23 +3144,17 @@ class Facture extends CommonInvoice
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -3443,16 +3369,12 @@ class Facture extends CommonInvoice
 				$this->update_price(1);
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 			    $this->error = $this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Invoice statut makes operation forbidden";
 			return -2;
 		}
@@ -3572,16 +3494,12 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $line->error;
 			return -1;
@@ -3639,9 +3557,7 @@ class Facture extends CommonInvoice
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3708,9 +3624,7 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3868,9 +3782,7 @@ class Facture extends CommonInvoice
 				$this->date_closing      = $this->db->jdate($obj->dateclosing);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3928,13 +3840,10 @@ class Facture extends CommonInvoice
 					if ($shortlist == 1)
 					{
 						$ga[$obj->fid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
+					} else {
 						$ga[$i]['id'] = $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -3943,9 +3852,7 @@ class Facture extends CommonInvoice
 				}
 			}
 			return $ga;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3993,9 +3900,7 @@ class Facture extends CommonInvoice
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -4041,9 +3946,7 @@ class Facture extends CommonInvoice
 		    $sqlSit .= " GROUP BY fs.situation_cycle_ref";
 		    $sqlSit .= " ORDER BY fs.situation_counter";
             $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
-		}
-		else
-		{
+		} else {
 		    $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
@@ -4068,9 +3971,7 @@ class Facture extends CommonInvoice
 			}
 
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -4146,9 +4047,7 @@ class Facture extends CommonInvoice
 						    dol_syslog(get_class($this).'::demandeprelevement Erreur');
 						    $error++;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = 'WithdrawRequestErrorNilAmount';
 	                    dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
 	                    $error++;
@@ -4166,23 +4065,17 @@ class Facture extends CommonInvoice
 
                     if ($error) return -1;
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->error = "A request already exists";
                     dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
                     return 0;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Status of invoice does not allow this";
             dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
             return -3;
@@ -4206,9 +4099,7 @@ class Facture extends CommonInvoice
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error);
 			return -1;
@@ -4273,9 +4164,7 @@ class Facture extends CommonInvoice
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4395,8 +4284,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				}
-				elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2)    // UP is negative (free line)
 				{
 					$line->subprice = -100;
 					$line->total_ht = -100;
@@ -4406,8 +4294,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				}
-				elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4418,8 +4305,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ttc = 119.6;
 					$line->multicurrency_total_tva = 19.6;
 					$line->remise_percent = 50;
-				}
-				else    // (product line)
+				} else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4505,9 +4391,7 @@ class Facture extends CommonInvoice
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4668,9 +4552,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -4755,13 +4637,10 @@ class Facture extends CommonInvoice
 		        if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
 		        {
 		            $hasDelay = 1;
-		        }
-		        elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
+		        } elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
 		        {
 		            $hasDelay = 1;
-		        }
-		        else
-		        {
+		        } else {
 		            $hasDelay = 0;
 		        }
 		    }
@@ -4847,13 +4726,10 @@ class Facture extends CommonInvoice
 	            $total2BillWT += $this->total_ttc;
 
 	            $retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100;
-	        }
-	        else {
+	        } else {
 	            return -1;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        // Because one day retained warranty could be used on standard invoices
 	        $retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
 	    }
@@ -4889,16 +4765,12 @@ class Facture extends CommonInvoice
 	        {
 	            $this->retained_warranty = floatval($value);
 	            return 1;
-	        }
-	        else
-	        {
+	        } else {
 	            dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -4932,16 +4804,12 @@ class Facture extends CommonInvoice
 	        {
 	            $this->retained_warranty_date_limit = $timestamp;
 	            return 1;
-	        }
-	        else
-	        {
+	        } else {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -5122,9 +4990,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -5177,9 +5043,7 @@ class FactureLigne extends CommonInvoiceLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5295,9 +5159,7 @@ class FactureLigne extends CommonInvoiceLine
     							$this->db->rollback();
     							return -3;
 						    }
-						}
-						else
-						{
+						} else {
 							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0)
 							{
@@ -5307,17 +5169,13 @@ class FactureLigne extends CommonInvoiceLine
 								return -3;
 							}
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
 						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $discount->error;
 					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 					$this->db->rollback();
@@ -5339,9 +5197,7 @@ class FactureLigne extends CommonInvoiceLine
 
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -5394,9 +5250,7 @@ class FactureLigne extends CommonInvoiceLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5474,9 +5328,7 @@ class FactureLigne extends CommonInvoiceLine
 			}
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -5518,9 +5370,7 @@ class FactureLigne extends CommonInvoiceLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -5560,9 +5410,7 @@ class FactureLigne extends CommonInvoiceLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 427daf445c5..9888bd23d13 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -145,9 +145,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -202,9 +200,7 @@ class PaymentTerm // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -239,9 +235,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->free($resql);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -305,9 +299,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -345,9 +337,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -396,9 +386,7 @@ class PaymentTerm // extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 8eb47268186..c88fef5015c 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -69,35 +69,25 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
+} // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 {
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-
-// Deletes a contact
+} // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->facture->creer)
 {
 	$object->fetch($id);
@@ -107,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -207,9 +196,7 @@ if ($id > 0 || !empty($ref))
 		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		    if ($res) break;
 		}
-	}
-	else
-	{
+	} else {
 		// Record not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a901b985342..ed9b032ae90 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -181,14 +181,10 @@ if ($id > 0 || !empty($ref))
 		$permtoedit = $user->rights->facture->creer;
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 65e9044f4f7..dfda4a5b16d 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -609,9 +609,7 @@ if ($resql)
 				if (!$invoicerectmp->isMaxNbGenReached())
 				{
 					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
-				}
-				else
-				{
+				} else {
 					print img_info($langs->trans("MaxNumberOfGenerationReached"));
 				}
 				print '</div>';
@@ -654,19 +652,14 @@ if ($resql)
 				if ($invoicerectmp->isMaxNbGenReached())
 				{
 					print $langs->trans("MaxNumberOfGenerationReached");
-				}
-				elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
 					print $langs->trans("CreateBill").'</a>';
-				}
-				else
-				{
+				} else {
 					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
 				}
-			}
-			else
-			{
+			} else {
 				print "&nbsp;";
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -676,9 +669,7 @@ if ($resql)
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -693,9 +684,7 @@ if ($resql)
 	print "</form>";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8b9e204f17e..c21d19ad538 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -304,8 +304,7 @@ if ($massaction == 'makepayment'){
 
 	header('Location: '.$loc);
 	exit;
-}
-elseif ($massaction == 'withdrawrequest')
+} elseif ($massaction == 'withdrawrequest')
 {
 	$langs->load("withdrawals");
 
@@ -313,9 +312,7 @@ elseif ($massaction == 'withdrawrequest')
 	{
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		//Checking error
 		$error = 0;
 
@@ -363,12 +360,10 @@ elseif ($massaction == 'withdrawrequest')
 				if ($numprlv > 0) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
-				}
-				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
+				} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-				}
-				else {
+				} else {
 					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
 				}
 			}
@@ -386,9 +381,7 @@ elseif ($massaction == 'withdrawrequest')
 				{
 					$db->commit();
 					$nbwithdrawrequestok++;
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
@@ -515,9 +508,7 @@ if ($search_status != '-1' && $search_status != '')
 		if ($search_status == '1') $sql .= " AND f.fk_statut = 1"; // unpayed
 		if ($search_status == '2') $sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
 		if ($search_status == '3') $sql .= " AND f.fk_statut = 3"; // abandonned
-	}
-	else
-	{
+	} else {
 		$sql .= " AND f.fk_statut IN (".$db->escape($search_status).")"; // When search_status is '1,2' for example
 	}
 }
@@ -563,9 +554,7 @@ if (!$sall)
 	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
 	}
-}
-else
-{
+} else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 
@@ -674,8 +663,7 @@ if ($resql)
 	if ($user->rights->facture->supprimer) {
 		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
         	$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
-		}
-        elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
+		} elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
             $arrayofmassactions['predelete'] = $langs->trans("Delete");
         }
     }
@@ -1219,9 +1207,7 @@ if ($resql)
                 if ($contextpage == 'poslist')
                 {
                     print $obj->ref;
-                }
-                else
-                {
+                } else {
                     print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
                 }
 
@@ -1316,9 +1302,7 @@ if ($resql)
 		        if ($contextpage == 'poslist')
 				{
 				    print $thirdpartystatic->name;
-				}
-				else
-				{
+				} else {
 				    print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
@@ -1619,9 +1603,7 @@ if ($resql)
 	$title = '';
 
 	print $formfile->showdocuments('massfilesarea_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 74de1c640d4..7cbe336e126 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -86,9 +86,7 @@ if (empty($reshook))
                 $db->commit();
 
                 setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 setEventMessages($object->error, $object->errors, 'errors');
             }
@@ -292,14 +290,10 @@ if ($object->id > 0)
 		if ($action == 'editinvoicedate')
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate');
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->date, 'daytext');
 		}
-	}
-	else
-	{
+	} else {
 		print dol_print_date($object->date, 'daytext');
 	}
 	print '</td>';
@@ -318,14 +312,10 @@ if ($object->id > 0)
 		if ($action == 'editconditions')
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-		}
-		else
-		{
+		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -343,17 +333,13 @@ if ($object->id > 0)
 		if ($action == 'editpaymentterm')
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date_lim_reglement, 'paymentterm');
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->date_lim_reglement, 'daytext');
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
 		}
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -369,9 +355,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -388,9 +372,7 @@ if ($object->id > 0)
 	if ($action == 'editbankaccount')
 	{
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-	}
-	else
-	{
+	} else {
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -502,9 +484,7 @@ if ($object->id > 0)
 	{
 		$num = $db->num_rows($result_sql);
 		$numopen = $num;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -520,9 +500,7 @@ if ($object->id > 0)
 	{
 		$obj = $db->fetch_object($result_sql);
 		if ($obj) $pending = $obj->amount;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -549,25 +527,18 @@ if ($object->id > 0)
     			print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="10" />';
     			print '<input type="submit" class="butAction" value="'.$langs->trans("MakeWithdrawRequest").'" />';
     			print '</form>';
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
     		}
-	    }
-	    else
-        {
+	    } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
         }
-	}
-	else
-	{
+	} else {
 		if ($num == 0)
 		{
 			if ($object->statut > Facture::STATUS_DRAFT) print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AlreadyPaid")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 			else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("Draft")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
-		}
-		else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
+		} else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 	}
 
 	print "</div><br>\n";
@@ -634,9 +605,7 @@ if ($object->id > 0)
 		}
 
 		$db->free($result_sql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -696,9 +665,7 @@ if ($object->id > 0)
 			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 
 		$db->free($result);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 284186b73ce..82ba8a33467 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-if(!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
@@ -60,7 +60,7 @@ if ($user->socid > 0)
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-if(!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
+if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
 else $startyear=$year-1;
 $endyear = $year;
 
@@ -68,7 +68,7 @@ $endyear = $year;
 /*
  * View
  */
-if(!empty($conf->category->enabled)) $langs->load('categories');
+if (!empty($conf->category->enabled)) $langs->load('categories');
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
@@ -180,9 +180,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -369,8 +367,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index a02a0fc1682..ef35c03eb54 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -78,9 +78,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 			// If not abandonned
     		$total = $total + $sign * $objectlink->total_ht;
     		echo price($objectlink->total_ht);
-    	}
-    	else
-    	{
+    	} else {
     		echo '<strike>'.price($objectlink->total_ht).'</strike>';
     	}
 	}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 00b4987ad66..d5daadcb557 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -214,16 +214,12 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -302,16 +298,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -428,18 +420,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -529,17 +517,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$totalam += $obj->am;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -608,14 +592,11 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 /**
@@ -686,16 +667,12 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 				print '<td class="right"></td>';
 				print '<td class="right">&nbsp;</td>';
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			print "</table></div><br>";
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -815,9 +792,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			print '</table></div><br>';
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -939,18 +914,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1049,17 +1020,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 1459bbf2402..78ef32072d6 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -91,7 +91,7 @@ $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescPurchasesJournal").'<br>';
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else  $description .= $langs->trans("DepositsAreIncluded");
+else $description .= $langs->trans("DepositsAreIncluded");
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
@@ -168,8 +168,7 @@ if ($result)
 
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -238,9 +237,7 @@ foreach ($tabfac as $key => $val)
 				{
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 98bd5e989f7..bd44f6c47cc 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -93,7 +93,7 @@ $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescSellsJournal").'<br>';
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else  $description .= $langs->trans("DepositsAreIncluded");
+else $description .= $langs->trans("DepositsAreIncluded");
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
 
@@ -114,8 +114,7 @@ $sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 $sql .= " AND f.fk_statut > 0";
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
-}
-else {
+} else {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 
@@ -195,8 +194,7 @@ if ($result)
    		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);
    		$i++;
    	}
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -268,9 +266,7 @@ foreach ($tabfac as $key => $val)
 				{
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 51275c7159f..cd7bbfd11c2 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -80,9 +80,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
         $db->commit();
         header("Location: list.php?localTaxType=".$lttype);
         exit;
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessages($object->error, $object->errors, 'errors');
         $_GET["action"] = "create";
@@ -113,22 +111,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
 				exit;
-			}
-			else
-			{
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-	else
-	{
+	} else {
         $mesg = 'Error try do delete a line linked to a conciliated bank transaction';
         setEventMessages($mesg, null, 'errors');
 	}
@@ -289,9 +281,7 @@ if ($id)
 	if ($object->rappro == 0)
 	{
 		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 6aa7c2b1a87..1dfeb0b8930 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -137,15 +137,11 @@ class Localtax extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else
-			{
+            } else {
 				$this->db->rollback();
 				return -1;
             }
-        }
-        else
-		{
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -206,9 +202,7 @@ class Localtax extends CommonObject
     	{
     		$this->db->commit();
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -270,9 +264,7 @@ class Localtax extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -377,15 +369,11 @@ class Localtax extends CommonObject
             	$ret = $obj->amount;
                 $this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-		{
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -418,15 +406,11 @@ class Localtax extends CommonObject
             	$ret = $obj->total_localtax;
                 $this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
             	return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -461,15 +445,11 @@ class Localtax extends CommonObject
                 $ret = $obj->amount;
             	$this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -547,9 +527,7 @@ class Localtax extends CommonObject
                     if ($bank_line_id > 0)
 					{
                         $this->update_fk_bank($bank_line_id);
-                    }
-					else
-					{
+                    } else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -567,22 +545,16 @@ class Localtax extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -604,9 +576,7 @@ class Localtax extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 61a11a042f2..10111dd7faa 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -53,17 +53,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
     $q = GETPOST("q");
     if (empty($q))
 	{
-		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); }
-		else
-		{
+		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); } else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -201,9 +197,7 @@ if ($calc == 0 || $calc == 2)
 					if ($coll->assuj == '1')
 					{
 						$intra = $langs->trans('Unknown');
-					}
-					else
-					{
+					} else {
 						$intra = '';
 					}
 				}
@@ -229,16 +223,13 @@ if ($calc == 0 || $calc == 2)
 	    print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		elseif ($coll_list == -2)
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else
-			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
 	}
 }
 
@@ -274,9 +265,7 @@ if ($calc == 0 || $calc == 1) {
 					if ($coll->assuj == '1')
 					{
 						$intra = $langs->trans('Unknown');
-					}
-					else
-					{
+					} else {
 						$intra = '';
 					}
 				}
@@ -304,16 +293,13 @@ if ($calc == 0 || $calc == 1) {
 		print '</tr>';
 
 		print '</table>';
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		elseif ($coll_list == -2)
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else
-			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
 	}
 }
 
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index a08ac99d6bd..8e810495ff4 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -52,15 +52,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 		}
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -152,9 +148,7 @@ function pt($db, $sql, $date)
             	$amountpaid = 0;
             	$previousmode = '';
             	$previousmonth = '';
-            }
-            else
-            {
+            } else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -182,8 +176,7 @@ function pt($db, $sql, $date)
 
         print "</table>";
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -388,9 +381,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'localtax2'			=>$x_paye[$my_paye_rate]['localtax2_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else
-			{
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 47a0f44be47..a8b37c3ef93 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -95,9 +95,7 @@ if ($result)
 
     print "</table>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 8e2e871251f..058f6871c7d 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -63,17 +63,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -222,11 +218,8 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 	elseif ($x_coll == -2)
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-	else
-		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
-}
-else
-{
+	else print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
+} else {
 	$x_both = array();
 
 	//now, from these two arrays, get another array with one rate per line
@@ -372,9 +365,7 @@ else
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
-					}
-					else
-					{
+					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 			            if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
@@ -416,8 +407,7 @@ else
 						if ($type == 0)
 						{
 							print $langs->trans("NotUsedForGoods");
-						}
-						else {
+						} else {
 							print price($fields['payment_amount']);
 							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 						}
@@ -532,9 +522,7 @@ else
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
-					}
-					else
-					{
+					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
@@ -572,9 +560,7 @@ else
 						if ($type == 0)
 						{
 							print $langs->trans("NA");
-						}
-						else
-						{
+						} else {
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
 								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4a7e387987c..4eea16f706b 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -131,8 +131,7 @@ if (empty($reshook))
 	            }
 
 	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        }
-			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
 	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
@@ -312,9 +311,7 @@ if (empty($reshook))
 	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
 	        header('Location: '.$loc);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	    }
 	}
@@ -503,9 +500,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print '<td>';
             $form->select_comptes($accountid, 'accountid', 0, '', 2);
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>&nbsp;</td>';
         }
         print "</tr>\n";
@@ -560,9 +555,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         if ($facture->type != Facture::TYPE_CREDIT_NOTE)
         {
             $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-        }
-        else
-        {
+        } else {
             $sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
         }
         // Sort invoices by date and serial number: the older one comes first
@@ -665,9 +658,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                         }
 
                         print '</td>';
-                    }
-                    else
-                    {
+                    } else {
                         print '<td align="center"></td>';
                     }
 
@@ -710,9 +701,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
     				    			print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
    				    			print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
    				    			print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-    				    	}
-    				    	else
-    				    	{
+    				    	} else {
     				    		print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
     				    		print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
     				    	}
@@ -746,9 +735,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
                         print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                         print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-                    }
-                    else
-                    {
+                    } else {
                         print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
                         print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                     }
@@ -803,9 +790,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 //print "</td></tr>\n";
             }
             $db->free($resql);
-        }
-        else
-		{
+        } else {
             dol_print_error($db);
         }
 
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index e14581f6531..4acfd34a53a 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -65,9 +65,7 @@ if ($action == 'setnote' && $user->rights->facture->paiement)
     {
         $db->commit();
         $action = '';
-    }
-    else
-    {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
     }
@@ -87,15 +85,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
         {
         	header("Location: ".$backtopage);
         	exit;
-        }
-        else
-        {
+        } else {
         	header("Location: list.php");
         	exit;
         }
-	}
-	else
-	{
+	} else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
@@ -131,9 +125,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
@@ -147,9 +139,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -162,9 +152,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -413,9 +401,7 @@ if ($resql)
 	print '</div>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -445,9 +431,7 @@ if ($user->socid == 0 && $action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index eeb578ad731..4b1c1637c89 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -79,9 +79,7 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
         {
 			setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -98,9 +96,7 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
         {
             setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -117,9 +113,7 @@ if ($action == 'setref' && $user->rights->banque->cheque)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -149,14 +143,10 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 
        		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         	exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs');
 	    $action = 'new';
 	}
@@ -170,9 +160,7 @@ if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banq
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -185,9 +173,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	{
 		header("Location: index.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($paiement->error, $paiement->errors, 'errors');
 	}
 }
@@ -212,9 +198,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
 
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -232,9 +216,7 @@ if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->ban
 		//header("Location: ".DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id);
 		//exit;
 		$action = '';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -261,15 +243,11 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 	{
 		dol_print_error($db, $object->error);
 		exit;
-	}
-	else
-	{
+	} else {
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
 		exit;
 	}
-}
-
-// Remove file in doc form
+} // Remove file in doc form
 elseif ($action == 'remove_file' && $user->rights->banque->cheque)
 {
 	if ($object->fetch($id) > 0)
@@ -314,9 +292,7 @@ if ($action == 'new')
 	$h++;
 
 	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
-}
-else
-{
+} else {
 	$result = $object->fetch($id, $ref);
 	if ($result < 0)
 	{
@@ -509,9 +485,7 @@ if ($action == 'new')
 				if ($paymentstatic->id)
 				{
 					print $paymentstatic->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -521,9 +495,7 @@ if ($action == 'new')
 				if ($accountlinestatic->rowid)
 				{
 					print $accountlinestatic->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -543,17 +515,13 @@ if ($action == 'new')
 		if ($user->rights->banque->cheque)
 		{
 			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn', $account_label).'">';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn', $account_label).'</a>';
 		}
 		print '</div><br>';
 		print '</form>';
 	}
-}
-else
-{
+} else {
 	$paymentstatic = new Paiement($db);
 	$accountlinestatic = new AccountLine($db);
 	$accountstatic = new Account($db);
@@ -587,9 +555,7 @@ else
         print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
         print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
         print '</form>';
-    }
-    else
-    {
+    } else {
         print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
     }
 
@@ -699,9 +665,7 @@ else
     			if ($paymentstatic->id)
     			{
     				print $paymentstatic->getNomUrl(1);
-    			}
-    			else
-    			{
+    			} else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -711,9 +675,7 @@ else
     			if ($accountlinestatic->rowid)
     			{
     				print $accountlinestatic->getNomUrl(1);
-    			}
-    			else
-    			{
+    			} else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -736,9 +698,7 @@ else
 
     			$i++;
     		}
-        }
-        else
-        {
+        } else {
             print '<td colspan="8" class="opacitymedium">';
             print $langs->trans("None");
             print '</td>';
@@ -755,9 +715,7 @@ else
 		}
 
 		print "</div>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 746065647d5..48c58dc7219 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -120,18 +120,14 @@ class RemiseCheque extends CommonObject
 				if ($this->statut == 0)
 				{
 					$this->ref = "(PROV".$this->id.")";
-				}
-				else
-				{
+				} else {
 					$this->ref = $obj->ref;
 				}
 			}
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -227,9 +223,7 @@ class RemiseCheque extends CommonObject
 						array_push($lines, $row[0]);
 					}
 					$this->db->free($resql);
-				}
-				else
-				{
+				} else {
 					$this->errno = -1026;
 					dol_syslog("RemiseCheque::Create Error ".$this->errno, LOG_ERR);
 				}
@@ -269,9 +263,7 @@ class RemiseCheque extends CommonObject
 					dol_syslog("RemiseCheque::Create Error update amount ".$this->errno, LOG_ERR);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$this->errno = -1;
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
@@ -288,9 +280,7 @@ class RemiseCheque extends CommonObject
             $this->db->commit();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->errno;
@@ -341,9 +331,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno === 0)
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Delete ROLLBACK ($this->errno)");
 		}
@@ -385,15 +373,11 @@ class RemiseCheque extends CommonObject
 				{
 				    $this->ref = $numref;
 					$this->statut = 1;
-				}
-				else
-				{
+				} else {
 					$this->errno = -1029;
 					dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 				}
-			}
-			else
-			{
+			} else {
 				$this->errno = -1033;
 				dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 			}
@@ -404,9 +388,7 @@ class RemiseCheque extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Validate ".$this->errno, LOG_ERR);
             return $this->errno;
@@ -488,9 +470,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			return $numref;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
@@ -544,9 +524,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -584,9 +562,7 @@ class RemiseCheque extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -664,17 +640,13 @@ class RemiseCheque extends CommonObject
 			{
 				//$outputlangs->charset_output=$sav_charset_output;
 				return 1;
-			}
-			else
-			{
+			} else {
 				//$outputlangs->charset_output=$sav_charset_output;
 				dol_syslog("Error");
 				dol_print_error($this->db, $docmodel->error);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorFileDoesNotExists", $dir.$file);
 			return -1;
 		}
@@ -720,9 +692,7 @@ class RemiseCheque extends CommonObject
 				$this->errno = -1030;
 				dol_syslog("RemiseCheque::updateAmount ERREUR UPDATE ($this->errno)");
 			}
-		}
-		else
-		{
+		} else {
 			$this->errno = -1031;
 			dol_syslog("RemiseCheque::updateAmount ERREUR SELECT ($this->errno)");
 		}
@@ -730,9 +700,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno === 0)
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::updateAmount ROLLBACK ($this->errno)");
 		}
@@ -761,9 +729,7 @@ class RemiseCheque extends CommonObject
 			if ($resql)
 			{
 				$this->updateAmount();
-			}
-			else
-			{
+			} else {
 				$this->errno = -1032;
 				dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
 			}
@@ -838,31 +804,23 @@ class RemiseCheque extends CommonObject
 					{
     					$this->db->commit();
     					return $rejectedPayment->id;
-					}
-					else
-					{
+					} else {
                         $this->db->rollback();
 					    return -1;
 					}
-				}
-				else
-				{
+				} else {
 				    $this->error = $rejectedPayment->error;
 				    $this->errors = $rejectedPayment->errors;
 				    $this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $rejectedPayment->error;
 				$this->errors = $rejectedPayment->errors;
 			    $this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -935,15 +893,11 @@ class RemiseCheque extends CommonObject
             {
                 $this->date_bordereau = $date;
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             return -2;
         }
     }
@@ -970,15 +924,11 @@ class RemiseCheque extends CommonObject
 			if ($resql)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -1046,8 +996,7 @@ class RemiseCheque extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index c85553d59a8..1ee79aeafd9 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -76,9 +76,7 @@ if ($resql) {
     print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
     print '</td></tr>';
     print "</table>\n";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -140,9 +138,7 @@ if ($resql)
 	print "</table>";
 
 	$db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index fe1f7c31050..e76936c71fd 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -221,9 +221,7 @@ if ($resql)
             print "</tr>\n";
     		$i++;
     	}
-    }
-    else
-    {
+    } else {
    		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
@@ -231,9 +229,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print "</form>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 9b0ee645fc7..f57e4408a6f 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -200,15 +200,11 @@ class Paiement extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->free($resql);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -242,9 +238,7 @@ class Paiement extends CommonObject
 		{
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		}
-		else
-		{
+		} else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -282,9 +276,7 @@ class Paiement extends CommonObject
 		{
 			$total = $totalamount;
 			$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
-		}
-		else
-		{
+		} else {
 			$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			$mtotal = $totalamount;
 		}
@@ -340,8 +332,7 @@ class Paiement extends CommonObject
                             if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
                             elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
                             //else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
-                            else
-                            {
+                            else {
                                 // If invoice is a down payment, we also convert down payment to discount
                                 if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
@@ -429,15 +420,11 @@ class Paiement extends CommonObject
                             	$error++;
                             }
                         }
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 				}
 			}
@@ -449,9 +436,7 @@ class Paiement extends CommonObject
 				if ($result < 0) { $error++; }
 				// Fin appel triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -463,9 +448,7 @@ class Paiement extends CommonObject
 		    $this->multicurrency_amount = $mtotal;
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -501,9 +484,7 @@ class Paiement extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -567,9 +548,7 @@ class Paiement extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -730,9 +709,7 @@ class Paiement extends CommonObject
 				    if ($result < 0) { $error++; }
 				    // Fin appel triggers
 				}
-            }
-            else
-			{
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -740,9 +717,7 @@ class Paiement extends CommonObject
             if (!$error)
             {
             	$this->db->commit();
-            }
-            else
-			{
+            } else {
             	$this->db->rollback();
             }
         }
@@ -750,9 +725,7 @@ class Paiement extends CommonObject
         if (!$error)
         {
             return $bank_line_id;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -776,9 +749,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
@@ -839,9 +810,7 @@ class Paiement extends CommonObject
 
                 $this->db->commit();
                 return 0;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
@@ -870,9 +839,7 @@ class Paiement extends CommonObject
             {
             	$this->num_payment = $this->db->escape($num);
                 return 0;
-            }
-            else
-            {
+            } else {
                 $this->error = 'Error -1 '.$this->db->error();
                 return -2;
             }
@@ -895,9 +862,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
@@ -919,9 +884,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
@@ -965,9 +928,7 @@ class Paiement extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
     }
@@ -999,9 +960,7 @@ class Paiement extends CommonObject
 			}
 
 			return $billsarray;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
@@ -1033,9 +992,7 @@ class Paiement extends CommonObject
     		}
 
     		return $amounts;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->error();
     		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
     		return -1;
@@ -1118,9 +1075,7 @@ class Paiement extends CommonObject
 			}
 
 			return $numref;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
 			return "";
@@ -1221,8 +1176,7 @@ class Paiement extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 20401d81a1a..eb2523960f3 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -129,9 +129,7 @@ if (GETPOST("orphelins", "alpha"))
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-}
-else
-{
+} else {
     $sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
     $sql .= " p.statut, p.num_paiement as num_payment,";
     $sql .= " c.code as paiement_code,";
@@ -161,7 +159,7 @@ else
     if ($userid)
     {
         if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
-        else  $sql .= " AND f.fk_user_author = ".$userid;
+        else $sql .= " AND f.fk_user_author = ".$userid;
     }
     // Search criteria
     $sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
@@ -378,9 +376,7 @@ if ($resql)
     print "</table>\n";
     print "</div>";
     print "</form>\n";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 76a1ce72d76..9d3bae3140d 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -70,9 +70,7 @@ if ($action == 'builddoc')
     if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
     {
         $outputlangs->charset_output = $sav_charset_output;
-    }
-    else
-    {
+    } else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 91ef2c215e6..349c483a5db 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -126,9 +126,7 @@ if ($resql)
         if ($objp->statut == 0)
         {
             print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
-        }
-        else
-        {
+        } else {
             print "-";
         }
 
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 509e20f3613..9c5ceea22bf 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -141,9 +141,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
                 $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -283,9 +281,7 @@ if ($action == 'create')
 		if ($objp->date_ech > 0)
 		{
 			print '<td class="left">'.dol_print_date($objp->date_ech, 'day').'</td>'."\n";
-		}
-		else
-		{
+		} else {
 			print "<td align=\"center\"><b>!!!</b></td>\n";
 		}
 
@@ -305,9 +301,7 @@ if ($action == 'create')
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
-		}
-		else
-		{
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 5fdfe327056..fbe5d926d33 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -66,9 +66,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
         exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -283,9 +281,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -316,9 +312,7 @@ if ($action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index fd87dd5e447..63769e2bd9e 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -158,15 +158,11 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
     }
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -220,9 +216,7 @@ if ($result)
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index c7c717e702b..347b3ebb37f 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -190,9 +190,7 @@ if ($result)
     print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index d81e101be3d..7d56cec823e 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -408,9 +408,7 @@ if ($id > 0 || $ref)
 			if ($obj->statut == 3)
 			{
 		  		print '<b>'.$langs->trans("StatusRefused").'</b>';
-			}
-			else
-			{
+			} else {
 		  		print "&nbsp;";
 			}
 
@@ -442,9 +440,7 @@ if ($id > 0 || $ref)
 		print '</form>';
 
 		$db->free($result);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0c21a3e6d2b..6192d97d92f 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -151,21 +151,15 @@ class BonPrelevement extends CommonObject
 				if ($this->db->query($sql))
 				{
 					$result = 0;
-				}
-				else
-				{
+				} else {
 					$result = -1;
 					dol_syslog(get_class($this)."::AddFacture Erreur $result");
 				}
-			}
-			else
-			{
+			} else {
 				$result = -2;
 				dol_syslog(get_class($this)."::AddFacture Erreur $result");
 			}
-		}
-		else
-		{
+		} else {
 			$result = -3;
 			dol_syslog(get_class($this)."::AddFacture Erreur $result");
 		}
@@ -208,14 +202,10 @@ class BonPrelevement extends CommonObject
 			if ($resql)
 			{
 				$num = $this->db->num_rows($resql);
-			}
-			else
-			{
+			} else {
 				$result = -1;
 			}
-		}
-		else
-		{
+		} else {
 			/*
 			 * No aggregate
 			 */
@@ -243,9 +233,7 @@ class BonPrelevement extends CommonObject
 			{
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::addline Error -2");
 				$result = -2;
 			}
@@ -320,15 +308,11 @@ class BonPrelevement extends CommonObject
 				$this->fetched = 1;
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::Fetch Erreur aucune ligne retournee");
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -396,17 +380,13 @@ class BonPrelevement extends CommonObject
 			{
 				$this->db->commit();
 				return 0;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_credite ROLLBACK ");
 
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible ");
 			return -2;
 		}
@@ -490,9 +470,7 @@ class BonPrelevement extends CommonObject
 							{
 								dol_syslog(get_class($this)."::set_infocredit AddPayment Error");
 								$error++;
-							}
-							else
-							{
+							} else {
 								$result = $paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
 								if ($result < 0)
 								{
@@ -516,9 +494,7 @@ class BonPrelevement extends CommonObject
 							dol_syslog(get_class($this)."::set_infocredit Update lines Error");
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog(get_class($this)."::set_infocredit Update Bons Error");
 						$error++;
 					}
@@ -533,28 +509,20 @@ class BonPrelevement extends CommonObject
 
 						$this->db->commit();
 						return 0;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						dol_syslog("bon-prelevment::set_infocredit ROLLBACK ");
 						return -1;
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::set_infocredit 1025 Open SQL transaction impossible ");
 					return -1025;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog("bon-prelevment::set_infocredit 1027 Date de credit < Date de trans ");
 				return -1027;
 			}
-		}
-		else
-		{
+		} else {
 			return -1026;
 		}
 	}
@@ -596,9 +564,7 @@ class BonPrelevement extends CommonObject
 				$message .= $langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
 
 				// TODO Call trigger to create a notification using notification module
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 
@@ -609,17 +575,13 @@ class BonPrelevement extends CommonObject
 				$this->db->commit();
 
 				return 0;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR);
 
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT);
 			return -2;
 		}
@@ -664,8 +626,7 @@ class BonPrelevement extends CommonObject
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) $arr[$i] = $row[0];
-					else
-					{
+					else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -675,9 +636,7 @@ class BonPrelevement extends CommonObject
 				}
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::getListInvoices Erreur");
 		}
 
@@ -714,9 +673,7 @@ class BonPrelevement extends CommonObject
 			$this->db->free($resql);
 
 			return $obj->nb;
-		}
-		else
-		{
+		} else {
 			$error = 1;
 			dol_syslog(get_class($this)."::SommeAPrelever Erreur -1");
 			dol_syslog($this->db->error());
@@ -759,9 +716,7 @@ class BonPrelevement extends CommonObject
 			$this->db->free($resql);
 
 			return $obj->nb;
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
@@ -848,9 +803,7 @@ class BonPrelevement extends CommonObject
 				}
 				$this->db->free($resql);
 				dol_syslog(__METHOD__."::Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_syslog(__METHOD__."::Read invoices error ".$this->db->error(), LOG_ERR);
 			}
@@ -894,27 +847,19 @@ class BonPrelevement extends CommonObject
 								$factures_prev_id[$i] = $fac[0];
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
-							}
-							else
-							{
+							} else {
 								dol_syslog(__METHOD__."::Check RIB Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_WARNING);
 								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 								$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 							}
-						}
-						else
-						{
+						} else {
 							dol_syslog(__METHOD__."::Check RIB Failed to read company", LOG_WARNING);
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog(__METHOD__."::Check RIB Failed to read invoice", LOG_WARNING);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog(__METHOD__."::Check RIB No invoice to process", LOG_WARNING);
 			}
 		}
@@ -940,9 +885,7 @@ class BonPrelevement extends CommonObject
 			if ($mode == 'real')
 			{
 				$ok = 1;
-			}
-			else
-			{
+			} else {
 				print $langs->trans("ModeWarning"); //"Option for real mode was not set, we stop after this simulation\n";
 			}
 		}
@@ -999,15 +942,11 @@ class BonPrelevement extends CommonObject
 						$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
 						$this->id = $prev_id;
 						$this->ref = $ref;
-					}
-					else
-					{
+					} else {
 						$error++;
 						dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
@@ -1128,16 +1067,12 @@ class BonPrelevement extends CommonObject
 			if (!$error)
 			{
 				$this->db->commit();
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 			}
 
 			return count($factures_prev);
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -1197,9 +1132,7 @@ class BonPrelevement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1258,8 +1191,7 @@ class BonPrelevement extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1300,9 +1232,7 @@ class BonPrelevement extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -1326,9 +1256,7 @@ class BonPrelevement extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -1358,9 +1286,7 @@ class BonPrelevement extends CommonObject
 			if ($this->db->query($sql))
 			{
 				$result = 0;
-			}
-			else
-			{
+			} else {
 				$result = -1;
 				dol_syslog(get_class($this)."::AddNotification Error $result");
 			}
@@ -1463,9 +1389,7 @@ class BonPrelevement extends CommonObject
 					$i++;
 				}
 				$nbtotalDrctDbtTxInf = $i;
-			}
-			else
-			{
+			} else {
 				fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
 				$result = -2;
 			}
@@ -1474,9 +1398,7 @@ class BonPrelevement extends CommonObject
 			if ($result != -2)
 			{
 				$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format);
-			}
-			else
-			{
+			} else {
 				fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company
 			}
 
@@ -1542,9 +1464,7 @@ class BonPrelevement extends CommonObject
 					$this->total = $this->total + $obj->amount;
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$result = -2;
 			}
 
@@ -1914,9 +1834,7 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '					</PrvtId>'.$CrLf;
 			$XML_SEPA_INFO .= '				</Id>'.$CrLf;
 			$XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;
-		}
-		else
-		{
+		} else {
 			fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf);
 			$result = -2;
 		}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 88b612554df..1e731b24524 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -96,17 +96,13 @@ class LignePrelevement
 				$this->statut          = $obj->statut;
 				$this->bon_ref         = $obj->ref;
 				$this->bon_rowid       = $obj->bon_rowid;
-			}
-			else
-			{
+			} else {
 				$result++;
 				dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0");
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			$result++;
 			dol_syslog("LignePrelevement::Fetch rowid=$rowid");
 			dol_syslog($this->db->error());
@@ -142,20 +138,17 @@ class LignePrelevement
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1');
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6');
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
 			elseif ($status == 2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 8c033353637..8599987fb23 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -160,9 +160,7 @@ class RejetPrelevement
 			{
 				$error++;
 				dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]);
-			}
-			else
-			{
+			} else {
 				$result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', '');
 				if ($result < 0)
 				{
@@ -191,9 +189,7 @@ class RejetPrelevement
 		{
 			dol_syslog("RejetPrelevement::Create Commit");
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::Create Rollback");
 			$this->db->rollback();
 		}
@@ -227,9 +223,7 @@ class RejetPrelevement
 				$row = $this->db->fetch_row($resql);
 				$userid = $row[0];
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
 		}
 
@@ -265,14 +259,10 @@ class RejetPrelevement
 			if ($result)
 			{
 				dol_syslog("RejetPrelevement::_send_email email envoye");
-			}
-			else
-			{
+			} else {
 				dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::_send_email Userid invalide");
 		}
 	}
@@ -310,8 +300,7 @@ class RejetPrelevement
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) $arr[$i] = $row[0];
-					else
-					{
+					else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -321,9 +310,7 @@ class RejetPrelevement
 				}
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_syslog("getListInvoices", LOG_ERR);
 		}
 
@@ -358,15 +345,11 @@ class RejetPrelevement
 				$this->db->free($resql);
 
 				return 0;
-			}
-			else
-			{
+			} else {
 				dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
 			return -2;
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 5306b6799b9..015380a669d 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -83,8 +83,7 @@ if (empty($reshook))
 		if ($result < 0)
 		{
 			setEventMessages($bprev->error, $bprev->errors, 'errors');
-		}
-		elseif ($result == 0)
+		} elseif ($result == 0)
 		{
 			$mesg = $langs->trans("NoInvoiceCouldBeWithdrawed", $format);
 			setEventMessages($mesg, null, 'errors');
@@ -93,9 +92,7 @@ if (empty($reshook))
 			{
 				$mesg .= '<span class="warning">'.$val."</span><br>\n";
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("DirectDebitOrderCreated", $bprev->getNomUrl(1)), null);
 		}
 	}
@@ -174,22 +171,16 @@ if ($nb) {
         } else {
             print '<a class="butAction"  type="submit" href="create.php?action=create&format=ALL">'.$langs->trans("CreateAll")."</a>\n";
 		}
-	}
-	else
-	{
+	} else {
 		if ($mysoc->isInEEC())
 		{
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateForSepaFRST")."</a>\n";
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateForSepaRCUR")."</a>\n";
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateAll")."</a>\n";
 		}
 	}
-}
-else
-{
+} else {
     print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
 }
 
@@ -307,17 +298,13 @@ if ($resql)
 			print '</tr>';
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table>";
 	print "</form>";
 	print "<br>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 181f71a678c..30618de8c24 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -88,9 +88,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (!$status)
 {
 	$title = $langs->trans("RequestStandingOrderToTreat");
-}
-else
-{
+} else {
 	$title = $langs->trans("RequestStandingOrderTreated");
 }
 
@@ -142,9 +140,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index fb0a5548426..c0fa4f55e68 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -134,9 +134,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-    }
-  	else
-    {
+    } else {
       	dol_print_error($db);
     }
 }
@@ -246,12 +244,10 @@ if ($result)
       	if ($obj->statut == 0)
 		{
 	  		print '-';
-		}
-      	elseif ($obj->statut == 2)
+		} elseif ($obj->statut == 2)
 		{
 	  		print $langs->trans("StatusCredited");
-		}
-      	elseif ($obj->statut == 3)
+		} elseif ($obj->statut == 3)
 		{
 	  		print '<b>'.$langs->trans("StatusRefused").'</b>';
 		}
@@ -289,9 +285,7 @@ if ($result)
   	print '</div>';
 
   	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 1cc454a3d4d..65116878bb9 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -135,9 +135,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-    }
-  	else
-    {
+    } else {
       	dol_print_error($db);
     }
 }
@@ -220,9 +218,7 @@ if ($resql)
 
     		$i++;
     	}
-	}
-	else
-	{
+	} else {
 	    print '<tr><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 
@@ -238,9 +234,7 @@ if ($resql)
     print '</div>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 18028e2059a..0ada15853d9 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -132,9 +132,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		print $langs->trans("Error");
 	}
@@ -185,9 +183,7 @@ if ($prev_id > 0 || $ref)
 
 		print "</table>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		print $db->error().' '.$sql;
 	}
 }
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index eb2932fd4cb..d182176f0fa 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -158,15 +158,11 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
     }
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -220,9 +216,7 @@ if ($result)
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 9169f71a377..fd77d6d90f6 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -73,9 +73,7 @@ if ($action == 'confirm_rejet')
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-		}
-
-		elseif ($daterej > dol_now())
+		} elseif ($daterej > dol_now())
 		{
 			$error++;
 			$langs->load("error");
@@ -102,14 +100,10 @@ if ($action == 'confirm_rejet')
 				header("Location: line.php?id=".$id);
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$action = "rejet";
 		}
-	}
-	else
-	{
+	} else {
 		header("Location: line.php?id=".$id);
 		exit;
 	}
@@ -161,25 +155,19 @@ if ($id)
 				{
 					/* Historique pour certaines install */
 					print $langs->trans("Unknown");
-				}
-				else
-				{
+				} else {
 					print dol_print_date($rej->date_rejet, 'day');
 				}
 				print '</td></tr>';
 				print '<tr><td width="20%">'.$langs->trans("RefusedInvoicing").'</td><td>'.$rej->invoicing.'</td></tr>';
-			}
-			else
-			{
+			} else {
 				print '<tr><td width="20%">'.$resf.'</td></tr>';
 			}
 		}
 
 		print '</table>';
 		dol_fiche_end();
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -245,14 +233,10 @@ if ($id)
 			if ($user->rights->prelevement->bons->credit)
 			{
 	  			print "<a class=\"butAction\" href=\"line.php?action=rejet&amp;id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
-			}
-			else
-			{
+			} else {
 				print "<a class=\"butActionRefused classfortooltip\" href=\"#\" title=\"".$langs->trans("NotAllowed")."\">".$langs->trans("StandingOrderReject")."</a>";
 			}
-		}
-		else
-		{
+		} else {
 			print "<a class=\"butActionRefused classfortooltip\" href=\"#\" title=\"".$langs->trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject")."</a>";
 		}
 	}
@@ -329,9 +313,7 @@ if ($id)
 		print "</table>";
 
 		$db->free($result);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 48f9bcc7c54..3130aa475f6 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -235,9 +235,7 @@ if ($result)
     print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 6d1994b7a4b..61417a2cd5f 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -117,9 +117,7 @@ if ($result)
 
 	print "</table>";
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c6d1962ff46..b12a6a2bb35 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -125,9 +125,7 @@ if ($resql)
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free();
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -219,9 +217,7 @@ if ($resql)
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3f2112537b1..8b75ec38fce 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -211,15 +211,11 @@ if ($id > 0)
 					}
 
 					$db->free($resqlp);
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -288,9 +284,7 @@ if ($id > 0)
 
 		print "</table>";
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 27bc4526a3e..671921506d5 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -99,8 +99,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             $month_end = $month_start - 1;
             if ($month_end < 1) $month_end = 12;
             else $year_end++;
-        }
-        else $month_end = $month_start;
+        } else $month_end = $month_start;
         $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
     }
     if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -151,11 +150,10 @@ if ($modecompta == "CREANCES-DETTES")
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
     $description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -166,8 +164,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
     $description = $langs->trans("RulesResultInOut");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -212,9 +209,7 @@ print_liste_field_titre('');
 if ($modecompta == 'BOOKKEEPING')
 {
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
-}
-else
-{
+} else {
 	if ($modecompta == 'CREANCES-DETTES')
 	{
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -312,16 +307,11 @@ if ($modecompta == 'BOOKKEEPING')
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr><td colspan="4" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 		}
-	}
-	else dol_print_error($db);
-}
-else
-{
+	} else dol_print_error($db);
+} else {
 	/*
 	 * Factures clients
 	 */
@@ -336,12 +326,10 @@ else
 	    $sql .= " AND f.fk_statut IN (1,2)";
 	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	    	$sql .= " AND f.type IN (0,1,2,5)";
-		else
-			$sql .= " AND f.type IN (0,1,2,3,5)";
+		else $sql .= " AND f.type IN (0,1,2,3,5)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 		/*
 	     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -463,12 +451,10 @@ else
 	    $sql .= " AND f.fk_statut IN (1,2)";
 	    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 	    	$sql .= " AND f.type IN (0,1,2)";
-		else
-			$sql .= " AND f.type IN (0,1,2,3)";
+		else $sql .= " AND f.type IN (0,1,2,3)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 	    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
@@ -517,9 +503,7 @@ else
 	            print "</tr>\n";
 	            $i++;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -552,8 +536,7 @@ else
 	    $sql .= " AND c.deductible = 0";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -597,8 +580,7 @@ else
 	            print '</tr>';
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -629,8 +611,7 @@ else
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
 	    $sql .= " AND cs.entity = ".$conf->entity;
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 	    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
 	    $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -674,8 +655,7 @@ else
 	            print '</tr>';
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -767,16 +747,12 @@ else
 		            print '</tr>';
 		            $i++;
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		        print '<tr class="oddeven"><td>&nbsp;</td>';
 		        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 		        print '</tr>';
 		    }
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -853,16 +829,12 @@ else
 					print '<td class="right">'.price(-$obj->amount_ttc).'</td>';
 					print '</tr>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -887,9 +859,7 @@ else
 		    	$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		    	$sql .= " WHERE p.entity IN (".getEntity('donation').")";
 		    	$sql .= " AND fk_statut in (1,2)";
-			}
-			else
-			{
+			} else {
 			    $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
 			    $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 			    $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
@@ -935,16 +905,12 @@ else
 					print '</tr>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -1011,8 +977,7 @@ else
                 print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
             print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
             print '</tr>';
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
     }
 
     /*
@@ -1060,8 +1025,7 @@ else
                 print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
             print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
             print '</tr>';
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
     }
 
 	/*
@@ -1083,8 +1047,7 @@ else
 		    $sql .= " WHERE f.fk_statut IN (1,2)";
 		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		    	$sql .= " AND f.type IN (0,1,2,5)";
-			else
-				$sql .= " AND f.type IN (0,1,2,3,5)";
+			else $sql .= " AND f.type IN (0,1,2,3,5)";
 		    if (!empty($date_start) && !empty($date_end))
 		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		    $sql .= " AND f.entity IN (".getEntity('invoice').")";
@@ -1131,8 +1094,7 @@ else
 		    $sql .= " WHERE f.fk_statut IN (1,2)";
 		    if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		    	$sql .= " AND f.type IN (0,1,2)";
-			else
-				$sql .= " AND f.type IN (0,1,2,3)";
+			else $sql .= " AND f.type IN (0,1,2,3)";
 		    if (!empty($date_start) && !empty($date_end))
 		    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 		    $sql .= " AND f.entity = ".$conf->entity;
@@ -1172,9 +1134,7 @@ else
 		    print '<td class="right">&nbsp;</td>'."\n";
 		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
-		}
-		else
-		{
+		} else {
 		    // VAT really already paid
 		    $amount = 0;
 		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
@@ -1253,9 +1213,7 @@ else
 		            }
 		        }
 		        $db->free($result);
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($db);
 		    }
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index ad81a3943c1..7221e932ca6 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -78,8 +78,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
 			else $year_end++;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -131,11 +130,10 @@ if ($modecompta == 'CREANCES-DETTES')
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
 	$description .= '<br>'.$langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= "<br>".$langs->trans("DepositsAreNotIncluded");
-	else  $description .= "<br>".$langs->trans("DepositsAreIncluded");
+	else $description .= "<br>".$langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES") {
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
@@ -146,8 +144,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") {
 	$description .= '<br>'.$langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -191,8 +188,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		else $sql .= " AND f.type IN (0,1,2,3,5)";
 	    if (!empty($date_start) && !empty($date_end))
 	    	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		/*
 		 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -228,12 +224,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$i++;
 		}
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -274,17 +268,14 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		// Nothing from this table
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -307,8 +298,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		else $sql .= " AND f.type IN (0,1,2,3)";
     	if (!empty($date_start) && !empty($date_end))
     		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
@@ -343,12 +333,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$i++;
 		}
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -429,8 +417,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		} else {
 			dol_print_error($db);
 		}
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		// TVA really already paid
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
@@ -493,8 +480,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 			dol_print_error($db);
 		}
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -516,8 +502,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " AND c.deductible = 0";
     	if (!empty($date_start) && !empty($date_end))
     		$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -554,8 +539,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -578,8 +562,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " AND c.deductible = 1";
     	if (!empty($date_start) && !empty($date_end))
     		$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -616,8 +599,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -664,8 +646,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -723,13 +704,10 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == 'BOOKKEEPING') {
+} elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
@@ -785,13 +763,10 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
-}
-elseif ($modecompta == 'BOOKKEEPING') {
+} elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
@@ -825,9 +800,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
@@ -855,9 +828,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -893,9 +864,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -960,9 +929,7 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 				$i++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1041,9 +1008,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
 				$totsorties[$annee] += $decaiss[$case];
 			}
-		}
-		else
-		{
+		} else {
 			if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss_ttc[$case], 'MT')).'</a>';
@@ -1062,9 +1027,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
 				$totentrees[$annee] += $encaiss[$case];
 			}
-		}
-		else
-		{
+		} else {
 			if (isset($encaiss_ttc[$case]))
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss_ttc[$case], 'MT')).'</a>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 66adea3371f..48cb8b1154e 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -90,8 +90,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
 			else $year_end++;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -178,11 +177,10 @@ if ($modecompta == "CREANCES-DETTES")
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES") {
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("AnnualByAccountInputOutputMode");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=CREANCES-DETTES">', '</a>').')';
@@ -192,8 +190,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") {
 	$description = $langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPersonalizedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -248,13 +245,11 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Get array of all report groups that are active
 	$cats = $AccCat->getCats(); // WARNING: Computed groups must be after group they include
@@ -375,7 +370,7 @@ elseif ($modecompta == "BOOKKEEPING")
 				print "</tr>\n";
 
 				//var_dump($sommes);
-			} else            // normal category
+			} else // normal category
 			{
 				$code = $cat['code']; // Category code we process
 
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index d7f20622a43..f9d5a90d543 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -128,9 +128,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		header("Location: list.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -145,29 +143,23 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!$dateperiod)
+	} elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!$actioncode > 0)
+	} elseif (!$actioncode > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (empty($amount))
+	} elseif (empty($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!is_numeric($amount))
+	} elseif (!is_numeric($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	else
-	{
+	} else {
 		$object->type = $actioncode;
 		$object->label = GETPOST('label', 'alpha');
 		$object->date_ech = $dateech;
@@ -195,24 +187,19 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!$dateperiod)
+	} elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (empty($amount))
+	} elseif (empty($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!is_numeric($amount))
+	} elseif (!is_numeric($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	else
-	{
+	} else {
 		$result = $object->fetch($id);
 
 		$object->date_ech = $dateech;
@@ -245,16 +232,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
-		}
-		else {
+		} else {
 			$object->label = $langs->trans("CopyOf").' '.$object->label;
 		}
 
 		if (GETPOST('clone_for_next_month', 'int')) {
 			$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
 			$object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm');
-		}
-		else {
+		} else {
 			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
 			$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
 			if ($newdateperiod) $object->periode = $newdateperiod;
@@ -271,18 +256,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$id = $originalId;
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db, $object->error);
 	}
@@ -431,9 +412,7 @@ if ($id > 0)
 			if (!empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX))
 			{
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
-			}
-			else
-			{
+			} else {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
 			}
@@ -535,9 +514,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->periode, "day");
 		}
 		print "</td></tr>";
@@ -548,8 +525,7 @@ if ($id > 0)
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
 			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
 			print "</td></tr>";
-		}
-		else {
+		} else {
 			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -674,9 +650,7 @@ if ($id > 0)
 					$totalpaye += $objp->amount;
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '<td></td><td></td><td></td><td></td>';
 				print '</tr>';
@@ -695,9 +669,7 @@ if ($id > 0)
 			print '</div>';
 
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -767,9 +739,7 @@ if ($id > 0)
 
 			print "</div>";
 		}
-	}
-	else
-	{
+	} else {
 		/* Social contribution not found */
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index b91d9ca31ee..cc66b56aabd 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -459,28 +459,23 @@ class Cchargesociales
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 6d3f4dffa4a..81ae1e28f20 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -171,14 +171,10 @@ class ChargeSociales extends CommonObject
                 $this->db->free($resql);
 
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -252,14 +248,11 @@ class ChargeSociales extends CommonObject
 			if (empty($error)) {
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1 * $error;
 			}
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -328,9 +321,7 @@ class ChargeSociales extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -386,9 +377,7 @@ class ChargeSociales extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -421,14 +410,10 @@ class ChargeSociales extends CommonObject
                 $obj = $this->db->fetch_object($result);
                 $this->db->free($result);
                 return $obj->amount;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->error();
             return -1;
         }
@@ -612,9 +597,7 @@ class ChargeSociales extends CommonObject
 
             $this->db->free($resql);
             return $amount;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -667,9 +650,7 @@ class ChargeSociales extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index bae8d28a756..4cb81422284 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -194,14 +194,11 @@ class PaymentSocialContribution extends CommonObject
 							if ($remaintopay == 0)
 							{
 								$result = $contrib->set_paid($user);
-							}
-							else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							} else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -215,9 +212,7 @@ class PaymentSocialContribution extends CommonObject
             $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -286,9 +281,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -358,9 +351,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -414,9 +405,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -465,9 +454,7 @@ class PaymentSocialContribution extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -577,9 +564,7 @@ class PaymentSocialContribution extends CommonObject
                         if ($result <= 0) dol_print_error($this->db);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -588,9 +573,7 @@ class PaymentSocialContribution extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -613,9 +596,7 @@ class PaymentSocialContribution extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 3c73c8e6614..e7d76b94a76 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -163,9 +163,7 @@ if ($object->id)
     $permtoedit = $user->rights->fournisseur->facture->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 9d210c23d85..43823490ed9 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -80,9 +80,7 @@ if (!GETPOSTISSET('search_typeid'))
 		$part = explode(':', $val);
 		if ($part[0] == 'cs.fk_type') $search_typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
@@ -208,9 +206,7 @@ if ($resql)
 		$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
 		print $countrynotdefined;
 		print '</div>';
-	}
-	else
-	{
+	} else {
 	    print '<div class="div-table-responsive">';
 	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -313,9 +309,7 @@ if ($resql)
 			if ($obj->periode)
 			{
 				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print "</td>\n";
@@ -345,9 +339,7 @@ if ($resql)
 		print '</div>';
 	}
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 5cfa5df06ed..fc1f66d5e2c 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -92,9 +92,7 @@ if ($mode != 'sconly')
 {
     $center = ($year ? '<a href="list.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="list.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit, 1);
-}
-else
-{
+} else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
 }
 
@@ -208,9 +206,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	    print '<td align="center" class="liste_total">&nbsp;</td>';
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -287,9 +283,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		    print "</table>";
 		    $db->free($result);
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -300,19 +294,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 {
 	$j = 1;
 	$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
 {
 	$j = 1;
 	$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
 {
 	$j = 2;
 	$numlt = 3;
-}
-else
-{
+} else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -388,9 +378,7 @@ while ($j < $numlt)
 
 			print "</table>";
 			$db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -472,9 +460,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
             $db->free($result);
 
             print "<br>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index acd58f90217..dc5ebd1731d 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -77,9 +77,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -209,8 +207,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByVatRate");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -220,11 +217,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 5831467ce63..ab2c1dcadb1 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -103,9 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -181,8 +179,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -192,11 +189,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 
@@ -232,8 +227,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
@@ -255,8 +249,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " AND cp.fk_product is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
 		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 		$sql .= ")";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 4d4f56a1354..8b6caa89a8f 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -96,9 +96,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else
-{
+} else {
 	// TODO We define q
 }
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -154,11 +152,10 @@ if ($modecompta == "CREANCES-DETTES") {
     //$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
     $description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -167,12 +164,10 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// TODO
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 	// TODO
 }
@@ -396,8 +391,7 @@ if (count($amount)) {
             } else {
                 //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
@@ -416,8 +410,7 @@ if (count($amount)) {
             } else {
                 //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
@@ -431,8 +424,7 @@ if (count($amount)) {
         	} else {
         		//print '</a>';
         	}
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
         	if ($key > 0) {
         		print '</a>';
         	}
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index bec20998cfa..ab71b147b50 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -113,9 +113,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else
-{
+} else {
 	// TODO We define q
 }
 
@@ -180,11 +178,10 @@ if ($modecompta == "CREANCES-DETTES")
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -193,11 +190,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -223,8 +218,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -241,8 +235,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
 	    $sql .= ")";
@@ -261,8 +254,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -275,8 +267,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 	    $sql .= ")";
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index d1a64e218d2..796ce2cc6a6 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -73,8 +73,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -124,11 +123,10 @@ if ($modecompta == "CREANCES-DETTES")
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -140,8 +138,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -173,8 +170,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	else $sql .= " AND f.type IN (0,1,2,3,5)";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	/*
 	 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -188,8 +184,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -223,8 +218,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -259,9 +253,7 @@ if ($modecompta == 'RECETTES-DEPENSES')
 			}
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -339,11 +331,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				}
-				else
-				{
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-					else { print '&nbsp;'; }
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 				}
 				print "</td>";
 			}
@@ -356,11 +345,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			}
-			else
-			{
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-				else { print '&nbsp;'; }
+			} else {
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 			}
 			print "</td>";
 
@@ -390,12 +376,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					print '<td class="borderrightlight right">-</td>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-				else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				print '</td>';
 			}
 
@@ -483,9 +466,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
-		}
-		else
-		{
+		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -494,9 +475,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
-	}
-	else
-	{
+	} else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -519,12 +498,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="borderrightlight right">+0%</td>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
-		else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 3ff41f4d114..c257d5d1f73 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -69,8 +69,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
-		}
-		else $month_end = $month_start;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
 	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
@@ -121,8 +120,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -133,8 +131,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -165,8 +162,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -176,8 +172,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -211,8 +206,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -289,11 +283,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				}
-				else
-				{
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-					else { print '&nbsp;'; }
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 				}
 				print "</td>";
 			}
@@ -306,11 +297,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			}
-			else
-			{
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-				else { print '&nbsp;'; }
+			} else {
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 			}
 			print "</td>";
 
@@ -340,12 +328,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					print '<td class="borderrightlight right">-</td>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-				else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				print '</td>';
 			}
 
@@ -368,9 +353,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
-		}
-		else
-		{
+		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -379,9 +362,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
-	}
-	else
-	{
+	} else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -404,12 +385,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="borderrightlight right">+0%</td>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
-		else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index fafb967ace1..5911daaba45 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -100,9 +100,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -172,8 +170,7 @@ if ($modecompta == "CREANCES-DETTES") {
 
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -181,11 +178,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 
@@ -221,8 +216,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
@@ -240,8 +234,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " AND cp.fk_product is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
 		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 		$sql .= ")";
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index fcae12f744b..60d65049800 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -107,9 +107,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
 	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
-}
-else
-{
+} else {
 	// TODO We define q
 }
 
@@ -175,8 +173,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -184,11 +181,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -215,8 +210,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -229,8 +223,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$db->escape($selected_cat);
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
 	    $sql .= ")";
@@ -245,8 +238,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -259,8 +251,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 	    $sql .= ")";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 658c9353a00..6fa22885dee 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -131,9 +131,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 			$db->commit();
 			header("Location: list.php");
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -166,22 +164,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
 				exit;
-			}
-			else
-			{
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-	else
-	{
+	} else {
 		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
 		setEventMessages($mesg, null, 'errors');
 	}
@@ -388,14 +380,10 @@ if ($id)
 		if (!empty($user->rights->tax->charges->supprimer))
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index c01408f3c9a..3274a3eaebd 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -150,15 +150,11 @@ class Tva extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else
-			{
+            } else {
 				$this->db->rollback();
 				return -1;
             }
-        }
-        else
-		{
+        } else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -224,9 +220,7 @@ class Tva extends CommonObject
     	{
     		$this->db->commit();
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -293,9 +287,7 @@ class Tva extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -404,15 +396,11 @@ class Tva extends CommonObject
 				$ret = $obj->amount;
                 $this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
                 $this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -445,15 +433,11 @@ class Tva extends CommonObject
                 $ret = $obj->total_tva;
             	$this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -488,15 +472,11 @@ class Tva extends CommonObject
                 $ret = $obj->amount;
             	$this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -612,9 +592,7 @@ class Tva extends CommonObject
                     if ($bank_line_id > 0)
 					{
                         $this->update_fk_bank($bank_line_id);
-                    }
-					else
-					{
+                    } else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -632,21 +610,15 @@ class Tva extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -669,9 +641,7 @@ class Tva extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -710,8 +680,7 @@ class Tva extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -752,9 +721,7 @@ class Tva extends CommonObject
 
             $this->db->free($resql);
             return $amount;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -799,9 +766,7 @@ class Tva extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index bcedba7a074..52466e33d84 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -66,14 +66,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
     if (empty($q))
     {
-        if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); }
-        else
-        {
+        if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
             if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
             	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
             	$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-            }
-            elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
             	if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
             		if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
             			$year_start--;
@@ -85,15 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             	}
             	$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
             	$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-            }
-            elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+            } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
             	$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
             	$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
             }
         }
-    }
-    else
-    {
+    } else {
         if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
         if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
         if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -321,9 +315,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                     'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
                     'link'				=>$expensereport->getNomUrl(1)
                 );
-            }
-            else
-            {
+            } else {
                 $invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
                 $invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
                 $invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
@@ -693,9 +685,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                             || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
                         {
                             print $langs->trans("NA");
-                        }
-                        else
-                        {
+                        } else {
                             if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
                                 $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
                             }
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index fabaf1ee705..cb26304cde5 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -148,9 +148,7 @@ if ($object->id)
     $permtoedit = $user->rights->fournisseur->facture->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 0a785aa78cd..43db8353c4c 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -57,14 +57,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
 				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
 					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
 						$year_start--;
@@ -76,15 +73,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
 				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -176,9 +170,7 @@ function pt($db, $sql, $date)
             	$amountpaid = 0;
             	$previousmode = '';
             	$previousmonth = '';
-            }
-            else
-            {
+            } else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -207,8 +199,7 @@ function pt($db, $sql, $date)
         print "</table>";
 
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -371,9 +362,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else
-			{
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 003a7eabcad..5b09da5305c 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -72,9 +72,7 @@ if (empty($_REQUEST['typeid']))
 		$part = explode(':', $val);
 		if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$typeid = $_REQUEST['typeid'];
 }
 
@@ -228,9 +226,7 @@ if ($result)
 		if ($obj->payment_code <> '')
 		{
 			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		}
-		else
-		{
+		} else {
 			$type = '<td>&nbsp;</td>';
 		}
 
@@ -266,8 +262,7 @@ if ($result)
 
 				$bankstatic->label = $obj->blabel;
 				print $bankstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 		// Amount
@@ -291,9 +286,7 @@ if ($result)
 	print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 79ee69a030c..abd5fb6841c 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -66,14 +66,11 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else
-		{
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
 				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
 					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
 						$year_start--;
@@ -85,15 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
 				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -315,9 +309,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else
-			{
+			} else {
 				$invoice_supplier->id = $x_paye[$my_paye_rate]['facid'][$id];
 				$invoice_supplier->ref = $x_paye[$my_paye_rate]['facnum'][$id];
 				$invoice_supplier->type = $x_paye[$my_paye_rate]['type'][$id];
@@ -439,9 +431,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					if (dol_string_nohtmltag($fields['descr'])) {
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
-				}
-				else
-				{
+				} else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -620,9 +610,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					if (dol_string_nohtmltag($fields['descr'])) {
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
-				}
-				else
-				{
+				} else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -673,9 +661,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
 					{
 						print $langs->trans("NA");
-					}
-					else
-					{
+					} else {
 						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
 							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 625cf524169..0ea0018632b 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -76,9 +76,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -159,9 +157,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index fbd31812fe8..415d9e47790 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -119,9 +119,7 @@ abstract class ActionsContactCardCommon
         	{
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -208,8 +206,7 @@ abstract class ActionsContactCardCommon
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
-			}
-			else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
+			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
         if ($action == 'view' || $action == 'delete')
@@ -222,9 +219,7 @@ abstract class ActionsContactCardCommon
 
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
         	}
 
@@ -309,9 +304,7 @@ abstract class ActionsContactCardCommon
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
             }
             $this->object->country_id = $langs->trans("Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label;
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 54b3f137967..099c973b0a4 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -104,9 +104,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
             $this->tpl['actionstodo'] = show_actions_todo($conf, $langs, $db, $objsoc, $this->object, 1);
 
             $this->tpl['actionsdone'] = show_actions_done($conf, $langs, $db, $objsoc, $this->object, 1);
-		}
-		else
-		{
+		} else {
 			// Confirm delete contact
         	if ($action == 'delete' && $user->rights->societe->contact->supprimer)
         	{
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index a6e5bee1898..6b73172decc 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -128,21 +128,15 @@ if (empty($reshook))
                 if ($result2)
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $error = $nuser->error; $errors = $nuser->errors;
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $error = $nuser->error; $errors = $nuser->errors;
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             $error = $object->error; $errors = $object->errors;
         }
     }
@@ -155,9 +149,7 @@ if (empty($reshook))
 		if ($object->setstatus(0) < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -170,9 +162,7 @@ if (empty($reshook))
 		if ($object->setstatus(1) < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -277,9 +267,7 @@ if (empty($reshook))
             else $url = 'card.php?id='.$id;
             header("Location: ".$url);
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
     }
@@ -299,15 +287,11 @@ if (empty($reshook))
         	{
         		header("Location: ".$backtopage);
         		exit;
-        	}
-        	else
-        	{
+        	} else {
         		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
         		exit;
         	}
-        }
-        else
-        {
+        } else {
             setEventMessages($object->error, $object->errors, 'errors');
         }
     }
@@ -350,23 +334,17 @@ if (empty($reshook))
                         if (!$result > 0)
                         {
                             $errors[] = "ErrorFailedToSaveFile";
-                        }
-                        else
-                        {
+                        } else {
                             $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
     					    // Create thumbs
     					    $object->addThumbs($newfile);
                         }
                     }
-                }
-                else
-                {
+                } else {
                     $errors[] = "ErrorBadImageFormat";
                 }
-            }
-            else
-            {
+            } else {
                 switch ($_FILES['photo']['error'])
                 {
                     case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -451,9 +429,7 @@ if (empty($reshook))
 	    							$resql = $db->query($sql);
 	    						}
 	    					}
-	    				}
-	    				else
-	    				{
+	    				} else {
 	    					$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$db->escape($object->email)."' AND entity = ".$db->escape(getEntity('mailing', 0));
 	    					$resql = $db->query($sql);
 	    				}
@@ -464,9 +440,7 @@ if (empty($reshook))
     				$object->old_lastname = '';
     				$object->old_firstname = '';
     				$action = 'view';
-    			}
-    			else
-    			{
+    			} else {
     				setEventMessages($object->error, $object->errors, 'errors');
     				$action = 'edit';
     			}
@@ -525,9 +499,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -646,8 +618,7 @@ else
                     print '</td>';
                     print '<input type="hidden" name="socid" id="socid" value="'.$objsoc->id.'">';
                     print '</td></tr>';
-                }
-                else {
+                } else {
                     print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                     print $form->select_company($socid, 'socid', '', 'SelectThirdParty');
                     print '</td></tr>';
@@ -702,18 +673,14 @@ else
                 if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-                }
-                else
-                {
+                } else {
                     print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
                 }
 
                 if ($object->country_id)
                 {
                     print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
-                }
-                else
-                {
+                } else {
                     print $countrynotdefined;
                 }
                 print '</td></tr>';
@@ -870,9 +837,7 @@ else
             if ($object->birthday)
             {
                 print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
-            }
-            else
-            {
+            } else {
                 print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
             }
             print '</td>';
@@ -881,9 +846,7 @@ else
             if ($object->birthday_alert)
             {
                 print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
-            }
-            else
-            {
+            } else {
                 print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
             }
             print '</td>';
@@ -899,17 +862,14 @@ else
             {
                 print ' &nbsp; &nbsp; ';
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            }
-            else
-            {
+            } else {
                 print ' &nbsp; &nbsp; ';
                 print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
             }
             print '</div>';
 
             print "</form>";
-        }
-        elseif ($action == 'edit' && !empty($id))
+        } elseif ($action == 'edit' && !empty($id))
         {
             /*
              * Fiche en mode edition
@@ -1030,9 +990,7 @@ else
                 if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-                }
-                else
-                {
+                } else {
                     print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
                 }
 
@@ -1069,9 +1027,7 @@ else
                 $langs->load("mails");
                 print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
                 print '<td>'.$object->getNbOfEMailings().'</td>';
-            }
-            else
-			{
+            } else {
 				print '<td colspan="2"></td>';
             }
             print '</tr>';
@@ -1095,9 +1051,7 @@ else
 
             	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 	            print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
-            }
-            else
-			{
+            } else {
 				print '<td colspan="2"></td>';
 			}
             print '</tr>';
@@ -1242,8 +1196,7 @@ else
                 $dolibarr_user = new User($db);
                 $result = $dolibarr_user->fetch($object->user_id);
                 print $dolibarr_user->getLoginUrl(1);
-            }
-            else print $langs->trans("NoDolibarrAccess");
+            } else print $langs->trans("NoDolibarrAccess");
             print '</td></tr>';
 
             // Photo
@@ -1418,8 +1371,7 @@ else
         if (!empty($conf->commande->enabled) || !empty($conf->expedition->enabled))
         {
             print '<tr><td>';
-            if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); }
-            else print $langs->trans("ContactForOrders");
+            if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); } else print $langs->trans("ContactForOrders");
             print '</td><td colspan="3">';
             $none = $langs->trans("NoContactForAnyOrder");
             if (!empty($conf->expedition->enabled)) { $none = $langs->trans("NoContactForAnyOrderOrShipments"); }
@@ -1447,8 +1399,7 @@ else
             $dolibarr_user = new User($db);
             $result = $dolibarr_user->fetch($object->user_id);
             print $dolibarr_user->getLoginUrl(1);
-        }
-        else print $langs->trans("NoDolibarrAccess");
+        } else print $langs->trans("NoDolibarrAccess");
         print '</td></tr>';
 
         print '<tr><td>';
@@ -1478,9 +1429,7 @@ else
 				{
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-				}
-				else
-				{
+				} else {
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 				}
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index d9753001db2..cfe41eafca2 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -287,9 +287,7 @@ class Contact extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -388,16 +386,12 @@ class Contact extends CommonObject
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
                 return -2;
             }
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 
 			$this->db->rollback();
@@ -596,16 +590,12 @@ class Contact extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
             $this->db->rollback();
 			return -1;
@@ -761,14 +751,10 @@ class Contact extends CommonObject
                     $error++;
                     $this->error = $this->db->lasterror();
 				}
-			}
-			else
-			{
+			} else {
 				$result = true;
 			}
-		}
-		else
-		{
+		} else {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
@@ -791,9 +777,7 @@ class Contact extends CommonObject
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
-		{
+		} else {
 		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 		    $this->db->rollback();
 		    return -$error;
@@ -846,8 +830,7 @@ class Contact extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		if ($id) $sql .= " WHERE c.rowid = ".$id;
-		else
-		{
+		else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
 			if ($ref_ext) {
 				$sql .= " AND c.ref_ext = '".$this->db->escape($ref_ext)."'";
@@ -867,8 +850,7 @@ class Contact extends CommonObject
 				dol_syslog($this->error, LOG_ERR);
 
 				return 2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 
@@ -942,9 +924,7 @@ class Contact extends CommonObject
 						$this->user_id = $uobj->rowid;
 					}
 					$this->db->free($resql);
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->error();
 					return -1;
 				}
@@ -970,9 +950,7 @@ class Contact extends CommonObject
 							$this->birthday_alert = 1;
 						}
 						$this->db->free($resql);
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->error();
 						return -1;
 					}
@@ -987,15 +965,11 @@ class Contact extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1016,8 +990,7 @@ class Contact extends CommonObject
 		if (in_array($this->civility_id, array('MR')) || in_array($this->civility_code, array('MR')))
 		{
 			$this->gender = 'man';
-		}
-		elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
+		} elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
 		{
 			$this->gender = 'woman';
 		}
@@ -1061,9 +1034,7 @@ class Contact extends CommonObject
 			}
 			$this->db->free($resql);
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1118,9 +1089,7 @@ class Contact extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->error().' sql='.$sql;
 			}
@@ -1186,9 +1155,7 @@ class Contact extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("Error ".$this->error, LOG_ERR);
 			return -1;
@@ -1235,9 +1202,7 @@ class Contact extends CommonObject
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 	}
@@ -1262,9 +1227,7 @@ class Contact extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1525,9 +1488,7 @@ class Contact extends CommonObject
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1680,9 +1641,7 @@ class Contact extends CommonObject
 			}
 
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index ad4b5ca08f5..7655e00ea3f 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -178,8 +178,7 @@ if ($type_element == 'fichinter')
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
-}
-elseif ($type_element == 'invoice')
+} elseif ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic = new Facture($db);
@@ -193,8 +192,7 @@ elseif ($type_element == 'invoice')
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'propal')
+} elseif ($type_element == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic = new Propal($db);
@@ -208,8 +206,7 @@ elseif ($type_element == 'propal')
 	$datePrint = 'c.datep';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'order')
+} elseif ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic = new Commande($db);
@@ -223,8 +220,7 @@ elseif ($type_element == 'order')
 	$dateprint = 'c.date_commande';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'supplier_invoice')
+} elseif ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic = new FactureFournisseur($db);
@@ -266,8 +262,7 @@ elseif ($type_element == 'supplier_order')
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'supplier';
-}
-elseif ($type_element == 'contract')
+} elseif ($type_element == 'contract')
 { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic = new Contrat($db);
@@ -423,9 +418,7 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else
-		{
+		} else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -467,9 +460,7 @@ if ($sql_select)
 				}
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
-			{
+			} else {
 				$label = $objp->product_label;
 			}
 
@@ -501,29 +492,23 @@ if ($sql_select)
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
-				{
+				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 842d03cb3a6..f601086ad05 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -67,9 +67,7 @@ if ($action == 'dolibarr2ldap')
 	{
 		setEventMessages($langs->trans("ContactSynchronized"), null, 'mesgs');
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 		$db->rollback();
 	}
@@ -106,9 +104,7 @@ if ($object->socid > 0)
 	$thirdparty->fetch($object->socid);
 
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$thirdparty->getNomUrl(1).'</td></tr>';
-}
-else
-{
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
 	print $langs->trans("ContactNotLinkedToCompany");
 	print '</td></tr>';
@@ -183,22 +179,16 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else
-		{
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 781daacd030..3f7791019ec 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -123,14 +123,12 @@ if ($type == "c")
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactcustomerlist';
 	$titre .= '  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche = "card.php";
-}
-elseif ($type == "f")
+} elseif ($type == "f")
 {
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactsupplierlist';
 	$titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
 	$urlfiche = "card.php";
-}
-elseif ($type == "o")
+} elseif ($type == "o")
 {
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactotherlist';
 	$titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
@@ -326,9 +324,7 @@ if (!empty($userid))    // propre au commercial
 if ($search_priv != '0' && $search_priv != '1')
 {
 	$sql .= " AND (p.priv='0' OR (p.priv='1' AND p.fk_user_creat=".$user->id."))";
-}
-else
-{
+} else {
 	if ($search_priv == '0') $sql .= " AND p.priv='0'";
 	if ($search_priv == '1') $sql .= " AND (p.priv='1' AND p.fk_user_creat=".$user->id.")";
 }
@@ -375,16 +371,13 @@ if ($search_import_key)             $sql .= natural_search("p.import_key", $sear
 if ($type == "o")        // filtre sur type
 {
 	$sql .= " AND p.fk_soc IS NULL";
-}
-elseif ($type == "f")        // filtre sur type
+} elseif ($type == "f")        // filtre sur type
 {
 	$sql .= " AND s.fournisseur = 1";
-}
-elseif ($type == "c")        // filtre sur type
+} elseif ($type == "c")        // filtre sur type
 {
 	$sql .= " AND s.client IN (1, 3)";
-}
-elseif ($type == "p")        // filtre sur type
+} elseif ($type == "p")        // filtre sur type
 {
 	$sql .= " AND s.client IN (2, 3)";
 }
@@ -402,9 +395,7 @@ $sql .= $hookmanager->resPrint;
 if ($view == "recent")
 {
 	$sql .= $db->order("p.datec", "DESC");
-}
-else
-{
+} else {
 	$sql .= $db->order($sortfield, $sortorder);
 }
 
@@ -921,9 +912,7 @@ while ($i < min($num, $limit))
 		    $objsoc = new Societe($db);
 		    $objsoc->fetch($obj->socid);
 		    print $objsoc->getNomUrl(1);
-		}
-		else
-			print '&nbsp;';
+		} else print '&nbsp;';
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 5a6ea3eb032..a5a1714b6e5 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -85,21 +85,15 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
 					{
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-					}
-					else
-					{
+					} else {
 					    // Create thumbs
 					    $object->addThumbs($newfile);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages("ErrorBadImageFormat", null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			switch ($_FILES['photo']['error'])
 			{
 				case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -111,9 +105,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					break;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$error = $object->error;
 	}
 }
@@ -183,9 +175,7 @@ if ($action == 'edit')
             $objsoc->fetch($object->socid);
 
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
-        }
-        else
-        {
+        } else {
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
@@ -207,9 +197,7 @@ if ($action == 'edit')
     if (!empty($object->birthday_alert))
     {
         print '<input type="checkbox" name="birthday_alert" checked></td>';
-    }
-    else
-    {
+    } else {
         print '<input type="checkbox" name="birthday_alert"></td>';
     }
     print '</tr>';
@@ -225,9 +213,7 @@ if ($action == 'edit')
     print '</div>';
 
     print "</form>";
-}
-else
-{
+} else {
     // View mode
 
     dol_fiche_head($head, 'perso', $title, -1, 'contact');
@@ -301,9 +287,7 @@ else
         if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
         else print $langs->trans("BirthdayAlertOff");
         print '</td>';
-    }
-    else
-    {
+    } else {
         print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3"></td>';
     }
     print "</tr>";
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 75362491424..ee325317033 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -102,8 +102,7 @@ if ($company->id)
 		$v->setEmail($company->email, 'INTERNET');
 	}
 	// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
-	else
-	{
+	else {
 		$v->setEmail($company->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 0055b0ba428..d016cb23d75 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -39,9 +39,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 9f825cdf009..c4f923a7372 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -112,13 +112,10 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
+	} elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
 		if (!GETPOST('dateend'))
 		{
@@ -132,9 +129,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -302,14 +297,11 @@ if (empty($reshook))
 										}
 
 										$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-									}
-									else
-									{
+									} else {
 										$label = $lines[$i]->product_label;
 									}
 									$desc = ($lines[$i]->desc && $lines[$i]->desc != $lines[$i]->libelle) ?dol_htmlentitiesbr($lines[$i]->desc) : '';
-								}
-								else {
+								} else {
 									$desc = dol_htmlentitiesbr($lines[$i]->desc);
 								}
 
@@ -354,9 +346,7 @@ if (empty($reshook))
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 						$error++;
 					}
@@ -367,30 +357,23 @@ if (empty($reshook))
 					// modified by hook
 					if ($reshook < 0)
 						$error++;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else
-			{
+			} else {
 				$result = $object->create($user);
 				if ($result > 0)
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 				$action = 'create';
 			}
 		}
-	}
-
-	elseif ($action == 'classin' && $user->rights->contrat->creer)
+	} elseif ($action == 'classin' && $user->rights->contrat->creer)
 	{
 		$object->setProject(GETPOST('projectid'));
 	}
@@ -407,9 +390,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -480,8 +461,7 @@ if (empty($reshook))
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				}
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -513,9 +493,7 @@ if (empty($reshook))
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else
-				    {
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -525,9 +503,7 @@ if (empty($reshook))
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$fk_unit = $prod->fk_unit;
-			}
-			else
-			{
+			} else {
 				$pu_ht = GETPOST('price_ht');
 				$price_base_type = 'HT';
 				$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
@@ -543,8 +519,7 @@ if (empty($reshook))
 			$fk_fournprice = $_POST['fournprice'];
 			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			else $pa_ht = null;
 
 			$info_bits = 0;
 			if ($tva_npr) $info_bits |= 0x01;
@@ -554,9 +529,7 @@ if (empty($reshook))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1;
-			}
-			else
-			{
+			} else {
 				// Insert line
 				$result = $object->addline(
 					$desc,
@@ -629,15 +602,11 @@ if (empty($reshook))
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha')) {
+	} elseif ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
 		if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
@@ -692,8 +661,7 @@ if (empty($reshook))
 			$fk_fournprice = $_POST['fournprice'];
 			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			else $pa_ht = null;
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
@@ -744,14 +712,10 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->deleteline(GETPOST('lineid'), $user);
 
@@ -759,14 +723,10 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->validate($user);
 
@@ -788,14 +748,10 @@ if (empty($reshook))
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'reopen' && $user->rights->contrat->creer)
+	} elseif ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 		$result = $object->reopen($user);
 		if ($result < 0)
@@ -822,23 +778,17 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
 		$result = $object->delete($user);
 		if ($result >= 0)
 		{
 			header("Location: list.php?restore_lastsearch_values=1");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		if (GETPOST('newcid') > 0)
 		{
@@ -850,18 +800,13 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				return;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras')
+	} elseif ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
@@ -881,8 +826,7 @@ if (empty($reshook))
 		if ($error) {
 			$action = 'edit_extras';
 		}
-	}
-	elseif ($action == 'setref_supplier')
+	} elseif ($action == 'setref_supplier')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 		if (!$cancelbutton) {
@@ -896,13 +840,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-	elseif ($action == 'setref_customer')
+	} elseif ($action == 'setref_customer')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -918,13 +860,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-	elseif ($action == 'setref')
+	} elseif ($action == 'setref')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -958,13 +898,11 @@ if (empty($reshook))
 	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	            exit;
 	        }
-	    }
-	    else {
+	    } else {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	        exit;
 	    }
-	}
-	elseif ($action == 'setdate_contrat')
+	} elseif ($action == 'setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -982,8 +920,7 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
@@ -1014,16 +951,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1044,8 +977,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1057,9 +989,7 @@ if (empty($reshook))
 		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
@@ -1119,9 +1049,7 @@ if ($action == 'create')
 		if ($element == 'project')
 		{
 			$projectid = GETPOST('originid');
-		}
-		else
-		{
+		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; }
 			if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
@@ -1148,8 +1076,7 @@ if ($action == 'create')
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid', 'int');
 		$note_private = GETPOST("note_private");
 		$note_public = GETPOST("note_public");
@@ -1195,9 +1122,7 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
-	}
-	else
-	{
+	} else {
 		print '<td>';
 		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
@@ -1291,9 +1216,7 @@ if ($action == 'create')
 	}
 
 	print "</form>\n";
-}
-else
-/* *************************************************************************** */
+} else /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
 /*                                                                             */
@@ -1599,9 +1522,7 @@ else
 						echo $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
 					}
 					// VAT
@@ -1622,9 +1543,7 @@ else
 					if ($objp->remise_percent > 0)
 					{
 						print '<td class="right">'.$objp->remise_percent."%</td>\n";
-					}
-					else
-					{
+					} else {
 						print '<td>&nbsp;</td>';
 					}
 
@@ -1681,8 +1600,7 @@ else
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						}
-						else print $langs->trans("Unknown");
+						} else print $langs->trans("Unknown");
 						print ' &nbsp;-&nbsp; ';
 						print $langs->trans("DateEndPlanned").': ';
 						if ($objp->date_fin)
@@ -1693,8 +1611,7 @@ else
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						}
-						else print $langs->trans("Unknown");
+						} else print $langs->trans("Unknown");
 
 						print '</td>';
 						print '</tr>';
@@ -1709,8 +1626,7 @@ else
 					}
 				}
 				// Line in mode update
-				else
-				{
+				else {
 					// Ligne carac
 					print '<tr class="oddeven">';
 					print '<td>';
@@ -1723,9 +1639,7 @@ else
 						print $productstatic->getNomUrl(1, '', 32);
 						print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 						print '<br>';
-					}
-					else
-					{
+					} else {
 						print $objp->label ? $objp->label.'<br>' : '';
 					}
 
@@ -1801,9 +1715,7 @@ else
 				}
 
 				$db->free($result);
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 
@@ -1873,9 +1785,7 @@ else
 				if (empty($dateactend))
 				{
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				}
-				else
-				{
+				} else {
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
@@ -2112,8 +2022,7 @@ else
 					if ($object->statut == 1) {
 						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -2152,9 +2061,7 @@ else
 					if ($user->rights->contrat->activer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btnactivateall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btnactivateall" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
 					}
 				}
@@ -2163,9 +2070,7 @@ else
 					if ($user->rights->contrat->desactiver)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btncloseall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btncloseall" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
 					}
 
@@ -2184,9 +2089,7 @@ else
 				if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
 				}
 			}
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index a35d3c871de..ffe66208afe 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -169,8 +169,7 @@ class Contracts extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve contrat list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -464,9 +463,7 @@ class Contracts extends DolibarrApi
         $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
               throw new RestException(405, $this->contract->error);
         }
     }
@@ -501,9 +498,7 @@ class Contracts extends DolibarrApi
         if ($this->contract->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->contract->error);
         }
     }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 1dec473edac..c2200a411c2 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -298,16 +298,12 @@ class Contrat extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				dol_print_error($db, get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Contract"));
 			return "";
@@ -410,9 +406,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -467,9 +461,7 @@ class Contrat extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -508,13 +500,10 @@ class Contrat extends CommonObject
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		elseif (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		} elseif (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
         $this->newref = dol_sanitizeFileName($num);
@@ -591,9 +580,7 @@ class Contrat extends CommonObject
 				$this->brouillon = 0;
 				$this->date_validation = $now;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 
@@ -601,9 +588,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -666,9 +651,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -720,8 +703,7 @@ class Contrat extends CommonObject
 				$this->error = 'Fetch found several records.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 				if ($obj)
@@ -770,16 +752,12 @@ class Contrat extends CommonObject
 
 					return $this->id;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::fetch Contract not found");
 				$this->error = "Contract not found";
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::fetch Error searching contract");
 			$this->error = $this->db->error();
 			return -1;
@@ -939,9 +917,7 @@ class Contrat extends CommonObject
 				$pos++;
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::Fetch Error when reading lines of contracts linked to products");
 			return -3;
 		}
@@ -1081,8 +1057,7 @@ class Contrat extends CommonObject
     			                    $error++;
     			                }
     			            }
-    			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+    			        } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
     			        {
     			            $origin_id = $tmp_origin_id;
     			            $ret = $this->add_object_linked($origin, $origin_id);
@@ -1129,8 +1104,7 @@ class Contrat extends CommonObject
     			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
     			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
     			        }
-    			    }
-    			    else dol_print_error($resqlcontact);
+    			    } else dol_print_error($resqlcontact);
     			}
 			}
 
@@ -1145,24 +1119,18 @@ class Contrat extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = "Failed to add contract";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
 			$this->db->rollback();
@@ -1331,9 +1299,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1426,9 +1392,7 @@ class Contrat extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1505,9 +1469,7 @@ class Contrat extends CommonObject
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -1558,9 +1520,7 @@ class Contrat extends CommonObject
 				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
 				{
 					return $result;
-				}
-				else
-				{
+				} else {
 					$pa_ht = $result;
 				}
 			}
@@ -1631,22 +1591,16 @@ class Contrat extends CommonObject
 				{
 					$this->db->rollback();
 					return -1;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return $contractlineid;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error()." sql=".$sql;
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
 			return -2;
 		}
@@ -1698,9 +1652,7 @@ class Contrat extends CommonObject
 		{
 			$remise = round(($pu * $remise_percent / 100), 2);
 			$price = $pu - $remise;
-		}
-		else
-		{
+		} else {
 			$remise_percent = 0;
 		}
 
@@ -1750,9 +1702,7 @@ class Contrat extends CommonObject
 			if (($result = $this->defineBuyPrice($pu, $remise_percent)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$pa_ht = $result;
 			}
 		}
@@ -1775,14 +1725,10 @@ class Contrat extends CommonObject
 		$sql .= ", total_ttc='".price2num($total_ttc)."'";
 		$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
 		$sql .= ", buy_price_ht='".price2num($pa_ht)."'";
-		if ($date_start > 0) { $sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; }
-		else { $sql .= ",date_ouverture_prevue=null"; }
-		if ($date_end > 0) { $sql .= ",date_fin_validite='".$this->db->idate($date_end)."'"; }
-		else { $sql .= ",date_fin_validite=null"; }
-		if ($date_debut_reel > 0) { $sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; }
-		else { $sql .= ",date_ouverture=null"; }
-		if ($date_fin_reel > 0) { $sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; }
-		else { $sql .= ",date_cloture=null"; }
+		if ($date_start > 0) { $sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; } else { $sql .= ",date_ouverture_prevue=null"; }
+		if ($date_end > 0) { $sql .= ",date_fin_validite='".$this->db->idate($date_end)."'"; } else { $sql .= ",date_fin_validite=null"; }
+		if ($date_debut_reel > 0) { $sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; } else { $sql .= ",date_ouverture=null"; }
+		if ($date_fin_reel > 0) { $sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; } else { $sql .= ",date_cloture=null"; }
 		$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
 		$sql .= " WHERE rowid = ".$rowid;
 
@@ -1825,16 +1771,12 @@ class Contrat extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::updateline Erreur -2");
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::updateline Erreur -1");
@@ -1895,9 +1837,7 @@ class Contrat extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1993,9 +1933,7 @@ class Contrat extends CommonObject
 			$text .= ($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="marginleft2"')) : '';
 			$text .= ($mode == 7 ? '</span>' : '');
 			return $text;
-		}
-		else
-		{
+		} else {
 			return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 		}
 	}
@@ -2113,9 +2051,7 @@ class Contrat extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2150,9 +2086,7 @@ class Contrat extends CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2188,9 +2122,7 @@ class Contrat extends CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2222,8 +2154,7 @@ class Contrat extends CommonObject
 			$sql .= " WHERE c.statut = 1";
 			$sql .= " AND c.rowid = cd.fk_contrat";
 			$sql .= " AND cd.statut = 0";
-		}
-		elseif ($mode == 'expired')
+		} elseif ($mode == 'expired')
 		{
 			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 			$sql .= $this->from;
@@ -2231,8 +2162,7 @@ class Contrat extends CommonObject
 			$sql .= " AND c.rowid = cd.fk_contrat";
 			$sql .= " AND cd.statut = 4";
 			$sql .= " AND cd.date_fin_validite < '".$this->db->idate(dol_now())."'";
-		}
-		elseif ($mode == 'active')
+		} elseif ($mode == 'active')
 		{
 		    $sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 		    $sql .= $this->from;
@@ -2258,8 +2188,7 @@ class Contrat extends CommonObject
 				$label = $langs->trans("BoardNotActivatedServices");
 				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
-			}
-			elseif ($mode == 'expired') {
+			} elseif ($mode == 'expired') {
 			    $warning_delay = $conf->contrat->services->expires->warning_delay;
 			    $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
 			    $label = $langs->trans("BoardExpiredServices");
@@ -2290,9 +2219,7 @@ class Contrat extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2333,9 +2260,7 @@ class Contrat extends CommonObject
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2791,11 +2716,22 @@ class ContratLigne extends CommonObjectLine
 		global $langs;
 		$langs->load("contracts");
 
-		if ($status == self::STATUS_INITIAL) { $labelStatus = $langs->trans("ServiceStatusInitial"); $labelStatusShort = $langs->trans("ServiceStatusInitial"); }
-		elseif ($status == self::STATUS_OPEN && $expired == -1) { $labelStatus = $langs->trans("ServiceStatusRunning"); $labelStatusShort = $langs->trans("ServiceStatusRunning"); }
-		elseif ($status == self::STATUS_OPEN && $expired == 0) { $labelStatus = $langs->trans("ServiceStatusNotLate"); $labelStatusShort = $langs->trans("ServiceStatusNotLateShort"); }
-		elseif ($status == self::STATUS_OPEN && $expired == 1) { $labelStatus = $langs->trans("ServiceStatusLate"); $labelStatusShort = $langs->trans("ServiceStatusLateShort"); }
-		elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
+        if ($status == self::STATUS_INITIAL) {
+            $labelStatus = $langs->trans("ServiceStatusInitial");
+            $labelStatusShort = $langs->trans("ServiceStatusInitial");
+        } elseif ($status == self::STATUS_OPEN && $expired == -1) {
+            $labelStatus = $langs->trans("ServiceStatusRunning");
+            $labelStatusShort = $langs->trans("ServiceStatusRunning");
+        } elseif ($status == self::STATUS_OPEN && $expired == 0) {
+            $labelStatus = $langs->trans("ServiceStatusNotLate");
+            $labelStatusShort = $langs->trans("ServiceStatusNotLateShort");
+        } elseif ($status == self::STATUS_OPEN && $expired == 1) {
+            $labelStatus = $langs->trans("ServiceStatusLate");
+            $labelStatusShort = $langs->trans("ServiceStatusLateShort");
+        } elseif ($status == self::STATUS_CLOSED) {
+            $labelStatus = $langs->trans("ServiceStatusClosed");
+            $labelStatusShort = $langs->trans("ServiceStatusClosed");
+        }
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status1';
@@ -2959,9 +2895,7 @@ class ContratLigne extends CommonObjectLine
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -3046,9 +2980,7 @@ class ContratLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -3195,9 +3127,7 @@ class ContratLigne extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -3278,9 +3208,7 @@ class ContratLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error()." sql=".$sql;
 			return -1;
@@ -3333,9 +3261,7 @@ class ContratLigne extends CommonObjectLine
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1da2416ce84..02d9c71776d 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -70,9 +70,7 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -90,9 +88,7 @@ if ($action == 'swapstatut' && $user->rights->contrat->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index fd3b3f66e4a..d60d54258bb 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -193,9 +193,7 @@ if ($object->id)
     $permtoedit = $user->rights->contrat->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2a7c9c0d91a..40a9a4100da 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -140,9 +140,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 // Search by status (only expired)
@@ -179,9 +177,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -298,16 +294,12 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 				//$tot_ttc+=$obj->total_ttc;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -383,9 +375,7 @@ if ($result)
 	$db->free($result);
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -439,9 +429,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else
-		{
+		} else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -462,9 +450,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -519,9 +505,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else
-		{
+		} else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -541,9 +525,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -599,9 +581,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else
-		{
+		} else {
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
             if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
             else print '</a> '.dol_trunc($obj->note, 20);
@@ -621,9 +601,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index a7205730817..3627661c727 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -708,8 +708,7 @@ while ($i < min($num, $limit))
 			if ($nbofsalesrepresentative > 3) {
 				// We print only number
 				print $nbofsalesrepresentative;
-			}
-			elseif ($nbofsalesrepresentative > 0)
+			} elseif ($nbofsalesrepresentative > 0)
 			{
 				$userstatic = new User($db);
 				$j = 0;
@@ -731,9 +730,7 @@ while ($i < min($num, $limit))
 				}
 			}
 			//else print $langs->trans("NoSalesRepresentativeAffected");
-		}
-		else
-		{
+		} else {
 			print '&nbsp';
 		}
 		print '</td>';
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 2b81ceff5fa..fd46b8eba98 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -98,14 +98,11 @@ if ($search_status != '')
 	$tmp = explode('&', $search_status);
 	$mode = $tmp[0];
 	if (empty($tmp[1])) $filter = '';
-	else
-	{
+	else {
 		if ($tmp[1] == 'filter=notexpired') $filter = 'notexpired';
 		if ($tmp[1] == 'filter=expired') $filter = 'expired';
 	}
-}
-else
-{
+} else {
 	$search_status = $mode;
 	if ($filter == 'expired') $search_status .= '&filter=expired';
 	if ($filter == 'notexpired') $search_status .= '&filter=notexpired';
@@ -597,9 +594,7 @@ while ($i < min($num, $limit))
 			print $productstatic->getNomUrl(1, '', 24);
 			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
 			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
-		}
-		else
-		{
+		} else {
 			if ($obj->type == 0) print img_object($obj->description, 'product').' '.dol_trunc($obj->description, 24);
 			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
@@ -682,8 +677,7 @@ while ($i < min($num, $limit))
 			$warning_delay = $conf->contrat->services->expires->warning_delay / 3600 / 24;
 			$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 			print img_warning($textlate);
-		}
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
+		} else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
         if (!$i) $totalarray['nbfield']++;
 	}
@@ -724,9 +718,7 @@ while ($i < min($num, $limit))
 	    {
 			// If contract is draft, we say line is also draft
 		    print $contractstatic->LibStatut(0, 5);
-	    }
-	    else
-	    {
+	    } else {
 		    print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
 	    }
 	    print '</td>';
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 66ed09413ef..f9f10f636ca 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -40,8 +40,7 @@ if ($cancel)
 	{
 		header("Location: ".$backtopageforcancel);
 		exit;
-	}
-	elseif (!empty($backtopage))
+	} elseif (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
@@ -57,8 +56,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 	{
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') continue; // The field was not submited to be edited
-		}
-		else {
+		} else {
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
@@ -106,17 +104,13 @@ if ($action == 'add' && !empty($permissiontoadd))
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
 			header("Location: ".$urltogo);
 			exit;
-		}
-		else
-		{
+		} else {
 			// Creation KO
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			else setEventMessages($object->error, null, 'errors');
 			$action = 'create';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'create';
 	}
 }
@@ -129,15 +123,12 @@ if ($action == 'update' && !empty($permissiontoadd))
 		// Check if field was submited to be edited
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) continue; // The field was not submited to be edited
-		}
-		elseif ($object->fields[$key]['type'] == 'boolean') {
+		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			if (!GETPOSTISSET($key)) {
 				$object->$key = 0; // use 0 instead null if the field is defined as not null
 				continue;
 			}
-		}
-
-		else {
+		} else {
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
@@ -180,16 +171,12 @@ if ($action == 'update' && !empty($permissiontoadd))
 		if ($result > 0)
 		{
 			$action = 'view';
-		}
-		else
-		{
+		} else {
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 	}
 }
@@ -208,9 +195,7 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
 	}
@@ -232,9 +217,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
-	}
-	else
-	{
+	} else {
 		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
@@ -269,9 +252,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 		setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -298,9 +279,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -327,9 +306,7 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd)
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -341,9 +318,7 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd)
 	if ($result >= 0)
 	{
 		// Nothing else done
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -370,9 +345,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
 
 			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -383,9 +356,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
+	} else {
 	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
 		//$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
         // ...
@@ -397,9 +368,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 			else $newid = $result;
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
-		}
-		else
-		{
+		} else {
 		    setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index ce582040ac9..eb51796eccd 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -37,9 +37,7 @@ if ($action == 'builddoc' && $permissiontoadd)
     if (is_numeric(GETPOST('model', 'alpha')))
     {
         $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
-    }
-    else
-    {
+    } else {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
@@ -89,9 +87,7 @@ if ($action == 'builddoc' && $permissiontoadd)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action = '';
-        }
-        else
-        {
+        } else {
         	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
@@ -134,8 +130,7 @@ if ($action == 'remove_file' && $permissiontoadd)
 
 	    header('Location: '.$urltoredirect);
 	    exit;
-	}
-	else {
+	} else {
 		setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors');
 	}
 }
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index 07829999c10..c352f07f9f7 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -49,9 +49,7 @@ if ($action == 'addcomment')
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
@@ -67,9 +65,7 @@ if ($action === 'updatecomment')
             setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
             header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
             exit;
-        }
-        else
-        {
+        } else {
             setEventMessages($comment->error, $comment->errors, 'errors');
             $action = '';
         }
@@ -84,9 +80,7 @@ if ($action == 'deletecomment')
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index bb5a7516fb2..46a6a31c202 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -122,9 +122,7 @@ if ($action == 'add')
 	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				$error++;
 	    				$langs->load("errors");
 	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -149,9 +147,7 @@ if ($action == 'add')
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
-    			{
+    			} else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -191,25 +187,19 @@ if ($action == 'add')
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
-    			{
+    			} else {
                     $error++;
     			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
-    		{
+    		} else {
                 $error++;
     		    $langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else
-	    {
+	    } else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -293,9 +283,7 @@ if ($action == 'update')
 	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else
-	        		{
+	        		} else {
 	        			$error++;
 	        			$langs->load("errors");
 	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -319,9 +307,7 @@ if ($action == 'update')
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
-    			{
+    			} else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -361,24 +347,18 @@ if ($action == 'update')
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
-    			{
+    			} else {
                     $error++;
     			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
-    		{
+    		} else {
     		    $error++;
     			$langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
-	    }
-	    else
-	    {
+	    } else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -394,11 +374,8 @@ if ($action == 'delete')
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else $mesg = $extrafields->error;
-	}
-	else
-	{
+        } else $mesg = $extrafields->error;
+	} else {
 	    $error++;
 		$langs->load("errors");
 		$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index 268d37d92d2..a77fc6e5ff6 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -37,17 +37,14 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask'
 	    {
 	        $object->fetch_thirdparty();
 	        $id = $object->id;
-	    }
-	    else
-	    {
+	    } else {
 	    	if (empty($object->error) && !count($object->errors))
 	    	{
 	    		if ($ret < 0)	// if $ret == 0, it means not found.
 	    		{
 	    			setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
 	    		}
-	    	}
-	        else setEventMessages($object->error, $object->errors, 'errors');
+	    	} else setEventMessages($object->error, $object->errors, 'errors');
 	        $action = '';
 	    }
 	}
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 2542cf23268..ea55052f880 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -41,8 +41,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 				$error++;
 				if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 					setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 				}
 			}
@@ -58,15 +57,13 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 			{
 				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
-			}
-			elseif (!empty($upload_dir))
+			} elseif (!empty($upload_dir))
 			{
 				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
 			}
 		}
 	}
-}
-elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
+} elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
     $link = GETPOST('link', 'alpha');
     if ($link)
@@ -86,8 +83,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
     if (GETPOST('section', 'alpha')) {
         // For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
         $file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
-    }
-    else								// For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
+    } else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	{
        	$urlfile = basename($urlfile);
        	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
@@ -124,8 +120,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         } else {
             setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
         }
-    }
-    elseif ($linkid)	// delete of external link
+    } elseif ($linkid)	// delete of external link
     {
         require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
         $link = new Link($db);
@@ -148,16 +143,13 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         if ($backtopage) {
         	header('Location: '.$backtopage);
             exit;
-        }
-        else
-        {
+        } else {
         	$tmpurl = $_SERVER["PHP_SELF"].'?id='.$object->id.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : '').(!empty($withproject) ? '&withproject=1' : '');
         	header('Location: '.$tmpurl);
             exit;
         }
     }
-}
-elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
+} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $langs->load('link');
@@ -176,13 +168,10 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('
         {
             setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
         }
-    }
-    else
-    {
+    } else {
         //error fetching
     }
-}
-elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
+} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	if (!empty($upload_dir))
@@ -235,15 +224,11 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 			            	}
 
 			                setEventMessages($langs->trans("FileRenamed"), null);
-			            }
-			            else
-			            {
+			            } else {
 			                $langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 			                setEventMessages($langs->trans("ErrorFailToRenameFile", $filenamefrom, $filenameto), null, 'errors');
 			            }
-	            	}
-	            	else
-	            	{
+	            	} else {
 	            		$langs->load("errors"); // key must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 	            		setEventMessages($langs->trans("ErrorDestinationAlreadyExists", $filenameto), null, 'errors');
 	            	}
@@ -269,9 +254,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 		    		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		    		$ecmfile->share = getRandomPassword(true);
 		    	}
-		    }
-		    else
-		    {
+		    } else {
 		    	$ecmfile->share = '';
 		    }
 		    $result = $ecmfile->update($user);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index ebae28e9582..23c76ae81fb 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -180,8 +180,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($val == 'thirdparty') // Id of third party or user
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					}
-					elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
+					} elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						$sendtoid[] = $val;
@@ -210,8 +209,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($val == 'thirdparty') // Id of third party
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					}
-					elseif ($val)	// Id du contact
+					} elseif ($val)	// Id du contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
@@ -256,20 +254,17 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($objectobj->element == 'societe')
 					{
 						$sendto = $objectobj->email;
-					}
-					elseif ($objectobj->element == 'expensereport')
+					} elseif ($objectobj->element == 'expensereport')
 					{
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
-					}
-					elseif ($objectobj->element == 'holiday')
+					} elseif ($objectobj->element == 'holiday')
 					{
 					    $fuser = new User($db);
 					    $fuser->fetch($objectobj->fk_user);
 					    $sendto = $fuser->email;
-					}
-					elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
+					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
 					{
 						$emails_to_sends = array();
 						$objectobj->fetch_thirdparty();
@@ -283,9 +278,7 @@ if (!$error && $massaction == 'confirm_presend')
 						if (count($emails_to_sends) > 0) {
 							$sendto = implode(',', $emails_to_sends);
 						}
-					}
-					else
-					{
+					} else {
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
 					}
@@ -336,9 +329,7 @@ if (!$error && $massaction == 'confirm_presend')
 							'names'=>array($filename),
 							'mimes'=>array($mime)
 						);
-					}
-					else
-					{
+					} else {
 							$nbignored++;
 							$langs->load("errors");
 							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
@@ -364,19 +355,15 @@ if (!$error && $massaction == 'confirm_presend')
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
 					$from = $user->getFullName($langs).' <'.$user->email.'>';
-				}
-				elseif ($fromtype === 'company') {
+				} elseif ($fromtype === 'company') {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-				}
-				elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp = explode(',', $user->email_aliases);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 					$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
@@ -384,8 +371,7 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 						$from = $obj->label.' <'.$obj->email.'>';
 					}
-				}
-				else {
+				} else {
 					$from = $_POST['fromname'].' <'.$_POST['frommail'].'>';
 				}
 
@@ -412,9 +398,7 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 					    $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
-				}
-				else
-				{
+				} else {
 					$objectforloop = new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty; // Force thirdparty on object (even if object was not loaded)
 					$looparray[0] = $objectforloop;
@@ -464,8 +448,7 @@ if (!$error && $massaction == 'confirm_presend')
 								);
 							}
 						}
-					}
-					elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) {
+					} elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) {
 						// Create form object
 						// if "one email per recipient" isn't check we must separate $attachedfiles by object
 						$attachedfiles = $attachedfilesThirdpartyObj[$thirdparty->id][$objectid];
@@ -481,9 +464,7 @@ if (!$error && $massaction == 'confirm_presend')
 					    $trackid = 'thi'.$thirdparty->id;
 					    if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
 					    if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
-					}
-					else
-					{
+					} else {
 					    $trackid = strtolower(get_class($objecttmp));
 					    if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
 					    if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
@@ -507,9 +488,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($mailfile->error)
 					{
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
-					}
-					else
-					{
+					} else {
 						$result = $mailfile->sendfile();
 						if ($result)
 						{
@@ -574,17 +553,13 @@ if (!$error && $massaction == 'confirm_presend')
 
 								$nbsent++; // Nb of object sent
 							}
-						}
-						else
-						{
+						} else {
 							$langs->load("other");
 							if ($mailfile->error)
 							{
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
-							}
-							else
-							{
+							} else {
 								$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
 						}
@@ -605,9 +580,7 @@ if (!$error && $massaction == 'confirm_presend')
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
 			setEventMessages($resaction, null, 'warnings');
 		}
@@ -722,16 +695,12 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						{
 							$result = $objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
-						}
-						else
-						{
+						} else {
 							setEventMessages($discount->error, $discount->errors, 'errors');
 							$error++;
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// Positive line
 						$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 						// Date start
@@ -789,9 +758,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						if ($result > 0)
 						{
 							$lineid = $result;
-						}
-						else
-						{
+						} else {
 							$lineid = 0;
 							$error++;
 							break;
@@ -881,9 +848,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		$action = 'create';
 		$_GET["origin"] = $_POST["origin"];
@@ -913,29 +878,22 @@ if (!$error && $massaction == 'cancelorders')
 			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
 			$error++;
 			break;
-		}
-		else
-			$result = $cmd->cancel();
+		} else $result = $cmd->cancel();
 
 		if ($result < 0)
 		{
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
-		}
-		else
-			$nbok++;
+		} else $nbok++;
 	}
 	if (!$error)
 	{
 		if ($nbok > 1)
 			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -1036,13 +994,10 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		// Create empty PDF
 		$formatarray = pdf_getFormat();
 		$page_largeur = $formatarray['width'];
@@ -1099,9 +1054,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-		}
-		else
-		{
+		} else {
             setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
@@ -1157,17 +1110,13 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 					setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
 					$error++;
 					break;
-				}
-				elseif ($result < 0)
+				} elseif ($result < 0)
 				{
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
-				}
-				else $nbok++;
-			}
-			else
-			{
+				} else $nbok++;
+			} else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
@@ -1179,9 +1128,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 		//var_dump($listofobjectthirdparties);exit;
@@ -1202,10 +1149,8 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            } else
-                $nbok++;
-        }
-        else {
+            } else $nbok++;
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1215,11 +1160,9 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
     if (!$error) {
         if ($nbok > 1)
             setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
@@ -1266,11 +1209,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			    $error++;
 			    break;
-			}
-			else $nbok++;
-		}
-		else
-		{
+			} else $nbok++;
+		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
 			break;
@@ -1282,9 +1222,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
 		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 	//var_dump($listofobjectthirdparties);exit;
@@ -1328,11 +1266,8 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            }
-            else $nbok++;
-        }
-        else
-        {
+            } else $nbok++;
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1344,9 +1279,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
         if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
         else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
         $db->commit();
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 }
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index e2da8a4170c..e88fc937e38 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -75,8 +75,7 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 						setEventMessages($printer->error, $printer->errors);
 						setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$ret = 1;
 					setEventMessages($e->getMessage(), null, 'errors');
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e23d2ce01a9..bc38d9839af 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -120,38 +120,32 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			if ($object->element == 'user' && $result == 0) $result = 1; // Even if not found, we consider ok
 			$thirdparty = $object->thirdparty;
 			$sendtosocid = $thirdparty->id;
-		}
-		elseif ($object->element == 'member' || $object->element == 'user')
+		} elseif ($object->element == 'member' || $object->element == 'user')
 		{
 			$thirdparty = $object;
 			if ($object->socid > 0) $sendtosocid = $object->socid;
-		}
-		elseif ($object->element == 'expensereport')
+		} elseif ($object->element == 'expensereport')
 		{
 			$tmpuser = new User($db);
 			$tmpuser->fetch($object->fk_user_author);
 			$thirdparty = $tmpuser;
 			if ($object->socid > 0) $sendtosocid = $object->socid;
-		}
-		elseif ($object->element == 'societe')
+		} elseif ($object->element == 'societe')
 		{
 			$thirdparty = $object;
 			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
-		}
-		elseif ($object->element == 'contact')
+		} elseif ($object->element == 'contact')
 		{
 			$contact = $object;
 			if ($contact->id > 0) $sendtosocid = $contact->fetch_thirdparty()->id;
-		}
-		else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		} else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
 
 		if (is_object($hookmanager))
 		{
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
-	}
-	else $thirdparty = $mysoc;
+	} else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
@@ -189,8 +183,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				elseif ($val == 'contact') // Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// $val is the Id of a contact
+				} elseif ($val)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					$sendtoid[] = $val;
@@ -239,8 +232,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				elseif ($val == 'contact')	// Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)				// $val is the Id of a contact
+				} elseif ($val)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
@@ -277,22 +269,17 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$fromtype = GETPOST('fromtype', 'alpha');
 			if ($fromtype === 'robot') {
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
+			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
+			} elseif ($fromtype === 'company') {
 				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 				$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
 				$sql .= ' WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
@@ -301,8 +288,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
-			}
-			else {
+			} else {
 				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
 			}
 
@@ -419,9 +405,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			{
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
-			}
-			else
-			{
+			} else {
 				$result = $mailfile->sendfile();
 				if ($result)
 				{
@@ -479,18 +463,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 			  		exit;
-				}
-				else
-				{
+				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';
 					if ($mailfile->error)
 					{
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						$mesg .= '<br>'.$mailfile->error;
-					}
-					else
-					{
+					} else {
 						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
 					$mesg .= '</div>';
@@ -499,17 +479,13 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$action = 'presend';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("other");
 		setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 313375d1aa1..05be4a31d18 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -50,9 +50,7 @@ if ($action == 'update' && is_array($arrayofparameters))
 	{
 		$db->commit();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
 	}
@@ -96,8 +94,7 @@ if ($action == 'setModuleOptions')
                 unset($listofdir[$key]); continue;
             }
             if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-            else
-            {
+            else {
                 $upload_dir = $tmpdir;
             }
         }
@@ -112,9 +109,7 @@ if ($action == 'setModuleOptions')
     {
         $db->commit();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
     }
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index bb6a8de30d4..9fb743f1208 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -68,8 +68,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
         //dol_print_error($db,$ecmdir->error);
         //exit;
     }
-}
-else    // For no ajax call
+} else // For no ajax call
 {
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -85,8 +84,7 @@ else    // For no ajax call
         }
 
         $relativepath = $ecmdir->getRelativePath(); // Example   'mydir/'
-    }
-	elseif (GETPOST('section_dir'))
+    } elseif (GETPOST('section_dir'))
 	{
 		$relativepath = GETPOST('section_dir');
 	}
@@ -234,8 +232,7 @@ if ($type == 'directory')
         $formfile->list_of_autoecmfiles($upload_dir, $filearray, $module, $param, 1, '', $perm, 1, $textifempty, $maxlengthname, $url, 1);
     }
     // Manual list
-    else
-    {
+    else {
     	if ($module == 'medias')
     	{
     		/*
@@ -259,9 +256,7 @@ if ($type == 'directory')
 	    		if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
 	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 	    	}
-    	}
-    	else
-    	{
+    	} else {
         	$relativepath = $ecmdir->getRelativePath();
         	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
     	}
@@ -270,9 +265,7 @@ if ($type == 'directory')
 		if (($section === '0' || empty($section)) && ($module != 'medias'))
         {
             $filearray = array();
-        }
-        else
-        {
+        } else {
         	$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
         }
 
@@ -282,13 +275,11 @@ if ($type == 'directory')
         	if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
 
             $textifempty = $langs->trans('NoFileFound');
-        }
-        elseif ($section === '0')
+        } elseif ($section === '0')
         {
         	if ($module == 'ecm') $textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         	else $textifempty = $langs->trans('NoFileFound');
-        }
-        else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+        } else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
 
         if ($module == 'medias')
         {
@@ -296,8 +287,7 @@ if ($type == 'directory')
             $modulepart = 'medias';
             $perm = ($user->rights->website->write || $user->rights->emailing->creer);
             $title = 'none';
-        }
-        elseif ($module == 'ecm') // DMS/ECM -> manual structure
+        } elseif ($module == 'ecm') // DMS/ECM -> manual structure
         {
             if ($user->rights->ecm->read)
             {
@@ -320,9 +310,7 @@ if ($type == 'directory')
             $perm = $user->rights->ecm->upload;
             $modulepart = 'ecm';
             $title = ''; // Use default
-        }
-        else
-        {
+        } else {
             $useinecm = 5;
             $modulepart = 'ecm';
             $perm = $user->rights->ecm->upload;
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 3e54532668a..620643da8f2 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -49,8 +49,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 	$preopened = GETPOST('preopened');
 
 	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
-}
-else    // For no ajax call
+} else // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
@@ -73,8 +72,7 @@ if ($modulepart == 'ecm')
 {
 	$fullpathselecteddir = $conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	$fullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
@@ -95,8 +93,7 @@ if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpat
 if ($modulepart == 'ecm')
 {
 	if (!$user->rights->ecm->read) accessforbidden();
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	// Always allowed
 }
@@ -471,8 +468,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 							if ($modulepart == 'ecm')
 							{
 								$newfullpathselecteddir = $conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-							elseif ($modulepart == 'medias')
+							} elseif ($modulepart == 'medias')
 							{
 								$newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
@@ -486,7 +482,6 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 
 				echo "</ul>\n";
 			}
-		}
-		else print "PermissionDenied";
+		} else print "PermissionDenied";
 	}
 }
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index d8f4985f6d8..98d7d00a8dc 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -60,9 +60,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
             $starttime = $time;
         }
-    }
-    else
-    {
+    } else {
         $starttime = $time;
     }
 
@@ -109,9 +107,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
 
             $eventfound[] = $event;
         }
-    }
-    else
-    {
+    } else {
         dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
     }
 }
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index c7e5bbd8991..1ed8ca34076 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -57,8 +57,7 @@ if (!empty($action) && !empty($name))
 		if ($action == 'set')
 		{
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		}
-		elseif ($action == 'del')
+		} elseif ($action == 'del')
 		{
 			dolibarr_del_const($db, $name, $entity);
 		}
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index a3db4505f70..16f39af9bde 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -51,20 +51,38 @@ if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; }
-	elseif ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; }
-	elseif ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; }
-	elseif ($element == 'contract') { $classpath = $subelement = 'contrat'; }
-	elseif ($element == 'shipping') { $classpath = $subelement = 'expedition'; }
-	elseif ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	elseif ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	elseif ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande') {
+		$classpath = $subelement = 'commande';
+	} elseif ($element == 'propal') {
+		$classpath = 'comm/propal';
+		$subelement = 'propal';
+	} elseif ($element == 'facture') {
+		$classpath = 'compta/facture';
+		$subelement = 'facture';
+	} elseif ($element == 'contract') {
+		$classpath = $subelement = 'contrat';
+	} elseif ($element == 'shipping') {
+		$classpath = $subelement = 'expedition';
+	} elseif ($element == 'deplacement') {
+		$classpath = 'compta/deplacement';
+		$subelement = 'deplacement';
+	} elseif ($element == 'order_supplier') {
+		$classpath = 'fourn';
+		$subelement = 'fournisseur.commande';
+	} elseif ($element == 'invoice_supplier') {
+		$classpath = 'fourn';
+		$subelement = 'fournisseur.facture';
+	}
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; }
-	elseif ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier') {
+		$classname = 'CommandeFournisseur';
+	} elseif ($element == 'invoice_supplier') {
+		$classname = 'FactureFournisseur';
+	} else {
+		$classname = ucfirst($subelement);
+	}
 
 	$object = new $classname($db);
 	$object->fetch($id);
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 14258e1ebb1..b1a72868312 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -62,8 +62,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	elseif ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
-	}
-	elseif ($element == 'invoice_supplier') {
+	} elseif ($element == 'invoice_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'facture';
 	}
@@ -83,8 +82,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 			{
 				$ret = $form->$methodname();
 				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			elseif (!empty($ext_element))
+			} elseif (!empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
@@ -99,16 +97,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$ret = $object->$methodname($fk_element);
 				if ($ret > 0) echo json_encode($object->$cachename);
 			}
-		}
-		else
-		{
+		} else {
 			$object = new GenericObject($db);
 			$value = $object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
-	}
-	else
-	{
+	} else {
 		echo $langs->transnoentities('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 6466df89a07..6c9f97bfbb0 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -58,11 +58,9 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 
 if (in_array($field, array('status'))) {
 	$result = restrictedArea($user, $element, $id);
-}
-elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
+} elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
-}
-else {
+} else {
 	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
 	exit;
 }
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index a914470e50d..e08b2c5efcf 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -66,7 +66,6 @@ elseif ($action == 'firstpingko')
 	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt'); // erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
-}
-else {
+} else {
 	print 'Error action='.$action.' not supported';
 }
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index 4e4e302d439..0dec4d21c68 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -51,8 +51,7 @@ if (!empty($output) && isset($amount) && isset($tva_tx))
 			$price = price2num($amount * (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
-		}
-		elseif ($output == 'price_ht') {
+		} elseif ($output == 'price_ht') {
 			$price = price2num($amount / (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
 			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 0eb0545a9ea..8273683b8de 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -59,51 +59,60 @@ top_httphead();
 if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
 	$ext_element = GETPOST('ext_element', 'alpha', 2);
-	$field				= substr($field, 8); // remove prefix val_
+	$field = substr($field, 8); // remove prefix val_
 	$type = GETPOST('type', 'alpha', 2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
-	$loadmethod			= GETPOST('loadmethod', 'alpha', 2);
-	$savemethod			= GETPOST('savemethod', 'alpha', 2);
+	$value = ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
+	$loadmethod = GETPOST('loadmethod', 'alpha', 2);
+	$savemethod = GETPOST('savemethod', 'alpha', 2);
 	$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
-	$newelement			= $element;
+	$newelement = $element;
 
 	$view = '';
 	$format = 'text';
 	$return = array();
 	$error = 0;
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
-	{
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
 		$element = $regs[1];
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $newelement = 'propale';
-	elseif ($element == 'fichinter') $newelement = 'ficheinter';
-	elseif ($element == 'product') $newelement = 'produit';
-	elseif ($element == 'member') $newelement = 'adherent';
-	elseif ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$newelement = 'propale';
+	} elseif ($element == 'fichinter') {
+		$newelement = 'ficheinter';
+	} elseif ($element == 'product') {
+		$newelement = 'produit';
+	} elseif ($element == 'member') {
+		$newelement = 'adherent';
+	} elseif ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
-	}
-	elseif ($element == 'invoice_supplier') {
+	} elseif ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
+	} else {
+		$newelement = $element;
 	}
-	else $newelement = $element;
 
 	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
 	$feature2 = $subelement;
 	$object_id = $fk_element;
-	if ($feature == 'expedition' || $feature == 'shipping')
-	{
+	if ($feature == 'expedition' || $feature == 'shipping') {
 		$feature = 'commande';
 		$object_id = 0;
 	}
-	if ($feature == 'shipping') $feature = 'commande';
-	if ($feature == 'payment') { $feature = 'facture'; }
-	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
+	if ($feature == 'shipping') {
+		$feature = 'commande';
+	}
+	if ($feature == 'payment') {
+		$feature = 'facture';
+	}
+	if ($feature == 'payment_supplier') {
+		$feature = 'fournisseur';
+		$feature2 = 'facture';
+	}
 	//var_dump(GETPOST('action','aZ09'));
 	//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
 	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
@@ -130,15 +139,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		}
-		elseif ($type == 'datepicker')
-		{
+		} elseif ($type == 'datepicker') {
 			$timestamp = GETPOST('timestamp', 'int', 2);
 			$format = 'date';
 			$newvalue = ($timestamp / 1000);
-		}
-		elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$loadmethodname = 'load_cache_'.$loadmethod;
 			$loadcachename = 'cache_'.$loadmethod;
 			$loadviewname = 'view_'.$loadmethod;
@@ -157,15 +162,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$return['error'] = $form->error;
 				}
-			}
-			else
-			{
+			} else {
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
@@ -187,9 +188,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$return['error'] = $object->error;
 				}
@@ -215,17 +214,13 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 
 				$return['value'] = $value;
 				$return['view'] = (!empty($view) ? $view : $value);
-			}
-			else
-			{
+			} else {
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
-	}
-	else
-	{
+	} else {
 		echo $langs->trans('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 31a95d1e02c..21d6ae9aad1 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -161,8 +161,7 @@ $reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
 if (empty($reshook))
 {
 	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
-}
-else $arrayresult = $hookmanager->resArray;
+} else $arrayresult = $hookmanager->resArray;
 
 // This allow to keep a search entry to the top
 if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 9edcad9f4fa..b0ab6ed2a7e 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -52,9 +52,7 @@ if (!empty($id) && !empty($action) && !empty($htmlname))
 	{
 		$seller = $mysoc;
 		$buyer = $soc;
-	}
-	else
-	{
+	} else {
 		$buyer = $mysoc;
 		$seller = $soc;
 	}
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 850d25bae47..568fd5b2f4c 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -75,8 +75,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 		if ($town)    $sql .= " AND z.town LIKE '%".$db->escape($town)."%'";
 		$sql .= " ORDER BY z.zip, z.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
-	}
-	else                                               // Use table of third parties
+	} else // Use table of third parties
 	{
 		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
 		$sql .= ", c.code as country_code, c.label as country";
@@ -128,9 +127,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 	}
 
 	echo json_encode($return_arr);
-}
-else
-{
+} else {
 }
 
 $db->close();
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 448e7d915c9..a951402fd7b 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -244,9 +244,7 @@ class box_actions extends ModeleBoxes
 					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
 				}
 				$out .= '</script>';
-			}
-			else
-			{
+			} else {
 				$out .= '<script>';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: false });';
 				$out .= '</script>';
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 8fc7b8766e4..a59edbbf337 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -141,9 +141,7 @@ class box_activity extends ModeleBoxes
         		} else {
         			dol_print_error($this->db);
         		}
-        	}
-        	else
-        	{
+        	} else {
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 17dd29057b3..e6d032d41f8 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -132,16 +132,14 @@ class box_birthdays extends ModeleBoxes
 				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 010bf8e7f21..e49d21ba387 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -133,16 +133,14 @@ class box_birthdays_members extends ModeleBoxes
 				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index f5bbf7021e9..c81e226decb 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -79,9 +79,7 @@ class box_bookmarks extends ModeleBoxes
         if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
-		}
-		else
-		{
+		} else {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("ListOfBookmark");
 		}
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 70718db55b5..00cad787e0b 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -154,16 +154,14 @@ class box_clients extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 93ac43d6c22..48268b28914 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -103,9 +103,7 @@ class box_external_rss extends ModeleBoxes
             // Show warning
             $title .= " ".img_error($langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ?dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown"))));
             $this->info_box_head = array('text' => $title, 'limit' => 0);
-        }
-        else
-        {
+        } else {
             $this->info_box_head = array(
                 'text' => $title,
                 'sublink' => $link,
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index a374094ea89..f5fe3e76dde 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -186,17 +186,14 @@ class box_factures_imp extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 4125ce92eaa..2c104bea729 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -151,18 +151,14 @@ class box_ficheinter extends ModeleBoxes
 				);
 
 				$this->db->free($resql);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else
-		{
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 			    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 46dfdff6d23..66497c2e94f 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -148,16 +148,14 @@ class box_goodcustomers extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e78b6e235b1..9d5aeda7b36 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -111,9 +111,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -153,9 +151,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -200,9 +196,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,13 +264,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 52dcdc995cd..b9fde24b759 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -108,9 +108,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -151,9 +149,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -197,9 +193,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -267,9 +261,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -277,8 +269,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 45459805f00..2ff1a579798 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -111,9 +111,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -152,9 +150,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -196,9 +192,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,9 +264,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -280,8 +272,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 99426be8cb1..fb40ee1f68f 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -110,9 +110,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -151,9 +149,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -195,9 +191,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -269,9 +263,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -279,8 +271,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index e8337d74303..fbf1874a132 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -94,9 +94,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
-		}
-		else
-		{
+		} else {
 			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 			$year = $tmparray['year'];
 			$showinvoicenb = $tmparray['showinvoicenb'];
@@ -393,9 +391,7 @@ class box_graph_product_distribution extends ModeleBoxes
                 'td' => 'class="nohover center"',
                 'textnoformat'=>$stringtoshow,
             );
-		}
-		else
-		{
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'maxlength'=>500,
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 42b95e516b5..4231638948a 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -111,9 +111,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -150,9 +148,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -196,9 +192,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
                             $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,9 +264,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -280,8 +272,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 374e9ab1bae..8dffe4adf20 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -149,8 +149,7 @@ class box_produits extends ModeleBoxes
                     if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
                         $price_base_type = $langs->trans($objp->price_base_type);
                         $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -159,9 +158,7 @@ class box_produits extends ModeleBoxes
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
-							}
-							else
-							{
+							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index dcd95445ddd..5b17ef22ddf 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -171,8 +171,7 @@ class box_produits_alerte_stock extends ModeleBoxes
                     {
                         $price_base_type = $langs->trans($objp->price_base_type);
                         $price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-	                }
-	                else //Parse the dynamic price
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -181,9 +180,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
-							}
-							else
-							{
+							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
@@ -228,17 +225,14 @@ class box_produits_alerte_stock extends ModeleBoxes
                     );
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index c99f07ff311..e8b056322da 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -146,8 +146,7 @@ class box_project extends ModeleBoxes
                                 'td' => 'class="right"',
                                 'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
                             );
-                        else
-                            $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+                        else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
                         $totalnbTask += $objTask->nb;
                     } else {
                         $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 7167097672b..f81e8e72a51 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -186,9 +186,7 @@ class box_services_contracts extends ModeleBoxes
 						}
 
 						$s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
-					}
-					else
-					{
+					} else {
 						$s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
 					}
 
@@ -229,17 +227,14 @@ class box_services_contracts extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength' => 500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 94b4764eeae..d7b3433f6d2 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -170,18 +170,14 @@ class box_services_expired extends ModeleBoxes
     			}
 
 				$this->db->free($resql);
-    		}
-    		else
-    		{
+    		} else {
     			$this->info_box_contents[0][] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
     		}
-    	}
-    	else
-    	{
+    	} else {
     		$this->info_box_contents[0][0] = array(
     		    'td' => 'class="nohover opacitymedium left"',
     		    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index c019062313c..5ba940f2af2 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -167,9 +167,7 @@ class box_supplier_orders extends ModeleBoxes
                     'text' => ($this->db->error().' sql='.$sql),
                 );
             }
-        }
-        else
-        {
+        } else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index f70f5bef450..952e0b78d92 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -174,9 +174,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
                     'text' => ($this->db->error().' sql='.$sql),
                 );
             }
-        }
-        else
-        {
+        } else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index f9a974ae1c5..55557cd355a 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -93,15 +93,13 @@ class box_task extends ModeleBoxes
         $filterValue = 'all';
         if (in_array(GETPOST($cookie_name), array('all', 'im_project_contact', 'im_task_contact'))) {
             $filterValue = GETPOST($cookie_name);
-        }
-        elseif (!empty($_COOKIE[$cookie_name])) {
+        } elseif (!empty($_COOKIE[$cookie_name])) {
             $filterValue = $_COOKIE[$cookie_name];
         }
 
         if ($filterValue == 'im_task_contact') {
             $textHead .= ' : '.$langs->trans("WhichIamLinkedTo");
-        }
-        elseif ($filterValue == 'im_project_contact') {
+        } elseif ($filterValue == 'im_project_contact') {
             $textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
         }
 
@@ -158,8 +156,7 @@ class box_task extends ModeleBoxes
             if ($filterValue === 'im_task_contact') {
                 $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = '".$user->id."' )";
                 $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
-            }
-            elseif ($filterValue === 'im_project_contact') {
+            } elseif ($filterValue === 'im_project_contact') {
                 $sql .= " JOIN ".MAIN_DB_PREFIX."element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = '".$user->id."' )";
                 $sql .= " JOIN ".MAIN_DB_PREFIX."c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
             }
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 01fbcdef47b..e5fa9d8fb0d 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -161,14 +161,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$this->box_order = $obj->box_order;
 				$this->fk_user = $obj->fk_user;
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -438,13 +434,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 						{
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget", $modName, "").'</div>';
-						}
-						else
-						{
+						} else {
 							try {
 								include_once $newdir.'/'.$file;
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								print $e->getMessage();
 							}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 5c7251c40e2..1b5faeff52e 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -215,9 +215,7 @@ class CMailFile
 		{
 			$this->msgishtml = 0;
 			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
-		{
+		} else {
 			$this->msgishtml = $msgishtml;
 		}
 
@@ -319,8 +317,7 @@ class CMailFile
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message .= $text_body.$files_encoded;
 			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
-		}
-		elseif ($this->sendmode == 'smtps')
+		} elseif ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -386,8 +383,7 @@ class CMailFile
 			$this->msgid = time().'.SMTPs-dolibarr-'.$trackid.'@'.$host;
 
 			$this->smtps = $smtps;
-		}
-		elseif ($this->sendmode == 'swiftmailer')
+		} elseif ($this->sendmode == 'swiftmailer')
 		{
 			// Use Swift Mailer library
             $host = dol_getprefix('email');
@@ -499,9 +495,7 @@ class CMailFile
 			if (!empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
 			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else
-		{
+		} else {
 			// Send mail method not correctly defined
 			// --------------------------------------
 			$this->error = 'Bad value for sendmode';
@@ -707,9 +701,7 @@ class CMailFile
 						$this->error .= ".<br>";
 						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
-					{
+					} else {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
 				}
@@ -722,8 +714,7 @@ class CMailFile
 				// Restore parameters
 				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
 				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				if (!is_object($this->smtps))
 				{
@@ -794,16 +785,13 @@ class CMailFile
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res = true;
-					}
-					else
-					{
+					} else {
 						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR);
 						$res = false;
 					}
 				}
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
                 // Use Swift Mailer library
                 // ------------------------------------------
@@ -860,14 +848,10 @@ class CMailFile
 				if (!empty($this->error) || !$result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
-				}
-				else
-				{
+				} else {
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
-			}
-			else
-			{
+			} else {
 				// Send mail method not correctly defined
 				// --------------------------------------
 
@@ -883,9 +867,7 @@ class CMailFile
 
 				return $reshook;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
@@ -924,9 +906,7 @@ class CMailFile
 			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
@@ -957,12 +937,10 @@ class CMailFile
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
 				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
@@ -991,9 +969,7 @@ class CMailFile
 			$out .= ">";
 			$out .= $msg;
 			$out .= "</body></html>";
-		}
-		else
-		{
+		} else {
 			$out = $msg;
 		}
 
@@ -1074,9 +1050,7 @@ class CMailFile
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2; // Uppercase seems replaced by phpmail
 			$out .= 'References: <'.$this->msgid.">".$this->eol2;
 			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
-		}
-		else
-		{
+		} else {
 			$this->msgid = time().'.phpmail@'.$host;
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2;
 		}
@@ -1205,9 +1179,7 @@ class CMailFile
 			{
 				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
-		}
-		else
-		{
+		} else {
 			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
 			$out .= $this->eol.$strContent.$this->eol;
@@ -1265,9 +1237,7 @@ class CMailFile
 					$out .= $encoded;
 					$out .= $this->eol;
 					//$out.= $this->eol;
-				}
-				else
-				{
+				} else {
 					return $encoded;
 				}
 			}
@@ -1365,9 +1335,7 @@ class CMailFile
 
 				// Check response from Server
 				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
-			}
-			else
-			{
+			} else {
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
@@ -1487,16 +1455,12 @@ class CMailFile
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -1532,9 +1496,7 @@ class CMailFile
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
-			{
+			} else {
 				$name  = '';
 				$email = trim($val);
 			}
@@ -1603,9 +1565,7 @@ class CMailFile
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
-			{
+			} else {
 				$name  = null;
 				$email = trim($val);
 			}
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 4cd06a81233..4e496408f1d 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -140,21 +140,17 @@ class CSMSFile
 				{
 					$this->error = $sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-				}
-				else
-				{
+				} else {
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
 					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
 				}
-			}
-		    elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+			} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 		    {
 		        $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
 		        $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
 		        dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-		        try
-		        {
+		        try {
 		            $classname = ucfirst($classfile);
 		            $sms = new $classname($this->db);
 		            $sms->expe = $this->addr_from;
@@ -176,29 +172,22 @@ class CSMSFile
     				if ($res <= 0)
     				{
     					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				}
-    				else
-    				{
+    				} else {
     					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
     					//var_dump($res);        // 1973128
     					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
     				}
-		        }
-		        catch (Exception $e)
+		        } catch (Exception $e)
 		        {
 		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 		        }
-		    }
-			else
-			{
+		    } else {
 				// Send sms method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for MAIN_SMS_SENDMODE constant';
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
 		}
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index a70a2f9cafc..cf671eb57ca 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -138,9 +138,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -184,13 +182,10 @@ class Ccountry // extends CommonObject
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -243,9 +238,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -283,9 +276,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index eff934b635f..91fba374181 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -156,9 +156,7 @@ class Comment extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -216,9 +214,7 @@ class Comment extends CommonObject
 
 			if ($num_rows) return 1;
 			else return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -280,9 +276,7 @@ class Comment extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index df80aab7a1f..a9b75cd5ad6 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -794,12 +794,10 @@ abstract class CommonDocGenerator
 					$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
 					//Add value to store price with currency
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
 				{
 					$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$object->array_options['options_'.$key]];
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
 					$valArray = explode(',', $object->array_options['options_'.$key]);
 					$output = array();
 					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt=>$valopt) {
@@ -808,8 +806,7 @@ abstract class CommonDocGenerator
 						}
 					}
 					$object->array_options['options_'.$key] = implode(', ', $output);
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
 				{
 					if (strlen($object->array_options['options_'.$key]) > 0)
 					{
@@ -817,17 +814,14 @@ abstract class CommonDocGenerator
 						$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language
 						$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
 						$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format
-					}
-					else
-					{
+					} else {
 						$object->array_options['options_'.$key] = '';
 						$object->array_options['options_'.$key.'_locale'] = '';
 						$object->array_options['options_'.$key.'_rfc'] = '';
 					}
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
+				} elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
 				{
 					$datetime = $object->array_options['options_'.$key];
 					$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language
@@ -835,8 +829,7 @@ abstract class CommonDocGenerator
 					$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
 				{
 					$id = $object->array_options['options_'.$key];
 					if ($id != "")
@@ -946,8 +939,7 @@ abstract class CommonDocGenerator
 
             if (empty($colDef['width'])) {
                 $countFlexCol++;
-            }
-            else {
+            } else {
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -957,16 +949,14 @@ abstract class CommonDocGenerator
             // setting empty conf with default
             if (!empty($colDef['title'])) {
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            }
-            else {
+            } else {
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
             if (!empty($colDef['content'])) {
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            }
-            else {
+            } else {
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
@@ -1322,8 +1312,7 @@ abstract class CommonDocGenerator
                     $html .= $field->content;
                     $i++;
                 }
-            }
-            elseif ($params['display'] == 'table') {
+            } elseif ($params['display'] == 'table') {
                 // Display in table format
                 $html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
 
@@ -1388,8 +1377,7 @@ abstract class CommonDocGenerator
     {
         if (!empty($this->cols[$colKey]['status'])) {
             return true;
-        }
-        else  return  false;
+        } else return  false;
     }
 
     /**
@@ -1439,8 +1427,7 @@ abstract class CommonDocGenerator
                     if (is_object($outputlangsbis)) {
                         // set cell padding with column title definition
                         $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
-                    }
-                    else {
+                    } else {
                         // set cell padding with column title definition
                         $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
                     }
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index c37ece437d4..81a553100f2 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -140,9 +140,7 @@ abstract class CommonInvoice extends CommonObject
 			$this->db->free($resql);
 			if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -170,9 +168,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -193,9 +189,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -216,9 +210,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -248,9 +240,7 @@ abstract class CommonInvoice extends CommonObject
 				$idarray[] = $row[0];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $idarray;
@@ -284,15 +274,11 @@ abstract class CommonInvoice extends CommonObject
 			{
 				// If there is any
 				return $obj->rowid;
-			}
-			else
-			{
+			} else {
 				// If no invoice replaces it
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -352,8 +338,7 @@ abstract class CommonInvoice extends CommonObject
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
 				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$this->id;
 				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)
-			}
-			elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 			{
 				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
@@ -372,15 +357,12 @@ abstract class CommonInvoice extends CommonObject
 						$obj = $this->db->fetch_object($resql);
 						if ($multicurrency) {
 							$retarray[] = array('amount'=>$obj->multicurrency_amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'0', 'ref'=>$obj->ref);
-						}
-						else {
+						} else {
 							$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'', 'ref'=>$obj->ref);
 						}
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					dol_print_error($this->db);
 					return array();
@@ -389,9 +371,7 @@ abstract class CommonInvoice extends CommonObject
 			}
 
 			return $retarray;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
@@ -482,9 +462,7 @@ abstract class CommonInvoice extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -549,41 +527,33 @@ abstract class CommonInvoice extends CommonObject
 		    if ($status == 0) {
 		        $labelStatus = $langs->trans('BillStatusDraft');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
-		    }
-		    elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+		    } elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
 		        $labelStatus = $langs->trans('BillStatusClosedUnpaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
 		        $statusType = 'status5';
-		    }
-		    elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+		    } elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
 		        $labelStatus = $langs->trans('BillStatusClosedPaidPartially');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
 		        $statusType = 'status9';
-		    }
-		    elseif ($alreadypaid <= 0) {
+		    } elseif ($alreadypaid <= 0) {
 		        $labelStatus = $langs->trans('BillStatusNotPaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
 		        $statusType = 'status1';
-		    }
-		    else {
+		    } else {
 		        $labelStatus = $langs->trans('BillStatusStarted');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
 		        $statusType = 'status3';
 		    }
-		}
-		else
-		{
+		} else {
 		    $statusType = 'status6';
 
 		    if ($type == self::TYPE_CREDIT_NOTE) {
 		        $labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
-		    }
-		    elseif ($type == self::TYPE_DEPOSIT) {
+		    } elseif ($type == self::TYPE_DEPOSIT) {
 		        $labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
-		    }
-		    else {
+		    } else {
 		        $labelStatus = $langs->trans('BillStatusPaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
 		    }
@@ -629,9 +599,7 @@ abstract class CommonInvoice extends CommonObject
 				$cdr_type = $obj->type_cdr;
 				$cdr_decalage = $obj->decalage;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -657,9 +625,7 @@ abstract class CommonInvoice extends CommonObject
 			{
 				$mois = 1;
 				$annee += 1;
-			}
-			else
-			{
+			} else {
 				$mois += 1;
 			}
 			// We move at the beginning of the next month, and we take a day off
@@ -682,8 +648,7 @@ abstract class CommonInvoice extends CommonObject
 
 			if ($diff < 0) $datelim = $date_lim_current;
 			else $datelim = $date_lim_next;
-		}
-		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
+		} else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 
 		return $datelim;
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2bd621bc0f6..3d4372a0cb1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -705,8 +705,7 @@ abstract class CommonObject
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
                 $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
-            }
-            else {
+            } else {
                 $out .= ($outdone ? ' - ' : '').$this->state;
             }
 			$outdone++;
@@ -833,10 +832,8 @@ abstract class CommonObject
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
+			} else return '';
+		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
 			if ($initsharekey)
@@ -844,8 +841,7 @@ abstract class CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
-			}
-			else return '';
+			} else return '';
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -867,9 +863,7 @@ abstract class CommonObject
 		if ($relativelink)
 		{
 			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
-		}
-		else
-		{
+		} else {
 			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
@@ -916,9 +910,7 @@ abstract class CommonObject
 		if (is_numeric($type_contact))
 		{
 			$id_type_contact = $type_contact;
-		}
-		else
-		{
+		} else {
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -981,18 +973,14 @@ abstract class CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $this->db->errno();
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
@@ -1047,9 +1035,7 @@ abstract class CommonObject
 		if ($resql)
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1085,9 +1071,7 @@ abstract class CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1123,9 +1107,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1185,9 +1167,7 @@ abstract class CommonObject
 								   'nom'=>$obj->lastname, // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else
-				{
+				} else {
 					$tab[$i] = $obj->id;
 				}
 
@@ -1195,9 +1175,7 @@ abstract class CommonObject
 			}
 
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1231,9 +1209,7 @@ abstract class CommonObject
 			$result = $this->update_contact($rowid, $newstatut);
 			$this->db->free($resql);
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
@@ -1285,9 +1261,7 @@ abstract class CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
@@ -1368,9 +1342,7 @@ abstract class CommonObject
 				}
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return null;
 		}
@@ -1430,9 +1402,7 @@ abstract class CommonObject
 				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return null;
 		}
@@ -1493,8 +1463,7 @@ abstract class CommonObject
 			}
 
 			return $result;
-		} else
-			return -1;
+		} else return -1;
 	}
 
 
@@ -1564,9 +1533,7 @@ abstract class CommonObject
 					$this->barcode_type_label = $obj->label;
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
-				}
-				else
-				{
+				} else {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -1773,9 +1740,7 @@ abstract class CommonObject
 				if (empty($this->fields) && method_exists($this, 'fetch'))
 				{
 					$result = $this->fetch($id);
-				}
-				else
-				{
+				} else {
 					$result = $this->fetchCommon($id);
 				}
 				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
@@ -1787,15 +1752,11 @@ abstract class CommonObject
 				if (property_exists($this, $field)) $this->$field = $value;
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1840,8 +1801,7 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		}
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
 		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
@@ -1855,8 +1815,7 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		}
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1954,7 +1913,7 @@ abstract class CommonObject
 		while ($i < $num)
 		{
 			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			else $contactAlreadySelected[$i] = $tab[$i]['id'];
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1981,14 +1940,12 @@ abstract class CommonObject
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE rowid = '.$this->id;
-		}
-		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
+		} elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE id = '.$this->id;
-		}
-		else											// Special case for old architecture objects
+		} else // Special case for old architecture objects
 		{
 			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
 			else $sql .= ' SET fk_projet = NULL';
@@ -2000,9 +1957,7 @@ abstract class CommonObject
 		{
 			$this->fk_project = $projectid;
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2034,16 +1989,12 @@ abstract class CommonObject
 				// for supplier
 				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2075,16 +2026,12 @@ abstract class CommonObject
 				if ($rate) $this->setMulticurrencyRate($rate, 2);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2183,16 +2130,12 @@ abstract class CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2226,16 +2169,12 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2264,16 +2203,12 @@ abstract class CommonObject
 	        {
 	            $this->retained_warranty_fk_cond_reglement = $id;
 	            return 1;
-	        }
-	        else
-	        {
+	        } else {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 	            $this->error = $this->db->error();
 	            return -1;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
 	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
@@ -2299,9 +2234,7 @@ abstract class CommonObject
 		{
 			$this->fk_delivery_address = $id;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
@@ -2425,9 +2358,7 @@ abstract class CommonObject
 		{
 			$this->modelpdf = $modelpdf;
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return 0;
 		}
@@ -2469,9 +2400,7 @@ abstract class CommonObject
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
 			$error++;
-		}
-		else
-		{
+		} else {
 			if (!$notrigger)
 			{
 				// Call trigger
@@ -2485,9 +2414,7 @@ abstract class CommonObject
 		{
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
 			$this->db->commit();
 			return 1;
@@ -2534,8 +2461,7 @@ abstract class CommonObject
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2577,9 +2503,7 @@ abstract class CommonObject
 						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2725,9 +2649,7 @@ abstract class CommonObject
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2759,9 +2681,7 @@ abstract class CommonObject
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2834,16 +2754,13 @@ abstract class CommonObject
 				if (!empty($row[0]))
 				{
 					return $row[0];
-				}
-				else
-				{
+				} else {
 					return $this->getRangOfLine($fk_parent_line);
 				}
 			}
 		}
 		// If not, search the last rang of element
-		else
-		{
+		else {
 			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
@@ -2882,9 +2799,7 @@ abstract class CommonObject
 		{
 			$this->ref_ext = $ref_ext;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2929,15 +2844,12 @@ abstract class CommonObject
 		{
 			if ($suffix == '_public') $this->note_public = $note;
 			elseif ($suffix == '_private') $this->note_private = $note;
-			else
-			{
+			else {
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3197,14 +3109,10 @@ abstract class CommonObject
 			if (!$error)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db, 'Bad request in update_price');
 			return -1;
 		}
@@ -3249,9 +3157,7 @@ abstract class CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
@@ -3324,15 +3230,12 @@ abstract class CommonObject
 			{
 				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
 				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
-			}
-			elseif ($justtarget)
+			} elseif ($justtarget)
 			{
 				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
 				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
 			}
-		}
-		else
-		{
+		} else {
 			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
 			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
@@ -3352,14 +3255,11 @@ abstract class CommonObject
 					if ($justsource)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
-					}
-					elseif ($justtarget)
+					} elseif ($justtarget)
 					{
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
-				}
-				else
-				{
+				} else {
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
@@ -3390,32 +3290,23 @@ abstract class CommonObject
 					// To work with non standard classpath or module name
 					if ($objecttype == 'facture') {
 						$classpath = 'compta/facture/class';
-					}
-					elseif ($objecttype == 'facturerec') {
+					} elseif ($objecttype == 'facturerec') {
 						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					elseif ($objecttype == 'propal') {
+					} elseif ($objecttype == 'propal') {
 						$classpath = 'comm/propal/class';
-					}
-					elseif ($objecttype == 'supplier_proposal') {
+					} elseif ($objecttype == 'supplier_proposal') {
 						$classpath = 'supplier_proposal/class';
-					}
-					elseif ($objecttype == 'shipping') {
+					} elseif ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					elseif ($objecttype == 'delivery') {
+					} elseif ($objecttype == 'delivery') {
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
+					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					elseif ($objecttype == 'fichinter') {
+					} elseif ($objecttype == 'fichinter') {
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					elseif ($objecttype == 'subscription') {
+					} elseif ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
-					}
-					elseif ($objecttype == 'contact') {
+					} elseif ($objecttype == 'contact') {
 						 $module = 'societe';
 					}
 
@@ -3424,23 +3315,17 @@ abstract class CommonObject
 
 					if ($objecttype == 'order') {
 						$classfile = 'commande'; $classname = 'Commande';
-					}
-					elseif ($objecttype == 'invoice_supplier') {
+					} elseif ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					elseif ($objecttype == 'order_supplier') {
+					} elseif ($objecttype == 'order_supplier') {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					elseif ($objecttype == 'supplier_proposal') {
+					} elseif ($objecttype == 'supplier_proposal') {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					elseif ($objecttype == 'facturerec') {
+					} elseif ($objecttype == 'facturerec') {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					elseif ($objecttype == 'subscription') {
+					} elseif ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
-					}
-					elseif ($objecttype == 'project' || $objecttype == 'projet') {
+					} elseif ($objecttype == 'project' || $objecttype == 'projet') {
 						$classpath = 'projet/class'; $classfile = 'project'; $classname = 'Project';
 					}
 
@@ -3464,17 +3349,13 @@ abstract class CommonObject
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3505,8 +3386,7 @@ abstract class CommonObject
 			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
 			$sql .= " WHERE fk_target = ".$this->id;
 			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		elseif ($updatetarget)
+		} elseif ($updatetarget)
 		{
 			$sql .= "fk_target = ".$targetid;
 			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
@@ -3518,9 +3398,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3555,21 +3433,16 @@ abstract class CommonObject
 		if ($rowid > 0)
 		{
 			$sql .= " rowid = ".$rowid;
-		}
-		else
-		{
+		} else {
 			if ($deletesource)
 			{
 				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			elseif ($deletetarget)
+			} elseif ($deletetarget)
 			{
 				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else
-			{
+			} else {
 				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql .= " OR";
 				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
@@ -3580,9 +3453,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -3659,16 +3530,12 @@ abstract class CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -3707,11 +3574,8 @@ abstract class CommonObject
 			{
 				$this->canvas = $obj->canvas;
 				return 1;
-			}
-			else return 0;
-		}
-		else
-		{
+			} else return 0;
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3784,16 +3648,13 @@ abstract class CommonObject
 					if (is_numeric($elementname))	// old usage
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
-					}
-					else	// new usage: $elementname=Translation key
+					} else // new usage: $elementname=Translation key
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break; // We found at least one, we stop here
 				}
-			}
-			else
-			{
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
@@ -3802,8 +3663,7 @@ abstract class CommonObject
 		{
 			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -3895,8 +3755,7 @@ abstract class CommonObject
 			{
 				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
 				$totalToShip += $line->qty_shipped; // defined for shipment only
-			}
-			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
 				if (empty($totalToShip)) $totalToShip = 0;
 				$totalToShip += $line->qty; // defined for reception only
@@ -3906,8 +3765,7 @@ abstract class CommonObject
 			if ($this->element == 'shipping') {
 				// for shipments
 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
+			} else {
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
@@ -3934,8 +3792,7 @@ abstract class CommonObject
 			{
 				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
-			}
-			else {
+			} else {
 				if ($weight_units == 99) {
 					// conversion 1 Pound = 0.45359237 KG
 					$trueWeightUnit = 0.45359237;
@@ -3944,8 +3801,7 @@ abstract class CommonObject
 					// conversion 1 Ounce = 0.0283495 KG
 					$trueWeightUnit = 0.0283495;
 					$totalWeight += $weight * $qty * $trueWeightUnit;
-				}
-				else {
+				} else {
 					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
@@ -3955,9 +3811,7 @@ abstract class CommonObject
 				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else
-			{
+			} else {
 				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
@@ -3988,9 +3842,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -4041,14 +3893,10 @@ abstract class CommonObject
 			{
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else
-			{
+			} else {
 				return '';
 			}
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			return false;
 		}
@@ -4084,14 +3932,11 @@ abstract class CommonObject
 					$this->label_incoterms = $obj->libelle;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else return -1;
+		} else return -1;
 	}
 
 
@@ -4132,9 +3977,7 @@ abstract class CommonObject
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
-			}
-			else
-			{
+			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
 			}
 
@@ -4199,9 +4042,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -4228,9 +4069,7 @@ abstract class CommonObject
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				}
-				else
-				{
+				} else {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
@@ -4311,9 +4150,7 @@ abstract class CommonObject
 					}
 
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else
-				{
+				} else {
 					$label = $line->product_label;
 				}
 
@@ -4332,9 +4169,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
 				}
 
@@ -4363,9 +4198,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
 				}
 
@@ -4425,9 +4258,7 @@ abstract class CommonObject
 						$action = '';
 						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
-				}
-				else
-				{
+				} else {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
 				}
 
@@ -4457,18 +4288,14 @@ abstract class CommonObject
 		if (!empty($line->date_start))
 		{
 			$date_start = $line->date_start;
-		}
-		else
-		{
+		} else {
 			$date_start = $line->date_debut_prevue;
 			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end = $line->date_end;
-		}
-		else
-		{
+		} else {
 			$date_end = $line->date_fin_prevue;
 			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
@@ -4483,8 +4310,7 @@ abstract class CommonObject
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
-		}
-		elseif (!empty($line->fk_product))
+		} elseif (!empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4502,9 +4328,7 @@ abstract class CommonObject
 			{
 				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
-		}
-		else
-		{
+		} else {
 			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'] .= $line->desc;
@@ -4526,32 +4350,25 @@ abstract class CommonObject
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
+			} elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
+			} elseif ($line->desc == '(EXCESS PAID)')
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-			}
-			else
-			{
+			} else {
 				$this->tpl['description'] = dol_trunc($line->desc, 60);
 			}
-		}
-		else
-		{
+		} else {
 			$this->tpl['description'] = '&nbsp;';
 		}
 
@@ -4578,9 +4395,7 @@ abstract class CommonObject
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
-			}
-			else
-			{
+			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
 			}
 
@@ -4631,9 +4446,7 @@ abstract class CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
@@ -4667,9 +4480,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			if (!$notrigger)
 			{
 				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
@@ -4832,9 +4643,7 @@ abstract class CommonObject
 			    {
 				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var
 				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			    }
-			    else
-			    {
+			    } else {
 				     $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 			    }
 			    // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
@@ -4902,9 +4711,7 @@ abstract class CommonObject
 							    if ($result < 0) {
 								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 							    }
-						    }
-						    else
-						    {
+						    } else {
 							    $ecmfile->entity = $conf->entity;
 							    $ecmfile->filepath = $rel_dir;
 							    $ecmfile->filename = $filename;
@@ -4943,9 +4750,7 @@ abstract class CommonObject
 							    }
 						    }
 					    }
-				    }
-				    else
-				    {
+				    } else {
 					    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
 				    }
 
@@ -4953,22 +4758,17 @@ abstract class CommonObject
 				    dol_meta_create($this);
 
 				    return 1;
-			    }
-			    else
-			    {
+			    } else {
 				    $outputlangs->charset_output = $sav_charset_output;
 				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				    return -1;
 			    }
-		    }
-		    else
-		    {
+		    } else {
 			    $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			    dol_print_error('', $this->error);
 			    return -1;
 		    }
-		}
-		else return $reshook;
+		} else return $reshook;
 	}
 
 	/**
@@ -5073,9 +4873,7 @@ abstract class CommonObject
 			if (!empty($this->errors))
 			{
 				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else
-			{
+			} else {
 				$this->errors = $interface->errors;
 			}
 		}
@@ -5136,9 +4934,7 @@ abstract class CommonObject
 					if (preg_match('/date/', $type))
 					{
 						$this->array_languages[$key][$codelang] = $this->db->jdate($value);
-					}
-					else
-					{
+					} else {
 						$this->array_languages[$key][$codelang] = $value;
 					}
 
@@ -5150,9 +4946,7 @@ abstract class CommonObject
 
 			if ($numrows) return $numrows;
 			else return 0;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -5201,14 +4995,12 @@ abstract class CommonObject
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			}
-			elseif (in_array($key_type, array('datetime')))
+			} elseif (in_array($key_type, array('datetime')))
 			{
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			}
-			elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+			} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 			{
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
@@ -5216,14 +5008,11 @@ abstract class CommonObject
 				} else {
 					$value_key = '';
 				}
-			}
-			elseif (in_array($key_type, array('price', 'double')))
+			} elseif (in_array($key_type, array('price', 'double')))
 			{
 				$value_arr = GETPOST($postfieldkey, 'alpha');
 				$value_key = price2num($value_arr);
-			}
-			else
-			{
+			} else {
 				$value_key = GETPOST($postfieldkey);
 				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 			}
@@ -5303,9 +5092,7 @@ abstract class CommonObject
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
-		}
-		else
-		{
+		} else {
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
@@ -5346,9 +5133,7 @@ abstract class CommonObject
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key] = $this->db->jdate($value);
-							}
-							else
-							{
+							} else {
 								$this->array_options["options_".$key] = $value;
 							}
 
@@ -5372,9 +5157,7 @@ abstract class CommonObject
 
 				if ($numrows) return $numrows;
 				else return 0;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -5407,9 +5190,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -5484,9 +5265,7 @@ abstract class CommonObject
 						$value = dol_eval($attrfieldcomputed, 1, 0);
 					    dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 					    $new_array_options[$key] = $value;
-					}
-					else
-					{
+					} else {
 						$new_array_options[$key] = null;
 					}
 				}
@@ -5498,8 +5277,7 @@ abstract class CommonObject
 			   			{
 			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
-			  			}
-			   			elseif ($value == '')
+			  			} elseif ($value == '')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
@@ -5511,8 +5289,7 @@ abstract class CommonObject
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5543,21 +5320,16 @@ abstract class CommonObject
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
 				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
-				   					}
-									else
-									{
+				   					} else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					}
-			   					else
-			   					{
+			   					} else {
 			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
-			   			}
-			   			else	// Common usage
+			   			} else // Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5584,24 +5356,20 @@ abstract class CommonObject
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key] = '';
-							}
-							elseif ($value)
+							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
 								if (is_numeric($value)) $res = $object->fetch($value);
 								else $res = $object->fetch('', $value);
 
 								if ($res > 0) $new_array_options[$key] = $object->id;
-								else
-								{
+								else {
 									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
 							}
-						}
-						else
-						{
+						} else {
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
 						break;
@@ -5648,9 +5416,7 @@ abstract class CommonObject
 					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
 					{
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else
-					{
+					} else {
 						$sql .= ",null";
 					}
 				}
@@ -5691,14 +5457,11 @@ abstract class CommonObject
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
-			{
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5741,8 +5504,7 @@ abstract class CommonObject
 						{
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_languages[$key] = null;
 						}
@@ -5754,8 +5516,7 @@ abstract class CommonObject
 							dol_syslog($langs->trans("ExtraLanguageHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_languages[$key] = null;
 						}
@@ -5814,14 +5575,11 @@ abstract class CommonObject
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
-			{
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5869,8 +5627,7 @@ abstract class CommonObject
 					{
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value === '')
+					} elseif ($value === '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5882,8 +5639,7 @@ abstract class CommonObject
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value === '')
+					} elseif ($value === '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5944,14 +5700,11 @@ abstract class CommonObject
 				dol_syslog(__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
-			}
-			else
-			{
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -6064,39 +5817,30 @@ abstract class CommonObject
 		if (empty($morecss) && !empty($val['css']))
 		{
 		    $morecss = $val['css'];
-		}
-		elseif (empty($morecss))
+		} elseif (empty($morecss))
 		{
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
+			} elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else
-			{
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
-				{
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6114,56 +5858,44 @@ abstract class CommonObject
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('duration')))
+		} elseif (in_array($type, array('duration')))
 		{
 			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
+		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif (in_array($type, array('real')))
+		} elseif (in_array($type, array('real')))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
@@ -6172,22 +5904,19 @@ abstract class CommonObject
 				$checked = ' value="1" ';
 			}
 			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -6208,8 +5937,7 @@ abstract class CommonObject
 				$out .= '>'.$val.'</option>';
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -6276,14 +6004,10 @@ abstract class CommonObject
 					{
 						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-					}
-					else
-					{
+					} else {
 						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
-				{
+				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
@@ -6318,9 +6042,7 @@ abstract class CommonObject
 							{
 								$labeltoshow .= $obj->$field_toshow.' ';
 							}
-						}
-						else
-						{
+						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
@@ -6337,16 +6059,13 @@ abstract class CommonObject
 								}
 							}
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if (!$notrans)
 							{
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
-								}
-								else {
+								} else {
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
@@ -6370,19 +6089,16 @@ abstract class CommonObject
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
@@ -6393,13 +6109,11 @@ abstract class CommonObject
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -6537,8 +6251,7 @@ abstract class CommonObject
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
@@ -6561,13 +6274,11 @@ abstract class CommonObject
 		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -6646,8 +6357,7 @@ abstract class CommonObject
 		{
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
-		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
+		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
 		if (is_array($val['arrayofkeyval'])) $type = 'select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
@@ -6663,8 +6373,7 @@ abstract class CommonObject
 		{
 			$type = 'link';
 			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
-		}
-        elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
             $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
             $type = 'sellist';
         }
@@ -6689,35 +6398,26 @@ abstract class CommonObject
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'timestamp')
+			} elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'double', 'price')))
+			} elseif (in_array($type, array('int', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else
-			{
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
-				{
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6733,59 +6433,49 @@ abstract class CommonObject
 			} else {
 				$value = '';
 			}
-		}
-		elseif ($type == 'datetime' || $type == 'timestamp')
+		} elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'dayhour');
 			} else {
 				$value = '';
 			}
-		}
-		elseif ($type == 'duration')
+		} elseif ($type == 'duration')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			if (!is_null($value) && $value !== '') {
 				$value = convertSecondToTime($value, 'allhourmin');
 			}
-		}
-		elseif ($type == 'double' || $type == 'real')
+		} elseif ($type == 'double' || $type == 'real')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -6846,9 +6536,7 @@ abstract class CommonObject
 							$value .= $obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -6859,14 +6547,11 @@ abstract class CommonObject
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$value = '';
@@ -6878,8 +6563,7 @@ abstract class CommonObject
 				}
 				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -6946,8 +6630,7 @@ abstract class CommonObject
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out = '';
 
@@ -6969,24 +6652,18 @@ abstract class CommonObject
 						$object->fetch($value);
 						$value = $object->getNomUrl($getnomurlparam);
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
-			}
-			else $value = '';
-		}
-		elseif ($type == 'text' || $type == 'html')
+			} else $value = '';
+		} elseif ($type == 'text' || $type == 'html')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value = preg_replace('/./i', '*', $value);
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$value = implode('<br>', $value);
 		}
@@ -7064,13 +6741,11 @@ abstract class CommonObject
 				if (is_array($params) && count($params) > 0) {
 					if (array_key_exists('cols', $params)) {
 						$colspan = $params['cols'];
-					}
-					elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
+					} elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
 						$reg = array();
 						if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {
 							$colspan = $reg[1];
-						}
-						else {
+						} else {
 							$colspan = $params['colspan'];
 						}
 					}
@@ -7116,9 +6791,7 @@ abstract class CommonObject
                     }
 
 					$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
-				}
-				else
-				{
+				} else {
 					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 					$csstyle = '';
 					if (is_array($params) && count($params) > 0) {
@@ -7315,9 +6988,7 @@ abstract class CommonObject
 		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
-		}
-		else
-		{
+		} else {
 			// Get cost price for margin calculation
 			if (!empty($fk_product))
 			{
@@ -7334,13 +7005,11 @@ abstract class CommonObject
 					if ($product->cost_price > 0)
 					{
 						$buyPrice = $product->cost_price;
-					}
-					elseif ($product->pmp > 0)
+					} elseif ($product->pmp > 0)
 					{
 						$buyPrice = $product->pmp;
 					}
-				}
-				elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				} elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
@@ -7363,8 +7032,7 @@ abstract class CommonObject
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->errors[] = $productFournisseur->error;
 						return -2;
@@ -7477,8 +7145,7 @@ abstract class CommonObject
 
 							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
 							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
-						}
-						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						} elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
 						$return .= "\n";
 
@@ -7504,26 +7171,20 @@ abstract class CommonObject
 								{
 									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
+								} else {
 									$return .= '<!-- Show original file -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
-							}
-							else
-							{
+							} else {
 								$return .= '<!-- Show nophoto file (because file is not shared) -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
-						}
-						else
-						{
+						} else {
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return .= '<!-- Show thumb -->';
 								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
+							} else {
 								$return .= '<!-- Show original file -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
@@ -7558,8 +7219,7 @@ abstract class CommonObject
 						{
 							$return .= '</td>';
 							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-						}
-						elseif ($nbbyrow < 0) $return .= '</div>';
+						} elseif ($nbbyrow < 0) $return .= '</div>';
 					}
 
 					if (empty($size)) {     // Format origine
@@ -7648,8 +7308,7 @@ abstract class CommonObject
 		{
 			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
 			else return false;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -7664,8 +7323,7 @@ abstract class CommonObject
 		{
 			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -7769,13 +7427,10 @@ abstract class CommonObject
 				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
-				}
-				else
-				{
+				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			}
-			elseif ($this->isArray($info))
+			} elseif ($this->isArray($info))
 			{
 				if (!empty($this->{$field})) {
 					if (!is_array($this->{$field})) {
@@ -7785,28 +7440,22 @@ abstract class CommonObject
 				} else {
 					$queryarray[$field] = null;
 				}
-			}
-			elseif ($this->isDuration($info))
+			} elseif ($this->isDuration($info))
 			{
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
 				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
 				else $queryarray[$field] = null;
-			}
-			elseif ($this->isInt($info) || $this->isFloat($info))
+			} elseif ($this->isInt($info) || $this->isFloat($info))
 			{
 				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-				else
-				{
+				else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ($this->{$field} != '' || !empty($info['notnull'])) {
 						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
 						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-					}
-					else $queryarray[$field] = null;
+					} else $queryarray[$field] = null;
 				}
-			}
-			else
-			{
+			} else {
 				$queryarray[$field] = $this->{$field};
 			}
 
@@ -7831,8 +7480,7 @@ abstract class CommonObject
 			{
 				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif ($this->isArray($info))
+			} elseif ($this->isArray($info))
 			{
 				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
@@ -7841,19 +7489,15 @@ abstract class CommonObject
 				} else {
 					$this->{$field} = array();
 				}
-			}
-			elseif ($this->isInt($info))
+			} elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else
-				{
+				else {
 					if ($this->isForcedToNullIfZero($info))
 					{
 						if (empty($obj->{$field})) $this->{$field} = null;
 						else $this->{$field} = (double) $obj->{$field};
-					}
-					else
-					{
+					} else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
 						} else {
@@ -7861,25 +7505,20 @@ abstract class CommonObject
 						}
 					}
 				}
-			}
-			elseif ($this->isFloat($info))
+			} elseif ($this->isFloat($info))
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
 					if (empty($obj->{$field})) $this->{$field} = null;
 					else $this->{$field} = (double) $obj->{$field};
-				}
-				else
-				{
+				} else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
 					} else {
 						$this->{$field} = null;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->{$field} = $obj->{$field};
 			}
 		}
@@ -8092,14 +7731,10 @@ abstract class CommonObject
 			{
 				$this->setVarsFromFetchObj($obj);
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8147,9 +7782,7 @@ abstract class CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8276,8 +7909,7 @@ abstract class CommonObject
 					return -1;
 				}
 			}
-		}
-		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
 			if (!empty($objectisused))
@@ -8443,9 +8075,7 @@ abstract class CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index f04e2da11ee..f92004120ff 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -82,9 +82,7 @@ abstract class CommonObjectLine extends CommonObject
 			$label = $res[$label_type];
 			$this->db->free($resql);
 			return $label;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 50330f26b17..6c832c4788d 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -175,8 +175,7 @@ abstract class CommonStickerGenerator
 		$hauteur = abs($y1 - $y2);
 		if ($length > $hauteur) {
 			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
 		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index ad87949d4e9..7973bc5ff16 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -249,8 +249,7 @@ class Conf
 		{
 			try {
 				date_default_timezone_set($this->global->MAIN_SERVER_TZ);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);
 			}
@@ -332,9 +331,7 @@ class Conf
 
 							// For backward compatibility
 							$this->$module->$dirname = $rootfordata."/".$name;
-						}
-						else
-						{
+						} else {
 							// For multicompany sharings
 							$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");
 
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 999b01341f0..caaeb706c32 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -74,9 +74,7 @@ class CoreObject extends CommonObject
             $this->is_clone = false;
 
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -93,9 +91,7 @@ class CoreObject extends CommonObject
         if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
         {
             return $this->{'is_'.$type}($this->fields[$field]);
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -199,9 +195,7 @@ class CoreObject extends CommonObject
 
                         $this->{$className}[] = $o;
                     }
-                }
-                else
-                {
+                } else {
                     $this->errors[] = $this->db->lasterror();
                 }
             }
@@ -256,9 +250,7 @@ class CoreObject extends CommonObject
             $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -268,9 +260,7 @@ class CoreObject extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -297,9 +287,7 @@ class CoreObject extends CommonObject
             $result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -309,9 +297,7 @@ class CoreObject extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -356,9 +342,7 @@ class CoreObject extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
@@ -377,8 +361,7 @@ class CoreObject extends CommonObject
     public function getDate($field, $format = '')
     {
         if (empty($this->{$field})) return '';
-        else
-        {
+        else {
             return dol_print_date($this->{$field}, $format);
         }
     }
@@ -395,9 +378,7 @@ class CoreObject extends CommonObject
         if (empty($date))
         {
             $this->{$field} = 0;
-        }
-        else
-        {
+        } else {
             require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
             $this->{$field} = dol_stringtotime($date);
         }
@@ -419,16 +400,12 @@ class CoreObject extends CommonObject
             if ($this->checkFieldType($key, 'date'))
             {
                 $this->setDate($key, $value);
-            }
-            elseif ($this->checkFieldType($key, 'float'))
+            } elseif ($this->checkFieldType($key, 'float'))
             {
                 $this->{$key} = (double) price2num($value);
-            }
-            elseif ($this->checkFieldType($key, 'int')) {
+            } elseif ($this->checkFieldType($key, 'int')) {
                 $this->{$key} = (int) price2num($value);
-            }
-            else
-            {
+            } else {
             	$this->{$key} = dol_string_nohtmltag($value);
             }
         }
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 406615aada6..34ef707b674 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -132,9 +132,7 @@ class Cstate // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -176,9 +174,7 @@ class Cstate // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -264,9 +260,7 @@ class Cstate // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 2524445b294..07d3563088e 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -136,9 +136,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -185,9 +183,7 @@ class Ctypent // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -240,9 +236,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -280,9 +274,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 096ae47a7b8..ac7b07ea5a9 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -135,9 +135,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -195,9 +193,7 @@ class CUnits // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -236,14 +232,11 @@ class CUnits // extends CommonObject
     		foreach ($filter as $key => $value) {
     			if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
     				$sqlwhere[] = $key.'='.(int) $value;
-    			}
-    			elseif (strpos($key, 'date') !== false) {
+    			} elseif (strpos($key, 'date') !== false) {
     				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
+    			} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
     				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
-    			}
-    			else {
+    			} else {
     				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -339,9 +332,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -379,9 +370,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -397,10 +386,9 @@ class CUnits // extends CommonObject
 	public function getUnitFromCode($code, $mode = 'code')
 	{
 
-		if($mode == 'short_label'){
+		if ($mode == 'short_label'){
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');
-		}
-		elseif($mode == 'code'){
+		} elseif ($mode == 'code'){
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');
 		}
 
@@ -424,10 +412,10 @@ class CUnits // extends CommonObject
 
 		// convert to standard unit
 		$value  = $value * $scaleUnitPow;
-		if($fk_new_unit !=0 ){
+		if ($fk_new_unit !=0 ){
 			// Calcul en unité de base
 			$scaleUnitPow = $this->scaleOfUnitPow($fk_new_unit);
-			if(!empty($scaleUnitPow))
+			if (!empty($scaleUnitPow))
 			{
 				// convert to new unit
 				$value  = $value / $scaleUnitPow;
@@ -436,11 +424,9 @@ class CUnits // extends CommonObject
 		return round($value, 2);
 	}
 
-
-
 	/**
 	 * get scale of unit factor
-	 * @param $id int id of unit in dictionary
+	 * @param int $id id of unit in dictionary
 	 * @return float|int
 	 */
 	public function scaleOfUnitPow($id)
@@ -448,9 +434,9 @@ class CUnits // extends CommonObject
 		$base = 10;
 		// TODO : add base col into unit dictionary table
 		$unit = $this->db->getRow('SELECT scale, unit_type from '.MAIN_DB_PREFIX.'c_units WHERE rowid = '.intval($id));
-		if($unit){
+		if ($unit) {
 			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
-			if($unit->unit_type == 'time'){
+			if ($unit->unit_type == 'time') {
 				return doubleval($unit->scale);
 			}
 
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 724b2a778d8..4cddc65d636 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -187,15 +187,11 @@ class DiscountAbsolute
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -264,9 +260,7 @@ class DiscountAbsolute
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
@@ -303,9 +297,7 @@ class DiscountAbsolute
                     $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
                 return -1;
             }
@@ -331,9 +323,7 @@ class DiscountAbsolute
         			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
-        	}
-        	else
-        	{
+        	} else {
         		dol_print_error($this->db);
         		return -1;
         	}
@@ -368,15 +358,12 @@ class DiscountAbsolute
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            elseif ($this->fk_invoice_supplier_source) {
+            } elseif ($this->fk_invoice_supplier_source) {
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
             	$sql .= " set paye=0, fk_statut=1";
             	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
@@ -387,22 +374,16 @@ class DiscountAbsolute
             	{
             		$this->db->commit();
             		return 1;
-            	}
-            	else
-            	{
+            	} else {
             		$this->error = $this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
-            }
-            else
-            {
+            } else {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -458,9 +439,7 @@ class DiscountAbsolute
         		$this->fk_facture = $rowidinvoice;
         	}
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -490,9 +469,7 @@ class DiscountAbsolute
         if ($resql)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -568,16 +545,13 @@ class DiscountAbsolute
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql .= ' AND f.type = 3';
-        }
-        elseif ($invoice->element == 'invoice_supplier')
+        } elseif ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql .= ' AND f.type = 3';
-        }
-        else
-        {
+        } else {
             $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -589,9 +563,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -614,16 +586,13 @@ class DiscountAbsolute
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
-        }
-        elseif ($invoice->element == 'invoice_supplier')
+        } elseif ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.')'; // Find discount coming from credit note or excess paid
-        }
-        else
-        {
+        } else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -635,9 +604,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -658,15 +625,12 @@ class DiscountAbsolute
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
             $sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
-        }
-        elseif ($invoice->element == 'invoice_supplier')
+        } elseif ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
             $sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
-        }
-        else
-        {
+        } else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -678,9 +642,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 24e0a6de275..2b148a96e8a 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -55,16 +55,14 @@ class DolGeoIP
 		    {
 		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 		    }
-		}
-		elseif ($type == 'city')
+		} elseif ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
 			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
 		    {
 		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 		    }
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
@@ -85,20 +83,16 @@ class DolGeoIP
 		{
 			try {
 				$this->gi = new GeoIp2\Database\Reader($datfile); // '/usr/local/share/GeoIP/GeoIP2-City.mmdb'
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->error = $e->getMessage();
 				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 				return 0;
 			}
-		}
-		elseif (function_exists('geoip_open'))
+		} elseif (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
-		}
-		else
-		{
+		} else {
 		    $this->gi = 'NOGI'; // We are using embedded php geoip functions
 		    //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
 		    //print geoip_database_info();
@@ -126,9 +120,7 @@ class DolGeoIP
 		{
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else
-		{
+		} else {
 			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
 			{
 				if ($geoipversion == '2')
@@ -136,33 +128,25 @@ class DolGeoIP
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						//return $e->getMessage();
 						return '';
 					}
-				}
-				else
-				{
+				} else {
 			    	if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
 			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 				}
-			}
-			else
-			{
+			} else {
 				if ($geoipversion == '2')
 				{
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						//return $e->getMessage();
 						return '';
 					}
-				}
-				else
-				{
+				} else {
 					if (!function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
 					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
 				}
@@ -193,14 +177,11 @@ class DolGeoIP
 			try {
 				$record = $this->gi->country($name);
 				return $record->country->isoCode;
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				//return $e->getMessage();
 				return '';
 			}
-		}
-		else
-		{
+		} else {
 			return geoip_country_code_by_name($this->gi, $name);
 		}
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 551fe2b82c0..4ca072897bb 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -472,14 +472,10 @@ class DolGraph
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
-			{
+			} else {
 				$this->bgcolor = $theme_bgcolor;
 			}
-		}
-		else
-		{
+		} else {
 			$this->bgcolor = $bg_color;
 		}
 	}
@@ -502,14 +498,10 @@ class DolGraph
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
-			{
+			} else {
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
-		}
-		else
-		{
+		} else {
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
 	}
@@ -725,9 +717,7 @@ class DolGraph
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
 				}
-			}
-			else
-			{
+			} else {
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
 				}
@@ -758,9 +748,7 @@ class DolGraph
 		if ($nblot < 0)
 		{
 			$this->stringtoshow .= '<!-- No series of data -->'."\n";
-		}
-		else
-		{
+		} else {
 			while ($i < $nblot)
 			{
 				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";
@@ -835,8 +823,7 @@ class DolGraph
 		}'."\n";
 		}
 		// Other cases, graph of type 'bars', 'lines'
-		else
-		{
+		else {
 			// Add code to support tooltips
 		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
 			$this->stringtoshow .= '
@@ -895,13 +882,12 @@ class DolGraph
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
 				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
-                    if($nblot == 3) {
-                        if($i == $firstlot) $align = 'right';
-                        elseif($i == $firstlot + 1) $align = 'center';
+                    if ($nblot == 3) {
+                        if ($i == $firstlot) $align = 'right';
+                        elseif ($i == $firstlot + 1) $align = 'center';
                         else $align = 'left';
                         $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.$align.'", barWidth: 0.45 }, ';
-                    }
-				    else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+                    } else $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
                 }
 				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
 				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
@@ -1058,9 +1044,7 @@ class DolGraph
 		if ($nblot < 0)
 		{
 			$this->stringtoshow .= '<!-- No series of data -->';
-		}
-		else
-		{
+		} else {
 			while ($i < $nblot)
 			{
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
@@ -1103,8 +1087,7 @@ class DolGraph
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					}
-					else $color = "#".$tmp; // If $val is '123' or '#123'
+					} else $color = "#".$tmp; // If $val is '123' or '#123'
 				}
 				$this->stringtoshow .= "'".$color."'";
 				$i++;
@@ -1170,8 +1153,7 @@ class DolGraph
 			$this->stringtoshow .= '});'."\n";
 		}
 		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
-		else
-		{
+		else {
 			$type = 'bar';
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 3bac7c8c2cc..25a0d2a25c5 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -350,28 +350,23 @@ class EmailSenderProfile extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -424,9 +419,7 @@ class EmailSenderProfile extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index b0fcc963eba..4b261a0f3c6 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -272,8 +272,7 @@ class EvalMath
 				while (($o2 = $stack->pop()) != '(') { // pop off the stack back to the last (
 					if (is_null($o2))
 						return $this->trigger(5, "unexpected ')'", ")");
-					else
-						$output[] = $o2;
+					else $output[] = $o2;
 				}
 				if (preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) { // did we just close a function?
 					$fnn = $matches[1]; // get the function name
@@ -295,8 +294,7 @@ class EvalMath
 				while (($o2 = $stack->pop()) != '(') {
 					if (is_null($o2))
 						return $this->trigger(5, "unexpected ','", ","); // oops, never had a (
-					else
-						$output[] = $o2; // pop the argument expression stuff and push onto the output
+					else $output[] = $o2; // pop the argument expression stuff and push onto the output
 				}
 				// make sure there was a function
 				if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 9c2e5b145dd..bffd23f05d2 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -173,9 +173,7 @@ class Events // extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -260,9 +258,7 @@ class Events // extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 6e0651568a1..c82e877fa80 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -253,11 +253,8 @@ class ExtraFields
 				$this->error = '';
 				$this->errno = 0;
 				return 1;
-			}
-			else return -2;
-		}
-		else
-		{
+			} else return -2;
+		} else {
 			return -1;
 		}
 	}
@@ -338,16 +335,12 @@ class ExtraFields
 					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -401,13 +394,10 @@ class ExtraFields
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
-			{
+			} else {
 				$params = '';
 			}
 
@@ -465,9 +455,7 @@ class ExtraFields
 			if ($this->db->query($sql))
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
@@ -527,9 +515,7 @@ class ExtraFields
 			}
 
 			return $result;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -562,15 +548,11 @@ class ExtraFields
 			if ($resql)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -659,29 +641,21 @@ class ExtraFields
 					if ($unique)
 					{
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
-					{
+					} else {
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -739,13 +713,10 @@ class ExtraFields
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
-			{
+			} else {
 				$params = '';
 			}
 
@@ -756,9 +727,7 @@ class ExtraFields
 				$sql_del .= " WHERE name = '".$attrname."'";
 				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
 				$sql_del .= " AND elementtype = '".$elementtype."'";
-			}
-			else
-			{
+			} else {
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
 				$sql_del .= " WHERE name = '".$attrname."'";
@@ -823,16 +792,12 @@ class ExtraFields
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -932,9 +897,7 @@ class ExtraFields
 				}
 			}
 			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
@@ -991,8 +954,7 @@ class ExtraFields
 			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else // Old usage
 		{
 			$label = $this->attribute_label[$key];
 			$type = $this->attribute_type[$key];
@@ -1020,39 +982,29 @@ class ExtraFields
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
+			} elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
+			} elseif (in_array($type, array('int', 'integer', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
+			} elseif ($type == 'password')
 			{
 				$morecss = 'maxwidth100';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else
-			{
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
-				{
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -1070,48 +1022,38 @@ class ExtraFields
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
+		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			if (empty($mode))
 			{
@@ -1122,27 +1064,22 @@ class ExtraFields
 					$checked = ' value="1" ';
 				}
 				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-			}
-			else
-			{
+			} else {
 				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
 			}
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1166,8 +1103,7 @@ class ExtraFields
 				$out .= '</option>';
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1326,13 +1262,11 @@ class ExtraFields
                 }
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
@@ -1343,13 +1277,11 @@ class ExtraFields
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -1547,14 +1479,12 @@ class ExtraFields
                     $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
                 }
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 			$showempty = (($required && $default != '') ? 0 : 1);
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
@@ -1602,8 +1532,7 @@ class ExtraFields
 			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else // Old usage
 		{
 			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
 			$label = $this->attribute_label[$key];
@@ -1630,17 +1559,14 @@ class ExtraFields
 		{
 			$showsize = 10;
 			$value = dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$showsize = 19;
 			$value = dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$showsize = 10;
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				//$value=price($value);
@@ -1648,38 +1574,31 @@ class ExtraFields
 				$number_decimals = $sizeparts[1];
 				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
 			else $value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1740,9 +1659,7 @@ class ExtraFields
 							$value .= $obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -1753,14 +1670,11 @@ class ExtraFields
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$value = '';
@@ -1772,8 +1686,7 @@ class ExtraFields
 				}
 			}
 			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -1840,8 +1753,7 @@ class ExtraFields
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out = '';
 
@@ -1862,28 +1774,21 @@ class ExtraFields
 						$object->fetch($value);
 						$value = $object->getNomUrl(3);
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
 			}
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
-		}
-		else
-		{
+		} else {
 			$showsize = round($size);
 			if ($showsize > 48) $showsize = 48;
 		}
@@ -1913,36 +1818,28 @@ class ExtraFields
         if ($type == 'date')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align = "right";
 		}
@@ -2065,14 +1962,12 @@ class ExtraFields
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('datetime')))
+				} elseif (in_array($key_type, array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
 					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
@@ -2080,14 +1975,11 @@ class ExtraFields
 					} else {
 						$value_key = '';
 					}
-				}
-				elseif (in_array($key_type, array('price', 'double')))
+				} elseif (in_array($key_type, array('price', 'double')))
 				{
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
-				}
-				else
-				{
+				} else {
 					$value_key = GETPOST("options_".$key);
 					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 				}
@@ -2099,12 +1991,10 @@ class ExtraFields
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
 				return -1;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2124,9 +2014,7 @@ class ExtraFields
 		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
-		{
+		} else {
 			$extralabels = $extrafieldsobjectkey;
 		}
 
@@ -2148,23 +2036,19 @@ class ExtraFields
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
 					// Clean parameters
 					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr = (array) $value_arr;
 					$value_key = implode(',', $value_arr);
-				}
-				elseif (in_array($key_type, array('price', 'double', 'int')))
+				} elseif (in_array($key_type, array('price', 'double', 'int')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
-				}
-				else
-				{
+				} else {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index 48f2e94936a..17851b09a6d 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -146,7 +146,6 @@ class ExtraLanguages
 			$keyprefix = $keyprefix.'options_';
 		}
 
-
 		return $out;
 	}
 
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index c9bb7372bd2..c941a3a0745 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -64,46 +64,36 @@ class FileUpload
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
+		} elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
+		} elseif ($element == 'project') {
 			$element = $pathname = 'projet';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
+		} elseif ($element == 'project_task') {
 			$pathname = 'projet'; $filename = 'task';
 			$dir_output = $conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
+		} elseif ($element == 'fichinter') {
 			$element = 'ficheinter';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
+		} elseif ($element == 'order_supplier') {
 			$pathname = 'fourn'; $filename = 'fournisseur.commande';
 			$dir_output = $conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
+		} elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename = 'fournisseur.facture';
 			$dir_output = $conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
+		} elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'productbatch') {
+		} elseif ($element == 'productbatch') {
 			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
+		} elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename = 'actioncomm';
 			$dir_output = $conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
+		} elseif ($element == 'chargesociales') {
 			$pathname = 'compta/sociales'; $filename = 'chargesociales';
 			$dir_output = $conf->tax->dir_output;
 		} else {
@@ -298,9 +288,7 @@ class FileUpload
 
 			if (preg_match('/error/i', $res)) return false;
 			return true;
-		}
-		else
-		{
+		} else {
 			return false;
 		}
 	}
@@ -451,9 +439,7 @@ class FileUpload
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
-			}
-			else
-			{
+			} else {
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
 			}
@@ -469,8 +455,7 @@ class FileUpload
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			}
-			elseif ($this->options['discard_aborted_uploads'])
+			} elseif ($this->options['discard_aborted_uploads'])
 			{
 				unlink($file_path);
 				$file->error = 'abort';
@@ -493,9 +478,7 @@ class FileUpload
 		if ($file_name)
 		{
 			$info = $this->getFileObject($file_name);
-		}
-		else
-		{
+		} else {
 			$info = $this->getFileObjects();
 		}
 		header('Content-type: application/json');
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 514782593d9..0686b68115a 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -157,16 +157,12 @@ class Fiscalyear extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -206,9 +202,7 @@ class Fiscalyear extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
@@ -242,9 +236,7 @@ class Fiscalyear extends CommonObject
 			$this->statut	    = $obj->statut;
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -268,9 +260,7 @@ class Fiscalyear extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -304,27 +294,22 @@ class Fiscalyear extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
@@ -369,9 +354,7 @@ class Fiscalyear extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -402,8 +385,7 @@ class Fiscalyear extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
@@ -434,8 +416,7 @@ class Fiscalyear extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index e24bce5e247..97c45e2f926 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -266,8 +266,7 @@ class HookManager
                     	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-                    else
-					{
+                    else {
                     	// TODO. this test should be done into the method of hook by returning nothing
                     	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3f7ab69089f..108fd211865 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -124,9 +124,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 				$ret .= '</div>'."\n";
-			}
-			else
-			{
+			} else {
 				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
@@ -135,9 +133,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 			}
-		}
-		else
-		{
+		} else {
 			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 			if ($help) {
@@ -190,9 +186,7 @@ class Form
 		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
-		}
-		else
-		{
+		} else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
 				$ret .= "\n";
@@ -206,14 +200,12 @@ class Form
 				{
 					$tmp = explode(':', $typeofdata);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^(numeric|amount)/', $typeofdata))
+				} elseif (preg_match('/^(numeric|amount)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
 				{
 					$tmp = explode(':', $typeofdata);
 					$cols = $tmp[2];
@@ -231,16 +223,13 @@ class Form
 					$valuetoshow = str_replace('&', '&amp;', $valuetoshow);
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
-				}
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif (preg_match('/^select;/', $typeofdata))
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -251,8 +240,7 @@ class Form
 						$arraylist[$tmpkey] = $tmp[1];
 					}
 					$ret .= $this->selectarray($htmlname, $arraylist, $value);
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -270,9 +258,7 @@ class Form
 
 				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
 				$ret .= '</form>'."\n";
-			}
-			else
-			{
+			} else {
 				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
@@ -289,8 +275,7 @@ class Form
 						$arraylist[$tmp[0]] = $tmp[1];
 					}
 					$ret .= $arraylist[$value];
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmpcontent = dol_htmlentitiesbr($value);
 					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -302,8 +287,7 @@ class Form
 					// We dont use dol_escape_htmltag to get the html formating active, but this need we must also
 					// clean data from some dangerous html
 					$ret .= dol_string_onlythesehtmltags(dol_htmlentitiesbr($tmpcontent));
-				}
-				else {
+				} else {
 					$ret .= dol_escape_htmltag($value);
 				}
 
@@ -441,8 +425,7 @@ class Form
 				if (!empty($tmp[1])) $inputOption = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
-			}
-			elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
+			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
@@ -450,22 +433,19 @@ class Form
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 
 				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
-			}
-			elseif (preg_match('/^(select|autocomplete)/', $inputType))
+			} elseif (preg_match('/^(select|autocomplete)/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $loadmethod = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				if (!empty($tmp[3])) $button_only = true;
-			}
-			elseif (preg_match('/^textarea/', $inputType))
+			} elseif (preg_match('/^textarea/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
 				$rows = (empty($tmp[1]) ? '8' : $tmp[1]);
 				$cols = (empty($tmp[2]) ? '80' : $tmp[2]);
-			}
-			elseif (preg_match('/^ckeditor/', $inputType))
+			} elseif (preg_match('/^ckeditor/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $toolbar = $tmp[1];
@@ -476,9 +456,7 @@ class Form
 				if (!empty($conf->fckeditor->enabled))
 				{
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
-				}
-				else
-				{
+				} else {
 					$inputType = 'textarea';
 				}
 			}
@@ -497,9 +475,7 @@ class Form
 						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
 						if (!empty($custommsg['error']))
 							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				}
-				else
-					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				} else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -507,9 +483,7 @@ class Form
 			}
 			$out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
 			$out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";
-		}
-		else
-		{
+		} else {
 			$out = $value;
 		}
 
@@ -557,9 +531,7 @@ class Form
 		if ($tooltiptrigger == '')
 		{
 			$htmltext = str_replace('"', '&quot;', $htmltext);
-		}
-		else
-		{
+		} else {
 			$classfortooltip = 'classfortooltiponclick';
 			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
 		}
@@ -568,15 +540,13 @@ class Form
 			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
 			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
 			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if ($tooltipon == 1 || $tooltipon == 3)
 		{
 			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
 			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
 			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';
 		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
 		// Define value if value is before
@@ -631,8 +601,7 @@ class Form
 		if (empty($conf->use_javascript_ajax))
 		{
 			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;
-			else
-			{
+			else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
@@ -858,9 +827,7 @@ class Form
 					{
 						$foundselected = true;
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
 					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
@@ -870,9 +837,7 @@ class Form
 				}
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -949,9 +914,7 @@ class Form
 					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
 					{
 						$out .= '<option value="'.$row['rowid'].'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
@@ -968,9 +931,7 @@ class Form
 			{
 				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1075,9 +1036,7 @@ class Form
 			asort($this->cache_types_fees);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1196,9 +1155,7 @@ class Form
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else
-		{
+		} else {
 			// Immediate load of all database
 			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
 		}
@@ -1328,9 +1285,7 @@ class Form
 							$label .= $obj->code_fournisseur.' - ';
 						}
 						$label .= ' '.$obj->name;
-					}
-					else
-					{
+					} else {
 						$label = $obj->name;
 					}
 
@@ -1359,14 +1314,10 @@ class Form
 						if (in_array($obj->rowid, $selected))
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else
-					{
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -1375,9 +1326,7 @@ class Form
 				}
 			}
 			$out .= '</select>'."\n";
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1457,9 +1406,7 @@ class Form
 			}
 			print '</select>';
 			return $qualifiedlines;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1589,9 +1536,7 @@ class Form
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
-							}
-							else
-							{
+							} else {
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
@@ -1600,9 +1545,7 @@ class Form
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
 							}
-						}
-						else
-						{
+						} else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
@@ -1613,9 +1556,7 @@ class Form
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';
 				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
 				$out .= '</option>';
@@ -1639,9 +1580,7 @@ class Form
 
 			$this->num = $num;
 			return $out;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1715,8 +1654,7 @@ class Form
 		{
 			// Build list includeUsers to have only hierarchy
 			$includeUsers = implode(",", $user->getAllChildIds(0));
-		}
-		elseif ($include == 'hierarchyme')
+		} elseif ($include == 'hierarchyme')
 		{
 			// Build list includeUsers to have only hierarchy and current user
 			$includeUsers = implode(",", $user->getAllChildIds(1));
@@ -1737,17 +1675,13 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
 			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE u.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
@@ -1764,9 +1698,7 @@ class Form
 		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
-		}
-		else
-		{
+		} else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
 
@@ -1805,9 +1737,7 @@ class Form
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= ' selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$obj->rowid.'"';
 						if ($disableline) $out .= ' disabled';
 						$out .= '>';
@@ -1847,9 +1777,7 @@ class Form
 						{
 							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
 							$moreinfo++;
-						}
-						else
-						{
+						} else {
 							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 							$moreinfo++;
 						}
@@ -1864,16 +1792,12 @@ class Form
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
 				$out .= '<option value="">'.$langs->trans("None").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1918,9 +1842,7 @@ class Form
 		if ($action == 'view')
 		{
 			$out .= '';
-		}
-		else
-		{
+		} else {
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
 			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
@@ -2010,8 +1932,7 @@ class Form
 		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
 				$filtertype = '0';
-			}
-			elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+			} elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$filtertype = '1';
 			}
 		}
@@ -2033,8 +1954,7 @@ class Form
 			{
 				if (empty($conf->product->enabled)) { // when product module is disabled, show services only
 					$filtertype = 1;
-				}
-				elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+				} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 					$filtertype = 0;
 				}
 			}
@@ -2130,9 +2050,7 @@ class Form
 			if ($hidelabel == 3) {
 				print img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else
-		{
+		} else {
 			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
 	}
@@ -2196,9 +2114,7 @@ class Form
 		if (count($warehouseStatusArray))
 		{
 		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
-		}
-		else
-		{
+		} else {
 		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
 		}
 
@@ -2288,13 +2204,11 @@ class Form
 		if ($finished == 0)
 		{
 			$sql .= " AND p.finished = ".$finished;
-		}
-		elseif ($finished == 1)
+		} elseif ($finished == 1)
 		{
 			$sql .= " AND p.finished = ".$finished;
 			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
-		}
-		elseif ($status >= 0)
+		} elseif ($status >= 0)
 		{
 			$sql .= " AND p.tosell = ".$status;
 		}
@@ -2302,8 +2216,7 @@ class Form
 		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
 		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
-		}
-		elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		// Add criteria on ref/label
@@ -2344,9 +2257,7 @@ class Form
 			$sql .= " ORDER BY categorie_product_id ";
 			//ASC OR DESC order
 			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
-		}
-		else
-		{
+		} else {
 			$sql .= $db->order("p.ref");
 		}
 
@@ -2380,9 +2291,7 @@ class Form
 			{
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
-			}
-			else
-			{
+			} else {
 			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
@@ -2433,9 +2342,7 @@ class Form
 							array_push($outarray, $optJson);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
 						$price_product = new Product($this->db);
 						$price_product->fetch($objp->rowid, '', '', 1);
@@ -2467,9 +2374,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -2619,9 +2524,7 @@ class Form
 					{
 						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-					}
-					else
-					{
+					} else {
 						$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 						$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 					}
@@ -2630,9 +2533,7 @@ class Form
 					$outpricebasetype = $objp2->price_base_type;
 					$outtva_tx = $objp2->tva_tx;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2649,9 +2550,7 @@ class Form
 				$outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
 				$opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 				$outval .= $langs->transnoentities("Unit");
-			}
-			else
-			{
+			} else {
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -2685,9 +2584,7 @@ class Form
 				{
 					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-				}
-				else
-				{
+				} else {
 					$opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 					$outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 				}
@@ -2706,9 +2603,7 @@ class Form
 			{
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-			}
-			else
-			{
+			} else {
 				$opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 				$outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 			}
@@ -2725,7 +2620,7 @@ class Form
 
     			if ($objp->stock > 0) {
     				$outval .= ' - <span class="product_line_stock_ok">';
-    			}elseif ($objp->stock <= 0) {
+    			} elseif ($objp->stock <= 0) {
     				$outval .= ' - <span class="product_line_stock_too_low">';
     			}
     			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
@@ -2744,7 +2639,7 @@ class Form
     			    $outval .= ' - '.$langs->transnoentities("VirtualStock").':';
     			    if ($virtualstock > 0) {
     			        $outval .= ' - <span class="product_line_stock_ok">';
-    			    }elseif ($virtualstock <= 0) {
+    			    } elseif ($virtualstock <= 0) {
     			        $outval .= ' - <span class="product_line_stock_too_low">';
     			    }
     			    $outval .= $virtualstock;
@@ -2796,9 +2691,7 @@ class Form
 			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
-		}
-		else
-		{
+		} else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss);
 		}
 	}
@@ -3007,9 +2900,7 @@ class Form
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";
 						$optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 						$outvallabel .= $langs->transnoentities("Unit");
-					}
-					else
-					{
+					} else {
 						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -3044,15 +2935,12 @@ class Form
 						$optlabel .= " - ".$reputations[$objp->supplier_reputation];
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
-					else                                            // No supplier price defined for product, even on other suppliers
+					} else // No supplier price defined for product, even on other suppliers
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
@@ -3100,9 +2988,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3147,9 +3033,7 @@ class Form
 			if (!$num)
 			{
 				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
-			}
-			else
-			{
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 				$form .= '<option value="0">&nbsp;</option>';
 
@@ -3192,9 +3076,7 @@ class Form
 					if ($objp->quantity == 1)
 					{
 						$opt .= $langs->trans("Unit");
-					}
-					else
-					{
+					} else {
 						$opt .= $langs->trans("Units");
 					}
 					if ($objp->quantity > 1)
@@ -3213,9 +3095,7 @@ class Form
 			$form .= '</select>';
 			$this->db->free($result);
 			return $form;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3256,9 +3136,7 @@ class Form
 					if ($selected && $selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
 					}
 					$i++;
@@ -3266,9 +3144,7 @@ class Form
 			}
 			print '</select>';
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3315,9 +3191,7 @@ class Form
 			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3364,9 +3238,7 @@ class Form
 			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3396,9 +3268,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayavailability['label'];
@@ -3449,9 +3319,7 @@ class Form
 
 			unset($tmparray);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3482,9 +3350,7 @@ class Form
 			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
 			{
 				print '<option value="'.$arraydemandreason['id'].'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$arraydemandreason['id'].'">';
 			}
 			$label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
@@ -3540,9 +3406,7 @@ class Form
 			$this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3582,9 +3446,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayconditions['label'];
@@ -3687,9 +3549,7 @@ class Form
 			if ($selected == $id)
 			{
 				$return .= '<option value="'.$id.'" selected>'.$value;
-			}
-			else
-			{
+			} else {
 				$return .= '<option value="'.$id.'">'.$value;
 			}
 			$return .= '</option>';
@@ -3830,9 +3690,7 @@ class Form
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 		}
 		if ($opt == '<option value ="" selected></option>')
@@ -3877,9 +3735,7 @@ class Form
 				if ($selected == $res->rowid)
 				{
 				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
-				}
-				else
-				{
+				} else {
 				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
 				}
 			}
@@ -3937,9 +3793,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
@@ -3949,14 +3803,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -4009,9 +3860,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
@@ -4020,14 +3869,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -4118,11 +3964,8 @@ class Form
 					$i++;
 				}
 				$this->db->free($result);
-			}
-			else dol_print_error($this->db);
-		}
-		else
-		{
+			} else dol_print_error($this->db);
+		} else {
 			$cat = new Categorie($this->db);
             $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
 		}
@@ -4132,17 +3975,14 @@ class Form
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
 					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
 					{
 						$add = 'selected ';
-					}
-					else
-					{
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';
@@ -4256,19 +4096,16 @@ class Form
 					if ($input['type'] == 'text')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'password')
+					} elseif ($input['type'] == 'password')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'select')
+					} elseif ($input['type'] == 'select')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd tdtop left">';
 						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
 						$more .= '</div></div>'."\n";
-					}
-					elseif ($input['type'] == 'checkbox')
+					} elseif ($input['type'] == 'checkbox')
 					{
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
@@ -4278,8 +4115,7 @@ class Form
 						if (isset($input['disabled'])) $more .= ' disabled';
 						$more .= ' /></div>';
 						$more .= '</div>'."\n";
-					}
-					elseif ($input['type'] == 'radio')
+					} elseif ($input['type'] == 'radio')
 					{
 						$i = 0;
 						foreach ($input['values'] as $selkey => $selval)
@@ -4294,8 +4130,7 @@ class Form
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
-					}
-					elseif ($input['type'] == 'date')
+					} elseif ($input['type'] == 'date')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
@@ -4306,16 +4141,13 @@ class Form
 						$formquestion[] = array('name'=>$input['name'].'year');
 						$formquestion[] = array('name'=>$input['name'].'hour');
 						$formquestion[] = array('name'=>$input['name'].'min');
-					}
-					elseif ($input['type'] == 'other')
+					} elseif ($input['type'] == 'other')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';
 						$more .= $input['value'];
 						$more .= '</div></div>'."\n";
-					}
-
-					elseif ($input['type'] == 'onecolumn')
+					} elseif ($input['type'] == 'onecolumn')
 					{
 						$moreonecolumn .= '<div class="margintoponly">';
 						$moreonecolumn .= $input['value'];
@@ -4440,9 +4272,7 @@ class Form
             });
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
-		}
-		else
-		{
+		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
@@ -4525,18 +4355,14 @@ class Form
 			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
 			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
 				$out .= $projet->getNomUrl(0, '', 1);
-			}
-			else
-			{
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -4571,9 +4397,7 @@ class Form
 			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_conditions_paiements();
@@ -4606,9 +4430,7 @@ class Form
 			$this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_availability();
@@ -4640,9 +4462,7 @@ class Form
 			$this->selectInputReason($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->loadCacheInputReason();
@@ -4691,9 +4511,7 @@ class Form
 			$ret .= '</td>';
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
 			else $ret .= dol_print_date($selected, 'day');
 		}
@@ -4727,9 +4545,7 @@ class Form
 			print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -4767,9 +4583,7 @@ class Form
 			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_types_paiements();
@@ -4801,9 +4615,7 @@ class Form
 			print $this->selectMultiCurrency($selected, $htmlname, 0);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_include_once('/core/lib/company.lib.php');
 			print !empty($selected) ? currency_name($selected, 1) : '&nbsp;';
 		}
@@ -4836,16 +4648,12 @@ class Form
 			print '</select> ';
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
 				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
-			}
-			else
-			{
+			} else {
 				print 1;
 			}
 		}
@@ -4883,9 +4691,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'HasCreditNoteFromSupplier';
-				}
-				else
-				{
+				} else {
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
 					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
@@ -4894,9 +4700,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'CompanyHasCreditNote';
-				}
-				else
-				{
+				} else {
 					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
 					else $translationKey = 'CompanyHasCreditNote';
 				}
@@ -4934,15 +4738,11 @@ class Form
 				print '</div>';
 			}
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				print $selected;
-			}
-			else
-			{
+			} else {
 				print "0";
 			}
 		}
@@ -4980,9 +4780,7 @@ class Form
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -5024,18 +4822,14 @@ class Form
 			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
 			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
 				$soc->fetch($selected);
 				$out .= $soc->getNomUrl($langs);
-			}
-			else
-			{
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -5083,18 +4877,14 @@ class Form
 			if ($selected && $selected == $code_iso)
 			{
 				$out .= '<option value="'.$code_iso.'" selected>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$code_iso.'">';
 			}
 			$out .= $currency['label'];
 			if ($mode == 1)
 			{
 			    $out .= ' ('.$code_iso.')';
-			}
-			else
-			{
+			} else {
                 $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
 			}
 			$out .= '</option>';
@@ -5218,15 +5008,11 @@ class Form
 				}
 
 				return $num;
-			}
-			else
-			{
+			} else {
 				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = '<font class="error">'.$this->db->error().'</font>';
 			return -2;
 		}
@@ -5281,9 +5067,7 @@ class Form
 			if ($societe_vendeuse->id == $mysoc->id)
 			{
 				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
-			}
-			else
-			{
+			} else {
 				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
 			}
 			return $return;
@@ -5298,9 +5082,7 @@ class Form
 		if (is_object($societe_vendeuse))
 		{
 			$code_country = "'".$societe_vendeuse->country_code."'";
-		}
-		else
-		{
+		} else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
@@ -5315,13 +5097,10 @@ class Form
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
-				}
-				elseif (!$idprod)  // We don't know type of product
+				} elseif (!$idprod)  // We don't know type of product
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
-				}
-				else
-				{
+				} else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
 					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
@@ -5395,8 +5174,7 @@ class Form
 							$return .= ' selected';
 							$selectedfound = true;
 						}
-					}
-					elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
 			   		{
 			   			$return .= ' selected';
 			   			$selectedfound = true;
@@ -5407,9 +5185,7 @@ class Form
 				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
 				{
 					$return .= $rate['labelpositiverates'];
-				}
-				else
-				{
+				} else {
 					$return .= vatrate($rate['label']);
 				}
 				//$return.=($rate['code']?' '.$rate['code']:'');
@@ -5419,9 +5195,7 @@ class Form
 			}
 
 			if (!$options_only) $return .= '</select>';
-		}
-		else
-		{
+		} else {
 			$return .= $this->error;
 		}
 
@@ -5522,8 +5296,7 @@ class Form
 			$sday	= (!empty($reg[3]) ? $reg[3] : '');
 			$shour	= (!empty($reg[4]) ? $reg[4] : '');
 			$smin	= (!empty($reg[5]) ? $reg[5] : '');
-		}
-		elseif (strval($set_time) != '' && $set_time != -1)
+		} elseif (strval($set_time) != '' && $set_time != -1)
 		{
 			// set_time est un timestamps (0 possible)
 			$syear = dol_print_date($set_time, "%Y");
@@ -5534,16 +5307,12 @@ class Form
 				$shour = dol_print_date($set_time, "%H");
 				$smin = dol_print_date($set_time, "%M");
 				$ssec = dol_print_date($set_time, "%S");
-			}
-			else
-			{
+			} else {
 				$shour = '';
 				$smin = '';
 				$ssec = '';
 			}
-		}
-		else
-		{
+		} else {
 			// Date est '' ou vaut -1
 			$syear = '';
 			$smonth = '';
@@ -5590,14 +5359,12 @@ class Form
 						$base = DOL_URL_ROOT.'/core/';
 						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
 						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					}
-					else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				elseif ($usecalendar == 'jquery')
+				} elseif ($usecalendar == 'jquery')
 				{
 					if (!$disabled)
 					{
@@ -5650,9 +5417,7 @@ class Form
                 		$retstring.='    });';
                 		$retstring.='});';
                 		$retstring.="</script>";*/
-					}
-					else
-					{
+					} else {
 						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 					}
 
@@ -5660,15 +5425,12 @@ class Form
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				else
-				{
+				} else {
 					$retstring .= "Bad value of MAIN_POPUP_CALENDAR";
 				}
 			}
 			// Show date with combo selects
-			else
-			{
+			else {
 				//$retstring.='<div class="inline-block">';
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
@@ -5704,9 +5466,7 @@ class Form
 				if ($emptydate || $set_time == -1)
 				{
 					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
-				}
-				else
-				{
+				} else {
 					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
 					for ($year = $syear - 10; $year < $syear + 10; $year++)
@@ -5781,8 +5541,7 @@ class Form
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
-            }
-            elseif ($addnowlink == 2)
+            } elseif ($addnowlink == 2)
             {
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
@@ -5808,8 +5567,7 @@ class Form
                 if ($addnowlink == 1)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
+                } elseif ($addnowlink == 2)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
                 }
@@ -5824,8 +5582,7 @@ class Form
                 if ($addnowlink == 1)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
+                } elseif ($addnowlink == 2)
                 {
                     $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
                 }
@@ -5930,12 +5687,10 @@ class Form
 				$retstring .= ">".$hour."</option>";
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text' || $typehour == 'textselect')
+		} elseif ($typehour == 'text' || $typehour == 'textselect')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
-		}
-		else return 'BadValueForParameterTypeHour';
+		} else return 'BadValueForParameterTypeHour';
 
 		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');
 		else $retstring .= '<span class="hideonsmartphone">:</span>';
@@ -5954,8 +5709,7 @@ class Form
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text')
+		} elseif ($typehour == 'text')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
@@ -6050,9 +5804,7 @@ class Form
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
 			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
-		{
+		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
 			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);
 		}
@@ -6080,9 +5832,7 @@ class Form
 		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 		{
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
-		}
-		else
-		{
+		} else {
 			$tmpescaped = $db->escape($tmpescaped);
 		}
 		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
@@ -6124,9 +5874,7 @@ class Form
 				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
-		}
-        else
-        {
+		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
         }
@@ -6135,9 +5883,7 @@ class Form
 		{
 			if (isset($objecttmp->fields['ref'])) {
 				$fieldstoshow = 't.ref';
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorNoFieldWithAttributeShowoncombobox");
 				return $langs->trans('ErrorNoFieldWithAttributeShowoncombobox');
@@ -6225,14 +5971,10 @@ class Form
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else
-					{
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -6242,9 +5984,7 @@ class Form
 			}
 
 			$out .= '</select>'."\n";
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -6350,9 +6090,7 @@ class Form
 				{
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
 					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
-				}
-				else
-				{
+				} else {
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
 					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
 					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
@@ -6480,9 +6218,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else
-		{
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6598,9 +6334,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else
-		{
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6647,9 +6381,7 @@ class Form
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6657,9 +6389,7 @@ class Form
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6674,8 +6404,7 @@ class Form
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
 						});'."\n";
-			}
-			elseif ($addjscombo == 2)
+			} elseif ($addjscombo == 2)
 			{
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
@@ -6930,41 +6659,31 @@ class Form
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'facturerec') {
+				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'propal') {
+				} elseif ($objecttype == 'propal') {
 					$tplpath = 'comm/'.$element;
 					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'supplier_proposal') {
+				} elseif ($objecttype == 'supplier_proposal') {
 					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
+				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-        		elseif ($objecttype == 'reception') {
+				} elseif ($objecttype == 'reception') {
         			$tplpath = 'reception';
         			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
-        		}
-				elseif ($objecttype == 'delivery') {
+        		} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'invoice_supplier') {
+				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
-				}
-				elseif ($objecttype == 'order_supplier') {
+				} elseif ($objecttype == 'order_supplier') {
 					$tplpath = 'fourn/commande';
-				}
-				elseif ($objecttype == 'expensereport') {
+				} elseif ($objecttype == 'expensereport') {
 					$tplpath = 'expensereport';
-				}
-				elseif ($objecttype == 'subscription') {
+				} elseif ($objecttype == 'subscription') {
 					$tplpath = 'adherents';
 				}
 
@@ -7072,8 +6791,7 @@ class Form
 			{
 				$possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);
 			}
-		}
-		elseif ($reshook > 0)
+		} elseif ($reshook > 0)
 		{
 			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
 			{
@@ -7160,9 +6878,7 @@ class Form
     		</div>
     		</dd>
     		</dl>';
-		}
-		else
-		{
+		} else {
 			$linktoelem = '';
 		}
 
@@ -7212,9 +6928,7 @@ class Form
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
-		}
-		else
-	    {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
 			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
@@ -7257,9 +6971,7 @@ class Form
 				if ($selected == $obj->rowid)
 				{
 					print '<option value="'.$obj->rowid.'" selected>';
-				}
-				else
-				{
+				} else {
 					print '<option value="'.$obj->rowid.'">';
 				}
 				print $obj->label;
@@ -7267,8 +6979,7 @@ class Form
 				$i++;
 			}
 			print "</select>";
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -7329,13 +7040,10 @@ class Form
 			if ($conf->browser->name == 'chrome')
 			{
 				$stringforfirstkey .= ' ALT +';
-			}
-			elseif ($conf->browser->name == 'firefox')
+			} elseif ($conf->browser->name == 'firefox')
 			{
 				$stringforfirstkey .= ' ALT + SHIFT +';
-			}
-			else
-			{
+			} else {
 				$stringforfirstkey .= ' CTL +';
 			}
 
@@ -7422,8 +7130,7 @@ class Form
 					$ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
 				}
 			}
-		}
-		elseif ($object->element == 'member')
+		} elseif ($object->element == 'member')
 		{
 			$ret .= $object->ref.'<br>';
 			$fullname = $object->getFullName($langs);
@@ -7432,24 +7139,19 @@ class Form
 			} else {
 				$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
 			}
-		}
-		elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
+		} elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
 		{
 			$ret .= dol_htmlentities($object->getFullName($langs));
-		}
-		elseif (in_array($object->element, array('action', 'agenda')))
+		} elseif (in_array($object->element, array('action', 'agenda')))
 		{
 			$ret .= $object->ref.'<br>'.$object->label;
-		}
-		elseif (in_array($object->element, array('adherent_type')))
+		} elseif (in_array($object->element, array('adherent_type')))
 		{
 			$ret .= $object->label;
-		}
-		elseif ($object->element == 'ecm_directories')
+		} elseif ($object->element == 'ecm_directories')
 		{
 			$ret .= '';
-		}
-		elseif ($fieldref != 'none')
+		} elseif ($fieldref != 'none')
 		{
 			$ret .= dol_htmlentities($object->$fieldref);
 		}
@@ -7536,8 +7238,7 @@ class Form
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
 			}
 			$email = $object->email;
-		}
-		elseif ($modulepart == 'contact')
+		} elseif ($modulepart == 'contact')
 		{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
@@ -7549,8 +7250,7 @@ class Form
 			}
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'userphoto')
+		} elseif ($modulepart == 'userphoto')
 		{
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
@@ -7563,8 +7263,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'memberphoto')
+		} elseif ($modulepart == 'memberphoto')
 		{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
@@ -7577,9 +7276,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		else
-		{
+		} else {
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
@@ -7607,8 +7304,7 @@ class Form
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			elseif ($altfile && file_exists($dir."/".$altfile))
+			} elseif ($altfile && file_exists($dir."/".$altfile))
 			{
 				if ($addlinktofullsize)
 				{
@@ -7618,16 +7314,13 @@ class Form
 				}
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			else
-			{
+			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
 				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
 				{
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
-					}
-					else {
+					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
 						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
 						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
@@ -7644,9 +7337,7 @@ class Form
 					//$defaultimg=urlencode(dol_buildpath($nophoto,3));
 					$defaultimg = 'mm';
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash
-				}
-				else
-				{
+				} else {
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
 				}
 			}
@@ -7659,8 +7350,7 @@ class Form
 				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
 				$ret .= '</table>';
 			}
-		}
-		else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		} else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
 
 		return $ret;
 	}
@@ -7708,9 +7398,7 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
 			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE ug.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";
 		}
 		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
@@ -7756,16 +7444,12 @@ class Form
 					$out .= '</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -7932,9 +7616,7 @@ class Form
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -7968,9 +7650,7 @@ class Form
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -8011,9 +7691,7 @@ class Form
 				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -8109,9 +7787,7 @@ class Form
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -8130,13 +7806,11 @@ class Form
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -8148,15 +7822,11 @@ class Form
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -8179,9 +7849,7 @@ class Form
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -8228,8 +7896,7 @@ class Form
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
 		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
-		        }
-		        else {
+		        } else {
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'">';
 		        }
 		    }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 19fa3f6fb26..2eca7ba78d4 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -82,9 +82,7 @@ class FormAccounting extends Form
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected = $selectid;
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE active = 1";
@@ -170,9 +168,7 @@ class FormAccounting extends Form
 			$sql .= " AND c.category_type = 0";
             if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
             $sql .= " ORDER BY c.label ASC";
-        }
-        else
-        {
+        } else {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql .= " WHERE c.active = 1";
@@ -204,14 +200,10 @@ class FormAccounting extends Form
                 }
                 $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
-            {
+            } else {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db, $db->lasterror());
         }
 
@@ -287,9 +279,7 @@ class FormAccounting extends Form
 		{
 		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
 		    $selected = $selectid;
-		}
-		else
-		{
+		} else {
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
     		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.labelshort, aa.rowid, aa.fk_pcg_version";
@@ -315,9 +305,7 @@ class FormAccounting extends Form
 				if (empty($obj->labelshort))
 				{
 					$labeltoshow = $obj->label;
-				}
-				else
-				{
+				} else {
 					$labeltoshow = $obj->labelshort;
 				}
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 398e2b8a235..9baec43790c 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -147,9 +147,7 @@ class FormActions
 	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
-        }
-        else
-		{
+        } else {
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
@@ -247,9 +245,7 @@ class FormActions
 	        			if (is_object($cacheusers[$actioncomm->userownerid]))
 	        			{
 	        				$tmpuser = $cacheusers[$actioncomm->userownerid];
-	        			}
-	        			else
-	        			{
+	        			} else {
 	        				$tmpuser = new User($this->db);
 	        				$tmpuser->fetch($actioncomm->userownerid);
 	        				$cacheusers[$actioncomm->userownerid] = $tmpuser;
@@ -269,8 +265,7 @@ class FormActions
 					{
 						if ($actioncomm->type_picto) {
 							$imgpicto = img_picto('', $actioncomm->type_picto);
-						}
-						else {
+						} else {
 							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
 							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
 							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
@@ -298,8 +293,7 @@ class FormActions
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
 		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
-		        		}
-		        		else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+		        		} else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td class="right">';
@@ -309,9 +303,7 @@ class FormActions
 
 	        		$cursorevent++;
 	        	}
-        	}
-        	else
-        	{
+        	} else {
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
 
@@ -372,9 +364,7 @@ class FormActions
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
-		{
+		} else {
 			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);
 		}
 
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 16e9a70ab56..b53d73bc757 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -114,9 +114,7 @@ class FormAdmin
 			if ($selected == $keytouse)
 			{
 				$out .= '<option value="'.$keytouse.'" selected>'.$valuetoshow.'</option>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$keytouse.'">'.$valuetoshow.'</option>';
 			}
 		}
@@ -184,9 +182,7 @@ class FormAdmin
     	                        if ($file == $selected)
     	                        {
     	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
-    	                        {
+    	                        } else {
     	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
     	                    }
@@ -385,9 +381,7 @@ class FormAdmin
 
                 $i++;
             }
-        }
-        else
-		{
+        } else {
 			dol_print_error($this->db);
 			return '';
 		}
@@ -405,9 +399,7 @@ class FormAdmin
             if ($selected == $key)
 			{
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$key.'">'.$value.'</option>';
 			}
 		}
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 8c27666dfc4..104daf6de0e 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -176,8 +176,7 @@ class FormBarCode
             }
             $out .= "</select>";
             $out .= ajax_combobox("select_".$htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $out;
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 6fb02454311..f4e551c6452 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -166,8 +166,7 @@ class FormCompany extends Form
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
@@ -241,8 +240,7 @@ class FormCompany extends Form
 					if ($obj->code == '0')		// Le code peut etre une chaine
 					{
 						$out .= '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if (!$country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
@@ -256,9 +254,7 @@ class FormCompany extends Form
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
@@ -267,16 +263,13 @@ class FormCompany extends Form
 						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
 							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-							}
-							else {
+							} else {
 								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
-						}
-						else {
+						} else {
 							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-							}
-							else {
+							} else {
 								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
@@ -288,9 +281,7 @@ class FormCompany extends Form
 			}
 			if (!empty($htmlname)) $out .= '</select>';
 			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -342,8 +333,7 @@ class FormCompany extends Form
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
@@ -356,9 +346,7 @@ class FormCompany extends Form
 						if ($selected > 0 && $selected == $obj->code)
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
-						{
+						} else {
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
@@ -366,9 +354,7 @@ class FormCompany extends Form
 				}
 			}
 			print '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -409,9 +395,7 @@ class FormCompany extends Form
 					if ($selected == $obj->code)
 					{
 						$out .= '<option value="'.$obj->code.'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -422,9 +406,7 @@ class FormCompany extends Form
 			}
 			$out .= '</select>';
 			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -525,9 +507,7 @@ class FormCompany extends Form
 					if ($selected > 0 && $selected == $val['code'])
 					{
 						$out .= '<option value="'.$val['code'].'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
@@ -543,9 +523,7 @@ class FormCompany extends Form
 	        $out .= ajax_combobox($htmlname);
 
 			$out .= '</div>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -652,9 +630,7 @@ class FormCompany extends Form
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
 			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
-		}
-		else
-		{
+		} else {
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
 			$sql .= " ".MAIN_DB_PREFIX."societe as s";
@@ -692,9 +668,7 @@ class FormCompany extends Form
 							if ($disabled) print ' disabled';
 							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
-						}
-						else
-						{
+						} else {
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
 							print '>'.dol_trunc($obj->name, 24).'</option>';
@@ -705,9 +679,7 @@ class FormCompany extends Form
 				print "</select>\n";
 				print ajax_combobox($htmlname);
 				return $firstCompany;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
@@ -849,8 +821,7 @@ class FormCompany extends Form
         			elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
         			elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
         		}
-        	}
-        	elseif ($country_code == 'ES')
+        	} elseif ($country_code == 'ES')
         	{
         		if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
         		if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
@@ -913,9 +884,7 @@ class FormCompany extends Form
     				if ($selected == $valors[$i])
     				{
     					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
-    				{
+    				} else {
     					print '<option value="'.$valors[$i].'">';
     				}
     				print $valors[$i];
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 2235ac6b335..6dce90d372b 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -103,18 +103,14 @@ class FormContract
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							$disabled = 0;
 							if ($obj->statut == 0)
 							{
@@ -130,9 +126,7 @@ class FormContract
 							if ($hideunselectables && $disabled)
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -157,9 +151,7 @@ class FormContract
 			}
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 26abcf2e721..c06611d74a8 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -101,9 +101,7 @@ class FormFile
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
 			return $this->_formAjaxFileUpload($object);
-		}
-		else
-	   	{
+		} else {
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				return 1;
@@ -196,9 +194,7 @@ class FormFile
 					$out .= ' ';
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 				}
-			}
-			else
-			{
+			} else {
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
 			}
 			$out .= "</td></tr>";
@@ -424,252 +420,196 @@ class FormFile
 			{
 				$showempty = 1;
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'propal')
+			} elseif ($modulepart == 'propal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'supplier_proposal')
+			} elseif ($modulepart == 'supplier_proposal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
 					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'commande')
+			} elseif ($modulepart == 'commande')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expedition')
+			} elseif ($modulepart == 'expedition')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
-			}
-            elseif ($modulepart == 'reception')
+			} elseif ($modulepart == 'reception')
             {
                 if (is_array($genallowed)) $modellist = $genallowed;
-                else
-                {
+                else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
-            }
-			elseif ($modulepart == 'livraison')
+            } elseif ($modulepart == 'livraison')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'ficheinter')
+			} elseif ($modulepart == 'ficheinter')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture')
+			} elseif ($modulepart == 'facture')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'contract')
+			} elseif ($modulepart == 'contract')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project_task')
+			} elseif ($modulepart == 'project_task')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product')
+			} elseif ($modulepart == 'product')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
 					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product_batch')
+			} elseif ($modulepart == 'product_batch')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
 					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'stock')
+			} elseif ($modulepart == 'stock')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'movement')
+			} elseif ($modulepart == 'movement')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
 					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'export')
+			} elseif ($modulepart == 'export')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					$modellist = ModeleExports::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'supplier_payment')
+			} elseif ($modulepart == 'supplier_payment')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'remisecheque')
+			} elseif ($modulepart == 'remisecheque')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'donation')
+			} elseif ($modulepart == 'donation')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 					$modellist = ModeleDon::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'member')
+			} elseif ($modulepart == 'member')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
+			} elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
 					$modellist = ModeleAction::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expensereport')
+			} elseif ($modulepart == 'expensereport')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'unpaid')
+			} elseif ($modulepart == 'unpaid')
 			{
 				$modellist = '';
-			}
-			elseif ($modulepart == 'user')
+			} elseif ($modulepart == 'user')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
 					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'usergroup')
+			} elseif ($modulepart == 'usergroup')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
 					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
-			}
-			else
-			{
+			} else {
 			    $submodulepart = $modulepart;
 
 			    // modulepart = 'nameofmodule' or 'nameofmodule:nameofsubmodule'
@@ -686,8 +626,7 @@ class FormFile
 					$res = include_once $file;
 				}
 				// For normalized external modules.
-				else
-				{
+				else {
 				    $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.$submodulepart.'.php', 0);
 					$res = include_once $file;
 				}
@@ -696,9 +635,7 @@ class FormFile
 				if (class_exists($class))
 				{
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
-				}
-				else
-				{
+				} else {
 					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
 					return -1;
 				}
@@ -742,9 +679,7 @@ class FormFile
 				{
 					$out .= ajax_combobox('model');
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
 
@@ -757,9 +692,7 @@ class FormFile
 				$morecss = 'maxwidth150';
 				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
 				$out .= $formadmin->select_language($defaultlang, 'lang_id', 0, null, 0, 0, 0, $morecss);
-			}
-			else
-			{
+			} else {
 				$out .= '&nbsp;';
 			}
 
@@ -895,9 +828,7 @@ class FormFile
 						{
 							$out .= $hookmanager->resPrint; // Complete line
 							$out .= '</tr>';
-						}
-						else
-						{
+						} else {
 							$out = $hookmanager->resPrint; // Replace all $out
 						}
 			  		}
@@ -983,9 +914,7 @@ class FormFile
 		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
-		}
-		else
-		{
+		} else {
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 		}
 		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
@@ -1052,9 +981,7 @@ class FormFile
     			</dl>';
 
 			if (!$found) $out = '';
-		}
-		else
-		{
+		} else {
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
 		}
@@ -1152,9 +1079,7 @@ class FormFile
 		if (isset($reshook) && $reshook != '') // null or '' for bypass
 		{
 			return $reshook;
-		}
-		else
-		{
+		} else {
 			if (!is_object($form))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
@@ -1274,9 +1199,7 @@ class FormFile
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
 						$editline = 1;
-					}
-					else
-					{
+					} else {
 						print dol_trunc($file['name'], 200);
 						print '</a>';
 					}
@@ -1309,9 +1232,7 @@ class FormFile
 						    if ($useinecm == 5 || $useinecm == 6)
 						    {
 						        $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image
-						    }
-						    else
-						    {
+						    } else {
 						        $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
 						    }
 						    if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
@@ -1326,8 +1247,7 @@ class FormFile
 							}
 							print '<img class="photo maxwidth200" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
-						}
-						else print '&nbsp;';
+						} else print '&nbsp;';
 						print '</td>';
 					}
 
@@ -1339,9 +1259,7 @@ class FormFile
 						{
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
-						}
-						else
-						{
+						} else {
 							if ($file['share'])
 							{
 								// Define $urlwithroot
@@ -1359,9 +1277,7 @@ class FormFile
 
 								print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
 								print '<input type="text" class="quatrevingtpercent minwidth200imp" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-							}
-							else
-							{
+							} else {
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
 						}
@@ -1419,15 +1335,12 @@ class FormFile
 									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
-							}
-							else {
+							} else {
 							   	print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
 							   	print '</td>';
 							}
 					    }
-					}
-					else
-					{
+					} else {
 						print '<td class="right">';
 						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
 						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1543,78 +1456,63 @@ class FormFile
 		{
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance = new Societe($this->db);
-		}
-		elseif ($modulepart == 'invoice')
+		} elseif ($modulepart == 'invoice')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$object_instance = new Facture($this->db);
-		}
-		elseif ($modulepart == 'invoice_supplier')
+		} elseif ($modulepart == 'invoice_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$object_instance = new FactureFournisseur($this->db);
-		}
-		elseif ($modulepart == 'propal')
+		} elseif ($modulepart == 'propal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$object_instance = new Propal($this->db);
-		}
-		elseif ($modulepart == 'supplier_proposal')
+		} elseif ($modulepart == 'supplier_proposal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 			$object_instance = new SupplierProposal($this->db);
-		}
-		elseif ($modulepart == 'order')
+		} elseif ($modulepart == 'order')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$object_instance = new Commande($this->db);
-		}
-		elseif ($modulepart == 'order_supplier')
+		} elseif ($modulepart == 'order_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 			$object_instance = new CommandeFournisseur($this->db);
-		}
-		elseif ($modulepart == 'contract')
+		} elseif ($modulepart == 'contract')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 			$object_instance = new Contrat($this->db);
-		}
-		elseif ($modulepart == 'product')
+		} elseif ($modulepart == 'product')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$object_instance = new Product($this->db);
-		}
-		elseif ($modulepart == 'tax')
+		} elseif ($modulepart == 'tax')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 			$object_instance = new ChargeSociales($this->db);
-		}
-		elseif ($modulepart == 'project')
+		} elseif ($modulepart == 'project')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance = new Project($this->db);
-		}
-		elseif ($modulepart == 'fichinter')
+		} elseif ($modulepart == 'fichinter')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 			$object_instance = new Fichinter($this->db);
-		}
-		elseif ($modulepart == 'user')
+		} elseif ($modulepart == 'user')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			$object_instance = new User($this->db);
-		}
-		elseif ($modulepart == 'expensereport')
+		} elseif ($modulepart == 'expensereport')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance = new ExpenseReport($this->db);
-		}
-		elseif ($modulepart == 'holiday')
+		} elseif ($modulepart == 'holiday')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 			$object_instance = new Holiday($this->db);
-		}
-		elseif ($modulepart == 'banque')
+		} elseif ($modulepart == 'banque')
 		{
 		    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		    $object_instance = new Account($this->db);
@@ -1634,15 +1532,11 @@ class FormFile
 				$id = 0; $ref = ''; $label = '';
 
 				// To show ref or specific information according to view to show (defined by $module)
-				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-				elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
-				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-                elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport', 'banque')))
+				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); } elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
+				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); } elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport', 'banque')))
 				{
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');
-				}
-				else
-				{
+				} else {
 				    //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
 				}
 
@@ -1651,9 +1545,7 @@ class FormFile
 				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
 				{
 					$found = 1;
-				}
-				else
-				{
+				} else {
 					//print 'Fetch '.$id." - ".$ref.'<br>';
 
 					if ($id) {
@@ -1874,9 +1766,7 @@ class FormFile
 				print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
 				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
 				print '</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>';
 				print img_picto('', 'globe').' ';
 				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
@@ -1937,8 +1827,7 @@ class FormFile
 				{
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
 					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
-				}
-				else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				} else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				$out .= '</a>';
 			}
 		}
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 32a3488b939..37073e8d3a5 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -96,16 +96,12 @@ class FormIntervention
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							$disabled = 0;
 							if (!$obj->fk_statut > 0)
 							{
@@ -121,9 +117,7 @@ class FormIntervention
 							if ($hideunselectables && $disabled)
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								$resultat .= '>'.$labeltoshow;
@@ -138,9 +132,7 @@ class FormIntervention
 			$out .= '</select>';
 			$db->free($resql);
 			return $out;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return '';
 		}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d961cd20536..4a6d7ee01ea 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -343,9 +343,7 @@ class FormMail extends Form
 		if (!empty($reshook))
 		{
 			return $hookmanager->resPrint;
-		}
-		else
-		{
+		} else {
 			$out = '';
 
 			$disablebademails = 1;
@@ -434,9 +432,7 @@ class FormMail extends Form
 					if (preg_match('/\((.*)\)/', $line->label, $reg))
 					{
 						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
-					}
-					else
-					{
+					} else {
 						$modelmail_array[$line->id] = $line->label;
 					}
 					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
@@ -519,9 +515,7 @@ class FormMail extends Form
 						if ($this->frommail)
 						{
 							$out .= ' &lt;'.$this->frommail.'&gt;';
-						}
-						else
-						{
+						} else {
 							if ($this->fromtype)
 							{
 								$langs->load('errors');
@@ -536,9 +530,7 @@ class FormMail extends Form
 						{
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						}
-						else
-						{
+						} else {
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
 						}
 
@@ -579,8 +571,7 @@ class FormMail extends Form
 								}
 								$i++;
 							}
-						}
-						else dol_print_error($this->db);
+						} else dol_print_error($this->db);
 
 						foreach ($listaliases as $typealias => $listalias)
 						{
@@ -615,9 +606,7 @@ class FormMail extends Form
 					}
 
 					$out .= "</td></tr>\n";
-				}
-				else
-				{
+				} else {
 					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
 					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
 					$out .= '&nbsp; &nbsp; ';
@@ -644,15 +633,12 @@ class FormMail extends Form
 							$soc = new Societe($this->db);
 							$soc->fetch($this->toid);
 							$out .= $soc->getNomUrl(1);
-						}
-						elseif ($this->totype == 'contact')
+						} elseif ($this->totype == 'contact')
 						{
 							$contact = new Contact($this->db);
 							$contact->fetch($this->toid);
 							$out .= $contact->getNomUrl(1);
-						}
-						else
-						{
+						} else {
 							$out .= $this->toname;
 						}
 						$out .= ' &lt;'.$this->tomail.'&gt;';
@@ -660,15 +646,11 @@ class FormMail extends Form
 						{
 							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';
 						}
-					}
-					else
-					{
+					} else {
 						// Note withto may be a text like 'AllRecipientSelected'
 						$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 					}
-				}
-				else
-				{
+				} else {
 					// The free input of email
 					if (!empty($this->withtofree))
 					{
@@ -741,9 +723,7 @@ class FormMail extends Form
 				if ($this->withtoccreadonly)
 				{
 					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
-				}
-				else
-				{
+				} else {
 				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
@@ -873,8 +853,7 @@ class FormMail extends Form
 							}
 							$out .= '<br></div>';
 						}
-					}
-					elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
+					} elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
 					{
 						$out .= $langs->trans("NoAttachedFiles").'<br>';
 					}
@@ -885,9 +864,7 @@ class FormMail extends Form
 						$out .= ' ';
 						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
-				}
-				else
-				{
+				} else {
 					$out .= $this->withfile;
 				}
 
@@ -912,9 +889,7 @@ class FormMail extends Form
 				if (empty($this->substit['__REF__']))
 				{
 					$paymenturl = '';
-				}
-				else
-				{
+				} else {
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal', 'other'));
@@ -933,9 +908,7 @@ class FormMail extends Form
 					$langs->load('other');
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
-				}
-				else
-				{
+				} else {
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
 					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
 				}
@@ -962,8 +935,7 @@ class FormMail extends Form
 				}
 
 				if (isset($_POST["message"]) && !$_POST['modelselected']) $defaultmessage = $_POST["message"];
-				else
-				{
+				else {
 					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
 					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
@@ -978,9 +950,7 @@ class FormMail extends Form
 				{
 					$out .= nl2br($defaultmessage);
 					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-				}
-				else
-				{
+				} else {
 					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
 
 					// Editor wysiwyg
@@ -1223,26 +1193,39 @@ class FormMail extends Form
 				$ret->content = $obj->content;
 				$ret->content_lines = $obj->content_lines;
 				$ret->joinfiles = $obj->joinfiles;
-			}
-			elseif ($id == -2) {
+			} elseif ($id == -2) {
 				// Not found with the provided label
 				return -1;
-			}
-			else {	// If there is no template at all
+			} else {	// If there is no template at all
 				$defaultmessage = '';
-				if ($type_template == 'body') { $defaultmessage = $this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template)); }
+				if ($type_template == 'body') {
+					// Special case to use this->withbody as content
+					$defaultmessage = $this->withbody;
+				} elseif ($type_template == 'facture_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice");
+				} elseif ($type_template == 'facture_relance') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder");
+				} elseif ($type_template == 'propal_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal");
+				} elseif ($type_template == 'supplier_proposal_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal");
+				} elseif ($type_template == 'order_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder");
+				} elseif ($type_template == 'order_supplier_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder");
+				} elseif ($type_template == 'invoice_supplier_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice");
+				} elseif ($type_template == 'shipping_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping");
+				} elseif ($type_template == 'fichinter_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter");
+				} elseif ($type_template == 'thirdparty') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
+				} elseif ($type_template == 'user') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
+				} elseif (!empty($type_template)) {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContent".ucfirst($type_template));
+				}
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
@@ -1254,9 +1237,7 @@ class FormMail extends Form
 
 			$db->free($resql);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
@@ -1290,9 +1271,7 @@ class FormMail extends Form
 			$num = $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1344,9 +1323,7 @@ class FormMail extends Form
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1476,9 +1453,7 @@ class FormMail extends Form
 					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 				}
-			}
-			else
-			{
+			} else {
 				/* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
 				$vars['__SECUREKEYPAYMENT_MEMBER__']='';
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 83923ffa6c7..5e18bb20782 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -118,8 +118,7 @@ class FormMargin
 					//}
 					//else
 						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] += $pa;
@@ -129,13 +128,11 @@ class FormMargin
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
 						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
 				}
-			}
-			else {
+			} else {
 				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
@@ -151,8 +148,7 @@ class FormMargin
 					//{
 					    $marginInfos['margin_on_products'] += $pv - $pa;
 					//}
-				}
-				elseif ($type == 1) {  // service
+				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] += $pa;
@@ -228,8 +224,7 @@ class FormMargin
 		print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';
 		if ($conf->global->MARGIN_TYPE == "1")
 			print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
+		else print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
 		print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';
 		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 726ea5feb78..f69ef6703e0 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -96,8 +96,7 @@ class FormOther
                 $label = $obj->label;
                 if ($obj->fk_user == 0) {
                 	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                }
-                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
                 	$tmpuser = new User($this->db);
                 	$tmpuser->fetch($obj->fk_user);
                 	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
@@ -106,9 +105,7 @@ class FormOther
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                }
-                else
-                {
+                } else {
                     print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
                 }
                 print $label;
@@ -117,8 +114,7 @@ class FormOther
             }
             print "</select>";
             print ajax_combobox($htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -163,8 +159,7 @@ class FormOther
                 $label = $obj->label;
                 if ($obj->fk_user == 0) {
                 	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                }
-                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
                 	$tmpuser = new User($this->db);
                 	$tmpuser->fetch($obj->fk_user);
                 	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
@@ -173,9 +168,7 @@ class FormOther
                 if ($selected == $obj->rowid)
                 {
                     print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                }
-                else
-                {
+                } else {
                     print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
                 }
                 print $label;
@@ -184,8 +177,7 @@ class FormOther
             }
             print "</select>";
             print ajax_combobox($htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -226,9 +218,7 @@ class FormOther
                     if ($selected && $selected == $obj->rowid)
                     {
                         print '<option value="'.$obj->rowid.'" selected>';
-                    }
-                    else
-                    {
+                    } else {
                         print '<option value="'.$obj->rowid.'">';
                         //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
                     }
@@ -240,9 +230,7 @@ class FormOther
             }
             print '</select>';
             return 0;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return 1;
         }
@@ -286,9 +274,7 @@ class FormOther
     				if (($selected && $selected == $obj->taux) || $num == 1)
     				{
     					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				}
-    				else
-    				{
+    				} else {
     					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
     					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
     				}
@@ -299,9 +285,7 @@ class FormOther
     		}
     		$out .= '</select>';
     		return $out;
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($this->db);
     		return '';
     	}
@@ -332,9 +316,7 @@ class FormOther
             if ($selected != '' && (int) $selected == $i)
             {
                 $return .= '<option value="'.$i.'" selected>';
-            }
-            else
-            {
+            } else {
                 $return .= '<option value="'.$i.'">';
             }
             $return .= $i.' % ';
@@ -459,9 +441,7 @@ class FormOther
         		$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
         		$sql_usr .= " OR u.entity = 0"; // Show always superadmin
         	}
-        }
-        else
-        {
+        } else {
         	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
         }
 
@@ -485,9 +465,7 @@ class FormOther
             	} else {
             		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
             	}
-            }
-            else
-            {
+            } else {
             	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
             }
 
@@ -534,9 +512,7 @@ class FormOther
                 $out .= '</option>';
             }
             $this->db->free($resql_usr);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -585,9 +561,7 @@ class FormOther
             print '</select>';
 
             print ajax_combobox($htmlname);
-        }
-        else
-        {
+        } else {
             print '<div class="warning">'.$langs->trans("NoProject").'</div>';
         }
     }
@@ -628,9 +602,7 @@ class FormOther
                         if (empty($lines[$i]->public))
                         {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        }
-                        else
-                        {
+                        } else {
                             print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                         }
                         //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
@@ -663,9 +635,7 @@ class FormOther
                     if (empty($lines[$i]->public))
                     {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    }
-                    else
-                    {
+                    } else {
                         print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
                     }
                     if ($lines[$i]->id) print ' > ';
@@ -793,8 +763,7 @@ class FormOther
 	             </script>';
             }
             $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
-        }
-        else  // In most cases, this is not used. We used instead function with no specific list of colors
+        } else // In most cases, this is not used. We used instead function with no specific list of colors
         {
         	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
             {
@@ -899,9 +868,7 @@ class FormOther
             if ($selected == $key)
             {
                 $select_week .= '<option value="'.$key.'" selected>';
-            }
-            else
-            {
+            } else {
                 $select_week .= '<option value="'.$key.'">';
             }
             $select_week .= $val;
@@ -942,9 +909,7 @@ class FormOther
             if ($selected == $key)
             {
                 $select_month .= '<option value="'.$key.'" selected>';
-            }
-            else
-            {
+            } else {
                 $select_month .= '<option value="'.$key.'">';
             }
             $select_month .= $val;
@@ -1013,9 +978,7 @@ class FormOther
                 if ($selected > 0 && $y == $selected) $selected_html = ' selected';
                 $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
             }
-        }
-        else
-        {
+        } else {
             for ($y = $min_year; $y <= $max_year; $y++)
             {
                 $selected_html = '';
@@ -1288,9 +1251,7 @@ class FormOther
                     if ($selected == $obj->rowid || $selected == $obj->$keyfield)
                     {
                         print '<option value="'.$obj->$keyfield.'" selected>';
-                    }
-                    else
-                    {
+                    } else {
                         print '<option value="'.$obj->$keyfield.'">';
                     }
                     print $obj->$labelfield;
@@ -1301,8 +1262,7 @@ class FormOther
             } else {
                 print $langs->trans("DictionaryEmpty");
             }
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -1336,9 +1296,7 @@ class FormOther
 		{
 			$resultautomanual .= '<option value="'.$automatic.'" selected>'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'">'.$langs->trans("Manual").'</option>'."\n";
-		}
-		else
-	    {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
 			$resultautomanual .= '<option value="'.$automatic.'">'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'"'.$selected.'>'.$langs->trans("Manual").'</option>'."\n";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index bf3db0cc65c..6fad72862c7 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -97,9 +97,7 @@ class FormProjets
 			));
 
 			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
-		{
+		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
 		if ($discard_closed > 0)
@@ -115,8 +113,7 @@ class FormProjets
 		{
 			print $out;
 			return '';
-		}
-		else return $out;
+		} else return $out;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -208,9 +205,7 @@ class FormProjets
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
 						{
 							$i++;
@@ -232,13 +227,11 @@ class FormProjets
 						{
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Draft");
-						}
-						elseif ($obj->fk_statut == 2)
+						} elseif ($obj->fk_statut == 2)
 						{
 							if ($discard_closed == 2) $disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Closed");
-						}
-						elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -249,15 +242,11 @@ class FormProjets
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -289,14 +278,11 @@ class FormProjets
 				{
 					print $out;
 					return '';
-				}
-				else return $out;
+				} else return $out;
 			} else {
 				return $outarray;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -379,8 +365,7 @@ class FormProjets
 					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
 					$out .= $show_empty;
 					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';
-				}
-				else $out .= '&nbsp;';
+				} else $out .= '&nbsp;';
 				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -394,9 +379,7 @@ class FormProjets
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -419,13 +402,11 @@ class FormProjets
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -441,15 +422,11 @@ class FormProjets
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -472,9 +449,7 @@ class FormProjets
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -598,9 +573,7 @@ class FormProjets
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
@@ -660,9 +633,7 @@ class FormProjets
 					if ($useshortlabel)
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-					}
-					else
-					{
+					} else {
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
 					}
@@ -682,9 +653,7 @@ class FormProjets
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 979d8a71ca8..e1653444960 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -97,9 +97,7 @@ class FormPropal
                         $i++;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
             }
         }
@@ -120,18 +118,14 @@ class FormPropal
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
-            {
+            } else {
                 print '<option value="'.$obj['id'].'">';
             }
             $key = $obj['code'];
             if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
             {
                 print $langs->trans($prefix.$key.($short ? 'Short' : ''));
-            }
-            else
-            {
+            } else {
                 $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
                 if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 669928cb3e9..55d214fbbd6 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -179,9 +179,7 @@ function limitChars(textarea, limit, infodiv)
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else
-                {
+                } else {
                     if ($this->fromtype)
                     {
                         $langs->load("errors");
@@ -190,58 +188,45 @@ function limitChars(textarea, limit, infodiv)
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else
-            {
+            } else {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
                 if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
-                    try
-                    {
+                    try {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else
-                        {
+                        } else {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch (Exception $e)
+                    } catch (Exception $e)
                     {
                         dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                     }
-                }
-                elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                } elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
                     $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
                     $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
-                    try
-                    {
+                    try {
                         $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else
-                        {
+                        } else {
                         	$sms = new stdClass();
                         	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch (Exception $e)
+                    } catch (Exception $e)
                     {
                         dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else
-                {
+                } else {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender = array();
                     $resultsender[0]->number = $this->fromsms;
@@ -255,9 +240,7 @@ function limitChars(textarea, limit, infodiv)
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else
-                {
+                } else {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
                     if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
@@ -278,9 +261,7 @@ function limitChars(textarea, limit, infodiv)
             if ($this->withtoreadonly)
             {
                 print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
-            }
-            else
-            {
+            } else {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
                 if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
@@ -317,9 +298,7 @@ function limitChars(textarea, limit, infodiv)
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else
-            {
+            } else {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index 5ecef635d73..c6d28a7b70f 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -79,9 +79,7 @@ class FormSocialContrib
             $sql .= " WHERE c.active = 1";
             $sql .= " AND c.fk_pays = ".$mysoc->country_id;
             $sql .= " ORDER BY c.libelle ASC";
-        }
-        else
-        {
+        } else {
             $sql = "SELECT c.id, c.libelle as type";
             $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
@@ -111,14 +109,10 @@ class FormSocialContrib
                 print '</select>';
                 if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
                 if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            }
-            else
-            {
+            } else {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db, $db->lasterror());
         }
     }
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 7b067fa11d6..c656f5e39ee 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -79,9 +79,7 @@ class FormWebsite
                 if ($selected == $obj->rowid)
                 {
                     $out .= '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
-                {
+                } else {
                     $out .= '<option value="'.$obj->rowid.'">';
                 }
                 $out .= $obj->ref;
@@ -89,8 +87,7 @@ class FormWebsite
                 $i++;
             }
             $out .= "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -138,9 +135,7 @@ class FormWebsite
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
-    				{
+    				} else {
     					print '<option value="'.$obj->code.'">';
     				}
     				print $obj->label;
@@ -149,13 +144,10 @@ class FormWebsite
     			}
     			print "</select>";
     			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		}
-    		else
-    		{
+    		} else {
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -205,9 +197,7 @@ class FormWebsite
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
-    		{
+    		} else {
     			$out .= '<option value="'.$key.'">';
     		}
     		$out .= $langs->trans($val);
@@ -242,9 +232,7 @@ class FormWebsite
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
-	    }
-	    else
-	    {
+	    } else {
 	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
 	    }
 
@@ -292,9 +280,7 @@ class FormWebsite
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out .= ajax_combobox($htmlname);
-	    }
-	    else
-	    {
+	    } else {
 	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
 	    	$out .= ajax_combobox($htmlname);
 	    }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index de00ea85e6f..fb4aaf4e7ff 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -43,9 +43,7 @@ class InfoBox
         		0 => 'Home',
         		27 => 'Accountancy Home'
         	);
-		}
-		else
-		{
+		} else {
 			return array(
 				0 => 'Home',
 				1 => 'userhome',
@@ -108,8 +106,7 @@ class InfoBox
             if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
             else $sql .= " AND b.fk_user = 0";
             $sql .= " ORDER BY b.box_order";
-        }
-        else	// available
+        } else // available
         {
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
@@ -133,9 +130,7 @@ class InfoBox
                         $boxname = preg_replace('/\.php$/i', '', $regs[1]);
                         $module = $regs[2];
                         $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
-                    }
-                    else
-                    {
+                    } else {
                         $boxname = preg_replace('/\.php$/i', '', $obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
                     }
@@ -199,17 +194,13 @@ class InfoBox
                         //print 'xx module='.$module.' enabled='.$enabled;
                         if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
                         else unset($box);
-                    }
-                    else
-                    {
+                    } else {
                         dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
                     }
                 }
                 $j++;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog($db->lasterror(), LOG_ERR);
             return array('error'=>$db->lasterror());
         }
@@ -307,15 +298,11 @@ class InfoBox
                 $error = $db->error();
                 $db->rollback();
                 return -2;
-            }
-            else
-            {
+            } else {
                 $db->commit();
                 return 1;
             }
-        }
-        else
-        {
+        } else {
             $error = $db->lasterror();
             $db->rollback();
             dol_syslog(get_class()."::saveboxorder ".$error);
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 5befc8ddb9c..b9b5189e81a 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -151,8 +151,7 @@ class Interfaces
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
-                        }
-                        catch (Exception $e)
+                        } catch (Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -187,14 +186,11 @@ class Interfaces
                 {
                     //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
                     $result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
-                }
-                elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+                } elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
                 {
                     dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
                     $result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
-                }
-                else
-                {
+                } else {
                     dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
                 }
 
@@ -219,9 +215,7 @@ class Interfaces
                     elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
                     //dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -230,9 +224,7 @@ class Interfaces
         {
             dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
             return -$nbko;
-        }
-        else
-        {
+        } else {
             //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
             return $nbok;
         }
@@ -291,9 +283,7 @@ class Interfaces
                         {
                             $langs->load("errors");
                             print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
-                        }
-                        else
-                        {
+                        } else {
                             include_once $newdir.'/'.$file;
                         }
 
@@ -369,19 +359,15 @@ class Interfaces
 		            {
 		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            }
-		            else
-		            {
+		            } else {
 		                if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
 		                if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
 		            }
-	            }
-	            else {
+	            } else {
 	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
 	            }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
             	print $e->getMessage();
             }
 
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index ea4ec500405..8fa5633bf5e 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -190,8 +190,7 @@ class Ldap
 
 				if ($this->serverPing($host, $this->serverPort) === true) {
 					$this->connection = ldap_connect($host, $this->serverPort);
-				}
-				else continue;
+				} else continue;
 
 				if (is_resource($this->connection))
 				{
@@ -221,14 +220,10 @@ class Ldap
 							$this->bind = $this->result;
 							$connected = 2;
 							break;
-						}
-						else
-						{
+						} else {
 							$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
-					}
-					else
-					{
+					} else {
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
 						{
@@ -239,9 +234,7 @@ class Ldap
 								$this->bind = $this->result;
 								$connected = 2;
 								break;
-							}
-							else
-							{
+							} else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -255,9 +248,7 @@ class Ldap
 								$this->bind = $this->result;
 								$connected = 1;
 								break;
-							}
-							else
-							{
+							} else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -272,9 +263,7 @@ class Ldap
 		{
 			$return = $connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
-		}
-		else
-		{
+		} else {
 			$this->error = 'Failed to connect to LDAP'.($this->error ? ': '.$this->error : '');
 			$return = -1;
 			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
@@ -295,9 +284,7 @@ class Ldap
 		if ($this->connection && !@ldap_close($this->connection))
 		{
 			return false;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -316,9 +303,7 @@ class Ldap
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -341,9 +326,7 @@ class Ldap
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -444,9 +427,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
@@ -498,9 +479,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -548,9 +527,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -593,16 +570,12 @@ class Ldap
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-			}
-			else
-			{
+			} else {
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
 				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
 			}
-		}
-		else
-		{
+		} else {
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
 			$result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
@@ -613,9 +586,7 @@ class Ldap
 			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			//print_r($info);
 			return -1;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::update done successfully");
 			return 1;
 		}
@@ -673,9 +644,7 @@ class Ldap
 		if (preg_match('/^ldap/', $this->server[0]))
 		{
 			$target = "-H ".join(',', $this->server);
-		}
-		else
-		{
+		} else {
 			$target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
 		}
 		$content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
@@ -688,9 +657,7 @@ class Ldap
 			if (!is_array($value))
 			{
 				$content .= "$key: $value\n";
-			}
-			else
-			{
+			} else {
 				foreach ($value as $valuekey => $valuevalue)
 				{
 					$content .= "$key: $valuevalue\n";
@@ -726,9 +693,7 @@ class Ldap
 			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			return 1;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -805,9 +770,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -857,9 +820,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -909,9 +870,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -1034,18 +993,14 @@ class Ldap
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
 				$filter = '('.$this->filter.')';
-			}
-			elseif (((string) $activefilter == 'member') && $this->filter)
+			} elseif (((string) $activefilter == 'member') && $this->filter)
 			{
 				$filter = '('.$this->filtermember.')';
-			}
-			else	// If this->filter is empty, make fiter on * (all)
+			} else // If this->filter is empty, make fiter on * (all)
 			{
 				$filter = '('.$useridentifier.'=*)';
 			}
-		}
-		else
-		{
+		} else {
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
 
@@ -1056,9 +1011,7 @@ class Ldap
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
-		}
-		else
-		{
+		} else {
 			// Return list with fields selected by default
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $userDn, $filter);
@@ -1095,9 +1048,7 @@ class Ldap
 					{
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
-					}
-					else
-					{
+					} else {
 						if (in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
 							foreach ($info[$i][$keyattributelower] as $key => $value) {
@@ -1170,9 +1121,7 @@ class Ldap
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
-			{
+			} else {
 				$i++;
 				$i++;
 			}
@@ -1183,9 +1132,7 @@ class Ldap
 			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
-		}
-		else
-		{
+		} else {
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return '?';
 		}
@@ -1243,9 +1190,7 @@ class Ldap
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
-		{
+		} else {
 			ldap_free_result($this->result);
 			return $result;
 		}
@@ -1283,9 +1228,7 @@ class Ldap
 				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
 				else dol_syslog('Ldap::fetch search returns but found no records');
 				//var_dump($result);exit;
-			}
-			else
-			{
+			} else {
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				dol_syslog(get_class($this)."::fetch search fails");
 				return -1;
@@ -1296,9 +1239,7 @@ class Ldap
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
-			{
+			} else {
 				break;
 			}
 		}
@@ -1307,9 +1248,7 @@ class Ldap
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0], $this->ldapcharset);
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0], $this->ldapcharset);
 			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0], $this->ldapcharset);
@@ -1323,9 +1262,7 @@ class Ldap
 			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
 			{
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
-			}
-			else
-			{
+			} else {
 				$this->pwdlastset = -1;
 			}
 			if (!$this->name && !$this->login) $this->pwdlastset = -1;
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 1a844f86f2b..2599fa69c09 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -123,23 +123,17 @@ class Link extends CommonObject
                 dol_syslog(get_class($this)."::Create success id=".$this->id);
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else
-        {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
                 $result = -1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $result = -2;
             }
@@ -211,17 +205,13 @@ class Link extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 // Doublon
                 $this->error = $langs->trans("ErrorDuplicateField");
                 $result = -1;
-            }
-            else
-            {
+            } else {
                 $this->error = $langs->trans("Error sql = ".$sql);
                 $result = -2;
             }
@@ -342,9 +332,7 @@ class Link extends CommonObject
                 $this->objecttype = $obj->objecttype;
                 $this->objectid = $obj->objectid;
                 return 1;
-            }
-            else
-			{
+            } else {
                 return 0;
             }
         } else {
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 72ff932bfa6..40edb80b3f3 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -213,8 +213,7 @@ class Menubase
                 //print $sql; exit;
                 $resqlrowidset = $this->db->query($sql);
                 if (!$resqlrowidset) dol_print_error($this->db);
-            }
-            else dol_print_error($this->db);
+            } else dol_print_error($this->db);
         }
 
         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
@@ -280,22 +279,16 @@ class Menubase
 		            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
 
 		            return $this->id;
-		        }
-		        else
-		        {
+		        } else {
 		            $this->error = "Error ".$this->db->lasterror();
 		            return -1;
 		        }
-        	}
-        	else
-        	{
+        	} else {
         		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
         		$this->error = 'Error Menu entry already exists';
         		return 0;
         	}
-        }
-        else
-        {
+        } else {
         	return -1;
         }
     }
@@ -431,9 +424,7 @@ class Menubase
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -574,9 +565,7 @@ class Menubase
         		{
         			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
         			//var_dump($this->newmenu->liste);
-        		}
-        		else
-        		{
+        		} else {
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
         			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
         			foreach ($this->newmenu->liste as $keyparent => $valparent)
@@ -693,17 +682,14 @@ class Menubase
                         {
                             $tab_titre = explode("/", $menu['titre']);
                             $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
-                        }
-                        elseif (preg_match('/\|\|/', $menu['titre']))
+                        } elseif (preg_match('/\|\|/', $menu['titre']))
                         {
                             // To manage different translation (Title||AltTitle@ConditionForAltTitle)
                         	$tab_title = explode("||", $menu['titre']);
                         	$alt_title = explode("@", $tab_title[1]);
                         	$title_enabled = verifCond($alt_title[1]);
                         	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
-                        }
-                        else
-                        {
+                        } else {
                             $title = $langs->trans($menu['titre']);
                         }
                     }
@@ -744,9 +730,7 @@ class Menubase
             // into the leftMenuCharger later to avoid useless operations.
 
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index a930cc97d2d..130dc09f4f8 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -194,9 +194,7 @@ class Notify
 						}
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -239,9 +237,7 @@ class Notify
 						}
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -258,9 +254,7 @@ class Notify
 					if ($notifcode)
 					{
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-					else
-					{
+					} else {
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
 
@@ -279,8 +273,7 @@ class Notify
 								$tmpuser->fetch($user->fk_user);
 								if ($tmpuser->email) $newval2 = trim($tmpuser->email);
 								else $newval2 = '';
-							}
-							else $newval2 = '';
+							} else $newval2 = '';
 						}
 						if ($newval2)
 						{
@@ -522,9 +515,7 @@ class Notify
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
-						}
-						else
-						{
+						} else {
 							$filepdf = $pdf_path;
 						}
 
@@ -567,8 +558,7 @@ class Notify
 							if ($obj->type_target == 'touserid') {
 	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							else {
+							} else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
@@ -576,27 +566,19 @@ class Notify
 							{
 								dol_print_error($this->db);
 							}
-						}
-						else
-						{
+						} else {
 							$error++;
 							$this->errors[] = $mailfile->error;
 						}
-					}
-					else
-				    {
+					} else {
 						dol_syslog("No notification sent for ".$sendto." because email is empty");
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-		}
-		else
-		{
+		} else {
 	   		$error++;
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
@@ -743,9 +725,7 @@ class Notify
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
-				}
-				else
-				{
+				} else {
 					$filepdf = $pdf_path;
 				}
 
@@ -808,9 +788,7 @@ class Notify
 						{
 							dol_print_error($this->db);
 						}
-					}
-					else
-					{
+					} else {
 						$error++;
 						$this->errors[] = $mailfile->error;
 					}
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index ed684529f33..19a94bca9f6 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -218,9 +218,7 @@ class SimpleOpenID
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -458,9 +456,7 @@ class SimpleOpenID
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else
-        {	// Default Header Redirect
+        } else {	// Default Header Redirect
             header('Location: '.$redirect_to);
         }
     }
@@ -502,9 +498,7 @@ class SimpleOpenID
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -554,9 +548,7 @@ class SimpleOpenID
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
             $this->SetOpenIDServer($server);
             return $server;
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index dd02bf365c1..56c6bdd216b 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -218,9 +218,7 @@ class RssParser
 				$foundintocache = 1;
 
 				$this->_lastfetchdate = $filedate;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -229,9 +227,7 @@ class RssParser
 		if ($foundintocache)    // Cache file found and is not too old
 		{
 			$str = file_get_contents($newpathofdestfile);
-		}
-		else
-		{
+		} else {
 			try {
 				ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
 				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
@@ -244,8 +240,7 @@ class RssParser
 				$context = stream_context_create($opts);
 
 				$str = file_get_contents($this->_urlRSS, false, $context);
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
 			}
 		}
@@ -258,9 +253,7 @@ class RssParser
 				//print 'xx'.LIBXML_NOCDATA;
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-			}
-			else
-			{
+			} else {
 				$xmlparser = xml_parser_create('');
 				if (!is_resource($xmlparser)) {
 					$this->error = "ErrorFailedToCreateParser"; return -1;
@@ -293,9 +286,7 @@ class RssParser
 					@chmod($newpathofdestfile, octdec($newmask));
 
 					$this->_lastfetchdate = $nowgmt;
-				}
-				else
-				{
+				} else {
 					print 'Error, failed to open file '.$newpathofdestfile.' for write';
 				}
 			}
@@ -324,9 +315,7 @@ class RssParser
 					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
 					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
 					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-				}
-				else
-				{
+				} else {
 					//var_dump($rss->channel);
 					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
 					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
@@ -341,8 +330,7 @@ class RssParser
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
 				else $items = $rss->items; // With xmlparse
 				//var_dump($items);exit;
-			}
-			elseif ($rss->_format == 'atom')
+			} elseif ($rss->_format == 'atom')
 			{
 				//var_dump($rss);
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
@@ -352,9 +340,7 @@ class RssParser
 					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
 					if (!empty($rss->title))         $this->_title = (string) $rss->title;
 					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-				}
-				else
-				{
+				} else {
 					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];
 					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];
 					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];
@@ -391,9 +377,7 @@ class RssParser
 							$itemPubDate = (string) $item->pubDate;
 							$itemId = '';
 							$itemAuthor = '';
-						}
-						else
-						{
+						} else {
 							$itemLink = (string) $item['link'];
 							$itemTitle = (string) $item['title'];
 							$itemDescription = (string) $item['description'];
@@ -411,8 +395,7 @@ class RssParser
 								$itemCategory[] = (string) $cat;
 							}
 						}
-					}
-					elseif ($rss->_format == 'atom')
+					} elseif ($rss->_format == 'atom')
 					{
 						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 						{
@@ -422,9 +405,7 @@ class RssParser
 							$itemPubDate = (string) $item['created'];
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
-						}
-						else
-						{
+						} else {
 							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');
 							$itemTitle = (string) $item['title'];
 							$itemDescription = $this->getAtomItemDescription($item);
@@ -432,8 +413,7 @@ class RssParser
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
 						}
-					}
-					else print 'ErrorBadFeedFormat';
+					} else print 'ErrorBadFeedFormat';
 
 					// Add record to result array
 					$this->_rssarray[$i] = array(
@@ -453,9 +433,7 @@ class RssParser
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorFailedToLoadRSSFile';
 			return -1;
 		}
@@ -495,12 +473,10 @@ class RssParser
 			if ($el == 'rdf') {
 				$this->_format = 'rss';
 				$this->feed_version = '1.0';
-			}
-			elseif ($el == 'rss') {
+			} elseif ($el == 'rss') {
 				$this->_format = 'rss';
 				$this->feed_version = $attrs['version'];
-			}
-			elseif ($el == 'feed') {
+			} elseif ($el == 'feed') {
 				$this->_format = 'atom';
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -511,8 +487,7 @@ class RssParser
 		if ($el == 'channel')
 		{
 			$this->inchannel = true;
-		}
-		elseif ($el == 'item' or $el == 'entry')
+		} elseif ($el == 'item' or $el == 'entry')
 		{
 			$this->initem = true;
 			if (isset($attrs['rdf:about'])) {
@@ -528,9 +503,7 @@ class RssParser
 		$el == 'textinput' )
 		{
 			$this->intextinput = true;
-		}
-
-		elseif (
+		} elseif (
 		$this->_format == 'rss' and
 		$this->current_namespace == '' and
 		$el == 'image' )
@@ -569,13 +542,10 @@ class RssParser
 			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
 			{
 				$link_el = 'link';
-			}
-			elseif (!isset($attrs['rel']))
+			} elseif (!isset($attrs['rel']))
 			{
 				$link_el = 'link';
-			}
-			else
-			{
+			} else {
 				$link_el = 'link_'.$attrs['rel'];
 			}
 
@@ -602,9 +572,7 @@ class RssParser
 		if ($this->_format == 'atom' and $this->incontent)
 		{
 			$this->append_content($text);
-		}
-		else
-		{
+		} else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -628,37 +596,30 @@ class RssParser
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		}
-		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
 		{
 			$this->intextinput = false;
-		}
-		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
 		{
 			$this->inimage = false;
-		}
-		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
+		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			$this->incontent = false;
-		}
-		elseif ($el == 'channel' or $el == 'feed')
+		} elseif ($el == 'channel' or $el == 'feed')
 		{
 			$this->inchannel = false;
-		}
-		elseif ($this->_format == 'atom' and $this->incontent) {
+		} elseif ($this->_format == 'atom' and $this->incontent) {
 			// balance tags properly
 			// note:  i don't think this is actually neccessary
 			if ($this->stack[0] == $el)
 			{
 				$this->append_content("</$el>");
-			}
-			else {
+			} else {
 				$this->append_content("<$el />");
 			}
 
 			array_shift($this->stack);
-		}
-		else {
+		} else {
 			array_shift($this->stack);
 		}
 
@@ -693,8 +654,7 @@ class RssParser
 		// phpcs:enable
 		if ($this->initem) {
 			$this->concat($this->current_item[$this->incontent], $text);
-		}
-		elseif ($this->inchannel) {
+		} elseif ($this->inchannel) {
 			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
@@ -715,28 +675,21 @@ class RssParser
 		{
 			if ($this->initem) {
 				$this->concat($this->current_item[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat($this->channel[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat($this->textinput[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat($this->image[$this->current_namespace][$el], $text);
 			}
-		}
-		else {
+		} else {
 			if ($this->initem) {
 				$this->concat($this->current_item[$el], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat($this->textinput[$el], $text);
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat($this->image[$el], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat($this->channel[$el], $text);
 			}
 		}
@@ -756,8 +709,7 @@ class RssParser
 		if (isset($item['summary']))
 		{
 			$result = $item['summary'];
-		}
-		elseif (isset($item['atom_content']))
+		} elseif (isset($item['atom_content']))
 		{
 			$result = $item['atom_content'];
 		}
@@ -845,14 +797,11 @@ function xml2php($xml)
 			$array[$key][] = $tmp;
 			$array[$key][] = $child;
 			$tab = true;
-		}
-		elseif ($tab === true)
+		} elseif ($tab === true)
 		{
 			//Add an element in an existing array
 			$array[$key][] = $child;
-		}
-		else
-		{
+		} else {
 			//Add a simple element
 			$array[$key] = $child;
 		}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 51e375c5279..0a0a39cc7cb 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -316,8 +316,7 @@ class SMTPs
 
         if ($_part === true)
         $_retValue = $this->_errorsTo;
-        else
-        $_retValue = $this->_errorsTo[$_part];
+        else $_retValue = $this->_errorsTo[$_part];
 
         return $_retValue;
     }
@@ -373,9 +372,7 @@ class SMTPs
         {
             $this->_setErr(99, $host.' is either offline or is an invalid host name.');
             $_retVal = false;
-        }
-        else
-        {
+        } else {
             //See if we can connect to the SMTP server
             if ($this->socket = @fsockopen(
                 preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
@@ -395,8 +392,7 @@ class SMTPs
                 $_retVal = $this->socket;
             }
             // This connection attempt failed.
-            else
-            {
+            else {
                 // @CHANGE LDR
                 if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
                 $this->_setErr($this->errno, $this->errstr);
@@ -521,9 +517,7 @@ class SMTPs
             if (!$_retVal) {
                 $this->_setErr(130, 'Invalid Authentication Credentials.');
 			}
-        }
-        else
-        {
+        } else {
             $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
         }
 
@@ -555,8 +549,7 @@ class SMTPs
             }
 
             // This is a "normal" SMTP Server "handshack"
-            else
-            {
+            else {
                 // Send the RFC821 specified HELO.
                 $host = $this->getHost();
                 $usetls = preg_match('@tls://@i', $host);
@@ -682,8 +675,7 @@ class SMTPs
         }
 
         // Read the Systems php.ini file
-        else
-        {
+        else {
             // Set these properties ONLY if they are set in the php.ini file.
             // Otherwise the default values will be used.
             if ($_host = ini_get('SMTPs'))
@@ -950,8 +942,7 @@ class SMTPs
 
         if ($_part === true)
         $_retValue = $this->_msgFrom;
-        else
-        $_retValue = $this->_msgFrom[$_part];
+        else $_retValue = $this->_msgFrom[$_part];
 
         return $_retValue;
     }
@@ -980,8 +971,7 @@ class SMTPs
 
         if ($_part === true)
             $_retValue = $this->_msgReplyTo;
-        else
-            $_retValue = $this->_msgReplyTo[$_part];
+        else $_retValue = $this->_msgReplyTo[$_part];
 
         return $_retValue;
     }
@@ -1015,8 +1005,7 @@ class SMTPs
                 $_addrList = explode(',', $_addrList);
 
                 // Stick it in an array
-                else
-                $_addrList = array($_addrList);
+                else $_addrList = array($_addrList);
             }
 
             // take the array of addresses and split them further
@@ -1037,8 +1026,7 @@ class SMTPs
                     $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
                 }
                 // We only have an eMail address
-                else
-                {
+                else {
                     // Strip off the beggining '<'
                     $_strAddr = str_replace('<', '', $_strAddr);
 
@@ -1094,9 +1082,7 @@ class SMTPs
             $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
             $_aryEmail['addr'] = $_tmpAry[1];
-        }
-        else
-        $_aryEmail['addr'] = $_tmpAry[0];
+        } else $_aryEmail['addr'] = $_tmpAry[0];
 
         // Pull User Name and Host.tld apart
         list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
@@ -1167,9 +1153,7 @@ class SMTPs
                             {
                                 $_realName = '"'.$_realName.'"';
                                 $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
-                            }
-                            else
-                            {
+                            } else {
                                 $_RCPT_list[] = $_addr.'@'.$_host;
                             }
                         }
@@ -1177,15 +1161,11 @@ class SMTPs
                 }
 
                 return implode(', ', $_RCPT_list);
-            }
-            else
-            {
+            } else {
                 $this->_setErr(101, 'No eMail Address for message to be sent to.');
                 return false;
             }
-        }
-        else
-        {
+        } else {
             $this->_setErr(102, 'eMail type not defined.');
             return false;
         }
@@ -1318,9 +1298,7 @@ class SMTPs
             $_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
             $_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
             $_header .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host."\r\n";
-        }
-        else
-        {
+        } else {
             $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
         }
         if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
@@ -1367,8 +1345,7 @@ class SMTPs
         //{
         if ($strType == 'html')
         $strMimeType = 'text/html';
-        else
-        $strMimeType = 'text/plain';
+        else $strMimeType = 'text/plain';
 
         // Make RFC821 Compliant, replace bare linefeeds
         $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
@@ -1510,9 +1487,7 @@ class SMTPs
                     $content .= "--".$this->_getBoundary('related')."--\r\n";
                     $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
                     $content .= "\r\n";
-                }
-                else
-                {
+                } else {
                     if (key_exists('image', $this->_msgContent))
                     {
                         $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 9620612cb2e..a18bad625e6 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -73,9 +73,7 @@ abstract class Stats
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -84,9 +82,7 @@ abstract class Stats
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else
-		{
+		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -170,9 +166,7 @@ abstract class Stats
         		$foundintocache = 1;
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	}
-        	else
-        	{
+        	} else {
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
@@ -182,9 +176,7 @@ abstract class Stats
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
-		{
+        } else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -220,8 +212,7 @@ abstract class Stats
 				fclose($fp);
 				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -299,9 +290,7 @@ abstract class Stats
         		$foundintocache = 1;
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	}
-        	else
-        	{
+        	} else {
         		dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
         	}
         }
@@ -311,9 +300,7 @@ abstract class Stats
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
-		{
+        } else {
 			$data = $this->getAllByProduct($year, $limit);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
@@ -366,8 +353,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -410,8 +396,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -449,9 +434,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -509,8 +492,7 @@ abstract class Stats
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		for ($i = 1; $i < 13; $i++)
 		{
@@ -565,8 +547,7 @@ abstract class Stats
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		for ($i = 1; $i < 13; $i++)
 		{
@@ -620,8 +601,7 @@ abstract class Stats
             }
 		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $result;
     }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3fc3151030a..c37a7cfc6ab 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -95,8 +95,7 @@ class Translate
 			$langpref = str_replace("-", "_", $langpref);
 			$langlist = preg_split("/[;,]/", $langpref);
 			$codetouse = preg_replace('/[^_a-zA-Z]/', '', $langlist[0]);
-		}
-		else $codetouse = $srclang;
+		} else $codetouse = $srclang;
 
 		// We redefine $srclang
 		$langpart = explode("_", $codetouse);
@@ -111,10 +110,8 @@ class Translate
 				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);
 				$longforlong = array('no_nb'=>'nb_NO');
 				if (isset($longforlong[strtolower($srclang)])) $srclang = $longforlong[strtolower($srclang)];
-			}
-			else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
-		}
-		else {						// If it's for a codetouse that is a short code xx
+			} else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
+		} else {						// If it's for a codetouse that is a short code xx
     	    // Array to convert short lang code into long code.
 	        $longforshort = array('ar'=>'ar_SA', 'el'=>'el_GR', 'ca'=>'ca_ES', 'en'=>'en_US', 'nb'=>'nb_NO', 'no'=>'nb_NO');
 			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];
@@ -302,12 +299,10 @@ class Translate
 												$tabtranslatedomain[$key] = $value;
 											}
 										}
-									}
-									elseif ($key[0] == '#')
+									} elseif ($key[0] == '#')
 									{
 									    continue;
-									}
-									else {
+									} else {
 										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
 										$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 										if ($usecachekey) {
@@ -515,9 +510,7 @@ class Translate
     					}
     				}
     			}
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($db);
 		    }
 		}
@@ -552,24 +545,19 @@ class Translate
 	    if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
         {
             $newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
-        }
-		elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
+        } elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
-		}
-		elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
+		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
 		{
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
-		}
-        elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
+		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
         {
             $newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
-        }
-        elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
+        } elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
         {
             $newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
-        }
-        elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
+        } elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
         {
         	// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
             //$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
@@ -636,8 +624,7 @@ class Translate
             $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);
 
 			return $str;
-		}
-		else								// Translation is not available
+		} else // Translation is not available
 		{
 		    //if ($key[0] == '$') { return dol_eval($key,1); }
 			return $this->getTradFromKey($key);
@@ -707,9 +694,7 @@ class Translate
             }
 
             return $str;
-		}
-		else
-		{
+		} else {
 		    if ($key[0] == '$') { return dol_eval($key, 1); }
 			return $this->getTradFromKey($key);
 		}
@@ -825,9 +810,7 @@ class Translate
 				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
 				{
 				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
-				}
-				else
-				{
+				} else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
 				if ($mainlangonly) {
@@ -956,9 +939,7 @@ class Translate
 
 			$db->free($resql);
 			return $this->cache_labels[$tablename][$key];
-		}
-		else
-		{
+		} else {
 			$this->error = $db->lasterror();
 			return -1;
 		}
@@ -1056,9 +1037,7 @@ class Translate
 			array_multisort($label, SORT_ASC, $this->cache_currencies);
 			//var_dump($this->cache_currencies);	$this->cache_currencies is now sorted onto label
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 6dc243d3723..c1f85d72a75 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -133,8 +133,7 @@ class Utils
 					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
 					$count += $result;
 					$countdeleted += $tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
+				} elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
@@ -144,9 +143,7 @@ class Utils
 						{
 							$count++;
 							$countdeleted++;
-						}
-						else
-						{
+						} else {
 							$counterror++;
 						}
 					}
@@ -166,8 +163,7 @@ class Utils
 		{
 			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
 			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
-		}
-		else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
+		} else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
 
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them
 		if (!empty($conf->api->enabled))
@@ -266,10 +262,8 @@ class Utils
 			if (GETPOST("sql_structure", "alpha") || $usedefault)
 			{
 				if (GETPOST("drop", "alpha") || $usedefault)	$param .= " --add-drop-table=TRUE";
-				else 				       	         		    $param .= " --add-drop-table=FALSE";
-			}
-			else
-			{
+				else $param .= " --add-drop-table=FALSE";
+			} else {
 				$param .= " -t";
 			}
 			if (GETPOST("disable-add-locks", "alpha")) $param .= " --add-locks=FALSE";
@@ -282,9 +276,7 @@ class Utils
 				if (GETPOST("delayed", "alpha"))	 	 $param .= " --delayed-insert";
 				if (GETPOST("sql_ignore", "alpha"))	 $param .= " --insert-ignore";
 				if (GETPOST("hexforbinary", "alpha") || $usedefault) $param .= " --hex-blob";
-			}
-			else
-			{
+			} else {
 				$param .= " -d"; // No row information (no data)
 			}
 			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
@@ -325,9 +317,7 @@ class Utils
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$errormsg = 'Error '.$retval;
 						$ok = 0;
-					}
-					else
-					{
+					} else {
 						$i = 0;
 						if (!empty($output_arr))
 						{
@@ -366,9 +356,7 @@ class Utils
 
 				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 				$errormsg = $langs->trans("ErrorFailedToWriteInDir");
@@ -390,9 +378,7 @@ class Utils
 				if ($compression == 'bz')   bzclose($handle);
 				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
 					$errormsg = '';
-				}
-				else
-				{
+				} else {
 					// Renommer fichier sortie en fichier erreur
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
@@ -430,9 +416,7 @@ class Utils
 				$this->backupTables($outputfiletemp);
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
-			}
-			else
-			{
+			} else {
 				$this->backupTables($outputfile);
 			}
 
@@ -612,15 +596,12 @@ class Utils
 		{
 			try {
 				$moduleobj = new $class($this->db);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -689,9 +670,7 @@ class Utils
 						if ($filecursor)
 						{
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else
-						{
+						} else {
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
 							return -1;
 						}
@@ -759,25 +738,19 @@ class Utils
 				$result = ($resarray['result'] == 0) ? 1 : 0;
 
 				chdir($currentdir);
-			}
-			else
-			{
+			} else {
 				$result = 0;
 			}
 
 			if ($result > 0)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				$error++;
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorCheckVersionIsDefined");
@@ -934,9 +907,7 @@ class Utils
 			{
 				$tables[] = $row[0];
 			}
-		}
-		else
-		{
+		} else {
 			$tables = is_array($tables) ? $tables : explode(',', $tables);
 		}
 
@@ -996,9 +967,7 @@ class Utils
 			if (empty($row2[1]))
 			{
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else
-			{
+			} else {
 				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 204a30b4829..a16d6297dd4 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -58,9 +58,7 @@ if (class_exists($keyforclass))
 			$this->export_help_array[$r][$fieldname] = $helpfield;
 		}
 	}
-}
-else
-{
+} else {
 	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
 }
 // End add common fields
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 921b3d14bb6..613b0c59556 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -129,8 +129,7 @@ if ($objecttype) {
     	}
         $ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
         $object = new $ObjectClassName($db);
-    }
-    catch (Exception $e) {
+    } catch (Exception $e) {
         print 'Failed to load class for type '.$objecttype;
     }
 }
@@ -252,12 +251,10 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			if (is_null($obj->val)) {
 				$keytouse = '__NULL__';
 				$valuetranslated = $langs->transnoentitiesnoconv("NotDefined");
-			}
-			elseif ($obj->val === '') {
+			} elseif ($obj->val === '') {
 				$keytouse = '';
 				$valuetranslated = $langs->transnoentitiesnoconv("Empty");
-			}
-			else {
+			} else {
 				$keytouse = (string) $obj->val;
 				$valuetranslated = $obj->val;
 			}
@@ -267,8 +264,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 				$valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
 				if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
 				$valuetranslated = $langs->trans($valuetranslated);
-			}
-			elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
+			} elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
 				$classname = $regs[1];
 				$classpath = $regs[2];
 				dol_include_once($classpath);
@@ -456,8 +452,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
-        }
-        else $sql .= $val.' as x_'.$key.', ';
+        } else $sql .= $val.' as x_'.$key.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -469,24 +464,20 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
-    	}
-    	else $sql .= $val.' as g_'.$key.', ';
+    	} else $sql .= $val.' as g_'.$key.', ';
     }
     foreach ($search_measures as $key => $val) {
         if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
         elseif (preg_match('/\-sum$/', $val)) {
             $tmpval = preg_replace('/\-sum$/', '', $val);
             $sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-        elseif (preg_match('/\-average$/', $val)) {
+        } elseif (preg_match('/\-average$/', $val)) {
             $tmpval = preg_replace('/\-average$/', '', $val);
             $sql .= 'AVG('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-        elseif (preg_match('/\-min$/', $val)) {
+        } elseif (preg_match('/\-min$/', $val)) {
         	$tmpval  = preg_replace('/\-min$/', '', $val);
         	$sql .= 'MIN('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
-        }
-        elseif (preg_match('/\-max$/', $val)) {
+        } elseif (preg_match('/\-max$/', $val)) {
         	$tmpval = preg_replace('/\-max$/', '', $val);
         	$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
         }
@@ -524,8 +515,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        }
-        else $sql .= $val.', ';
+        } else $sql .= $val.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -537,8 +527,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	}
-    	else $sql .= $val.', ';
+    	} else $sql .= $val.', ';
     }
     $sql = preg_replace('/,\s*$/', '', $sql);
     $sql .= ' ORDER BY ';
@@ -552,8 +541,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        }
-        else $sql .= $val.', ';
+        } else $sql .= $val.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -565,8 +553,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	}
-    	else $sql .= $val.', ';
+    	} else $sql .= $val.', ';
     }
     $sql = preg_replace('/,\s*$/', '', $sql);
 }
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 3a75b4bdc90..d3a6d3a01c9 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -59,9 +59,7 @@ print '<head>'."\n";
 if (GETPOST('mode') && GETPOST('mode') == 'test')
 {
 	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php"></script>'."\n";
-}
-else
-{
+} else {
 	print '<title>'.$langs->trans("Calendar").'</title>';
 }
 
@@ -109,9 +107,7 @@ if ($qualified)
 {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
 	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
-}
-else
-{
+} else {
 	dol_print_error('', 'ErrorBadParameters');
 }
 
@@ -154,9 +150,7 @@ function displayBox($selectedDate, $month, $year)
 	{
 		$selDate = xyzToUnixTimestamp($selectedDate);
 		$xyz = dol_print_date($selDate, "%Y%m%d");
-	}
-	else
-	{
+	} else {
 		$selDate = 0;
 		$xyz = 0;
 	}
@@ -220,9 +214,7 @@ function displayBox($selectedDate, $month, $year)
 				echo "<td>&nbsp;</td>";
 				$cols++;
 			}
-		}
-		else
-		{
+		} else {
 			if ($mydate["wday"] == $startday)
 			{
 				echo "<tr class=\"dpWeek\">";
@@ -255,9 +247,7 @@ function displayBox($selectedDate, $month, $year)
 		if ($thedate == '')
 		{
 			$stoploop = 1;
-		}
-		else
-		{
+		} else {
 			$mydate = dol_getdate($thedate);
 			if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
 		}
@@ -277,9 +267,7 @@ function displayBox($selectedDate, $month, $year)
 			print $langs->trans("Month".$selectMonth)." ";
 			print sprintf("%02s", $tempDate["mday"]);
 			print ", ".$selectYear;
-		}
-		else
-		{
+		} else {
 			print "Click a Date";
 		}
 		?></td>
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 2818eff65e2..2ed52b2f01c 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -120,9 +120,7 @@ abstract class DoliDB implements Database
 				dol_syslog('', 0, 1);
 			}
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->transaction_opened++;
 			dol_syslog('', 0, 1);
 			return 1;
@@ -146,14 +144,10 @@ abstract class DoliDB implements Database
 				$this->transaction_opened = 0;
 				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -174,9 +168,7 @@ abstract class DoliDB implements Database
 			$this->transaction_opened = 0;
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -252,9 +244,7 @@ abstract class DoliDB implements Database
 				$i++;
 			}
 			return $return;
-		}
-		else
-		{
+		} else {
 			return '';
 		}
 	}
@@ -331,7 +321,7 @@ abstract class DoliDB implements Database
 		if ($res)
 		{
 			$results = array();
-			if($this->num_rows($res) > 0){
+			if ($this->num_rows($res) > 0){
 				while ($obj = $this->fetch_object($res)){
 					$results[] = $obj;
 				}
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 667f1986815..4201e5cf86f 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -90,9 +90,7 @@ class DoliDBMssql extends DoliDB
 			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else
-		{
+		} else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -108,18 +106,14 @@ class DoliDBMssql extends DoliDB
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else
-			{
+			} else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
 				$this->error = $this->error();
 				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
-		}
-		else
-		{
+		} else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -198,8 +192,7 @@ class DoliDBMssql extends DoliDB
 		{
             $version = $this->fetch_array($resql);
             return $version['computed'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -249,9 +242,7 @@ class DoliDBMssql extends DoliDB
 				dol_syslog("BEGIN Transaction", LOG_DEBUG);
 			}
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -275,13 +266,10 @@ class DoliDBMssql extends DoliDB
 			{
 				dol_syslog("COMMIT Transaction", LOG_DEBUG);
 				return true;
-			}
-			else
-			{
+			} else {
 				return false;
 			}
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -305,8 +293,7 @@ class DoliDBMssql extends DoliDB
 			$ret = mssql_query("ROLLBACK TRANSACTION", $this->db);
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -367,9 +354,7 @@ class DoliDBMssql extends DoliDB
                     if (!empty($query_comp))
                         $query .= " WHERE ".implode(" AND ", $query_comp);
                 }
-    		}
-    		else
-    		{
+    		} else {
                 if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
                 {
                     $original_query = $query;
@@ -431,9 +416,7 @@ class DoliDBMssql extends DoliDB
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = mssql_query($query, $this->db);
-		}
-		else
-		{
+		} else {
 			$ret = mssql_query($query, $this->db);
 		}
 
@@ -597,9 +580,7 @@ class DoliDBMssql extends DoliDB
 		{
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else
-		{
+		} else {
 			// Constants to convert a MSSql error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -649,8 +630,7 @@ class DoliDBMssql extends DoliDB
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mssql_get_last_message.
 			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
-		}
-		else {
+		} else {
 			return mssql_get_last_message();
 		}
 	}
@@ -670,9 +650,7 @@ class DoliDBMssql extends DoliDB
 		if ($res && $data = $this->fetch_array($res))
 		{
 			return $data["id"];
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -734,8 +712,7 @@ class DoliDBMssql extends DoliDB
 		{
             $row = $this->fetch_row($resql);
             return $row[0];
-		}
-		else return '?';
+		} else return '?';
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -849,10 +826,8 @@ class DoliDBMssql extends DoliDB
 			{
 				if (preg_match("/null/i", $field_desc['default']))
 				$sqlfields[$i]  .= " default ".$field_desc['default'];
-				else
-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
-			}
-			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+				else $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
 			    $sqlfields[$i] .= " ".$field_desc['null'];
 
 			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
@@ -892,8 +867,7 @@ class DoliDBMssql extends DoliDB
 		dol_syslog($sql);
 		if (!$this -> query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -910,8 +884,7 @@ class DoliDBMssql extends DoliDB
 
 		if (!$this->query($sql))
 			return -1;
-		else
-			return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -958,16 +931,14 @@ class DoliDBMssql extends DoliDB
 		if (preg_match("/^[^\s]/i", $field_desc['default']))
 		if (preg_match("/null/i", $field_desc['default']))
 		$sql  .= " default ".$field_desc['default'];
-		else
-		$sql  .= " default '".$field_desc['default']."'";
+		else $sql  .= " default '".$field_desc['default']."'";
 		if (preg_match("/^[^\s]/i", $field_desc['extra']))
 		$sql  .= " ".$field_desc['extra'];
 		$sql .= " ".$field_position;
 
 		if (!$this -> query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -991,8 +962,7 @@ class DoliDBMssql extends DoliDB
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1012,8 +982,7 @@ class DoliDBMssql extends DoliDB
 		{
 			$this->error = $this->lasterror();
 			return -1;
-		}
-		else return 1;
+		} else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1037,9 +1006,7 @@ class DoliDBMssql extends DoliDB
             if ($this->lasterrno != '15025')
             {
 	            return -1;
-            }
-            else
-			{
+            } else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
@@ -1050,9 +1017,7 @@ class DoliDBMssql extends DoliDB
         {
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
-        }
-        else
-        {
+        } else {
             if ($num)
             {
                 $this->select_db($dolibarr_main_db_name);
@@ -1206,9 +1171,7 @@ class DoliDBMssql extends DoliDB
 	    if (is_array($fields))
 	    {
 	        $where = " IN ('".implode("','", $fields)."')";
-	    }
-	    else
-	    {
+	    } else {
 	        $where = "='".$this->escape($fields)."'";
 	    }
 	    $result = array();
@@ -1219,9 +1182,7 @@ class DoliDBMssql extends DoliDB
 	        {
 	            $result[] = $obj;
 	        }
-	    }
-	    else
-	        return false;
+	    } else return false;
 
 	    return $result;
 	}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 7c0d680662d..b98c6444148 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -121,18 +121,14 @@ class DoliDBMysqli extends DoliDB
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
-            }
-            else
-            {
+            } else {
                 $this->database_selected = false;
                 $this->database_name = '';
                 $this->ok = false;
                 $this->error = $this->error();
                 dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
             }
-        }
-        else
-        {
+        } else {
             // Pas de selection de base demandee, ok ou ko
             $this->database_selected = false;
 
@@ -269,9 +265,7 @@ class DoliDBMysqli extends DoliDB
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
-        }
-        else
-        {
+        } else {
             $ret = $this->db->query($query);
         }
 
@@ -341,9 +335,7 @@ class DoliDBMysqli extends DoliDB
         {
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetch_row();
-        }
-        else
-        {
+        } else {
             // si le curseur est un booleen on retourne la valeur 0
             return 0;
         }
@@ -470,8 +462,7 @@ class DoliDBMysqli extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
-        }
-        else {
+        } else {
             return $this->db->error;
         }
     }
@@ -516,8 +507,7 @@ class DoliDBMysqli extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -549,8 +539,7 @@ class DoliDBMysqli extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -574,8 +563,7 @@ class DoliDBMysqli extends DoliDB
         {
             $row = $this->fetch_row($resql);
             return $row[0];
-        }
-        else return '?';
+        } else return '?';
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -703,8 +691,7 @@ class DoliDBMysqli extends DoliDB
 			{
 				if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
-				}
-				else {
+				} else {
 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 				}
 			}
@@ -747,8 +734,7 @@ class DoliDBMysqli extends DoliDB
 
         if (!$this->query($sql))
         return -1;
-        else
-        return 1;
+        else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -765,8 +751,7 @@ class DoliDBMysqli extends DoliDB
 
 		if (!$this->query($sql))
  			return -1;
-    	else
-    		return 1;
+    	else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -823,8 +808,7 @@ class DoliDBMysqli extends DoliDB
         {
             if (preg_match("/null/i", $field_desc['default']))
             $sql .= " default ".$field_desc['default'];
-            else
-            $sql .= " default '".$field_desc['default']."'";
+            else $sql .= " default '".$field_desc['default']."'";
         }
         if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
         {
@@ -863,8 +847,7 @@ class DoliDBMysqli extends DoliDB
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -882,8 +865,7 @@ class DoliDBMysqli extends DoliDB
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
         if (!$this->query($sql))
         return -1;
-        else
-        return 1;
+        else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -928,9 +910,7 @@ class DoliDBMysqli extends DoliDB
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
             	return -1;
-            }
-            else
-			{
+            } else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index bf9b468d4a8..8eeaa7f335b 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -104,9 +104,7 @@ class DoliDBPgsql extends DoliDB
 		{
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else
-		{
+		} else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -122,18 +120,14 @@ class DoliDBPgsql extends DoliDB
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else
-			{
+			} else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
 				$this->error = $this->error();
 				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
-		}
-		else
-		{
+		} else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -518,8 +512,7 @@ class DoliDBPgsql extends DoliDB
 				{
 					$query = preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', '\\1\'\\2\'', $query);
 					dol_syslog("Warning: Bad formed request converted into ".$query, LOG_WARNING);
-				}
-				else $loop = false;
+				} else $loop = false;
 			}
 		}
 
@@ -722,8 +715,7 @@ class DoliDBPgsql extends DoliDB
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else {
+		} else {
 			// Constants to convert error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -998,10 +990,8 @@ class DoliDBPgsql extends DoliDB
 			{
 				if (preg_match("/null/i", $field_desc['default']))
 				    $sqlfields[$i] .= " default ".$field_desc['default'];
-				else
-				    $sqlfields[$i] .= " default '".$field_desc['default']."'";
-			}
-			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+				else $sqlfields[$i] .= " default '".$field_desc['default']."'";
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
 			    $sqlfields[$i]  .= " ".$field_desc['null'];
 
 			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
@@ -1041,8 +1031,7 @@ class DoliDBPgsql extends DoliDB
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1059,8 +1048,7 @@ class DoliDBPgsql extends DoliDB
 
 		if (!$this->query($sql))
 			return -1;
-		else
-			return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1178,8 +1166,7 @@ class DoliDBPgsql extends DoliDB
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -1231,8 +1218,7 @@ class DoliDBPgsql extends DoliDB
 		{
             $liste = $this->fetch_array($resql);
 		    return $liste['server_encoding'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -1272,8 +1258,7 @@ class DoliDBPgsql extends DoliDB
 		{
 		    $liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -1312,9 +1297,7 @@ class DoliDBPgsql extends DoliDB
 		if (file_exists('/usr/bin/pg_dump'))
 		{
 		    $fullpathofdump = '/usr/bin/pg_dump';
-		}
-		else
-		{
+		} else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 		    $resql = $this->query('SHOW data_directory');
     		if ($resql)
@@ -1343,9 +1326,7 @@ class DoliDBPgsql extends DoliDB
         if (file_exists('/usr/bin/'.$tool))
         {
             $fullpathofdump = '/usr/bin/'.$tool;
-        }
-        else
-        {
+        } else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
             $resql = $this->query('SHOW data_directory');
             if ($resql)
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 2d24c232797..a1a4e10ec7e 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -111,9 +111,7 @@ class DoliDBSqlite3 extends DoliDB
             $this->addCustomFunction('WEEKDAY');
             $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        else
-        {
+        } else {
             // host, login ou password incorrect
             $this->connected = false;
             $this->ok = false;
@@ -339,8 +337,7 @@ class DoliDBSqlite3 extends DoliDB
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
@@ -467,8 +464,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($ret) {
                 $ret->queryString = $query;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->error = $this->db->lastErrorMsg();
         }
@@ -553,9 +549,7 @@ class DoliDBSqlite3 extends DoliDB
         {
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
-        }
-        else
-        {
+        } else {
             // si le curseur est un booleen on retourne la valeur 0
             return false;
         }
@@ -641,8 +635,7 @@ class DoliDBSqlite3 extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
-        }
-        else {
+        } else {
             // Constants to convert error code to a generic Dolibarr error code
             /*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -706,8 +699,7 @@ class DoliDBSqlite3 extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
-        }
-        else {
+        } else {
             return $this->error;
         }
     }
@@ -751,8 +743,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -784,8 +775,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -931,10 +921,8 @@ class DoliDBSqlite3 extends DoliDB
             {
                 if (preg_match("/null/i", $field_desc['default']))
                     $sqlfields[$i] .= " default ".$field_desc['default'];
-                else
-                    $sqlfields[$i] .= " default '".$field_desc['default']."'";
-            }
-            elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+                else $sqlfields[$i] .= " default '".$field_desc['default']."'";
+            } elseif (preg_match("/^[^\s]/i", $field_desc['null']))
                 $sqlfields[$i] .= " ".$field_desc['null'];
 
             elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
@@ -991,8 +979,7 @@ class DoliDBSqlite3 extends DoliDB
 
     	if (!$this->query($sql))
     		return -1;
-    	else
-    		return 1;
+    	else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1043,8 +1030,7 @@ class DoliDBSqlite3 extends DoliDB
         {
             if (preg_match("/null/i", $field_desc['default']))
             $sql .= " default ".$field_desc['default'];
-            else
-            $sql .= " default '".$field_desc['default']."'";
+            else $sql .= " default '".$field_desc['default']."'";
         }
         if (preg_match("/^[^\s]/i", $field_desc['extra']))
         $sql .= " ".$field_desc['extra'];
@@ -1280,8 +1266,7 @@ class DoliDBSqlite3 extends DoliDB
                 $obj = $this->fetch_row($resql);
                 //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
                 $result[$var] = $obj[0];
-            }
-            else {
+            } else {
                 // TODO Récupérer le message
                 $result[$var] = 'FAIL';
             }
@@ -1354,12 +1339,11 @@ class DoliDBSqlite3 extends DoliDB
         if ($y == 0 && $month == 0) return 0;
         $num = (365 * $y + 31 * ($month - 1) + $day);
         if ($month <= 2) {
-            $y--; }
-        else {
+            $y--; } else {
             $num -= floor(($month * 4 + 23) / 10);
-        }
-        $temp = floor(($y / 100 + 1) * 3 / 4);
-        return $num + floor($y / 4) - $temp;
+			}
+			$temp = floor(($y / 100 + 1) * 3 / 4);
+			return $num + floor($y / 4) - $temp;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index 4f85610e657..db926a2b6bc 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -63,8 +63,7 @@ if ($resql)    // This can fail when class is used on old database (during migra
     			$this->export_entities_array[$r][$fieldname] = $keyforelement;
 		    }
 			// If this is a computed field
-			else
-			{
+			else {
 			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
 			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
 			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 0f50f33e988..80973006886 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -97,9 +97,7 @@ function SendError($number, $text)
 	{
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
-	}
-	else
-	{
+	} else {
 		SetXmlHeaders();
 
 		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
@@ -127,6 +125,5 @@ function SendErrorNode($number, $text)
 {
 	if ($text)
 		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
-	else
-		echo '<Error number="'.$number.'" />';
+	else echo '<Error number="'.$number.'" />';
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index dcc1650d4cd..5590879f8e6 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -86,8 +86,7 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
 			{
 				if (is_dir($sServerDir.$sFile))
 					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-				else
-				{
+				else {
 					$iFileSize = @filesize($sServerDir.$sFile);
 					if (!$iFileSize) {
 						$iFileSize = 0;
@@ -147,8 +146,7 @@ function CreateFolder($resourceType, $currentFolder)
 
 		if (strpos($sNewFolderName, '..') !== false)
 			$sErrorNumber = '102'; // Invalid folder name.
-		else
-		{
+		else {
 			// Map the virtual path to the local server path of the current folder.
 			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
 
@@ -171,13 +169,9 @@ function CreateFolder($resourceType, $currentFolder)
 						$sErrorNumber = '110';
 						break;
 				}
-			}
-			else
-				$sErrorNumber = '103';
+			} else $sErrorNumber = '103';
 		}
-	}
-	else
-		$sErrorNumber = '102';
+	} else $sErrorNumber = '102';
 
 	// Create the "Error" node.
 	echo '<Error number="'.$sErrorNumber.'" />';
@@ -254,9 +248,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 					$iCounter++;
 					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
 					$sErrorNumber = '201';
-				}
-				else
-				{
+				} else {
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
 					if (is_file($sFilePath))
@@ -289,19 +281,14 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
-				}
-				elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
+				} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
 				}
 			}
-		}
-		else
-			$sErrorNumber = '202';
-	}
-	else
-		$sErrorNumber = '202';
+		} else $sErrorNumber = '202';
+	} else $sErrorNumber = '202';
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -314,9 +301,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
     {
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    }
-    else
-	{
+    } else {
 	    //issue the CKEditor Callback
         SendCKEditorResults(
 			$CKEcallback,
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 2a9ac9f146b..2438882604e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -46,8 +46,7 @@ function GetResourceTypePath($resourceType, $sCommand)
 
 	if ($sCommand == "QuickUpload")
 		return $Config['QuickUploadPath'][$resourceType];
-	else
-		return $Config['FileTypesPath'][$resourceType];
+	else return $Config['FileTypesPath'][$resourceType];
 }
 
 /**
@@ -67,9 +66,7 @@ function GetResourceTypeDirectory($resourceType, $sCommand)
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
-	}
-	else
-	{
+	} else {
 		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
 			return $Config['FileTypesAbsolutePath'][$resourceType];
 
@@ -178,9 +175,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'])
 		{
 			mkdir($folderPath);
-		}
-		else
-		{
+		} else {
 			$permissions = '0777';
 			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
 			{
@@ -202,9 +197,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		ini_restore('error_reporting');
 
 		return $sErrorMsg;
-	}
-	else
-		return '';
+	} else return '';
 }
 
 /**
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index 1349ed00dad..b8caad99ee3 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -81,18 +81,14 @@ function ConvertToXmlAttribute($value)
 	if (defined('PHP_OS'))
 	{
 		$os = PHP_OS;
-	}
-	else
-	{
+	} else {
 		$os = php_uname();
 	}
 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
-	{
+	} else {
 		return (htmlspecialchars($value));
 	}
 }
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 1564fc3f9bc..48b957b9e8a 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -70,10 +70,8 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 	if (preg_match('/\d\.\d/', $appli))
 	{
 		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-	}
-	else $appli .= " ".DOL_VERSION;
-}
-else $appli .= " ".DOL_VERSION;
+	} else $appli .= " ".DOL_VERSION;
+} else $appli .= " ".DOL_VERSION;
 
 if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
@@ -89,9 +87,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 		$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
 		$logouttext .= '</a>';
-	}
-	else
-	{
+	} else {
 		$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 	}
@@ -118,9 +114,8 @@ $result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note
 if (is_numeric($result))
 {
 	if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
-	else  $toprightmenu = $hookmanager->resPrint; // replace
-}
-else $toprightmenu .= $result; // For backward compatibility
+	else $toprightmenu = $hookmanager->resPrint; // replace
+} else $toprightmenu .= $result; // For backward compatibility
 
 // Link to module builder
 if (!empty($conf->modulebuilder->enabled))
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 92b8dc34a0e..78a96484751 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -177,8 +177,7 @@ $(document).ready(function(){
 if (empty($user->socid))	// If internal user or not defined
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
-}
-else                        	// If external user
+} else // If external user
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index b78c0478370..47f01d649cf 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -185,8 +185,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			                {
 			                	$qualified = 0;
 			                }
-            			}
-            			else						// This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
+            			} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
             			{
             				$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
             				//var_dump($reg[2]);
@@ -225,9 +224,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
         if ($buffer) $arraysql[$i] = $buffer;
         fclose($fp);
-    }
-    else
-    {
+    } else {
         dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
     }
 
@@ -251,9 +248,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     $obj = $db->fetch_object($resql);
                     $listofmaxrowid[$table] = $obj->max;
                     if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
-                }
-                else
-                {
+                } else {
                     if (!$silent) print '<tr><td class="tdtop" colspan="2">';
                     if (!$silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
                     if (!$silent) print '</tr>';
@@ -369,9 +364,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     dol_syslog('Admin.lib::run_sql Insert nb '.$cursorinsert.', done in table '.$table.', rowid is '.$listofinsertedrowid[$cursorinsert], LOG_DEBUG);
                 }
                 // 	          print '<td class="right">OK</td>';
-            }
-            else
-            {
+            } else {
                 $errno = $db->errno();
                 if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
 
@@ -413,9 +406,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
         if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
         $ok = 1;
-    }
-    else
-    {
+    } else {
         if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
         $ok = 0;
@@ -457,9 +448,7 @@ function dolibarr_del_const($db, $name, $entity = 1)
     {
         $conf->global->$name = '';
         return 1;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         return -1;
     }
@@ -554,9 +543,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
         $db->commit();
         $conf->global->$name = $value;
         return 1;
-    }
-    else
-    {
+    } else {
         $error = $db->lasterror();
         $db->rollback();
         return -1;
@@ -658,8 +645,7 @@ function security_prepare_head()
     {
     	$obj = $db->fetch_object($resql);
     	if ($obj) $nbPerms = $obj->nb;
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
     $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
     $head[$h][1] = $langs->trans("DefaultRights");
@@ -970,9 +956,7 @@ function activateModule($value, $withdeps = 1)
     if ($result <= 0)
     {
         $ret['errors'][] = $objMod->error;
-    }
-    else
-    {
+    } else {
         if ($withdeps)
         {
             if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
@@ -1008,9 +992,7 @@ function activateModule($value, $withdeps = 1)
     				{
     				    $ret['nbmodules'] += $resarray['nbmodules'];
     				    $ret['nbperms'] += $resarray['nbperms'];
-    				}
-    				else
-    				{
+    				} else {
     				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
@@ -1081,8 +1063,7 @@ function unActivateModule($value, $requiredby = 1)
         $objMod = new $modName($db);
         $result = $objMod->remove();
         if ($result <= 0) $ret = $objMod->error;
-    }
-    else    // We come here when we try to unactivate a module when module does not exists anymore in sources
+    } else // We come here when we try to unactivate a module when module does not exists anymore in sources
     {
         //print $dir.$modFile;exit;
     	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
@@ -1162,9 +1143,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else
-                        {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -1209,24 +1188,19 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                                 {
                                     print 'Error in descriptor of module '.$const_name.'. Array ->dictionaries has not same number of record for key "tabname", "tablib", "tabsql" and "tabsqlsort"';
                                     //print "$const_name: $nbtabname=$nbtablib=$nbtabsql=$nbtabsqlsort=$nbtabfield=$nbtabfieldvalue=$nbtabfieldinsert=$nbtabrowid=$nbtabcond=$nbtabfieldcheck=$nbtabhelp\n";
-                                }
-                                else
-                                {
+                                } else {
                                 	$taborder[] = 0; // Add an empty line
                                 }
                             }
 
                             $j++;
                             $i++;
-                        }
-                        else dol_syslog("Module ".get_class($objMod)." not qualified");
+                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
-        }
-        else
-        {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1284,15 +1258,12 @@ function activateModulesRequiredByCountry($country_code)
 
 								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
 							}
-						}
-						else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else dol_syslog("Module ".get_class($objMod)." not qualified");
 					}
 				}
 			}
 			closedir($handle);
-		}
-		else
-		{
+		} else {
 			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 		}
 	}
@@ -1347,9 +1318,7 @@ function complete_elementList_with_modules(&$elementList)
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else
-                        {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -1386,15 +1355,12 @@ function complete_elementList_with_modules(&$elementList)
 
                             $j++;
                             $i++;
-                        }
-                        else dol_syslog("Module ".get_class($objMod)." not qualified");
+                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
-        }
-        else
-        {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1447,17 +1413,13 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
     	// $const is a const key like 'MYMODULE_ABC'
     	if (is_numeric($key)) {		// Very old behaviour
     		$type = 'string';
-    	}
-    	else
-    	{
+    	} else {
     		if (is_array($const))
     		{
     			$type = $const['type'];
 				$label = $const['label'];
     			$const = $key;
-    		}
-    		else
-    		{
+    		} else {
     			$type = $const;
     			$const = $key;
     		}
@@ -1548,9 +1510,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 print '<input type="hidden" name="consttype" value="yesno">';
                 print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
                 print '</td>';
-            }
-            else
-            {
+            } else {
                 print '<td>';
                 print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
                 print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
@@ -1559,18 +1519,15 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                     print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
                     print $obj->value;
                     print "</textarea>\n";
-                }
-                elseif ($obj->type == 'html')
+                } elseif ($obj->type == 'html')
                 {
                 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
                 	$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
                 	$doleditor->Create();
-                }
-                elseif ($obj->type == 'yesno')
+                } elseif ($obj->type == 'yesno')
                 {
                 	print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
-                }
-                elseif (preg_match('/emailtemplate/', $obj->type))
+                } elseif (preg_match('/emailtemplate/', $obj->type))
                 {
                 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 	$formmail = new FormMail($db);
@@ -1594,8 +1551,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 	//var_dump($arraydefaultmessage);
                 	//var_dump($arrayofmessagename);
                 	print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
-                }
-                else	// type = 'string' ou 'chaine'
+                } else // type = 'string' ou 'chaine'
                 {
                     print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
                 }
@@ -1684,9 +1640,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 	{
 		$db->commit();
 		return 1;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1717,9 +1671,7 @@ function delDocumentModel($name, $type)
 	{
 		$db->commit();
 		return 1;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1748,8 +1700,7 @@ function phpinfo_array()
 		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
 		{
 			$info_arr[trim($cat)][trim($val[1])] = $val[2];
-		}
-		elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
+		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
 		{
 			$info_arr[trim($cat)][trim($val[1])] = array("local" => $val[2], "master" => $val[3]);
 		}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 5d450aa4b04..77a8ba8ea5b 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -304,9 +304,7 @@ function show_array_actions_to_do($max = 5)
 	    print "</table></div><br>";
 
 	    $db->free($resql);
-	}
-	else
-	{
+	} else {
 	    dol_print_error($db);
 	}
 }
@@ -393,9 +391,7 @@ function show_array_last_actions_done($max = 5)
 		print "</table></div><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 1d3e80b90be..8e782c3a7fd 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -494,9 +494,7 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 	{
 		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	}
-	else
-	{
+	} else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script>
 			$(document).ready(function() {
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index d0f102a4e78..387d705780a 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -334,8 +334,7 @@ function checkBanForAccount($account)
             return false; // Sould be 6 but can be 123-456
         elseif (strlen($account->code_banque) < 6)
             return false; // Sould be 6
-        else
-            return true;
+        else return true;
     }
 
     // No particular rule
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index a4d7a077aab..da712d960cd 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -127,15 +127,12 @@ function barcode_encode($code, $encoding)
         /* use built-in EAN-Encoder */
         dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
         $bars = barcode_encode_ean($code, $encoding);
-    }
-    elseif (file_exists($genbarcode_loc))	// For example C39
+    } elseif (file_exists($genbarcode_loc))	// For example C39
     {
         /* use genbarcode */
         dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
         $bars = barcode_encode_genbarcode($code, $encoding);
-    }
-    else
-    {
+    } else {
         print "barcode_encode needs an external programm for encodings other then EAN/ISBN (code=".$code.", encoding=".$encoding.")<BR>\n";
         print "<UL>\n";
         print "<LI>download gnu-barcode from <A href=\"https://www.gnu.org/software/barcode/\">www.gnu.org/software/barcode/</A>\n";
@@ -263,9 +260,7 @@ function barcode_encode_genbarcode($code, $encoding)
         $text = fgets($fp, 1024);
         $encoding = fgets($fp, 1024);
         pclose($fp);
-    }
-    else
-    {
+    } else {
         dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
         return false;
     }
@@ -396,18 +391,14 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
     {
         header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
         imagejpeg($im);
-    }
-    elseif ($mode == 'gif')
+    } elseif ($mode == 'gif')
     {
         header("Content-Type: image/gif; name=\"barcode.gif\"");
         imagegif($im);
-    }
-    elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
+    } elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
     {
         imagepng($im, $filebarcode);
-    }
-    else
-    {
+    } else {
         header("Content-Type: image/png; name=\"barcode.png\"");
         imagepng($im);
     }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4b0a2d5b131..9449edec696 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -73,9 +73,7 @@ function societe_prepare_head(Societe $object)
 		    $head[$h][2] = 'contact';
 		    $h++;
 		}
-    }
-    else
-	{
+    } else {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][1] = $langs->trans("ContactsAddresses");
@@ -134,8 +132,7 @@ function societe_prepare_head(Societe $object)
     			$nbNote = $obj->nb;
     			$i++;
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($db);
     	}
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -227,8 +224,7 @@ function societe_prepare_head(Societe $object)
                 $nbBankAccount = $obj->nb;
                 $i++;
             }
-        }
-        else {
+        } else {
             dol_print_error($db);
         }
 
@@ -261,8 +257,7 @@ function societe_prepare_head(Societe $object)
     			$nbNote = $obj->nb;
     			$i++;
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($db);
     	}
     	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
@@ -296,8 +291,7 @@ function societe_prepare_head(Societe $object)
         			$nbNote = $obj->nb;
         			$i++;
         		}
-        	}
-        	else {
+        	} else {
         		dol_print_error($db);
         	}
 
@@ -474,15 +468,12 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
             elseif ($withcode == 3) $result = $obj->rowid;
             elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
             else $result = $label;
-        }
-        else
-        {
+        } else {
             $result = 'NotDefined';
         }
         $dbtouse->free($resql);
         return $result;
-    }
-    else dol_print_error($dbtouse, '');
+    } else dol_print_error($dbtouse, '');
     return 'Error';
 }
 
@@ -531,42 +522,32 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
             if ($withcode == 1) {
                 if ($withregion == 1) {
                     return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-                else {
+                } else {
                     return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
                 }
-            }
-            elseif ($withcode == 2) {
+            } elseif ($withcode == 2) {
                 if ($withregion == 1) {
                     return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-                else {
+                } else {
                     return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
                 }
-            }
-            elseif ($withcode === 'all') {
+            } elseif ($withcode === 'all') {
                 if ($withregion == 1) {
                     return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);
-                }
-                else {
+                } else {
                     return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);
                 }
-            }
-            else {
+            } else {
                 if ($withregion == 1) {
                     return $label = $obj->region_name.' - '.$label;
-                }
-                else {
+                } else {
                     return $label;
                 }
             }
-        }
-        else
-        {
+        } else {
             return $langs->transnoentitiesnoconv("NotDefined");
         }
-    }
-    else dol_print_error($dbtouse, '');
+    } else dol_print_error($dbtouse, '');
 }
 
 /**
@@ -606,9 +587,7 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
             $label = ($obj->label != '-' ? $obj->label : '');
             if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
             else return $label;
-        }
-        else
-        {
+        } else {
             return $code_iso;
         }
     }
@@ -641,9 +620,7 @@ function getFormeJuridiqueLabel($code)
             $obj = $db->fetch_object($resql);
             $label = ($obj->libelle != '-' ? $obj->libelle : '');
             return $label;
-        }
-        else
-        {
+        } else {
             return $langs->trans("NotDefined");
         }
     }
@@ -831,15 +808,11 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
                     }
                     $i++;
                 }
-            }
-            else
-			{
+            } else {
             	print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
             }
             $db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
         print "</table>";
@@ -1238,9 +1211,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
             print "</tr>\n";
             $i++;
         }
-    }
-    else
-	{
+    } else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1326,9 +1297,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         // Recherche histo sur actioncomm
         if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
-        }
-        else
-        {
+        } else {
             $sql = "SELECT a.id, a.label as label,";
         }
         $sql .= " a.datep as dp,";
@@ -1339,9 +1308,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
         $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
         if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))      $sql .= ", sp.lastname, sp.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
+        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
@@ -1366,9 +1333,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             $sql .= " ON er.resource_type = 'dolresource'";
             $sql .= " AND er.element_id = a.id";
             $sql .= " AND er.resource_id = ".$filterobj->id;
-        }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+        } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
@@ -1379,39 +1344,32 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
         if ($force_filter_contact === false) {
             if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
+            elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
             elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent')
             {
                 $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
             {
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
             {
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
+            } elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element)
             {
             	$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element)."'";
             	if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
@@ -1425,14 +1383,11 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-                else
-                {
+                else {
                     if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
                     elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
                 }
-            }
-            else
-            {
+            } else {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
                 else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
@@ -1549,9 +1504,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	            $numaction++;
 	            $i++;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        dol_print_error($db);
 	    }
     }
@@ -1576,9 +1529,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             (is_null($filterobj) || get_class($filterobj) == 'Societe'))
         {
             $out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
-        }
-        else
-        {
+        } else {
             $out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
         }
         if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
@@ -1742,8 +1693,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
             if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element']))
             {
             	$out .= dolGetElementUrl($histo[$key]['fk_element'], $histo[$key]['elementtype'], 1);
-            }
-            else $out .= '&nbsp;';
+            } else $out .= '&nbsp;';
             $out .= '</td>';
 
             // Contact(s) for action
@@ -1772,8 +1722,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					}
 				}
 				$out .= '</td>';
-			}
-            else {
+			} else {
             	$out .= '<td>&nbsp;</td>';
             }
 
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 33ad0a85229..1779e77213e 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -123,9 +123,7 @@ function dol_print_cron_urls()
     		print $langs->trans("CronExplainHowToRunUnix");
     		print '<br>';
     		print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
-    	}
-    	else
-    	{
+    	} else {
     		print $langs->trans("CronExplainHowToRunWin");
     	}
 	}
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b44d7260e97..22f99312520 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -94,9 +94,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
         $localdt = new DateTime($newrefgmtdate, $localtz);
         $tmp = -1 * $localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
-    }
-    else
-    {
+    } else {
     	$tmp = 0;
     	dol_print_error('', 'PHP version must be 5.3+');
     }
@@ -231,47 +229,37 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 			{
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
-		}
-		elseif ($format == 'allhourminsec')
+		} elseif ($format == 'allhourminsec')
 		{
 		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
-		}
-		elseif ($format == 'allhourmin')
+		} elseif ($format == 'allhourmin')
 		{
 		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
-		}
-		elseif ($format == 'allhour')
+		} elseif ($format == 'allhour')
 		{
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
 		}
-	}
-	elseif ($format == 'hour')	// only hour part
+	} elseif ($format == 'hour')	// only hour part
 	{
 		$sTime = dol_print_date($iSecond, '%H', true);
-	}
-	elseif ($format == 'fullhour')
+	} elseif ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
 			$iSecond = $iSecond / 3600;
-		}
-		else {
+		} else {
 			$iSecond = 0;
 		}
 		$sTime = $iSecond;
-	}
-	elseif ($format == 'min')	// only min part
+	} elseif ($format == 'min')	// only min part
 	{
 		$sTime = dol_print_date($iSecond, '%M', true);
-	}
-    elseif ($format == 'sec')	// only sec part
+	} elseif ($format == 'sec')	// only sec part
     {
         $sTime = dol_print_date($iSecond, '%S', true);
-    }
-    elseif ($format == 'month')	// only month part
+    } elseif ($format == 'month')	// only month part
     {
         $sTime = dol_print_date($iSecond, '%m', true);
-    }
-    elseif ($format == 'year')	// only year part
+    } elseif ($format == 'year')	// only year part
     {
         $sTime = dol_print_date($iSecond, '%Y', true);
     }
@@ -300,8 +288,7 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 		} elseif ($year_date > 0 && !empty($day_date)) {
 			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
 			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
-		} else
-			$sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
+		} else $sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
 	} elseif ($year_date > 0) {
 		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
 		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
@@ -346,8 +333,7 @@ function dol_stringtotime($string, $gm = 1)
         if ($syear < 50) $syear += 1900;
         if ($syear >= 50 && $syear < 100) $syear += 2000;
         $string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-    }
-    elseif (
+    } elseif (
     	   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
     	|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
    		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
@@ -411,9 +397,7 @@ function dol_get_prev_month($month, $year)
 	{
 		$prev_month = 12;
 		$prev_year  = $year - 1;
-	}
-	else
-	{
+	} else {
 		$prev_month = $month - 1;
 		$prev_year  = $year;
 	}
@@ -432,9 +416,7 @@ function dol_get_next_month($month, $year)
 	{
 		$next_month = 1;
 		$next_year  = $year + 1;
-	}
-	else
-	{
+	} else {
 		$next_month = $month + 1;
 		$next_year  = $year;
 	}
@@ -508,9 +490,7 @@ function dol_get_last_day($year, $month = 12, $gm = false)
 	{
 		$month = 1;
 		$year += 1;
-	}
-	else
-	{
+	} else {
 		$month += 1;
 	}
 
@@ -563,9 +543,7 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
     		$prev_month = 12;
     		$prev_year  = $year - 1;
     	}
-    }
-    else
-    {
+    } else {
     	$prev_month = $month;
 		$prev_year = $year;
     }
@@ -647,9 +625,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				if ($tmp[2])
 				{
 					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;
-				}
-				else
-				{
+				} else {
 					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;
 				}
 			}
@@ -674,9 +650,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				if (!empty($obj->dayrule) && $obj->dayrule != 'date')		// For example 'easter', '...'
 				{
 					$specialdayrule[$obj->dayrule] = $obj->dayrule;
-				}
-				else
-				{
+				} else {
 					$match = 1;
 					if (!empty($obj->year) && $obj->year != $annee) $match = 0;
 					if ($obj->month != $mois) $match = 0;
@@ -687,9 +661,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($db->lasterror(), LOG_ERR);
 			return 'Error sql '.$db->lasterror();
 		}
@@ -857,9 +829,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 		if ($lastday == 1)
 		{
 			$bit = 0;
-		}
-		else
-		{
+		} else {
 			$bit = 1;
 		}
 		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
@@ -901,8 +871,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 		$nbOpenDay = ($numdays - $numholidays);
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	elseif ($timestampStart == $timestampEnd)
+	} elseif ($timestampStart == $timestampEnd)
 	{
 		$numholidays = 0;
 		if ($lastday) {
@@ -914,9 +883,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 
 		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	else
-	{
+	} else {
 		return $langs->trans("Error");
 	}
 }
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 38e847bb3c1..4e9768b2a44 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -75,8 +75,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$discount->fetch($line->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
@@ -84,27 +83,21 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
-		}
-		else
-		{
+		} else {
 			if ($idprod)
 			{
 				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
-			}
-			else
-			{
+			} else {
 				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 		}
@@ -123,9 +116,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 				if ($prodser->isService())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-				}
-				else
-				{
+				} else {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
 			}
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index df9e3d94619..ddccb11247e 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -111,9 +111,7 @@ function show_skin($fuser, $edit = 0)
     					if ($subdir == $selected_theme)
     					{
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-    					}
-    					else
-    					{
+    					} else {
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
     					}
 						print '</div>';
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 3d14f14a7df..b9da91093bb 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -84,9 +84,7 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
 		$h++;
-	}
-	else
-	{
+	} else {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index dbea182fb9b..03bb8a419c9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -118,8 +118,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
-				}
-				elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
+				} elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
 				// Check if file is qualified
 				foreach ($excludefilterarray as $filt)
 				{
@@ -167,8 +166,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
 							}
 						}
-					}
-					elseif (!$isdir && (($types == "files") || ($types == "all")))
+					} elseif (!$isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
 						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
@@ -279,9 +277,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 		}
 
 		return $file_list;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		return array();
 	}
@@ -372,14 +368,10 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
-				{
+				} else {
 					$filearray[$key]['rowid'] = $result;
 				}
-			}
-			else
-			{
+			} else {
 				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
@@ -403,8 +395,7 @@ function dol_compare_file($a, $b)
 
 	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }
-	else { $retup = 1; $retdown = -1; }
+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; } else { $retup = 1; $retdown = -1; }
 
 	if ($sortfield == 'name')
 	{
@@ -512,9 +503,7 @@ function dol_dir_is_emtpy($folder)
 
 		if ($folder_content == "...") return true;
 		else return false;
-	}
-	else
-		return true; // Dir does not exists
+	} else return true; // Dir does not exists
 }
 
 /**
@@ -540,9 +529,7 @@ function dol_count_nb_of_line($file)
 			if (!$line === false) $nb++;
 		}
 		fclose($fp);
-	}
-	else
-	{
+	} else {
 		$nb = -1;
 	}
 
@@ -625,9 +612,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 	if (empty($arrayreplacementisregex))
 	{
 		$content = make_substitutions($content, $arrayreplacement, null);
-	}
-	else
-	{
+	} else {
 		foreach ($arrayreplacement as $key => $value)
 		{
 			$content = preg_replace($key, $value, $content);
@@ -773,9 +758,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
 					}
-				}
-				else
-				{
+				} else {
 					$newfile = $file;
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
@@ -791,18 +774,14 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
-				{
+				} else {
 					$result = $tmpresult;
 				}
 				if ($result < 0) break;
 			}
 		}
 		closedir($dir_handle);
-	}
-	else
-	{
+	} else {
 		// Source directory does not exists
 		$result = -2;
 	}
@@ -868,8 +847,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+			} else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -906,8 +884,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					$ecmfile->filepath = $rel_dir;
 					$ecmfile->filename = $filename;
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
 					$rel_dir = dirname($rel_filetorenameafter);
@@ -926,8 +903,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
@@ -1091,8 +1067,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		$errmsg = join(',', $hookmanager->errors);
 		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
-	}
-	elseif (empty($reshook))
+	} elseif (empty($reshook))
 	{
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded = dol_osencode($src_file);
@@ -1122,9 +1097,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return 1; // Success
-		}
-		else
-		{
+		} else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3; // Unknown error
 		}
@@ -1182,9 +1155,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 	{
 		if ($reshook < 0) return false;
 		return true;
-	}
-	else
-	{
+	} else {
 		$error = 0;
 
 		//print "x".$file." ".$disableglob;exit;
@@ -1227,19 +1198,14 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 						// TODO Failure to remove can be because file was already removed or because of permission
 						// If error because it does not exists, we should return true, and we should return false if this is a permission problem
 					}
 				}
-			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
-		{
+			} else dol_syslog("No files to delete found", LOG_DEBUG);
+		} else {
 			$ok = false;
 			if ($nophperrors) $ok = @unlink($file_osencoded);
 			else $ok = unlink($file_osencoded);
@@ -1301,9 +1267,7 @@ function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub =
 					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
 					{
 						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
-					{
+					} else {
 						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
 						if ($result) $countdeleted++;
@@ -1383,9 +1347,7 @@ function dol_delete_preview($object)
 			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewold);
 			return 0;
 		}
-	}
-	else
-	{
+	} else {
 		$multiple = $filepreviewold.".";
 		for ($i = 0; $i < 20; $i++)
 		{
@@ -1473,9 +1435,7 @@ function dol_meta_create($object)
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 			return 1;
-	}
-	else
-	{
+	} else {
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
 
@@ -1618,27 +1578,22 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 						{
 							if ($allowoverwrite) {
 								// Do not show error message. We can have an error due to DB_ERROR_RECORD_ALREADY_EXISTS
-							}
-							else {
+							} else {
 								setEventMessages('FailedToAddFileIntoDatabaseIndex', '', 'warnings');
 							}
 						}
 					}
 
 					$nbok++;
-				}
-				else
-				{
+				} else {
 					$langs->load("errors");
 					if ($resupload < 0)	// Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-					}
-					elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
+					} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-					}
-					else	// Known error
+					} else // Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1665,9 +1620,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
@@ -1870,31 +1823,22 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 				{
 					try {
 						$ret = $image->writeImages($fileoutput, true);
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
 				if ($ret) return $count;
 				else return -3;
-			}
-			else
-			{
+			} else {
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		return 0;
 	}
 }
@@ -1916,14 +1860,11 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 
 	$foundhandler = 0;
 
-	try
-	{
+	try {
 		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
 
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
 			{
@@ -1995,9 +1936,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 					$errorstring = "dol_compress_file error archive->errorCode = ".$archive->errorCode()." errormsg=".$errormsg;
 					dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
 					return -3;
-				}
-				else
-				{
+				} else {
 					dol_syslog("dol_compress_file success - ".count($result)." files");
 					return 1;
 				}
@@ -2010,9 +1949,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$errorstring = "Try to zip with format ".$mode." with no handler for this format";
 			dol_syslog($errorstring, LOG_ERR);
 
@@ -2020,8 +1957,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			$errormsg = $errorstring;
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2052,8 +1988,7 @@ function dol_uncompress($inputfile, $outputdir)
 		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);
 		//var_dump($result);
 		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
-		{
+		else {
 			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
 			foreach ($result as $key => $val)
@@ -2082,9 +2017,7 @@ function dol_uncompress($inputfile, $outputdir)
 			$zip->extractTo($outputdir.'/');
 			$zip->close();
 			return array();
-		}
-		else
-		{
+		} else {
 			return array('error'=>'ErrUnzipFails');
 		}
 	}
@@ -2117,11 +2050,8 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 		return -3;
 	}
 
-	try
-	{
-		if ($mode == 'gz') { $foundhandler = 0; }
-		elseif ($mode == 'bz') { $foundhandler = 0; }
-		elseif ($mode == 'zip')
+	try {
+		if ($mode == 'gz') { $foundhandler = 0; } elseif ($mode == 'bz') { $foundhandler = 0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
 			 {
@@ -2185,13 +2115,10 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2271,20 +2198,17 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		$accessallowed = 1;
 		$original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
-	}
-	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+	} // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
 		// Dir for custom dirs
@@ -2293,203 +2217,169 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 		$accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
 		$original_file = $dirins.'/'.$original_file;
-	}
-	// Wrapping for some images
+	} // Wrapping for some images
 	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
-	}
-	// Wrapping for users photos
+	} // Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->user->dir_output.'/'.$original_file;
-	}
-	// Wrapping for members photos
+	} // Wrapping for members photos
 	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu factures
+	} // Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu propal
+	} // Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu commande
+	} // Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu intervention
+	} // Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu conat
+	} // Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
 		$original_file = $conf->contrat->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier proposal
+	} // Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
 		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier order
+	} // Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
+	} // Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
+	} // Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
 		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats propales
+	} // Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
 		$original_file = $conf->propal->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les images des stats commandes
+	} // Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats factures
+	} // Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
 		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
 		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
 		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
 		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
 		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
 		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats produits
+	} // Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
 	{
 		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
-	}
-	// Wrapping for taxes
+	} // Wrapping for taxes
 	elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output))
 	{
 		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
 		$modulepartsuffix = str_replace('tax-', '', $modulepart);
 		$original_file = $conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
-	}
-	// Wrapping for events
+	} // Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
-	}
-	// Wrapping for categories
+	} // Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
 		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les prelevements
+	} // Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
 		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
 		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les graph energie
+	} // Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->stock->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph fournisseurs
+	} // Wrapping pour les graph fournisseurs
 	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph des produits
+	} // Wrapping pour les graph des produits
 	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les code barre
+	} // Wrapping pour les code barre
 	elseif ($modulepart == 'barcode')
 	{
 		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
 		$original_file = '';
-	}
-	// Wrapping pour les icones de background des mailings
+	} // Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour le scanner
+	} // Wrapping pour le scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-	// Wrapping pour les images fckeditor
+	} // Wrapping pour les images fckeditor
 	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for users
+	} // Wrapping for users
 	elseif ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
 		$canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
@@ -2499,9 +2389,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->user->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for third parties
+	} // Wrapping for third parties
 	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2511,9 +2399,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
-	}
-
-	// Wrapping for contact
+	} // Wrapping for contact
 	elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2522,9 +2408,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
-	}
-
-	// Wrapping for invoices
+	} // Wrapping for invoices
 	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2533,8 +2417,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('invoice').")";
-	}
-	// Wrapping for mass actions
+	} // Wrapping for mass actions
 	elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2542,81 +2425,70 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_orders')
+	} elseif ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_sendings')
+	} elseif ($modulepart == 'massfilesarea_sendings')
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_invoices')
+	} elseif ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_expensereport')
+	} elseif ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_interventions')
+	} elseif ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_order')
+	} elseif ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_invoice')
+	} elseif ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-
-	// Wrapping for interventions
+	} // Wrapping for interventions
 	elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2625,9 +2497,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les deplacements et notes de frais
+	} // Wrapping pour les deplacements et notes de frais
 	elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
 		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2636,8 +2506,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les propales
+	} // Wrapping pour les propales
 	elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2646,9 +2515,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('propal').")";
-	}
-
-	// Wrapping pour les commandes
+	} // Wrapping pour les commandes
 	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2657,9 +2524,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
-	}
-
-	// Wrapping pour les projets
+	} // Wrapping pour les projets
 	elseif ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2668,8 +2533,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
@@ -2677,9 +2541,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-
-	// Wrapping pour les commandes fournisseurs
+	} // Wrapping pour les commandes fournisseurs
 	elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2688,9 +2550,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les factures fournisseurs
+	} // Wrapping pour les factures fournisseurs
 	elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2699,8 +2559,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les rapport de paiements
+	} // Wrapping pour les rapport de paiements
 	elseif ($modulepart == 'supplier_payment')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2709,9 +2568,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les rapport de paiements
+	} // Wrapping pour les rapport de paiements
 	elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2720,9 +2577,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
 		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
-	}
-
-	// Wrapping for accounting exports
+	} // Wrapping for accounting exports
 	elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
 	{
 		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
@@ -2730,9 +2585,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les expedition
+	} // Wrapping pour les expedition
 	elseif ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2740,8 +2593,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
-	}
-	// Wrapping pour les bons de livraison
+	} // Wrapping pour les bons de livraison
 	elseif ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2749,9 +2601,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
-	}
-
-	// Wrapping pour les actions
+	} // Wrapping pour les actions
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2759,9 +2609,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les actions
+	} // Wrapping pour les actions
 	elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
 		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2769,9 +2617,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
-	}
-
-	// Wrapping pour les produits et services
+	} // Wrapping pour les produits et services
 	elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2781,9 +2627,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
 		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les lots produits
+	} // Wrapping pour les lots produits
 	elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
 		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2792,9 +2636,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		if (!empty($conf->productbatch->enabled)) $original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping for stock movements
+	} // Wrapping for stock movements
 	elseif ($modulepart == 'movement' || $modulepart == 'mouvement')
 	{
 		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2803,9 +2645,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;
-	}
-
-	// Wrapping pour les contrats
+	} // Wrapping pour les contrats
 	elseif ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2814,9 +2654,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
-	}
-
-	// Wrapping pour les dons
+	} // Wrapping pour les dons
 	elseif ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
 		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2824,9 +2662,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->don->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les dons
+	} // Wrapping pour les dons
 	elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
 	{
 		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2834,9 +2670,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->resource->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les remises de cheques
+	} // Wrapping pour les remises de cheques
 	elseif ($modulepart == 'remisecheque' && !empty($conf->bank->dir_output))
 	{
 		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2845,9 +2679,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 
 		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
-	}
-
-	// Wrapping for bank
+	} // Wrapping for bank
 	elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output))
 	{
 		if ($fuser->rights->banque->{$lire})
@@ -2855,55 +2687,41 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->bank->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for export module
+	} // Wrapping for export module
 	elseif ($modulepart == 'export' && !empty($conf->export->dir_temp))
 	{
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
 		$accessallowed = 1;
 		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// Wrapping for import module
+	} // Wrapping for import module
 	elseif ($modulepart == 'import' && !empty($conf->import->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->import->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour l'editeur wysiwyg
+	} // Wrapping pour l'editeur wysiwyg
 	elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for backups
+	} // Wrapping for backups
 	elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
 		if ($fuser->admin) $accessallowed = 1;
 		$original_file = $conf->admin->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for upload file test
+	} // Wrapping for upload file test
 	elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
 		if ($fuser->admin) $accessallowed = 1;
 		$original_file = $conf->admin->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour BitTorrent
+	} // Wrapping pour BitTorrent
 	elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
 	{
 		$accessallowed = 1;
 		$dir = 'files';
 		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
 		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
-	}
-
-	// Wrapping pour Foundation module
+	} // Wrapping pour Foundation module
 	elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
 		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2911,22 +2729,17 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for Scanner
+	} // Wrapping for Scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// GENERIC Wrapping
+	} // GENERIC Wrapping
 	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
 	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
 	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
-	else
-	{
+	else {
 		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
 		if ($fuser->admin) $accessallowed = 1; // If user is admin
 
@@ -2941,8 +2754,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
+		} elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
@@ -2951,8 +2763,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
+		} elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
@@ -2961,8 +2772,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+		} elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
@@ -2974,9 +2784,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				$accessallowed = 1;
 			}
 			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
-		{
+		} else {
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.'). The module for this modulepart value may not be activated.');
@@ -3105,17 +2913,13 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize);
-		}
-		else
-		{
+		} else {
 			$md5_local = md5_file($pathref.'/'.$filename);
 
 			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
-			}
-			else
-			{
+			} else {
 				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);
 				$checksumconcat[] = $md5_local;
 			}
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index c46cd150a51..1693329329e 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -55,9 +55,7 @@ if ($resql)
         $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
         $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 809ebef2ca9..5b78dae709c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -84,9 +84,7 @@ function getEntity($element, $shared = 1, $currentobject = null)
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared, $currentobject);
-	}
-	else
-	{
+	} else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
 		if (in_array($element, $addzero)) $out .= '0,';
@@ -108,9 +106,7 @@ function setEntity($currentobject)
 	if (is_object($mc) && method_exists($mc, 'setEntity'))
 	{
 		return $mc->setEntity($currentobject);
-	}
-	else
-	{
+	} else {
 		return ((is_object($currentobject) && $currentobject->id > 0 && $currentobject->entity > 0) ? $currentobject->entity : $conf->entity);
 	}
 }
@@ -168,21 +164,13 @@ function getBrowserInfo($user_agent)
 	}
 
 	// OS
-	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; }
-	elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; }
-	elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
+	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
 
 	// Name
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; }
-	elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; }
-	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; }
-	elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; }
-	elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; }
-	elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; }	// Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; }
-	elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
-	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); }    // MS products at end
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
+	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }
 
 	if ($tablet) {
@@ -257,17 +245,14 @@ function GETPOSTISSET($paramname)
 		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 		{
 			$isset = 1;
-		}
-		elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+		{
+			$isset = 1;
+		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 		{
 			$isset = 1;
 		}
-		elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
-		{
-			$isset = 1;
-		}
-	}
-	else {
+	} else {
 		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname]));
 	}
 
@@ -350,17 +335,14 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];
-			}
-			elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_page_'.$relativepathstring];
-			}
-			elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
+			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
-		}
-		// Else, retreive default values if we are not doing a sort
+		} // Else, retreive default values if we are not doing a sort
 		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
@@ -395,8 +377,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								}
-								else $qualified = 1;
+								} else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -410,8 +391,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 							}
 						}
 					}
-				}
-				// Management of default search_filters and sort order
+				} // Management of default search_filters and sort order
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
@@ -436,8 +416,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 										}
 										if (!$foundintru) $qualified = 1;
 										//var_dump($defkey.'-'.$qualified);
-									}
-									else $qualified = 1;
+									} else $qualified = 1;
 
 									if ($qualified)
 									{
@@ -458,8 +437,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 								}
 							}
-						}
-						elseif (isset($user->default_values[$relativepathstring]['filters']))
+						} elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
 							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
 							{
@@ -475,8 +453,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								}
-								else $qualified = 1;
+								} else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -488,9 +465,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
-									}
-									else
-									{
+									} else {
 										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 									}
@@ -515,32 +490,48 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		{
 			$loopnb++; $newout = '';
 
-			if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-			elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; }
-			elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; }
-			elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-			elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-			elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-			elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-			elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-			elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-			elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
-			{
+			if ($reg[1] == 'DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['mday'];
+			} elseif ($reg[1] == 'MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['mon'];
+			} elseif ($reg[1] == 'YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['year'];
+			} elseif ($reg[1] == 'PREVIOUS_DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+				$newout = $tmp2['day'];
+			} elseif ($reg[1] == 'PREVIOUS_MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']);
+				$newout = $tmp2['month'];
+			} elseif ($reg[1] == 'PREVIOUS_YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = ($tmp['year'] - 1);
+			} elseif ($reg[1] == 'NEXT_DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+				$newout = $tmp2['day'];
+			} elseif ($reg[1] == 'NEXT_MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']);
+				$newout = $tmp2['month'];
+			} elseif ($reg[1] == 'NEXT_YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = ($tmp['year'] + 1);
+			} elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID') {
 				$newout = $mysoc->country_id;
-			}
-			elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
-			{
+			} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID') {
 				$newout = $user->id;
-			}
-			elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
-			{
+			} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID') {
 				$newout = $user->fk_user;
-			}
-			elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
-			{
+			} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {
 				$newout = $conf->entity;
+			} else {
+				$newout = ''; // Key not found, we replace with empty string
 			}
-			else $newout = ''; // Key not found, we replace with empty string
 			//var_dump('__'.$reg[1].'__ -> '.$newout);
 			$out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
 		}
@@ -558,8 +549,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
 			break;
 		case 'alpha':
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
 				$out = str_replace(array('"', '../'), '', trim($out));
@@ -746,8 +736,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 		{
 			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
 		}
-	}
-	else				// For an url path
+	} else // For an url path
 	{
 		// We try to get local path of file on filesystem from url
 		// Note that trying to know if a file on disk exist by forging path on disk from url
@@ -824,9 +813,7 @@ function dol_clone($object, $native = 0)
 	if (empty($native))
 	{
 		$myclone = unserialize(serialize($object));
-	}
-	else
-	{
+	} else {
 		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
 
@@ -917,9 +904,7 @@ function dol_string_unaccent($str)
 		);
 		$string = strtr($string, $replacements);
 		return rawurldecode($string);
-	}
-	else
-	{
+	} else {
 		// See http://www.ascii-code.com/
         $string = strtr(
 			$str,
@@ -977,10 +962,8 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
 	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }
-	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; }
-	elseif ($mode == 1) $substitjs["'"] = "\\'";
-	elseif ($mode == 2) { $substitjs['"'] = '\\"'; }
-	elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
+	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; } elseif ($mode == 1) $substitjs["'"] = "\\'";
+	elseif ($mode == 2) { $substitjs['"'] = '\\"'; } elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -1135,8 +1118,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			// This is when server run behind a reverse proxy
 			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
 			elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) $data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
-		}
-		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
+		} // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
 		elseif (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
 		elseif (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
@@ -1254,8 +1236,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	{
 		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 			$isactive = true;
-		}
-		else {
+		} else {
 			$isactive = false;
 		}
 
@@ -1267,13 +1248,10 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				if (!empty($links[$i][0]))
 				{
 					$out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				}
-				else
-				{
+				} else {
 					$out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
-			}
-			elseif (!empty($links[$i][1]))
+			} elseif (!empty($links[$i][1]))
 			{
 				//print "x $i $active ".$links[$i][2]." z";
 				if ($isactive)
@@ -1281,18 +1259,14 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
-				}
-				else
-				{
+				} else {
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
 				}
 			}
 			$out .= '</div>';
-		}
-		else
-		{
+		} else {
 			// The popup with the other tabs
 			if (!$popuptab)
 			{
@@ -1304,10 +1278,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			{
 				if (!empty($links[$i][0]))
 					$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else
-					$outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
-			}
-			elseif (!empty($links[$i][1]))
+				else $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+			} elseif (!empty($links[$i][1]))
 			{
 				$outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 				$outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
@@ -1439,19 +1411,16 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
 		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
-		else
-		{
+		else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
-			}
-			else {    // Show no photo link
+			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
-	}
-	elseif ($object->element == 'ticket')
+	} elseif ($object->element == 'ticket')
 	{
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
@@ -1463,9 +1432,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if ($object->nbphoto > 0)
 			{
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$showphoto.'</div>';
-			}
-			else
-			{
+			} else {
 				$showimage = 0;
 			}
 		}
@@ -1474,15 +1441,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
-			}
-			else {    // Show no photo link
+			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($showimage)
 		{
 			if ($modulepart != 'unknown')
@@ -1497,9 +1461,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					{
 						$subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);
 						$subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end
-					}
-					else
-					{
+					} else {
 						$subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
 					}
 					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
@@ -1542,8 +1504,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 							$phototoshow .= '</div></div>';
 						}
 					}
-				}
-				elseif (!$phototoshow)
+				} elseif (!$phototoshow)
 				{
 					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
@@ -1564,9 +1525,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$width = 80;
 					$cssclass = 'photorefcenter';
 					$nophoto = img_picto('No photo', 'title_agenda');
-				}
-				else
-				{
+				} else {
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
 					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
@@ -1589,12 +1548,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
 		{
 		   	$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-		}
-		else {
+		} else {
 			$morehtmlstatus .= $object->getLibStatut(6);
 		}
-	}
-	elseif ($object->element == 'product')
+	} elseif ($object->element == 'product')
 	{
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
 		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1609,32 +1566,27 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	}
-	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus .= $tmptxt;
-	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract')
+	} elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
 		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
 		else $morehtmlstatus .= $object->getLibStatut(4);
-	}
-	elseif ($object->element == 'facturerec')
+	} elseif ($object->element == 'facturerec')
 	{
 		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
 		else $morehtmlstatus .= $object->getLibStatut(5);
-	}
-	elseif ($object->element == 'project_task')
+	} elseif ($object->element == 'project_task')
 	{
 		$object->fk_statut = 1;
 		if ($object->progress > 0) $object->fk_statut = 2;
 		if ($object->progress >= 100) $object->fk_statut = 3;
 		$tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt; // No status on task
-	}
-	else { // Generic case
+	} else { // Generic case
 		$tmptxt = $object->getLibStatut(6);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt;
@@ -1753,8 +1705,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
-	}
-	elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+	} elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
@@ -1763,8 +1714,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
-	}
-	elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+	} elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
@@ -1773,15 +1723,13 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		{
 			$ret .= "\n".$object->state;
 		}
-	}
-	elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	} elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
-	}
-	else                                        		// Other: title firstname name \n address lines \n zip town \n country
+	} else // Other: title firstname name \n address lines \n zip town \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
@@ -1815,8 +1763,7 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-	}
-	else return 'Error date into a not supported range';
+	} else return 'Error date into a not supported range';
 }
 
 /**
@@ -1858,8 +1805,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz = 0;
 				$offsetdst = 0;
-			}
-			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
 			{
 				$to_gmt = true;
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -1924,8 +1870,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 	{
 	    dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
 	    return '';
-	}
-	elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
+	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
 	{
 	    // This part of code should not be used.
 	    dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
@@ -1940,17 +1885,14 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 
 	    $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
 	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
-	}
-	else
-	{
+	} else {
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
 		{
 			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret = adodb_strftime($format, $timetouse, $to_gmt);
-		}
-		else $ret = 'Bad value '.$time.' for date';
+		} else $ret = 'Bad value '.$time.' for date';
 	}
 
 	if (preg_match('/__b__/i', $format))
@@ -1964,9 +1906,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 		{
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
-		}
-		else
-		{
+		} else {
 			$monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);
 		}
@@ -2034,9 +1974,7 @@ function dol_getdate($timestamp, $fast = false)
 	if ($usealternatemethod)
 	{
 		$arrayinfo = adodb_getdate($timestamp, $fast);
-	}
-	else
-	{
+	} else {
 		$arrayinfo = getdate($timestamp);
 	}
 
@@ -2087,28 +2025,23 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
 	{
 		$default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'
 		$localtz = new DateTimeZone($default_timezone);
-	}
-	elseif ($gm === 'user')
+	} elseif ($gm === 'user')
 	{
 		// We use dol_tz_string first because it is more reliable.
 		$default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
 		try {
 			$localtz = new DateTimeZone($default_timezone);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
 			$default_timezone = @date_default_timezone_get();
 		}
-	}
-	elseif (strrpos($gm, "tz,") !== false)
+	} elseif (strrpos($gm, "tz,") !== false)
 	{
 		$timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
-		try
-		{
+		try {
 			$localtz = new DateTimeZone($timezone);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 		}
@@ -2147,8 +2080,7 @@ function dol_now($mode = 'gmt')
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
 		$ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
-	}
-	/*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
+	} /*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
@@ -2187,16 +2119,13 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 		$ret = $size;
 		$textunitshort = $langs->trans("b");
 		$textunitlong = $langs->trans("Bytes");
-	}
-	else
-	{
+	} else {
 		$ret = round($size / $level, 0);
 		$textunitshort = $langs->trans("Kb");
 		$textunitlong = $langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret .= ' '.$textunitlong; }
-	else { $ret .= ' '.$textunitshort; }
+	if (empty($shortunit)) { $ret .= ' '.$textunitlong; } else { $ret .= ' '.$textunitshort; }
 
 	return $ret;
 }
@@ -2268,9 +2197,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
 			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
 		}
-	}
-	else
-	{
+	} else {
 		if ($showinvalid && !isValidEmail($email))
 		{
 			$langs->load("errors");
@@ -2362,9 +2289,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 			$htmllink .= ($link ? ' '.$link : '');
 		}
 		$htmllink .= '</div>';
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		$htmllink .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));
 	}
@@ -2404,284 +2329,236 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		// France
 		if (dol_strlen($phone) == 10) {
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);
-		}
-		elseif (dol_strlen($phone) == 7)
+		} elseif (dol_strlen($phone) == 7)
 		{
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);
-		}
-		elseif (dol_strlen($phone) == 9)
+		} elseif (dol_strlen($phone) == 9)
 		{
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-
-	elseif (strtoupper($countrycode) == "CA")
+	} elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PT")
+	} elseif (strtoupper($countrycode) == "PT")
 	{//Portugal
 		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SR")
+	} elseif (strtoupper($countrycode) == "SR")
 	{//Suriname
 		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DE")
+	} elseif (strtoupper($countrycode) == "DE")
 	{//Allemagne
 		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ES")
+	} elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BF")
+	} elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "RO")
+	} elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TR")
+	} elseif (strtoupper($countrycode) == "TR")
 	{//Turquie
 		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "US")
+	} elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MX")
+	} elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ML")
+	} elseif (strtoupper($countrycode) == "ML")
 	{//Mali
 		if (dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TH")
+	} elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
 		if (dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MU")
+	} elseif (strtoupper($countrycode) == "MU")
 	{
         //Maurice
 		if (dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ZA")
+	} elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
 		if (dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SY")
+	} elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
 		if (dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AE")
+	} elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
-		}
-		elseif (dol_strlen($phone) == 14)
+		} elseif (dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DZ")
+	} elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
 		if (dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BE")
+	} elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
 		if (dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PF")
+	} elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
 		if (dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CO")
+	} elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
 		if (dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JO")
+	} elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
 		if (dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JM")
+	} elseif (strtoupper($countrycode) == "JM")
 	{//Jamaïque
 		if (dol_strlen($newphone) == 12)
 		{//ex: +1867_ABC_DEFG
 			$newphone = substr($newphone, 0, 5).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MG")
+	} elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if (dol_strlen($phone) == 13)
 		{//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GB")
+	} elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
 		if (dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CH")
+	} elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
 		if (dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 15)
+		} elseif (dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
 			$newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TN")
+	} elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
 		if (dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GF")
+	} elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
 		if (dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GP")
+	} elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
 		if (dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MQ")
+	} elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
 		if (dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "IT")
+	} elseif (strtoupper($countrycode) == "IT")
 	{//Italie
 		if (dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AU")
+	} elseif (strtoupper($countrycode) == "AU")
 	{
         //Australie
 		if (dol_strlen($phone) == 12)
@@ -2697,8 +2574,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$newphoneform = $newphone;
 			$newphone = '<a href="tel:'.$phone.'"';
 			$newphone .= '>'.$newphoneform.'</a>';
-		}
-		elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
 
@@ -2751,9 +2627,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		if ($withpicto) {
 			if ($withpicto == 'fax') {
 				$picto = 'phoning_fax';
-			}elseif ($withpicto == 'phone') {
+			} elseif ($withpicto == 'phone') {
 				$picto = 'phoning';
-			}elseif ($withpicto == 'mobile') {
+			} elseif ($withpicto == 'mobile') {
 				$picto = 'phoning_mobile';
 			} else {
 				$picto = '';
@@ -2792,11 +2668,8 @@ function dol_print_ip($ip, $mode = 0)
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
 				$ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png', '', 1);
-			}
-			else $ret .= ' ('.$countrycode.')';
-		}
-		else
-		{
+			} else $ret .= ' ('.$countrycode.')';
+		} else {
 			// Nothing
 		}
 	}
@@ -3018,20 +2891,14 @@ function dol_substr($string, $start, $length, $stringencoding = '', $trunconbyte
 		if (function_exists('mb_substr'))
 		{
 			$ret = mb_substr($string, $start, $length, $stringencoding);
-		}
-		else
-		{
+		} else {
 			$ret = substr($string, $start, $length);
 		}
-	}
-	else
-	{
+	} else {
 		if (function_exists('mb_strcut'))
 		{
 			$ret = mb_strcut($string, $start, $length, $stringencoding);
-		}
-		else
-		{
+		} else {
 			$ret = substr($string, $start, $length);
 		}
 	}
@@ -3068,11 +2935,9 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');
-		else
-		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+		else //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
-	}
-	elseif ($trunc == 'middle')
+	} elseif ($trunc == 'middle')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1))
@@ -3080,27 +2945,20 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 			$size1 = round($size / 2);
 			$size2 = round($size / 2);
 			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
-		}
-		else
-		return $string;
-	}
-	elseif ($trunc == 'left')
+		} else return $string;
+	} elseif ($trunc == 'left')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
-		else
-		return $string;
-	}
-	elseif ($trunc == 'wrap')
+		else return $string;
+	} elseif ($trunc == 'wrap')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + 1))
 		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
-		else
-		return $string;
-	}
-	else return 'BadParam3CallingDolTrunc';
+		else return $string;
+	} else return 'BadParam3CallingDolTrunc';
 }
 
 /**
@@ -3219,34 +3077,27 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			if ($pictowithouttext == 'off') {
 			    $fakey = 'fa-square';
 				$fasize = '1.3em';
-			}
-			elseif ($pictowithouttext == 'on') {
+			} elseif ($pictowithouttext == 'on') {
 			    $fakey = 'fa-check-square';
 				$fasize = '1.3em';
-			}
-			elseif ($pictowithouttext == 'listlight') {
+			} elseif ($pictowithouttext == 'listlight') {
 				$fakey = 'fa-download';
 				$marginleftonlyshort = 1;
-			}
-			elseif ($pictowithouttext == 'printer') {
+			} elseif ($pictowithouttext == 'printer') {
 				$fakey = 'fa-print';
 				$fasize = '1.2em';
-			}
-			elseif ($pictowithouttext == 'note') {
+			} elseif ($pictowithouttext == 'note') {
 			    $fakey = 'fa-sticky-note';
 				$marginleftonlyshort = 1;
-			}
-			elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
+			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
 			    $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
 			    $fakey = 'fa-'.$convertarray[$pictowithouttext];
 			    if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
 				$marginleftonlyshort = 1;
-			}
-			elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
+			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
 			{
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
-			}
-			else {
+			} else {
 				$fakey = 'fa-'.$pictowithouttext;
 			}
 
@@ -3327,11 +3178,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 		if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {
 			$path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module
-		}
-		elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
+		} elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
 			$path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme
-		}
-		elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
+		} elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
 			$path = $theme.'/theme/'.$theme; // If the theme have the same name as the module
 		}
 
@@ -3409,8 +3258,7 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
 		$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
 		//return '<i class="fa fa-weather-level'.$picto.'"></i>';
 		$picto = $leveltopicto[$picto];
-	}
-	elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3434,8 +3282,7 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
 	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	if ($pictoisfullpath) $path = $picto;
-	else
-	{
+	else {
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
 		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
@@ -3462,12 +3309,25 @@ function img_action($titlealt, $numaction)
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
-		elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
-		elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
-		elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
-		elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
-		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+		if ($numaction == '-1' || $numaction == 'ST_NO') {
+			$numaction = -1;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
+		} elseif ($numaction == '0' || $numaction == 'ST_NEVER') {
+			$numaction = 0;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted');
+		} elseif ($numaction == '1' || $numaction == 'ST_TODO') {
+			$numaction = 1;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeToContact');
+		} elseif ($numaction == '2' || $numaction == 'ST_PEND') {
+			$numaction = 2;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess');
+		} elseif ($numaction == '3' || $numaction == 'ST_DONE') {
+			$numaction = 3;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');
+		} else {
+			$titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);
+			$numaction = 0;
+		}
 	}
 	if (!is_numeric($numaction)) $numaction = 0;
 
@@ -3752,7 +3612,9 @@ function img_left($titlealt = 'default', $selected = 0, $moreatt = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Left');
+	}
 
 	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
@@ -3795,21 +3657,29 @@ function img_allow($allow, $titlealt = 'default')
 /**
  *	Return image of a credit card according to its brand name
  *
- *	@param	string	$brand		Brand name of credit card
- *  @param	string	$morecss	More CSS
+ *	@param  string	$brand		Brand name of credit card
+ *  @param  string	$morecss	More CSS
  *	@return string     			Return img tag
  */
 function img_credit_card($brand, $morecss = null)
 {
 	if (is_null($morecss)) $morecss = 'fa-2x';
 
-	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; }
-	elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; }
-	elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; }
-	elseif ($brand == 'discover' || $brand == 'Discover') {$brand = 'cc-discover'; }
-	elseif ($brand == 'jcb' || $brand == 'JCB') {$brand = 'cc-jcb'; }
-	elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; }
-	elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }
+	if ($brand == 'visa' || $brand == 'Visa') {
+		$brand = 'cc-visa';
+	} elseif ($brand == 'mastercard' || $brand == 'MasterCard') {
+		$brand = 'cc-mastercard';
+	} elseif ($brand == 'amex' || $brand == 'American Express') {
+		$brand = 'cc-amex';
+	} elseif ($brand == 'discover' || $brand == 'Discover') {
+		$brand = 'cc-discover';
+	} elseif ($brand == 'jcb' || $brand == 'JCB') {
+		$brand = 'cc-jcb';
+	} elseif ($brand == 'diners' || $brand == 'Diners club') {
+		$brand = 'cc-diners-club';
+	} elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {
+		$brand = 'credit-card';
+	}
 
 	return '<span class="fa fa-'.$brand.' fa-fw'.($morecss ? ' '.$morecss : '').'"></span>';
 }
@@ -3897,8 +3767,7 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 	if ($infoonimgalt)
 	{
 		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
-	}
-	else {
+	} else {
 		if (empty($conf->use_javascript_ajax)) $textfordropdown = '';
 
 		$class = (empty($admin) ? 'undefined' : ($admin == '1' ? 'info' : $admin));
@@ -3978,8 +3847,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$out .= "<br>\n";
 		$syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-	}
-	else                              // Mode CLI
+	} else // Mode CLI
 	{
 		$out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
 		$syslog .= "pid=".dol_getmypid();
@@ -3999,8 +3867,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ?dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<br>\n";
-		}
-		else                            // Mode CLI
+		} else // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
 			$out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
@@ -4028,8 +3895,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 			{
 				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
-			}
-			else                        // Mode CLI
+			} else // Mode CLI
 			{
 				$out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";
 			}
@@ -4047,8 +3913,8 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	}
 
 	if (empty($dolibarr_main_prod)) print $out;
-	else	// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
-	{
+	else {
+		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 		print 'This website or feature is currently temporarly not available.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
 		$langs->load("errors");
 		print $langs->trans("DolibarrHasDetectedError").'. ';
@@ -4157,8 +4023,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib;
 		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
-	}
-	else {
+	} else {
 		$out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib;
 		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
 		$out .= '>';
@@ -4177,20 +4042,16 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			if (preg_match('/^DESC/i', $sortorder))
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			}
-			else		// We reverse the var $sortordertouseinlink
+			} else // We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
-		}
-		else                        // We are on field that is the first current sorting criteria
+		} else // We are on field that is the first current sorting criteria
 		{
 			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			}
-			else
-			{
+			} else {
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
 		}
@@ -4219,9 +4080,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-		}
-		else
-		{
+		} else {
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
@@ -4350,9 +4209,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
-	}
-	else
-	{
+	} else {
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
@@ -4402,8 +4259,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 				}
 			}
 
-			do
-			{
+			do {
 				if ($pagenavastextinput) {
 					if ($cpt == $page)
 					{
@@ -4415,15 +4271,12 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					if ($cpt == $page)
 					{
 						$pagelist .= '<li class="pagination"><span class="active">'.($page + 1).'</span></li>';
-					}
-					else
-					{
+					} else {
 						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
 					}
 				}
 				$cpt++;
-			}
-			while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
+			} while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
 
 			if (empty($pagenavastextinput)) {
 				if ($cpt < $nbpages)
@@ -4438,9 +4291,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 				//}
 			}
-		}
-		else
-		{
+		} else {
 			$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";
 		}
 	}
@@ -4581,8 +4432,7 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
 	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
-	else
-	{
+	else {
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret = $rate.($addpercent ? '%' : '');
 	}
@@ -4672,9 +4522,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
 		{
 		    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
-		}
-		else
-		{
+		} else {
 			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
 		}
@@ -4797,18 +4645,15 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 	{
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
+	} elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
 	{
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
 	{
 		$dimension = $dimension / 1000000;
 		$unit = $unit + 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
 	{
 		$dimension = $dimension / 1000;
 		$unit = $unit + 3;
@@ -4874,9 +4719,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (!$thirdparty_buyer->localtax1_assuj) return 0;
-			}
-			else
-			{
+			} else {
 				if (!$thirdparty_seller->localtax1_assuj) return 0;
 			}
 		}
@@ -4888,15 +4731,11 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (!$thirdparty_buyer->localtax2_assuj) return 0;
-			}
-			else
-			{
+			} else {
 				if (!$thirdparty_seller->localtax2_assuj) return 0;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
 		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
 	}
@@ -4918,8 +4757,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
-			}
-			else  // i am the seller
+			} else // i am the seller
 			{
 				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
@@ -4936,15 +4774,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
-			}
-			else  // i am the seller
+			} else // i am the seller
 			{
 				if (in_array($mysoc->country_code, array('ES')))
 				{
 					return $thirdparty_buyer->localtax2_value;
-				}
-				else
-				{
+				} else {
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
 			}
@@ -4989,9 +4824,7 @@ function isOnlyOneLocalTax($local)
 	if (count($valors) > 1)
 	{
 		return false;
-	}
-	else
-	{
+	} else {
 		return true;
 	}
 }
@@ -5045,8 +4878,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else
-	{
+	else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
@@ -5069,8 +4901,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 		$obj = $db->fetch_object($resql);
 		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
 		else return array();
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	return array();
 }
@@ -5101,8 +4932,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	$sql  = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else
-	{
+	else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
@@ -5129,13 +4959,10 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		if ($local == 1)
 		{
 			return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		}
-		elseif ($local == 2)
+		} elseif ($local == 2)
 		{
 			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		}
-		else
-		{
+		} else {
 			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
 	}
@@ -5175,16 +5002,12 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 				$product->get_buyprice($idprodfournprice, 0, 0, 0);
 				$ret = $product->vatrate_supplier;
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
-			}
-			else
-			{
+			} else {
 				$ret = $product->tva_tx; // Default vat of product we defined
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
 			$found = 1;
-		}
-		else
-		{
+		} else {
 			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
@@ -5211,10 +5034,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 					if ($obj->default_vat_code) $ret .= ' ('.$obj->default_vat_code.')';
 				}
 				$db->free($sql);
-			}
-			else dol_print_error($db);
-		}
-		else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
+			} else dol_print_error($db);
+		} else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -5254,9 +5075,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 			elseif ($local==2) $ret=$product->localtax2_tx;
 			$found=1;
 			*/
-		}
-		else
-		{
+		} else {
 			// TODO Read default product vat according to countrycode and product
 		}
 	}
@@ -5279,8 +5098,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 				if ($local == 1) $ret = $obj->localtax1;
 				elseif ($local == 2) $ret = $obj->localtax2;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -5360,9 +5178,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		{
 			//print 'VATRULE 3';
 			return 0;
-		}
-		else
-		{
+		} else {
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 		}
@@ -5402,8 +5218,7 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
-	}
-	elseif ($idprod > 0)
+	} elseif ($idprod > 0)
 	{
 		if (!class_exists('Product')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -5441,15 +5256,12 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 		if ($mysoc->country_code == 'ES')
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
-		}
-		else
-		{
+		} else {
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
 			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
 			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
 		}
-	}
-	elseif ($local == 2) //I Localtax 2
+	} elseif ($local == 2) //I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;
@@ -5484,8 +5296,7 @@ function yn($yesno, $case = 1, $color = 0)
 		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
 		$classname = 'ok';
-	}
-	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
+	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
 		$result = $langs->trans("no");
 		if ($case == 1 || $case == 3) $result = $langs->trans("No");
@@ -5531,9 +5342,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		if ($level == 1) $path = substr($num, 0, 1);
 		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
-	}
-	else
-	{
+	} else {
 		// TODO
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
@@ -5605,16 +5414,12 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
-				}
-				else
-				{
+				} else {
 					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);
 					$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
-			}
-			else
-			{
+			} else {
 				$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
 		}
@@ -5754,29 +5559,23 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		{
 			$firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters
 			$firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters
-		}
-		else
-		{
+		} else {
 			$firstline = preg_replace('/[\n\r].*/', '', $text);
 		}
 		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');
-	}
-	else
-	{
+	} else {
 		$ishtml = 0;
 		if (dol_textishtml($text))
 		{
 			$text = preg_replace('/\n/', '', $text);
 			$ishtml = 1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
-		}
-		else
-		{
+		} else {
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 
 		$text = strtr($text, $repTable);
-		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
 		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -5843,9 +5642,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
 		$newstring = strtr($newstring, array('&'=>'__and__', '<'=>'__lt__', '>'=>'__gt__', '"'=>'__dquot__'));
 		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
 		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
-	}
-	else
-	{
+	} else {
 		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
 		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
@@ -5934,9 +5731,7 @@ function dol_string_is_good_iso($s, $clean = 0)
 	{
 		$ordchar = ord($s[$scursor]);
 		//print $scursor.'-'.$ordchar.'<br>';
-		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; }
-		elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; }
-		elseif ($clean) {
+		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; } elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; } elseif ($clean) {
 			$out .= $s[$scursor];
 		}
 	}
@@ -5977,7 +5772,7 @@ function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 
 	$text = strtr($text, $repTable);
-	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
 	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -6021,9 +5816,7 @@ function dol_textishtml($msg, $option = 0)
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
 		elseif (preg_match('/<br/i', $msg))				return true;
 		return false;
-	}
-	else
-	{
+	} else {
 		if (preg_match('/<html/i', $msg))				return true;
 		elseif (preg_match('/<body/i', $msg))			return true;
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
@@ -6216,9 +6009,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			    $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
-		}
-		else
-		{
+		} else {
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
 			$substitutionarray['__REF_CLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
@@ -6290,8 +6081,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object) ? $object->tva_intra : '');
 				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_public) : '');
 				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_private) : '');
-			}
-			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+			} elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty) ? $object->thirdparty->id : '');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty) ? $object->thirdparty->name : '');
@@ -6387,9 +6177,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			if (empty($substitutionarray['__REF__']))
 			{
 				$paymenturl = '';
-			}
-			else
-			{
+			} else {
 				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				$outputlangs->loadLangs(array('paypal', 'other'));
@@ -6409,18 +6197,15 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
 				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
 				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
 
 				if (is_object($object) && $object->element == 'propal') $substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
 				if (is_object($object) && $object->element == 'commande') $substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
@@ -6695,17 +6480,14 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 		$ret .= $firstname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $lastname;
-	}
-	elseif ($nameorder == 2 || $nameorder == 3)
+	} elseif ($nameorder == 2 || $nameorder == 3)
 	{
 	    $ret .= $firstname;
 	    if (empty($ret) && $nameorder == 3)
 	    {
 	    	$ret .= $lastname;
 	    }
-	}
-	else
-	{
+	} else {
 		$ret .= $lastname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $firstname;
@@ -6730,8 +6512,7 @@ function setEventMessage($mesgs, $style = 'mesgs')
 	if (!is_array($mesgs))		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
-	}
-	else						// If mesgs is an array
+	} else // If mesgs is an array
 	{
 		foreach ($mesgs as $mesg)
 		{
@@ -6756,9 +6537,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 	if (empty($mesg) && empty($mesgs))
 	{
 		dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
-	}
-	else
-	{
+	} else {
 		if ($messagekey)
 		{
 			// Complete message with a js link to set a cookie "DOLHIDEMESSAGE".$messagekey;
@@ -6769,8 +6548,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 		{
 			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
 			if (empty($mesgs)) setEventMessage($mesg, $style);
-			else
-			{
+			else {
 				if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
 				setEventMessage($mesgs, $style);
 			}
@@ -6877,9 +6655,7 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 						}
 					});
 				</script>';
-		}
-		else
-		{
+		} else {
 			$return = $out;
 		}
 	}
@@ -6929,8 +6705,7 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }
 			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }
 		}
-	}
-	elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
+	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
 	elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;
 	if ($style == 'error') $iserror++;
 	if ($style == 'warning') $iswarning++;
@@ -6953,17 +6728,14 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 					$tmpmesgstring = preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
 					$tmpmesgstring = preg_replace('/<\/div>/', '', $tmpmesgstring);
 					$newmesgarray[] = $tmpmesgstring;
-				}
-				else
-				{
+				} else {
 					dol_syslog("Error call of dol_htmloutput_mesg with an array with a value that is not a string", LOG_WARNING);
 				}
 			}
 			$mesgarray = $newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-	}
-	else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+	} else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
 }
 
 /**
@@ -7011,9 +6783,7 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 				if (is_object($array[$key]))
 				{
 					$temp[$key] = $array[$key]->$index;
-				}
-				else
-				{
+				} else {
 					$temp[$key] = $array[$key][$index];
 				}
 			}
@@ -7148,9 +6918,7 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 		else $cache_codes[$tablename][$key][$fieldid] = '';
 		$db->free($resql);
 		return $cache_codes[$tablename][$key][$fieldid];
-	}
-	else
-	{
+	} else {
 		return -1;
 	}
 }
@@ -7203,9 +6971,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	{
 		if ($hideerrors) return @eval('return '.$s.';');
 		else return eval('return '.$s.';');
-	}
-	else
-	{
+	} else {
 		if ($hideerrors) @eval($s);
 		else eval($s);
 	}
@@ -7249,8 +7015,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 	);
 
 	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else
-	{
+	else {
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
@@ -7468,9 +7233,7 @@ function getLanguageCodeFromCountryCode($countrycode)
     			return strtolower($locale_language).'_'.strtoupper($locale_region);
     		}
     	}
-	}
-	else
-	{
+	} else {
         dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
 	}
 
@@ -7530,16 +7293,14 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 							$substitutionarray = array();
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
-						}
-						else $label = $langs->trans($values[2]);
+						} else $label = $langs->trans($values[2]);
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
-				}
-				elseif (count($values) == 5)       // deprecated
+				} elseif (count($values) == 5)       // deprecated
 				{
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
 
@@ -7550,16 +7311,14 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 						$substitutionarray = array();
 						complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 						$label = make_substitutions($reg[1], $substitutionarray);
-					}
-					else $label = $langs->trans($values[2]);
+					} else $label = $langs->trans($values[2]);
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
 					$head[$h][1] = $label;
 					$head[$h][2] = str_replace('+', '', $values[1]);
 					$h++;
 				}
-			}
-			elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
+			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
 			{
 				if ($values[0] != $type) continue;
 				$tabname = str_replace('-', '', $values[1]);
@@ -7664,8 +7423,7 @@ function printCommonFooter($zone = 'private')
 							}
 							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						}
-						else $qualified = 1;
+						} else $qualified = 1;
 
 						if ($qualified)
 						{
@@ -7696,8 +7454,7 @@ function printCommonFooter($zone = 'private')
 							}
 							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						}
-						else $qualified = 1;
+						} else $qualified = 1;
 
 						if ($qualified)
 						{
@@ -7774,8 +7531,7 @@ function printCommonFooter($zone = 'private')
 	        $debugbar['time']->stopMeasure('pageaftermaster');
 	        print '<!-- Output debugbar data -->'."\n";
 		    print $debugbar->getRenderer()->render();
-		}
-		elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
+		} elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
 		{
 			print "\n";
 			print "<!-- Start of log output\n";
@@ -7912,21 +7668,17 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					if (is_numeric($numnewcrit))
 					{
 						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;
-					}
-					else
-					{
+					} else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
 					$i2++; // a criteria was added to string
 				}
-			}
-			elseif ($mode == 2 || $mode == -2)
+			} elseif ($mode == 2 || $mode == -2)
 			{
 				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '')."IN (".$db->escape(trim($crit)).")";
 				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
 				$i2++; // a criteria was added to string
-			}
-			elseif ($mode == 3 || $mode == -3)
+			} elseif ($mode == 3 || $mode == -3)
 			{
 				$tmparray = explode(',', trim($crit));
 				if (count($tmparray))
@@ -7944,8 +7696,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					$i2++; // a criteria was added to string
 				}
 				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
-			}
-			elseif ($mode == 4)
+			} elseif ($mode == 4)
 			{
 			    $tmparray = explode(',', trim($crit));
 			    if (count($tmparray))
@@ -7964,8 +7715,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 			            }
 			        }
 			    }
-			}
-			else    // $mode=0
+			} else // $mode=0
 			{
 				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
@@ -7978,9 +7728,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
 					{
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
-					}
-					else
-					{
+					} else {
 						$newres .= $field." LIKE '";
 
 						$tmpcrit = trim($tmpcrit);
@@ -8270,9 +8018,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 			{
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -8304,9 +8050,7 @@ function colorIsLight($stringcolor)
 			$r = $tmp[0];
 			$g = $tmp[1];
 			$b = $tmp[2];
-		}
-		else
-		{
+		} else {
 			$hexr = $stringcolor[0].$stringcolor[1];
 			$hexg = $stringcolor[2].$stringcolor[3];
 			$hexb = $stringcolor[4].$stringcolor[5];
@@ -8402,11 +8146,9 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
         foreach ($params['attr']as $key => $value) {
 			if ($key == 'class') {
 				$attr['class'] .= ' '.$value;
-			}
-			elseif ($key == 'classOverride') {
+			} elseif ($key == 'classOverride') {
 				$attr['class'] = $value;
-			}
-			else {
+			} else {
 				$attr[$key] = $value;
 			}
         }
@@ -8457,11 +8199,9 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
     if ($displayMode == 0) {
         $return = !empty($html) ? $html : $statusLabel;
-    }
-    elseif ($displayMode == 1) {
+    } elseif ($displayMode == 1) {
         $return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);
-    }
-    // Use status with images (for backward compatibility)
+    } // Use status with images (for backward compatibility)
     elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
         $return = '';
         $htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
@@ -8497,21 +8237,16 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
         if ($displayMode === 2) {
             $return = $htmlImg.' '.$htmlLabelShort;
-        }
-        elseif ($displayMode === 3) {
+        } elseif ($displayMode === 3) {
             $return = $htmlImg;
-        }
-        elseif ($displayMode === 4) {
+        } elseif ($displayMode === 4) {
             $return = $htmlImg.' '.$htmlLabel;
-        }
-        elseif ($displayMode === 5) {
+        } elseif ($displayMode === 5) {
             $return = $htmlLabelShort.' '.$htmlImg;
-        }
-        else { // $displayMode >= 6
+        } else { // $displayMode >= 6
             $return = $htmlLabel.' '.$htmlImg;
         }
-    }
-    // Use new badge
+    } // Use new badge
     elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
         $statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel;
 
@@ -8520,11 +8255,9 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
         if ($displayMode == 3) {
             $return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);
-        }
-        elseif ($displayMode === 5) {
+        } elseif ($displayMode === 5) {
             $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
-        }
-        else {
+        } else {
             $return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);
         }
     }
@@ -8577,11 +8310,9 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
         foreach ($params['attr'] as $key => $value) {
             if ($key == 'class') {
                 $attr['class'] .= ' '.$value;
-            }
-            elseif ($key == 'classOverride') {
+            } elseif ($key == 'classOverride') {
                 $attr['class'] = $value;
-            }
-            else {
+            } else {
                 $attr[$key] = $value;
             }
         }
@@ -8650,8 +8381,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 
         if ($status == -1) { // disable
             $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
-        }
-        elseif ($status == 0) { // Not enough permissions
+        } elseif ($status == 0) { // Not enough permissions
             $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
         }
     }
@@ -8669,11 +8399,9 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
         foreach ($params['attr'] as $key => $value) {
             if ($key == 'class') {
                 $attr['class'] .= ' '.$value;
-            }
-            elseif ($key == 'classOverride') {
+            } elseif ($key == 'classOverride') {
                 $attr['class'] = $value;
-            }
-            else {
+            } else {
                 $attr[$key] = $value;
             }
         }
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 531e0fe242c..7673776ad93 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -55,8 +55,7 @@ function jsUnEscape($source)
                 $entity = "&#".$unicode.';';
                 $decodedStr .= utf8_encode($entity);
                 $pos += 4;
-            }
-            else {
+            } else {
                 // we have an escaped ascii character
                 $hexVal = substr($source, $pos, 2);
                 $decodedStr .= chr(hexdec($hexVal));
@@ -159,8 +158,7 @@ function dol_print_file($langs, $filename, $searchalt = 0)
             elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
             else print $content;
             return true;
-        }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+        } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
 
         if ($searchalt) {
             // Test si fichier dans repertoire de la langue alternative
@@ -176,8 +174,7 @@ function dol_print_file($langs, $filename, $searchalt = 0)
                 elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
                 else print $content;
                 return true;
-            }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+            } else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
         }
     }
 
@@ -232,9 +229,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
         	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else
-        {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -268,9 +263,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
         	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else
-        {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -304,9 +297,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else
-        {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -340,9 +331,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else
-        {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -404,9 +393,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
 			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else
-        {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_cloture);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -440,9 +427,7 @@ function dol_print_object_info($object, $usetable = 0)
         {
 			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
         	else print $langs->trans("Unknown");
-        }
-        else
-        {
+        } else {
             $userstatic = new User($db);
             $userstatic->fetch($object->user_rappro);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
@@ -618,8 +603,7 @@ function clean_url($url, $http = 1)
         $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
 
         return $CleanUrl;
-    }
-    else return $url;
+    } else return $url;
 }
 
 
@@ -759,9 +743,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
         $maskcounter = $reg[1];
         $hasglobalcounter = true;
-    }
-    else
-    {
+    } else {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri = '00000';
         $maskcounter = '00000';
@@ -783,8 +765,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient = '';
+    } else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
     if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -798,9 +779,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         $masktype = $regType[1];
         $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
         $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
-    }
-    else
-    {
+    } else {
     	$masktype = '';
     	$masktype_value = '';
     }
@@ -814,9 +793,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     	$maskuser = $regType[1];
     	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
     	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
-    }
-    else
-    {
+    } else {
     	$maskuser = '';
     	$maskuser_value = '';
     }
@@ -891,18 +868,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         // Define posy, posm and reg
         if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
         {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
 
             if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
-        }
-        else // if reset is for a specific month in year, we need year
+        } else // if reset is for a specific month in year, we need year
         {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
-        	elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
-            elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
+            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask';
         }
         // Define length
         $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
@@ -933,11 +904,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         	{
         		// If before of next new year date
         		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
-        	}
-        	// If after or equal of current new year date
+        	} // If after or equal of current new year date
         	elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
-        }
-        // For backward compatibility
+        } // For backward compatibility
         elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
 
         if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
@@ -955,13 +924,11 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
             $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
             $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere .= ')';
-        }
-		elseif ($resetEveryMonth)
+        } elseif ($resetEveryMonth)
 		{
 			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else   // reset is done on january
+		} else // reset is done on january
         {
             $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
         }
@@ -973,9 +940,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     if (function_exists('mb_strrpos'))
     	{
     	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
-	}
-	else
-	{
+	} else {
     	$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
@@ -1020,8 +985,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     {
         $obj = $db->fetch_object($resql);
         $counter = $obj->val;
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
     // Check if we must force counter to maskoffset
     if (empty($counter)) $counter = $maskoffset;
@@ -1029,8 +993,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
     {
     	$counter = 0;
     	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
-    }
-    elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
+    } elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
 
     if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
     {
@@ -1068,12 +1031,10 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $ref = $obj->ref;
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
 
         $numFinal = $ref;
-    }
-    elseif ($mode == 'next')
+    } elseif ($mode == 'next')
     {
         $counter++;
 
@@ -1125,8 +1086,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
             {
                 $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
                 $maskrefclient_counter = $maskrefclient_obj->val;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
 			$maskrefclient_counter++;
@@ -1141,8 +1101,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
         	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
+		} else // we want yyyy to be current year
 		{
         	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
         	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
@@ -1223,9 +1182,7 @@ function check_value($mask, $value)
         $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
         $maskcounter = $reg[1];
         $hasglobalcounter = true;
-    }
-    else
-    {
+    } else {
         // setting some defaults so the rest of the code won't fail if there is a third party counter
         $masktri = '00000';
         $maskcounter = '00000';
@@ -1246,8 +1203,7 @@ function check_value($mask, $value)
         $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
         $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
         if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient = '';
+    } else $maskrefclient = '';
 
     // fail if there is neither a global nor a third party counter
     if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
@@ -1391,16 +1347,13 @@ function numero_semaine($time)
     if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
-    }
-    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
+    } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
-    }
-    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
+    } elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
-    }
-    else // Jeudi
+    } else // Jeudi
     {
         $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
     }
@@ -1421,9 +1374,7 @@ function numero_semaine($time)
         if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
         {
             $numeroSemaine = 53;
-        }
-        else
-        {
+        } else {
             $numeroSemaine = 1;
         }
     }
@@ -1527,9 +1478,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
             }
             $user->conf->$key = $value;
             //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else
-        {
+        } else {
             unset($user->conf->$key);
         }
     }
@@ -1551,9 +1500,7 @@ function dol_print_reduction($reduction, $langs)
     if ($reduction == 100)
     {
         $string = $langs->transnoentities("Offered");
-    }
-    else
-    {
+    } else {
     	$string = vatrate($reduction, true);
     }
 
@@ -1673,14 +1620,10 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                         $max = ($maxfilenamelength ? $maxfilenamelength : 28);
                         $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
                     }
-                }
-                else
-                {
+                } else {
                     $liste[0] = $obj->label.': '.$langs->trans("None");
                 }
-            }
-            else
-            {
+            } else {
             	if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format
                 {
                     global $_Avery_Labels;
@@ -1689,17 +1632,14 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
                     {
                     	$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
                     }
-                }
-                else    // Common usage
+                } else // Common usage
                 {
                 	$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
                 }
             }
             $i++;
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         return -1;
     }
@@ -1776,9 +1716,7 @@ function getSoapParams()
                       'proxy_password' => $proxypass,
                       'trace'		   => 1
         );
-    }
-    else
-    {
+    } else {
         $params = array('connection_timeout'=>$timeout,
                       'response_timeout'=>$response_timeout,
                       'proxy_use'      => 0,
@@ -1831,64 +1769,51 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classpath = 'compta/facture/class';
 		$module = 'facture';
 		$myobject = 'facture';
-	}
-	elseif ($objecttype == 'commande' || $objecttype == 'order') {
+	} elseif ($objecttype == 'commande' || $objecttype == 'order') {
 		$classpath = 'commande/class';
 		$module = 'commande';
 		$myobject = 'commande';
-	}
-	elseif ($objecttype == 'propal') {
+	} elseif ($objecttype == 'propal') {
 		$classpath = 'comm/propal/class';
-	}
-	elseif ($objecttype == 'supplier_proposal') {
+	} elseif ($objecttype == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
-	}
-	elseif ($objecttype == 'shipping') {
+	} elseif ($objecttype == 'shipping') {
 		$classpath = 'expedition/class';
 		$myobject = 'expedition';
 		$module = 'expedition_bon';
-	}
-	elseif ($objecttype == 'delivery') {
+	} elseif ($objecttype == 'delivery') {
 		$classpath = 'livraison/class';
 		$myobject = 'livraison';
 		$module = 'livraison_bon';
-	}
-	elseif ($objecttype == 'contract') {
+	} elseif ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';
 		$myobject = 'contrat';
-	}
-	elseif ($objecttype == 'member') {
+	} elseif ($objecttype == 'member') {
 		$classpath = 'adherents/class';
 		$module = 'adherent';
 		$myobject = 'adherent';
-	}
-	elseif ($objecttype == 'cabinetmed_cons') {
+	} elseif ($objecttype == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
 		$module = 'cabinetmed';
 		$myobject = 'cabinetmedcons';
-	}
-	elseif ($objecttype == 'fichinter') {
+	} elseif ($objecttype == 'fichinter') {
 		$classpath = 'fichinter/class';
 		$module = 'ficheinter';
 		$myobject = 'fichinter';
-	}
-	elseif ($objecttype == 'task') {
+	} elseif ($objecttype == 'task') {
 		$classpath = 'projet/class';
 		$module = 'projet';
 		$myobject = 'task';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$module = 'stock';
 		$myobject = 'stock';
-	}
-	elseif ($objecttype == 'inventory') {
+	} elseif ($objecttype == 'inventory') {
 		$classpath = 'product/inventory/class';
 		$module = 'stock';
 		$myobject = 'inventory';
-	}
-	elseif ($objecttype == 'mo') {
+	} elseif ($objecttype == 'mo') {
 		$classpath = 'mrp/class';
 		$module = 'mrp';
 		$myobject = 'mo';
@@ -1903,14 +1828,12 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classname = 'FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier') {
+	} elseif ($objecttype == 'order_supplier') {
 		$classfile = 'fournisseur.commande';
 		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
@@ -1931,8 +1854,7 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 					$ret = $langs->trans('Deleted');
 				}
 				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			} else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 		}
 	}
 	return $ret;
@@ -1967,9 +1889,7 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -2147,8 +2067,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		{
 			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
 			if ($color < 128) $color -= ($color * ($ratio / 100));
-		}
-		else			// We decrease agressiveness
+		} else // We decrease agressiveness
 		{
 			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
 			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
@@ -2156,9 +2075,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		if ($brightness > 0)
 		{
 			$color = ($color * (100 + abs($brightness)) / 100);
-		}
-		else
-		{
+		} else {
 			$color = ($color * (100 - abs($brightness)) / 100);
 		}
 
@@ -2241,15 +2158,13 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false)
     if ($alpha !== false) {
         $rgb['a'] = floatval($alpha);
         $string = 'rgba('.implode(',', $rgb).')';
-    }
-    else {
+    } else {
         $string = 'rgb('.implode(',', $rgb).')';
     }
 
     if ($returnArray) {
         return $rgb;
-    }
-    else {
+    } else {
         return $string;
     }
 }
@@ -2299,71 +2214,49 @@ function getModuleDirForApiClass($module)
 
     if ($module == 'contracts') {
     	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+    } elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
-    }
-    elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
+    } elseif ($module == 'contact' || $module == 'contacts' || $module == 'customer' || $module == 'thirdparty' || $module == 'thirdparties') {
         $moduledirforclass = 'societe';
-    }
-    elseif ($module == 'propale' || $module == 'proposals') {
+    } elseif ($module == 'propale' || $module == 'proposals') {
         $moduledirforclass = 'comm/propal';
-    }
-    elseif ($module == 'agenda' || $module == 'agendaevents') {
+    } elseif ($module == 'agenda' || $module == 'agendaevents') {
         $moduledirforclass = 'comm/action';
-    }
-    elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
+    } elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
         $moduledirforclass = 'adherents';
-    }
-    elseif ($module == 'don' || $module == 'donations') {
+    } elseif ($module == 'don' || $module == 'donations') {
         $moduledirforclass = 'don';
-    }
-    elseif ($module == 'banque' || $module == 'bankaccounts') {
+    } elseif ($module == 'banque' || $module == 'bankaccounts') {
         $moduledirforclass = 'compta/bank';
-    }
-    elseif ($module == 'category' || $module == 'categorie') {
+    } elseif ($module == 'category' || $module == 'categorie') {
         $moduledirforclass = 'categories';
-    }
-    elseif ($module == 'order' || $module == 'orders') {
+    } elseif ($module == 'order' || $module == 'orders') {
         $moduledirforclass = 'commande';
-    }
-    elseif ($module == 'shipments') {
+    } elseif ($module == 'shipments') {
         $moduledirforclass = 'expedition';
-    }
-    elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
+    } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
-    }
-    elseif ($module == 'products') {
+    } elseif ($module == 'products') {
         $moduledirforclass = 'product';
-    }
-    elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
+    } elseif ($module == 'project' || $module == 'projects' || $module == 'tasks') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'task') {
+    } elseif ($module == 'task') {
         $moduledirforclass = 'projet';
-    }
-    elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
+    } elseif ($module == 'stock' || $module == 'stockmovements' || $module == 'warehouses') {
         $moduledirforclass = 'product/stock';
-    }
-    elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
+    } elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
     	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
+    } elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
-    }
-    elseif ($module == 'expensereports') {
+    } elseif ($module == 'expensereports') {
         $moduledirforclass = 'expensereport';
-    }
-    elseif ($module == 'users') {
+    } elseif ($module == 'users') {
         $moduledirforclass = 'user';
-    }
-    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    } elseif ($module == 'ficheinter' || $module == 'interventions') {
     	$moduledirforclass = 'fichinter';
-    }
-    elseif ($module == 'tickets') {
+    } elseif ($module == 'tickets') {
     	$moduledirforclass = 'ticket';
-    }
-    elseif ($module == 'boms') {
+    } elseif ($module == 'boms') {
         $moduledirforclass = 'bom';
     }
 
@@ -2430,8 +2323,7 @@ function autoOrManual($automaticmanual, $case = 1, $color = 0)
         if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
         $classname = 'ok';
-    }
-    elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
+    } elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
     {
         $result = $langs->trans("manual");
         if ($case == 1 || $case == 3) $result = $langs->trans("Manual");
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 26db2bbec90..04c60bbc8e4 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -180,17 +180,13 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 	{
 		if ($numero >= 1 && $numero < 2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 0 && $numero < 1) {
+		} elseif ($numero >= 0 && $numero < 1) {
 			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 1000000 && $numero < 1000001) {
+		} elseif ($numero >= 1000000 && $numero < 1000001) {
 			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
+		} elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
 			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		else {
+		} else {
 			$entexto = "";
 			$number = $numero;
 			if ($number >= 1000000000) {
@@ -213,8 +209,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 				$entexto .= hundreds2text($CdMILLON, $DdMILLON, $udMILLON);
 				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1)
 					$entexto .= " MILL&OacuteN ";
-				else
-					$entexto .= " MILLONES ";
+				else $entexto .= " MILLONES ";
 			}
 			if ($number >= 1000) {
 				$cdm = (int) ($numero / 100000);
@@ -270,13 +265,11 @@ function hundreds2text($hundreds, $tens, $units)
 			$entexto .= $unidades[$units - 1];
 		}
 		return $entexto;
-	}
-	elseif ($tens == 2) {
+	} elseif ($tens == 2) {
 		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
-	}
-	elseif ($tens == 1) {
+	} elseif ($tens == 1) {
 		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= $diecis[$units];
 		return $entexto;
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index ae0eb86882e..e6e20692317 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -77,40 +77,32 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
     {
     	curl_setopt($ch, CURLOPT_POST, 1); // POST
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
-    }
-    elseif ($postorget == 'POSTALREADYFORMATED')
+    } elseif ($postorget == 'POSTALREADYFORMATED')
     {
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
         curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    }
-    elseif ($postorget == 'PUT')
+    } elseif ($postorget == 'PUT')
     {
         $array_param = null;
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	if (!is_array($param)) parse_str($param, $array_param);
-    	else
-    	{
+    	else {
     	    dol_syslog("parameter param must be a string", LOG_WARNING);
     	    $array_param = $param;
     	}
     	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
-    }
-    elseif ($postorget == 'PUTALREADYFORMATED')
+    } elseif ($postorget == 'PUTALREADYFORMATED')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
-    }
-    elseif ($postorget == 'HEAD')
+    } elseif ($postorget == 'HEAD')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
     	curl_setopt($ch, CURLOPT_NOBODY, true);
-    }
-    elseif ($postorget == 'DELETE')
+    } elseif ($postorget == 'DELETE')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
-    }
-    else
-    {
+    } else {
     	curl_setopt($ch, CURLOPT_POST, 0); // GET
     }
 
@@ -143,9 +135,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
         $rep['curl_error_msg'] = curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',', $rep));
-    }
-    else
-    {
+    } else {
     	$info = curl_getinfo($ch);
 
     	// Ad keys to $rep
@@ -182,9 +172,7 @@ function getDomainFromURL($url, $mode = 0)
 	if ($mode == 2)
 	{
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
-	}
-	else
-	{
+	} else {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
 	if (empty($mode))
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 4f65ca3a2bf..cb6fdc7ad2e 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -124,25 +124,20 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	{
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
-	}
-	elseif (!file_exists($file))
+	} elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
 		return $langs->trans("ErrorFileNotFound", $file);
-	}
-	elseif (image_format_supported($file) < 0)
+	} elseif (image_format_supported($file) < 0)
 	{
 		return 'This filename '.$file.' does not seem to be an image filename.';
-	}
-	elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
+	} elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
 	{
 		return 'Wrong value for parameter newWidth or newHeight';
-	}
-	elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
+	} elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
 	{
 		return 'At least newHeight or newWidth must be defined for resizing';
-	}
-	elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
+	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
 	{
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
@@ -220,9 +215,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($newWidth, $newHeight);
-	}
-	else
-	{
+	} else {
 		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
 	}
 
@@ -350,17 +343,14 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 						$img = imagerotate($img, $deg, imageColorAllocateAlpha($img, 0, 0, 0, 127));
 						imagealphablending($img, false);
 						imagesavealpha($img, true);
-					}
-					else {
+					} else {
 						$img = imagerotate($img, $deg, 0);
 					}
 				}
 				// then rewrite the rotated image back to the disk as $fileDest
 				if ($fileDest === false) {
 					return $img;
-				}
-				else
-				{
+				} else {
 					// In fact there exif is only for JPG but just in case
 					// Create image on disk
 					$image = false;
@@ -425,24 +415,20 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	{
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
-	}
-	elseif (!file_exists($file))
+	} elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
         dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
 	    return $langs->trans("ErrorFileNotFound", $file);
-	}
-	elseif (image_format_supported($file) < 0)
+	} elseif (image_format_supported($file) < 0)
 	{
         dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
 	    return 'ErrorBadImageFormat';
-	}
-	elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
+	} elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
 		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
         dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxWidth';
-	}
-	elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
+	} elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
 		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
         dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
 	    return 'Error: Wrong value for parameter maxHeight';
@@ -570,8 +556,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127));
 			imagealphablending($rotated, false);
 			imagesavealpha($rotated, true);
-		}
-    	else {
+		} else {
 			$rotated = imagerotate($img, $exifAngle, 0);
 		}
 
@@ -596,9 +581,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
-	}
-	else
-	{
+	} else {
 		// Si hauteur determinante
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
@@ -614,9 +597,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
-	}
-	else
-	{
+	} else {
 		$imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
 	}
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 703d50c97f8..4094da1375f 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -67,8 +67,7 @@ function facture_prepare_head($object)
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $nbStandingOrders = $obj->nb;
-        }
-        else dol_print_error($db);
+        } else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
 		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index d5ca3431845..1357bfb2417 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -176,8 +176,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					{
 						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
 						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
-					}
-					else {
+					} else {
 						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
 					}
 
@@ -261,16 +260,12 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			}
 
 			$result = 1;
-		}
-		else
-		{
+		} else {
 			if ($usestdout) print "No invoices found for criteria.\n";
 			else dol_syslog("No invoices found for criteria");
 			$result = 0;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		dol_syslog("scripts/invoices/rebuild_merge.php: Error");
 		$error++;
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 44ad9cc6ff1..bdd5f622838 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -53,9 +53,7 @@ function dol_json_encode($elements)
 	if (is_object($elements))	// Count number of properties for an object
 	{
 		foreach ($elements as $key => $value) $num++;
-	}
-	else
-	{
+	} else {
 	    $num = count($elements);
 	}
 	//var_dump($num);
@@ -74,9 +72,7 @@ function dol_json_encode($elements)
 			if ($i !== $last) $output .= ',';
 		}
 		$output .= ']';
-	}
-	else
-	{
+	} else {
 		// associative (object)
 		$output = '{';
 		$last = $num - 1;
@@ -197,11 +193,10 @@ function _val($val)
 	    }
 
 	    return '"'.$ascii.'"';
-	}
-	elseif (is_int($val)) return sprintf('%d', $val);
+	} elseif (is_int($val)) return sprintf('%d', $val);
 	elseif (is_float($val)) return sprintf('%F', $val);
 	elseif (is_bool($val)) return ($val ? 'true' : 'false');
-	else  return 'null';
+	else return 'null';
 }
 
 if (!function_exists('json_decode'))
@@ -244,8 +239,7 @@ function dol_json_decode($json, $assoc = false)
 			elseif (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';
 			elseif ($json[$i] == ':') $out .= ' => ';
 			else $out .= $json[$i];
-		}
-		else $out .= $json[$i];
+		} else $out .= $json[$i];
 		if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;
 	}
 
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 038791ce1cc..f95b6d03407 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -112,18 +112,14 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	if (!function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	elseif (empty($conf->global->LDAP_SERVER_HOST))
+	} elseif (empty($conf->global->LDAP_SERVER_HOST))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	elseif (empty($key) || empty($dn) || empty($objectclass))
+	} elseif (empty($key) || empty($dn) || empty($objectclass))
 	{
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
 	print '<br><br>';
@@ -170,8 +166,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 				if (strtolower($key) == 'userpassword') $hide = 1;
 			}
 			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
-		}
-		elseif ($subcount)
+		} elseif ($subcount)
 		{
 			$subcount--;
 			$newstring = dol_htmlentitiesbr($val);
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index a301ac40a2b..9d64185c781 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -63,13 +63,10 @@ function dol_setcache($memoryid, $data)
 		if ($rescode == 0)
 		{
 			return count($data);
-		}
-		else
-		{
+		} else {
 			return -$rescode;
 		}
-	}
-	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
@@ -86,13 +83,10 @@ function dol_setcache($memoryid, $data)
 		if ($result)
 		{
 			return count($data);
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
-	}
-	// Using shmop
+	} // Using shmop
 	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
 		$result = dol_setshmop($memoryid, $data);
@@ -133,13 +127,10 @@ function dol_getcache($memoryid)
 		if ($rescode == 0)
 		{
 			return $data;
-		}
-		else
-		{
+		} else {
 			return -$rescode;
 		}
-	}
-	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
@@ -158,13 +149,10 @@ function dol_getcache($memoryid)
 		if ($data)
 		{
 			return $data;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
-	}
-	// Using shmop
+	} // Using shmop
 	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
 		$data = dol_getshmop($memoryid);
@@ -235,9 +223,7 @@ function dol_setshmop($memoryid, $data)
 		}
 		shmop_close($handle);
 		return ($shm_bytes_written1 + $shm_bytes_written2);
-	}
-	else
-	{
+	} else {
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
 	}
@@ -263,9 +249,7 @@ function dol_getshmop($memoryid)
 		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
 		else return -1;
 		shmop_close($handle);
-	}
-	else
-	{
+	} else {
 		return -2;
 	}
 	return $data;
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index b9a958160d4..9e2a909f2f4 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -83,8 +83,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 	//$pathoffiletoedittmp=$destdir.'/class/'.strtolower($objectname).'.class.php.tmp';
 	//dol_delete_file($pathoffiletoedittmp, 0, 1, 1);
 
-	try
-	{
+	try {
 		include_once $pathoffiletoeditsrc;
 		if (class_exists($objectname)) $object = new $objectname($db);
 		else return -4;
@@ -192,8 +191,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 
 		return $object;
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		print $e->getMessage();
 		return -5;
@@ -234,16 +232,14 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	}
 
 	// Load object from myobject.class.php
-	try
-	{
+	try {
 		if (!is_object($object))
 		{
 			include_once $pathoffiletoclasssrc;
 			if (class_exists($objectname)) $object = new $objectname($db);
 			else return -1;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		print $e->getMessage();
 	}
@@ -270,8 +266,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			$texttoinsert .= "\t".$key." ".$type;
 			if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
 			if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
-			else
-			{
+			else {
 				if ($val['default'] != '')
 				{
 					if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
@@ -292,9 +287,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	if ($result)
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
-	}
-	else
-	{
+	} else {
 		$error++;
 	}
 
@@ -337,9 +330,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	if ($result)
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
-	}
-	else
-	{
+	} else {
 		$error++;
 	}
 
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 7dfd025609c..1120b3f8d15 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -45,9 +45,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
         include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
-    }
-    else
-    {
+    } else {
         $content = nl2br($content);
     }
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index d031984552e..969eb05328c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -180,8 +180,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}
 		//if ($mode) $out.='&noidempotency=1';
-	}
-	elseif ($type == 'order')
+	} elseif ($type == 'order')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'order_ref';
@@ -190,16 +189,14 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'invoice')
+	} elseif ($type == 'invoice')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'invoice_ref';
@@ -208,16 +205,14 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'contractline')
+	} elseif ($type == 'contractline')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'contractline_ref';
@@ -226,16 +221,14 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'member' || $type == 'membersubscription')
+	} elseif ($type == 'member' || $type == 'membersubscription')
 	{
 	    $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'member_ref';
@@ -244,8 +237,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -262,8 +254,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 63789a18e62..793ea47de25 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -54,9 +54,7 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat = dol_getDefaultFormat($outputlangs);
-	}
-	else
-	{
+	} else {
 		$pdfformat = $conf->global->MAIN_PDF_FORMAT;
 	}
 
@@ -305,9 +303,7 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
     $height = 0;
     if ($end_page == $start_page) {
         $height = $end_y - $start_y;
-    }
-    else
-    {
+    } else {
         for ($page = $start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
         	$tmpm = $pdf->getMargins();
@@ -482,8 +478,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
     			// Country
     			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
     				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			}
-    			elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+    			} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
     				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
     			}
 
@@ -513,9 +508,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
                         if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
     			    }
     			}
-    		}
-    		else
-    		{
+    		} else {
     			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
     			// Country
     			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
@@ -781,7 +774,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 					// Key
 					$tmplength = 15;
 					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
+				} elseif ($val == 'IBAN' || $val == 'BIC') {
 					// Key
 					$tmplength = 0;
 					$content = '';
@@ -803,9 +796,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
     		$curx = $savcurx;
     		$cury += 8;
 		}
-	}
-	else
-	{
+	} else {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
@@ -840,9 +831,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		$tmpy = $pdf->getStringHeight(100, $val);
 		$cury += $tmpy;
 		$cur += 1;
-	}
-
-	elseif (!$usedetailedbban) $cury += 1;
+	} elseif (!$usedetailedbban) $cury += 1;
 
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
@@ -1058,9 +1047,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
     			$width = 200; $align = 'C';
     		}
 		    $freetextheight = $pdf->getStringHeight($width, $line);
-		}
-		else
-		{
+		} else {
             $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
 		}
@@ -1075,9 +1062,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
-		}
-		else
-		{
+		} else {
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
 		}
 		$posy -= $freetextheight;
@@ -1244,9 +1229,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	{
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 	}
@@ -1282,8 +1265,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$textwasmodified = ($note == $prodser->note);
 			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
-	}
-	elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
+	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
 		if ($object->type == $object::TYPE_DEPOSIT) {
 			$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 		}
@@ -1306,8 +1288,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
@@ -1315,21 +1296,17 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
-		}
-		else
-		{
+		} else {
 			if ($idprod)
 			{
 				if (empty($hidedesc))
@@ -1337,15 +1314,11 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
 					{
 						$libelleproduitservice = $desc."\n".$libelleproduitservice;
-					}
-					else
-					{
+					} else {
 						$libelleproduitservice .= $desc;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$libelleproduitservice .= $desc;
 			}
 		}
@@ -1359,9 +1332,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		if ($prodser->isService())
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-		}
-		else
-		{
+		} else {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
 	}
@@ -1374,14 +1345,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				$ref_prodserv = $ref_supplier;
 			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
 				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
+			else // Common case
 			{
 				$ref_prodserv = $prodser->ref; // Show local ref
 				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
 			}
-		}
-		else
-		{
+		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
@@ -1943,9 +1912,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
 			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
-			}
-			else
-				$result = $object->lines[$i]->situation_percent.'%';
+			} else $result = $object->lines[$i]->situation_percent.'%';
 	  	}
 	}
 	return $result;
@@ -2000,9 +1967,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
         		}
 				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
-        	}
-        	else
-        	{
+        	} else {
                 $result .= price($sign * $total_ht, 0, $outputlangs);
         	}
         }
@@ -2044,8 +2009,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if ($object->lines[$i]->special_code == 3)
     	{
     		$result .= $outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
+    	} elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
 	}
 	return $result;
 }
@@ -2074,8 +2038,7 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 			if ($type == 'all')
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
+			} elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
 				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -2083,12 +2046,10 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 				$action = '';
 				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
-			}
-			elseif ($type == 0 && $object->lines[$i]->product_type == 0)
+			} elseif ($type == 0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			elseif ($type == 1 && $object->lines[$i]->product_type == 1)
+			} elseif ($type == 1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -2119,8 +2080,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 	    if ($objecttype == 'facture')
 	    {
 	        // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    }
-	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2131,8 +2091,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
+		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
 			foreach ($objects as $elementobject)
@@ -2142,8 +2101,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'contrat')
+		} elseif ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
 			foreach ($objects as $elementobject)
@@ -2153,8 +2111,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'fichinter')
+		} elseif ($objecttype == 'fichinter')
 		{
 			$outputlangs->load('interventions');
 			foreach ($objects as $elementobject)
@@ -2164,8 +2121,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("InterDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->datec, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'shipping')
+		} elseif ($objecttype == 'shipping')
 		{
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
@@ -2186,9 +2142,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    }
-			    else
-			    {
+			    } else {
 			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
 			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
 			        $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
@@ -2234,8 +2188,7 @@ function pdf_getSizeForImage($realpath)
 		{
 			$width = $maxwidth;
 			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
-		}
-		else	// No pb with maxheight
+		} else // No pb with maxheight
 		{
 			$height = $maxheight;
 		}
@@ -2260,9 +2213,7 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 	if ($object->lines[$i]->special_code == 3)
 	{
 		return $outputlangs->transnoentities("Option");
-	}
-	else
-	{
+	} else {
 		if (is_object($hookmanager))
 		{
 			$special_code = $object->lines[$i]->special_code;
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index c06c4431562..f453f543305 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -131,8 +131,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
+	} else // deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate using the full vat rate (including text code)
 	{
 	    dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
 
@@ -152,15 +151,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
 		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
-		{
+		else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
@@ -169,8 +166,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
 		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
-		{
+		else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
 		}
@@ -192,9 +188,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
     	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
     	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
     	$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
-    }
-    else
-    {
+    } else {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
     	$pu_wt = $pu;
@@ -268,9 +262,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[5] = price2num($pu * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[2], 'MU'); // Selon TVA NPR ou non
 		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
-	{
+	} else {
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
 		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
@@ -354,9 +346,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$result[2] = price2num($result[0] + $result[1], 'MT');
 			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
-		{
+		} else {
 			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[0] = price2num($result[2] - $result[1], 'MT');
@@ -405,9 +395,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[24] = $newresult[8];
 		$result[25] = $newresult[9];
 		$result[26] = $newresult[10];
-	}
-	else
-	{
+	} else {
 		$result[16] = $result[0];
 		$result[17] = $result[1];
 		$result[18] = $result[2];
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 43acb16ba2a..b2ad7d8f43b 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -544,17 +544,14 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 				't.rowid' => $unit,
 				't.active' => 1
 			);
-		}
-		elseif ($scale !== '')
+		} elseif ($scale !== '')
 		{
 			$arrayforfilter = array(
 				't.scale' => $scale,
 				't.unit_type' => $measuring_style,
 				't.active' => 1
 			);
-		}
-		else
-		{
+		} else {
 			$arrayforfilter = array(
 				't.rowid' => $unit,
 				't.unit_type' => $measuring_style,
@@ -575,8 +572,7 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 			$measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label] = $labeltoreturn;
 			return $labeltoreturn;
 		}
-	}
-	else {
+	} else {
 		return $measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label];
 	}
 }
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index bef3d9fd0dc..0fa9a3ed0bb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -77,8 +77,7 @@ function project_prepare_head($object)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $nbTimeSpent = 1;
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
 		$head[$h][1] = $langs->trans("TimeSpent");
@@ -191,8 +190,7 @@ function task_prepare_head($object)
 	{
 		$obj = $db->fetch_object($resql);
 		if ($obj) $nbTimeSpent = 1;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
@@ -418,15 +416,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					if ($foundtaskforuserdeeper > 0)
 					{
 						$showlineingray = 1; // We will show line but in gray
-					}
-					else
-					{
+					} else {
 						$showline = 0; // No reason to show line
 					}
 				}
-			}
-			else
-			{
+			} else {
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
 				if (empty($user->rights->projet->all->lire))
@@ -681,9 +675,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
                 if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
 			}
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -1264,8 +1256,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -1379,9 +1370,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -1640,8 +1629,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -1744,9 +1732,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -1909,8 +1895,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -2005,9 +1990,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -2109,9 +2092,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else
-	{
+	} else {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -2159,8 +2140,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			$arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
@@ -2338,9 +2318,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		print '</tr>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -2404,13 +2382,11 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
             $progressBarClass = 'progress-bar-danger';
             $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
-        }
-        elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+        } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
             $progressBarClass = 'progress-bar-warning';
             $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress - $progressCalculated).'%</span>';
-        }
-        else {
+        } else {
             $progressBarClass = 'progress-bar-success';
             $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress - $progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress - $progressCalculated).'%</span>';
@@ -2425,8 +2401,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
         if ($label !== true) {
             $out .= $label; // replace label by param
-        }
-        else {
+        } else {
             $out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
         }
         $out .= '    </span>';
@@ -2438,8 +2413,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
         $out .= '    <span class="progress-number">';
         if ($progressNumber !== true) {
             $out .= $progressNumber; // replace label by param
-        }
-        else {
+        } else {
             if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
 
 			$url = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$task->id;
@@ -2474,9 +2448,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
 		}
     	$out .= '        </div>';
-    }
-    else
-    {
+    } else {
     	// bad
     	$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
     	$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
@@ -2517,12 +2489,10 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
             if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
                 $badgeClass .= 'badge-danger';
                 if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            }
-            elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
+            } elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
                 $badgeClass .= 'badge-warning';
                 if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
-            }
-            else {
+            } else {
                 $badgeClass .= 'badge-success';
                 if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
             }
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 03f1525eb91..06e311b39f5 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -45,8 +45,7 @@ function dol_encode($chain, $key = '1')
 			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 		}
 		$chain = implode("", $output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result = '';
 		$strlength = dol_strlen($chain);
@@ -84,8 +83,7 @@ function dol_decode($chain, $key = '1')
 		}
 
 		$chain = implode("", $output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result = '';
 		$strlength = dol_strlen($chain);
@@ -237,44 +235,35 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		if ($feature == 'societe')
 		{
 			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'contact')
+		} elseif ($feature == 'contact')
 		{
 			if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'produit|service')
+		} elseif ($feature == 'produit|service')
 		{
 			if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'prelevement')
+		} elseif ($feature == 'prelevement')
 		{
 			if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'cheque')
+		} elseif ($feature == 'cheque')
 		{
 			if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }
-		}
-		elseif ($feature == 'projet')
+		} elseif ($feature == 'projet')
 		{
 			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }
-		}
-		elseif (!empty($feature2))														// This is for permissions on 2 levels
+		} elseif (!empty($feature2))														// This is for permissions on 2 levels
 		{
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature)
 			{
 				if ($subfeature == 'user' && $user->id == $objectid) continue; // A user can always read its own card
-				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }
-				elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }
-				else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; } elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; } else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
 			}
 			if (!$tmpreadok)	// We found a test on feature that is ko
 			{
 				$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
 				$nbko++;
 			}
-		}
-		elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is permissions on 1 level
+		} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup'))		// This is permissions on 1 level
 		{
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
@@ -297,28 +286,22 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			if ($feature == 'contact')
 			{
 				if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'produit|service')
+			} elseif ($feature == 'produit|service')
 			{
 				if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'prelevement')
+			} elseif ($feature == 'prelevement')
 			{
 				if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'commande_fournisseur')
+			} elseif ($feature == 'commande_fournisseur')
 			{
 				if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'banque')
+			} elseif ($feature == 'banque')
 			{
 				if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }
-			}
-			elseif ($feature == 'cheque')
+			} elseif ($feature == 'cheque')
 			{
 				if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }
-			}
-			elseif (!empty($feature2))														// This is for permissions on one level
+			} elseif (!empty($feature2))														// This is for permissions on one level
 			{
 				foreach ($feature2 as $subfeature)
 				{
@@ -336,8 +319,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 						break;
 					}
 				}
-			}
-			elseif (!empty($feature))														// This is for permissions on 2 levels ('creer' or 'write')
+			} elseif (!empty($feature))														// This is for permissions on 2 levels ('creer' or 'write')
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
 				if (empty($user->rights->$feature->creer)
@@ -375,47 +357,38 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			if ($feature == 'contact')
 			{
 				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'produit|service')
+			} elseif ($feature == 'produit|service')
 			{
 				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'commande_fournisseur')
+			} elseif ($feature == 'commande_fournisseur')
 			{
 				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'banque')
+			} elseif ($feature == 'banque')
 			{
 				if (!$user->rights->banque->modifier) $deleteok = 0;
-			}
-			elseif ($feature == 'cheque')
+			} elseif ($feature == 'cheque')
 			{
 				if (!$user->rights->banque->cheque) $deleteok = 0;
-			}
-			elseif ($feature == 'ecm')
+			} elseif ($feature == 'ecm')
 			{
 				if (!$user->rights->ecm->upload) $deleteok = 0;
-			}
-			elseif ($feature == 'ftp')
+			} elseif ($feature == 'ftp')
 			{
 				if (!$user->rights->ftp->write) $deleteok = 0;
-			}elseif ($feature == 'salaries')
+			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
-			}
-			elseif ($feature == 'salaries')
+			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
-			}
-			elseif (!empty($feature2))							// This is for permissions on 2 levels
+			} elseif (!empty($feature2))							// This is for permissions on 2 levels
 			{
 				foreach ($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
 					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
 				}
-			}
-			elseif (!empty($feature))							// This is used for permissions on 1 level
+			} elseif (!empty($feature))							// This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
@@ -503,35 +476,28 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 					{
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND dbt.entity IS NOT NULL";
-					}
-					else
-					{
+					} else {
 						$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND ((ug.fk_user = dbt.rowid";
 						$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 						$sql .= " OR dbt.entity = 0)"; // Show always superadmin
 					}
-				}
-				else {
+				} else {
 					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checksoc))	// We check feature = checksoc
+		} elseif (in_array($feature, $checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
@@ -541,8 +507,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND sc.fk_user = ".$user->id;
 				$sql .= " AND sc.fk_soc = s.rowid";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(s.rowid) as nb";
@@ -550,8 +515,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE s.rowid IN (".$objectid.")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -560,8 +524,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.fk_soc = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -570,8 +533,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -579,8 +541,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checkproject))
+		} elseif (in_array($feature, $checkproject))
 		{
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -589,16 +550,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
 				if (!in_array($objectid, $tmparray)) return false;
-			}
-			else
-			{
+			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checktask))
+		} elseif (in_array($feature, $checktask))
 		{
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
@@ -610,16 +568,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
 				if (!in_array($task->fk_project, $tmparray)) return false;
-			}
-			else
-			{
+			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		} elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -629,8 +584,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
@@ -643,8 +597,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				$sql .= " AND sc.fk_user = ".$user->id;
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -661,9 +614,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 			{
 				$obj = $db->fetch_object($resql);
 				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
-			{
+			} else {
 				return false;
 			}
 		}
@@ -722,9 +673,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 			{
 				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 				print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
-			}
-			else
-			{
+			} else {
 				print $langs->trans("ErrorForbidden3");
 			}
 		}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index ce346c0d26e..ba9a477ebd7 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -101,9 +101,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
     					$dol_screenwidth = GETPOST('screenwidth');
     					$dol_screenheight = GETPOST('screenheight');
     				}
-    			}
-    			else
-    			{
+    			} else {
     				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
     				sleep(1);
     				// Load translation files required by the page
@@ -179,9 +177,7 @@ if (!function_exists('dol_loginfunction'))
 				$tmp = dol_buildpath($reldir.'login.tpl.php');
 				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }
 			}
-		}
-		else
-		{
+		} else {
 			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
@@ -226,13 +222,11 @@ if (!function_exists('dol_loginfunction'))
 		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 		{
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-		}
-		elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 		{
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 			$width = 128;
-		}
-		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 		{
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 		}
@@ -363,8 +357,7 @@ function encodedecode_dbpassconf($level = 0)
 					$passwd = $val;
 					$lineofpass = 1;
 				}
-			}
-			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
+			} elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
 			{
 				$val = trim($reg[1]); // This also remove CR/LF
 				$val = preg_replace('/^["\']/', '', $val);
@@ -375,9 +368,7 @@ function encodedecode_dbpassconf($level = 0)
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
 					$passwd = $val;
-				}
-				else
-				{
+				} else {
 					$passwd = $val;
 					$val = dol_encode($val);
 					$passwd_crypted = $val;
@@ -400,9 +391,7 @@ function encodedecode_dbpassconf($level = 0)
 
 				//print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
 				//exit;
-			}
-			else
-			{
+			} else {
 				$config .= $buffer;
 			}
 		}
@@ -422,15 +411,11 @@ function encodedecode_dbpassconf($level = 0)
 			//@chmod($file, octdec('0600'));
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_syslog("encodedecode_dbpassconf Failed to open conf.php file for writing", LOG_WARNING);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		dol_syslog("encodedecode_dbpassconf Failed to read conf.php", LOG_ERR);
 		return -2;
 	}
@@ -475,8 +460,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 			}
 
 			$generated_password = str_shuffle($randomCode);
-		}
-		else	// Old platform, non cryptographic random
+		} else // Old platform, non cryptographic random
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
@@ -493,8 +477,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 			$generated_password = str_shuffle($randomCode);
 		}
-	}
-	elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
+	} elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
 	{
 		$nomclass = "modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
 		$nomfichier = $nomclass.".class.php";
@@ -513,9 +496,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		if (function_exists('random_int'))	// Cryptographic random
 		{
 			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
-		}
-		else
-		{
+		} else {
 			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
 		}
 	}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index ad1e6304d03..b81757f261f 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -304,9 +304,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						}
 
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-					}
-					else
-					{
+					} else {
 						$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 					}
 
@@ -332,9 +330,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					}
 
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					print "<td>";
 					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -439,9 +435,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						print '<td class="right">';
 						print dol_print_date($receiving->date_delivery, 'day');
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						//print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
@@ -454,9 +448,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '</table>';
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 837f505c132..37cb9b31e8d 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -63,8 +63,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
-		else
-		{
+		else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
@@ -80,9 +79,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 			{
 				$out = $langs->trans("FeatureOnlineSignDisabled");
 				return $out;
-			}
-			else
-			{
+			} else {
 				$out .= '&hashp='.$hashp;
 			}
 		}
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index cdf9fe29b1c..798fa568cb2 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -110,8 +110,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$paymenttable = 'paiement';
     	$paymentfacturetable = 'paiement_facture';
     	$invoicefieldref = 'ref';
-    }
-    elseif ($direction == 'buy')
+    } elseif ($direction == 'buy')
     {
     	$invoicetable = 'facture_fourn';
     	$invoicedettable = 'facture_fourn_det';
@@ -162,8 +161,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -174,9 +172,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
     	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -203,8 +199,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -273,9 +268,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -310,8 +303,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -322,9 +314,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
     	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -351,8 +341,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -424,9 +413,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -455,8 +442,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -528,9 +514,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     				$company_id = $assoc['company_id'];
     			}
-    		}
-    		else
-    		{
+    		} else {
     			dol_print_error($db);
     			return -3;
     		}
@@ -579,9 +563,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $paymenttable = 'paiement';
         $paymentfacturetable = 'paiement_facture';
         $invoicefieldref = 'ref';
-    }
-    else
-    {
+    } else {
         $invoicetable = 'facture_fourn';
         $invoicedettable = 'facture_fourn_det';
         $fk_facture = 'fk_facture_fourn';
@@ -631,8 +613,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        }
-        elseif ($y)
+        } elseif ($y)
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -643,9 +624,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
         if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } else {
     	// Count on payments date
     	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
     	$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -672,8 +651,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-    	}
-    	elseif ($y)
+    	} elseif ($y)
     	{
     		$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
     		$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -742,9 +720,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
                 $rate = $assoc['rate'];
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             return -3;
         }
@@ -779,8 +755,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        }
-        elseif ($y)
+        } elseif ($y)
         {
             $sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
             $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -791,9 +766,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
         if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } else {
         // Count on payments date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
         $sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -820,8 +793,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
             $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-        }
-        elseif ($y)
+        } elseif ($y)
         {
             $sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
             $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -893,9 +865,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
                 $rate = $assoc['rate'];
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             return -3;
         }
@@ -924,8 +894,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		{
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		}
-		elseif ($y)
+		} elseif ($y)
 		{
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
@@ -997,9 +966,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
 					$rate = $assoc['rate'];
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 				return -3;
 			}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index cf6607e6960..dbd26cc1f75 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -112,15 +112,13 @@ function ticket_prepare_head($object)
 	$ticketViewType = "messaging";
 	if (empty($_SESSION['ticket-view-type'])) {
 		$_SESSION['ticket-view-type'] = $ticketViewType;
-	}
-	else {
+	} else {
 		$ticketViewType = $_SESSION['ticket-view-type'];
 	}
 
 	if ($ticketViewType == "messaging") {
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-	}
-	else {
+	} else {
 		// $ticketViewType == "list"
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 	}
@@ -162,17 +160,13 @@ function showDirectPublicLink($object)
 	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	{
 		$out .= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';
-	}
-	else
-	{
+	} else {
 		$out .= img_picto('', 'object_globe.png').' '.$langs->trans("TicketPublicAccess").':<br>';
 		if ($url)
 		{
 			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
 			$out .= ajax_autoselect("directpubliclink", 0);
-		}
-		else
-		{
+		} else {
 			$out .= '<span class="opacitymedium">'.$langs->trans("TicketNotCreatedFromPublicInterface").'</span>';
 		}
 	}
@@ -314,9 +308,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
         // Recherche histo sur actioncomm
         if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
-        }
-        else
-        {
+        } else {
             $sql = "SELECT a.id, a.label as label,";
         }
         $sql .= " a.datep as dp,";
@@ -351,8 +343,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $sql .= " ON er.resource_type = 'dolresource'";
             $sql .= " AND er.element_id = a.id";
             $sql .= " AND er.resource_id = ".$filterobj->id;
-        }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+        } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
         elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
         elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
@@ -367,28 +358,23 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             {
                 $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Product')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-            elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
+            } elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')
             {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
                 if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
@@ -402,14 +388,11 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-                else
-                {
+                else {
                     if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
                     elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
                 }
-            }
-            else
-            {
+            } else {
                 if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
                 elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
                 else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
@@ -526,9 +509,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             $numaction++;
             $i++;
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -554,9 +535,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			(is_null($filterobj) || get_class($filterobj) == 'Societe'))
 		{
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
-		}
-		else
-		{
+		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
 		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
@@ -655,16 +634,13 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
             if ($histo[$key]['percent'] == -1) {
                 $colorClass = 'timeline-icon-not-applicble';
                 $pictoTitle = $langs->trans('StatusNotApplicable');
-            }
-            elseif ($histo[$key]['percent'] == 0) {
+            } elseif ($histo[$key]['percent'] == 0) {
                 $colorClass = 'timeline-icon-todo';
                 $pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
-            }
-            elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
+            } elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
                 $colorClass = 'timeline-icon-in-progress';
                 $pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
-            }
-            elseif ($histo[$key]['percent'] >= 100) {
+            } elseif ($histo[$key]['percent'] >= 100) {
                 $colorClass = 'timeline-icon-done';
                 $pictoTitle = $langs->trans('StatusActionDone').' (100%)';
             }
@@ -672,17 +648,13 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
             if ($actionstatic->code == 'AC_TICKET_CREATE') {
                 $iconClass = 'fa fa-ticket';
-            }
-            elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
+            } elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
                 $iconClass = 'fa fa-pencil';
-            }
-            elseif ($actionstatic->code == 'TICKET_MSG') {
+            } elseif ($actionstatic->code == 'TICKET_MSG') {
                 $iconClass = 'fa fa-comments';
-            }
-            elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+            } elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
                 $iconClass = 'fa fa-mask';
-            }
-            elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
+            } elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
             {
                 if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
                 else {
@@ -764,8 +736,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 			if ($actionstatic->code == 'TICKET_MSG') {
 				$out .= $langs->trans('TicketNewMessage');
-			}
-			elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+			} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
 				$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';
 			} else {
                 if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
@@ -823,8 +794,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
                 }
 
                 $footer .= $langs->trans('ActionOnContact').' : '.$contactList;
-            }
-            elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
+            } elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
             {
                 $contact = new Contact($db);
                 $result = $contact->fetch($histo[$key]['contact_id']);
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 0dcb6e8242d..076e5ba644e 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -79,9 +79,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
     		{
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
     			else print img_picto_common('', 'treemenu/line.gif');
-    		}
-    		else
-    		{
+    		} else {
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
     			else print img_picto_common('', 'treemenu/linebottom.gif');
     		}
@@ -174,9 +172,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print '</td><td class="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
-			{
+			} else {
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> A '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
@@ -184,8 +180,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			// And now we search all its sons of lower level
 			tree_recur($tab, $tab[$x], $rang + 1, 'iddivjstree', 0, $showfk);
 			print '</li>';
-		}
-		elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
+		} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
 		    //print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 		    if (empty($ulprinted) && !empty($pere['rowid']))
@@ -210,9 +205,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print '</td><td class="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
-			{
+			} else {
 			    print $tab[$x]['entry'];
 			}
 			//print ' -> B '.$tab[$x]['rowid'].' mainmenu='.$tab[$x]['mainmenu'].' leftmenu='.$tab[$x]['leftmenu'].' fk_mainmenu='.$tab[$x]['fk_mainmenu'].' fk_leftmenu='.$tab[$x]['fk_leftmenu'].'<br>'."\n";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 9ac9383e516..e6c7243c449 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -125,8 +125,7 @@ function user_prepare_head($object)
 				$nbNote = $obj->nb;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -346,9 +345,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td class="nowrap left" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 		$dirthemestring = '';
 		foreach ($dirthemes as $dirtheme)
 		{
@@ -403,9 +400,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						if ($subdir == $selected_theme)
 						{
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
-						}
-						else
-						{
+						} else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
 						}
 						print '</div>';
@@ -441,18 +436,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 		// Nothing
-	}
-	else
-	{
+	} else {
 		// Show logo
 		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
 		if ($edit)
 		{
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
-		}
-		else
-		{
+		} else {
 			print  yn($conf->global->MAIN_SHOW_LOGO);
 		}
 		print '</td>';
@@ -486,9 +477,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -497,9 +486,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
 			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
-		}
-		else
-		{
+		} else {
 			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
@@ -531,9 +518,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
@@ -541,9 +526,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
-		}
-	   	else
-	   	{
+		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -577,9 +560,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
 
 		print '<tr class="oddeven">';
@@ -588,9 +569,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
-		}
-	   	else
-	   	{
+		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -624,9 +603,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 }
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbackvmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackvmenu1)));
 
 		print '<tr class="oddeven">';
@@ -635,9 +612,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -651,9 +626,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleColor for title of Pages
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
 
 		print '<tr class="oddeven">';
@@ -662,9 +635,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -677,9 +648,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
 
 		print '<tr class="oddeven">';
@@ -688,9 +657,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
-		}
-	   	else
-	   	{
+		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> '; // $colorbacktitle1 in CSS
@@ -703,9 +670,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
 
 		print '<tr class="oddeven">';
@@ -714,9 +679,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -729,9 +692,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleLinkColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
 		print '<tr class="oddeven">';
@@ -740,9 +701,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -756,9 +715,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableLineOddColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
 
 		print '<tr class="oddeven">';
@@ -767,9 +724,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -783,9 +738,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableLineEvenColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
 
 		print '<tr class="oddeven">';
@@ -794,9 +747,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print $langs->trans("Default");
@@ -830,9 +781,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     }
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = (empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
 
 		print '<tr class="oddeven">';
@@ -841,13 +790,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else
-			{
+			else {
 				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
 				print $langs->trans("Default");
@@ -872,8 +818,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else {
+	} else {
 		$default = (empty($colorbacklinepairhover) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairhover)));
 
 		print '<tr class="oddeven">';
@@ -886,17 +831,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			if ($color)
 			{
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
-			}
-			else print $langs->trans("Default");
+			} else print $langs->trans("Default");
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -916,9 +858,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
 		print '<tr class="oddeven">';
@@ -931,17 +871,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			if ($color)
 			{
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
-			}
-			else print $langs->trans("Default");
+			} else print $langs->trans("Default");
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -961,15 +898,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
    	    if ($edit)
    	    {
    	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-   	    }
-   	    else
-   	    {
+   	    } else {
    	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
    	        {
    	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
-   	        }
-   	        else
-   	        {
+   	        } else {
    	            print yn(1);
    	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
    	        }
@@ -978,9 +911,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
 	    print '</td>';
 	    print '</tr>';
-	}
-	else
-	{
+	} else {
 	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 	    $default=$langs->trans('No');
 	    print '<tr class="oddeven">';
@@ -1023,13 +954,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
-		}
-		else
-		{
+		} else {
 			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])) {
 				print $colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND];
-			}
-			else {
+			} else {
 				print yn(0);
 			}
 		}
@@ -1037,9 +965,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORCOLORBLINDDesc"));
 		print '</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 	}
 	print '</table>';
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index f3a4f738927..4bebc0c0081 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -93,9 +93,7 @@ function dolKeepOnlyPhpCode($str)
 			if (!empty($partlings))
 			{
 				$newstr .= $partlings[0].'?>';
-			}
-			else
-			{
+			} else {
 				$newstr .= $part.'?>';
 			}
 		}
@@ -242,8 +240,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
 			$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
 		}
-	}
-	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
+	} elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
 	{
 		$content = str_replace('<link rel="stylesheet" href="/styles.css', '<link rel="stylesheet" href="styles.css', $content);
 
@@ -299,8 +296,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		if (empty($includehtmlcontentopened)) {
 			$content = str_replace('!~!~!~', '', $content);
 		}
-	}
-	else									// REPLACEMENT OF LINKS When page called from virtual host
+	} else // REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists = 1;
 		if ($website->virtualhost) {
@@ -335,9 +331,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			// If some links to documents or viewimage remains, we replace with wrapper
 			$content = preg_replace('/(<img[^>]*src=")\/?viewimage\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 			$content = preg_replace('/(<a[^>]*href=")\/?documents\.php/', '\1/wrapper.php', $content, -1, $nbrep);
-		}
-		else
-		{
+		} else {
 			// <img src="image.png... => <img src="medias/image.png...
 			$content = preg_replace('/(<img[^>]*src=")\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
 			$content = preg_replace('/(url\(["\']?)\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
@@ -425,9 +419,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		if ($result > 0)
 		{
 			$containerref = $tmpwebsitepage->pageurl;
-		}
-		else
-		{
+		} else {
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 			exit;
 		}
@@ -463,19 +455,14 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 				{
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
-				}
-				else
-				{
+				} else {
 					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
-			}
-			else
-			{
+			} else {
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
-	}
-	else								// When page called from virtual host server
+	} else // When page called from virtual host server
 	{
 		$newurl = '/'.$containerref.'.php';
 	}
@@ -487,9 +474,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		}
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
-	{
+	} else {
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
 	}
@@ -579,8 +564,7 @@ function getStructuredData($type, $data = array())
 			}
 		}'."\n";
 		$ret .= '</script>'."\n";
-	}
-	elseif ($type == 'organization')
+	} elseif ($type == 'organization')
 	{
 		$companyname = $mysoc->name;
 		$url = $mysoc->url;
@@ -602,13 +586,12 @@ function getStructuredData($type, $data = array())
 			$ret .= ",\n";
 			$ret .= '"sameAs": [';
 			$i = 0;
-			foreach($mysoc->socialnetworks as $key => $value) {
+			foreach ($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
 					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
 				} elseif ($key == 'youtube') {
 					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
-				}
-				else {
+				} else {
 					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;
@@ -618,8 +601,7 @@ function getStructuredData($type, $data = array())
 		}
 		$ret .= '}'."\n";
 		$ret .= '</script>'."\n";
-	}
-	elseif ($type == 'blogpost')
+	} elseif ($type == 'blogpost')
 	{
 		if (!empty($websitepage->author_alias))
 		{
@@ -671,7 +653,7 @@ function getStructuredData($type, $data = array())
 				$ret .= '"keywords": [';
 				$i = 0;
 				$arrayofkeywords = explode(',', $websitepage->keywords);
-				foreach($arrayofkeywords as $keyword) {
+				foreach ($arrayofkeywords as $keyword) {
 					$ret.= '"'.dol_escape_json($keyword).'"';
 					$i++;
 					if ($i < count($arrayofkeywords)) $ret .= ', ';
@@ -682,8 +664,7 @@ function getStructuredData($type, $data = array())
 			$ret .= "\n".'}'."\n";
 			$ret .= '</script>'."\n";
 		}
-	}
-	elseif ($type == 'product')
+	} elseif ($type == 'product')
 	{
 		$ret = '<!-- Add structured data for product -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
@@ -803,16 +784,13 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("EmptySearchString");
-	}
-	elseif (dol_strlen($searchstring) < 2)
+	} elseif (dol_strlen($searchstring) < 2)
 	{
 		$weblangs->load("errors");
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
-	}
-	else
-	{
+	} else {
 		$tmparrayoftype = explode(',', $type);
 		foreach ($tmparrayoftype as $tmptype) {
 			if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
@@ -873,9 +851,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$arrayresult['code'] = $db->lasterrno();
 			$arrayresult['message'] = $db->lasterror();
@@ -934,9 +910,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				$arrayresult['code'] = 'KO';
 				$arrayresult['message'] = $weblangs->trans("NoRecordFound");
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$arrayresult['code'] = 'KO';
 			$arrayresult['message'] = 'No supported algorithm found';
@@ -985,9 +959,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-		}
-		else
-		{
+		} else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1023,15 +995,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
-				}
-				else
-				{
+				} else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
@@ -1062,9 +1031,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-		}
-		else
-		{
+		} else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1102,15 +1069,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
-				}
-				else
-				{
+				} else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index de5bb6d0ddd..a594dd1dd84 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -197,8 +197,9 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 					}
 				}
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 		$tplcontent .= '<?php } ?>'."\n";
 	}
 	// Add manifest.json on homepage
@@ -266,8 +267,7 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
 		}
-	}
-	else {
+	} else {
 		$result1 = true;
 	}
 
@@ -530,8 +530,7 @@ function showWebsiteTemplates(Website $website)
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	}
 
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index 912f0f16cea..ad16755f617 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -58,8 +58,7 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
         {
             $error++;
             $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
-        }
-        elseif ($result == 0)
+        } elseif ($result == 0)
         {
             $error++;
             $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 3d8120a6d29..e7252ac2171 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -229,9 +229,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 					{
 						$enddate = dol_time_plus_duree($startdate, 1, "d");
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($enddate))
 					{
 						$enddate = $startdate + $duration;
@@ -315,9 +313,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 		{
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
-	}
-	else
-	{
+	} else {
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
 	}
@@ -528,9 +524,7 @@ function calEncode($line)
 		}
 
 		$out .= $newpara;
-	}
-	else
-	{
+	} else {
 		$strlength = dol_strlen($line);
 
 		for ($j = 0; $j < $strlength; $j++)
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index ea3fa2f3a19..3cdcda3d0b2 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -106,9 +106,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				if ($passok)
 				{
 					$login = $obj->login;
-				}
-				else
-				{
+				} else {
 				    sleep(2); // Anti brut force protection
 				    dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO bad password for '".$usertotest."', cryptType=".$cryptType, LOG_NOTICE);
 
@@ -124,8 +122,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					global $mc;
 
 					if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
-					else
-					{
+					else {
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0)
 						{
@@ -134,9 +131,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
 				sleep(1);
 
@@ -145,9 +140,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO db error for '".$usertotest."' error=".$db->lasterror(), LOG_ERR);
 			sleep(1);
 			$_SESSION["dol_loginmesg"] = $db->lasterror();
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 3a8b274c109..0885519f0fa 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -126,9 +126,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					$_SESSION["dol_loginmesg"] = $langs->trans("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);
 					return '';
 				}
-			}
-			else
-			{
+			} else {
 				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
 			}
 			$ldap->close();
@@ -218,9 +216,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
-		{
+		} else {
 			/* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
              ** (for iPlanet, other servers may differ)
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index a401dfd7764..1f23424fb6b 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -56,9 +56,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
         {
             $openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
             $openid->Redirect(); // This will redirect user to OpenID Server
-        }
-        else
-        {
+        } else {
             $error = $openid->GetError();
             return false;
         }
@@ -89,21 +87,17 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
                     $login = $obj->login;
                 }
             }
-        }
-        elseif ($openid->IsError() === true)
+        } elseif ($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();
             return false;
-        }
-        else
-        {
+        } else {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    elseif ($_GET['openid_mode'] == 'cancel')
+    } elseif ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index e55da6f93ac..f6312f41015 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -116,8 +116,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
 			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
 			else $classname = 'class="tmenu"';
-		}
-		elseif ($showmode == 2) $classname = 'class="tmenu"';
+		} elseif ($showmode == 2) $classname = 'class="tmenu"';
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -145,8 +144,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 		 {
 		 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		 }*/
-		else
-		{
+		else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
 		}
@@ -357,8 +355,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				}
 				$i++;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 		$db->free($resql);
 	}
 
@@ -410,14 +407,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				// Should not happend. Entries are added
 				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 		$db->free($resql);
 	}
 
@@ -473,9 +467,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
-				}
-				else
-				{
+				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -533,14 +525,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					else print '</span>';
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				}
-				elseif ($showmenu)                 // Not enabled but visible (so greyed)
+				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
-				}
-				else
-				{
+				} else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
@@ -566,8 +555,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					// If title is not pure text and contains a table, no carriage return added
 					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
-				}
-				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 2a67d43c1e3..a9d05fe4b5c 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -78,9 +78,7 @@ class MenuManager
     		$mainmenu = $_GET["mainmenu"];
     		$_SESSION["mainmenu"] = $mainmenu;
     		$_SESSION["leftmenuopened"] = "";
-    	}
-    	else
-    	{
+    	} else {
     		// On va le chercher en session si non defini par le lien
     		$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
     	}
@@ -96,9 +94,7 @@ class MenuManager
     		{
     			//$leftmenu="";
     			$_SESSION["leftmenuopened"] = "";
-    		}
-    		else
-    		{
+    		} else {
     			$_SESSION["leftmenuopened"] = $leftmenu;
     		}
     	} else {
@@ -145,9 +141,7 @@ class MenuManager
         {
         	if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         	if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        }
-        else
-        {
+        } else {
         	$conf->global->MAIN_SHOW_LOGO = 0;
         	if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -210,8 +204,7 @@ class MenuManager
         				{
         				    if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");
-        				}
-						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
         			}
@@ -221,13 +214,10 @@ class MenuManager
 					    if ($val['enabled'])
 					    {
 					        $lastlevel[0] = 'enabled';
-					    }
-					    elseif ($showmenu)                 // Not enabled but visible (so greyed)
+					    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
 					    {
 					        $lastlevel[0] = 'greyed';
-					    }
-					    else
-					    {
+					    } else {
 					        $lastlevel[0] = 'hidden';
 					    }
 					}
@@ -258,9 +248,7 @@ class MenuManager
        						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
-       						}
-       						else
-       						{
+       						} else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -285,21 +273,16 @@ class MenuManager
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
-	        				}
-	        				else
-	        				{
+	        				} else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    }
-	        				    else
-	        				    {
+	        				    } else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
@@ -308,8 +291,7 @@ class MenuManager
 	        				{
 	        					if ($val2['enabled'])	// Allowed
 	        						print '</a>';
-	        					else
-	        						print '</a>';
+	        					else print '</a>';
 	        				}
 	        				print '</li>'."\n";
        					}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index be455d5431a..9f9acd0655e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -439,9 +439,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 				{
 					$mtitle .= $langs->trans($item);
 				}
-			}
-			else
-			{
+			} else {
 				$mtitle = $langs->trans($smenu->title);
 			}
 			// Add item
@@ -483,8 +481,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
 			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
 			else $classname = 'class="tmenu"';
-		}
-		elseif ($showmode == 2) $classname = 'class="tmenu"';
+		} elseif ($showmode == 2) $classname = 'class="tmenu"';
 
 		$menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);
 	}
@@ -512,8 +509,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		{
 			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		}*/
-		else
-		{
+		else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
 		}
@@ -1308,14 +1304,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 								}
 								$i++;
 							}
-						}
-						else
-						{
+						} else {
 							// Should not happend. Entries are added
 							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
-					}
-					else dol_print_error($db);
+					} else dol_print_error($db);
 					$db->free($resql);
 				}
 
@@ -1624,9 +1617,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
-					}
-					else
-					{
+					} else {
 						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
 						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
 						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
@@ -1725,14 +1716,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-				}
-				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
-				}
-				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 				}
 
@@ -1986,9 +1975,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
-				}
-				else
-				{
+				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -2046,14 +2033,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					else print '</span>';
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				}
-				elseif ($showmenu)                 // Not enabled but visible (so greyed)
+				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
-				}
-				else
-				{
+				} else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
@@ -2079,8 +2063,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					// If title is not pure text and contains a table, no carriage return added
 					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
-				}
-				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 5276a509ae5..5a33d0b323b 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -77,9 +77,7 @@ class MenuManager
         	$mainmenu = $_GET["mainmenu"];
         	$_SESSION["mainmenu"] = $mainmenu;
         	$_SESSION["leftmenuopened"] = "";
-        }
-        else
-        {
+        } else {
         	// On va le chercher en session si non defini par le lien
         	$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
         }
@@ -95,9 +93,7 @@ class MenuManager
         	{
         		//$leftmenu="";
         		$_SESSION["leftmenuopened"] = "";
-        	}
-        	else
-        	{
+        	} else {
         		$_SESSION["leftmenuopened"] = $leftmenu;
         	}
         } else {
@@ -146,9 +142,7 @@ class MenuManager
         {
         	if ($mode == 'top')  print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
         	if ($mode == 'left') print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
-        }
-        else
-		{
+        } else {
         	$conf->global->MAIN_SHOW_LOGO = 0;
         	if ($mode == 'top')  print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
         	if ($mode == 'left') print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
@@ -215,8 +209,7 @@ class MenuManager
         				{
         					if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
         				    else print $langs->trans("Dashboard");
-        				}
-        				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
@@ -226,13 +219,10 @@ class MenuManager
         			    if ($val['enabled'])
         			    {
         			        $lastlevel[0] = 'enabled';
-        			    }
-        			    elseif ($showmenu)                 // Not enabled but visible (so greyed)
+        			    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
         			    {
         			        $lastlevel[0] = 'greyed';
-        			    }
-        			    else
-        			    {
+        			    } else {
         			        $lastlevel[0] = 'hidden';
         			    }
         			}
@@ -263,9 +253,7 @@ class MenuManager
        						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
-       						}
-       						else
-       						{
+       						} else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -290,21 +278,16 @@ class MenuManager
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
-	        				}
-	        				else
-	        				{
+	        				} else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    }
-	        				    else
-	        				    {
+	        				    } else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
@@ -313,8 +296,7 @@ class MenuManager
 	        				{
 	        					if ($val2['enabled'])	// Allowed
 	        						print '</a>';
-	        					else
-	        						print '</a>';
+	        					else print '</a>';
 	        				}
 	        				print '</li>'."\n";
        					}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 923f4e84965..64145334883 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -215,8 +215,7 @@ class MenuManager
 		                {
 		                    if (in_array($val['mainmenu'], array('cashdesk', 'websites'))) print $langs->trans("Access");
 		                    else print $langs->trans("Dashboard");
-		                }
-		                else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+		                } else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 		                print '</a>';
 		                print '</li>'."\n";
 		            }
@@ -226,13 +225,10 @@ class MenuManager
 		                if ($val['enabled'])
 		                {
 		                    $lastlevel[0] = 'enabled';
-		                }
-		                elseif ($showmenu)                 // Not enabled but visible (so greyed)
+		                } elseif ($showmenu)                 // Not enabled but visible (so greyed)
 		                {
 		                    $lastlevel[0] = 'greyed';
-		                }
-		                else
-		                {
+		                } else {
 		                    $lastlevel[0] = 'hidden';
 		                }
 		            }
@@ -281,21 +277,16 @@ class MenuManager
 		                            //print ' data-ajax="false"';
 		                            print '>';
 		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        }
-		                        else					// Not allowed but visible (greyed)
+		                        } else // Not allowed but visible (greyed)
 		                        {
 		                            print '<a href="#" class="vsmenudisabled">';
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
-		                    }
-		                    else
-		                    {
+		                    } else {
 		                        if ($val2['enabled'])	// Allowed
 		                        {
 		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        }
-		                        else
-		                        {
+		                        } else {
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
@@ -375,9 +366,7 @@ class MenuManager
 						if (($alt % 2 == 0))
 						{
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
-						}
-						else
-						{
+						} else {
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
 					}
@@ -397,9 +386,7 @@ class MenuManager
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
-						}
-						else
-						{
+						} else {
 							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
@@ -419,9 +406,7 @@ class MenuManager
 							else print '<span class="vsmenu">';
 							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
 							else print '</span>';
-						}
-						else
-						{
+						} else {
 							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
 						}
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 24811ad854d..6038754b023 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -437,9 +437,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     if (!$ignoreerror) {
                          $this->error = $this->db->lasterror();
                          $err++;
-                    }
-                    else
-                    {
+                    } else {
                          dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
                     }
                 }
@@ -450,9 +448,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$err) {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return 0;
         }
@@ -537,9 +533,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$err) {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return 0;
         }
@@ -560,9 +554,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name")) {
             // If module name translation exists
             return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
-        }
-        else
-        {
+        } else {
             // If module name translation using it's unique id does not exist, we try to use its name to find translation
             if (is_array($this->langfiles)) {
                 foreach ($this->langfiles as $val)
@@ -596,9 +588,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc")) {
             // If module description translation exists
             return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
-        }
-        else
-        {
+        } else {
             // If module description translation does not exist using its unique id, we can use its name to find translation
             if (is_array($this->langfiles)) {
                 foreach ($this->langfiles as $val)
@@ -650,14 +640,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         'images/' => dol_buildpath(strtolower($this->name).'/images/', 1),
                     )
                 );
-            }
-            else
-            {
+            } else {
                 $content = nl2br($content);
             }
-        }
-        else
-        {
+        } else {
             // Mostly for internal modules
             if (!empty($this->descriptionlong)) {
                 if (is_array($this->langfiles)) {
@@ -745,9 +731,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             if ((float) DOL_VERSION >= 6.0) {
                 @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
                 $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
-            }
-            else
-            {
+            } else {
                 $content = nl2br($content);
             }
         }
@@ -858,9 +842,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->trans($langstring) == $langstring) {
             // Translation not found
             return $langs->trans($this->export_label[$r]);
-        }
-        else
-        {
+        } else {
             // Translation found
             return $langs->trans($langstring);
         }
@@ -883,9 +865,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($langs->trans($langstring) == $langstring) {
             // Translation not found
             return $langs->transnoentitiesnoconv($this->import_label[$r]);
-        }
-        else
-        {
+        } else {
             // Translation found
             return $langs->transnoentitiesnoconv($langstring);
         }
@@ -912,9 +892,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$resql)
         {
             $err++;
-        }
-        else
-        {
+        } else {
             $obj = $this->db->fetch_object($resql);
             if ($obj) {
                 return $this->db->jdate($obj->tms);
@@ -945,9 +923,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (!$resql)
         {
             $err++;
-        }
-        else
-        {
+        } else {
             $obj = $this->db->fetch_object($resql);
             $tmp = array();
             if ($obj->note) {
@@ -1232,17 +1208,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                         if (!$err) {
                             $this->db->commit();
-                        }
-                        else
-                        {
+                        } else {
                                   $this->error = $this->db->lasterror();
                                   $this->db->rollback();
                         }
                     }
                     // else box already registered into database
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     $err++;
                 }
@@ -1427,17 +1399,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                         if (!$err) {
                             $this->db->commit();
-                        }
-                        else
-                        {
+                        } else {
                             $this->error = $this->db->lasterror();
                             $this->db->rollback();
                         }
                     }
                     // else box already registered into database
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     $err++;
                 }
@@ -1628,14 +1596,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     if (!$this->db->query($sql)) {
                         $err++;
                     }
-                }
-                else
-                {
+                } else {
                     dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_WARNING);
                 }
-            }
-            else
-            {
+            } else {
                 $err++;
             }
         }
@@ -1737,17 +1701,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
                                     $sql .= " VALUES ";
                                     $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
-                                }
-                                else
-                                   {
+                                } else {
                                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
                                     $sql .= " (id, entity, libelle, module, type, bydefault, perms)";
                                     $sql .= " VALUES ";
                                     $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
                                 }
-                            }
-                            else
-                            {
+                            } else {
                                  $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
                                  $sql .= " (id, entity, libelle, module, type, bydefault)";
                                  $sql .= " VALUES ";
@@ -1761,8 +1721,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                     $this->error = $this->db->lasterror();
                                     $err++;
                                     break;
-                                }
-                                else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
+                                } else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
                                 }
                             }
 
@@ -1792,16 +1751,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                   $result = $tmpuser->fetch($obj2->rowid);
                                 if ($result > 0) {
                                     $tmpuser->addrights($r_id, '', '', 0, 1);
-                                }
-                                else
-                                 {
+                                } else {
                                     dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);
                                 }
                                  $i++;
                             }
-                        }
-                        else
-                        {
+                        } else {
                             dol_print_error($this->db);
                         }
                     }
@@ -1815,9 +1770,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 }
             }
             $this->db->free($resql);
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $err++;
         }
@@ -1884,9 +1837,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
             if (!$this->menu[$key]['fk_menu']) {
                 $menu->fk_menu = 0;
-            }
-            else
-            {
+            } else {
                 $foundparent = 0;
                 $fk_parent = $this->menu[$key]['fk_menu'];
                 if (preg_match('/^r=/', $fk_parent))    // old deprecated method
@@ -1896,14 +1847,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         $menu->fk_menu = $this->menu[$fk_parent]['rowid'];
                         $foundparent = 1;
                     }
-                }
-                elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
+                } elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
                     $menu->fk_menu = -1;
                     $menu->fk_mainmenu = $reg[1];
                     $menu->fk_leftmenu = $reg[2];
                     $foundparent = 1;
-                }
-                elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
+                } elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
                     $menu->fk_menu = -1;
                     $menu->fk_mainmenu = $reg[1];
                     $menu->fk_leftmenu = '';
@@ -1933,9 +1882,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 $result = $menu->create($user); // Save menu entry into table llx_menu
                 if ($result > 0) {
                     $this->menu[$key]['rowid'] = $result;
-                }
-                else
-                {
+                } else {
                     $this->error = $menu->error;
                     dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
                     $err++;
@@ -1946,9 +1893,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
         if (!$err) {
             $this->db->commit();
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::insert_menus ".$this->error, LOG_ERR);
             $this->db->rollback();
         }
@@ -2080,9 +2025,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
                 $this->db->query($sql);
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $err++;
         }
@@ -2147,13 +2090,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                         $newvalue = json_encode($value['data']);
                         if (isset($value['entity'])) { $entity = $value['entity'];
                         }
-                    }
-                    elseif (isset($value['data']) && !is_array($value['data'])) {
+                    } elseif (isset($value['data']) && !is_array($value['data'])) {
                         $newvalue = $value['data'];
                         if (isset($value['entity'])) { $entity = $value['entity'];
                         }
-                    }
-                    else    // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
+                    } else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
                     {
                         $newvalue = json_encode($value);
                     }
@@ -2183,9 +2124,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                          $error++;
                          $this->error = $this->db->lasterror();
-                    }
-                    else
-                    {
+                    } else {
                          dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
                     }
                 }
@@ -2290,9 +2229,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		{
 			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
 			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
-		}
-		else
-		{
+		} else {
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
 
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index bf957175f84..27260748662 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -85,9 +85,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			$modele = 'soleil';
 		}
 	}
@@ -141,16 +139,12 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index b978bed1eab..0b489e7202c 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -295,8 +295,7 @@ class CommActionRapport
 				if ($obj->dp2) {
 					if (dol_print_date($this->db->jdate($obj->dp), "day") != dol_print_date($this->db->jdate($obj->dp2), "day"))
 						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-					else
-						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					else $textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
 				}
 				$textdate = $outputlangs->trans("ID").' '.$obj->id.' - '.$textdate;
 				$pdf->MultiCell(45 - $this->marge_gauche, $height, $textdate, 0, 'L', 0);
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 1bf2b836269..3aa46add2ac 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -118,9 +118,7 @@ class pdf_ban extends ModeleBankAccountDoc
 		    {
 		        $dir = $conf->bank->dir_output;
 		        $file = $dir."/SPECIMEN.pdf";
-		    }
-		    else
-		    {
+		    } else {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        $dir = $conf->bank->dir_output."/".$objectref;
 		        $file = $dir."/".$objectref.".pdf";
@@ -203,9 +201,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -223,9 +219,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -262,9 +256,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -331,16 +323,13 @@ class pdf_ban extends ModeleBankAccountDoc
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 23868eef643..e50acfb6c2a 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -123,9 +123,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output;
 		        $file = $dir."/SPECIMEN.pdf";
-		    }
-		    else
-		    {
+		    } else {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output."/".$objectref;
@@ -209,9 +207,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -367,9 +363,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -415,9 +409,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -566,16 +558,13 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -590,8 +579,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		if (!empty($object->date_rum))
 		{
             $daterum = dol_print_date($object->date_rum, 'day', false, $outputlangs, true);
-		}
-		else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
+		} else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".$daterum, '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 5b561f90c1c..9569f800f7f 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -204,33 +204,24 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $product);
 				if ($is_dispo <> 0)
 				{
 					$result = -3;
-				}
-				else
-				{
+				} else {
 					$result = 0;
 				}
-			}
-			else
-			{
+			} else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
-				}
-				else
-				{
+				} else {
 					$result = -1;
 				}
 			}
@@ -263,14 +254,10 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 9755369793e..b722dd20c76 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -130,8 +130,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -267,9 +266,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -301,9 +298,7 @@ class doc_generic_bom_odt extends ModelePDFBom
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -336,8 +331,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -353,8 +347,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -385,25 +378,21 @@ class doc_generic_bom_odt extends ModelePDFBom
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -422,15 +411,12 @@ class doc_generic_bom_odt extends ModelePDFBom
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -439,8 +425,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -453,8 +438,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -474,8 +458,7 @@ class doc_generic_bom_odt extends ModelePDFBom
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -496,9 +479,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 08acd30451c..31f621ec15c 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -129,9 +129,7 @@ class mod_bom_standard extends ModeleNumRefboms
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_bom_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index daa2e04366d..f1a95bb5c14 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -126,9 +126,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 7cc72a865d8..66b2f9f7d82 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -178,9 +178,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
 		{
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
 			$modele = 'blochet';
@@ -203,16 +201,12 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "chequereceipt_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $dir.$file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 75c5103c4ab..4fd09edf994 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -137,8 +137,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -279,9 +278,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -313,9 +310,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -352,8 +347,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -369,8 +363,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -401,25 +394,21 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -438,15 +427,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -455,8 +441,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -469,8 +454,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -490,8 +474,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -512,9 +495,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 3838b9146e6..e60508487c2 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -172,9 +172,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else
-		{
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -239,9 +237,7 @@ class pdf_einstein extends ModelePDFCommandes
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -440,18 +436,14 @@ class pdf_einstein extends ModelePDFCommandes
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -566,9 +558,7 @@ class pdf_einstein extends ModelePDFCommandes
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -582,9 +572,7 @@ class pdf_einstein extends ModelePDFCommandes
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -599,8 +587,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -642,15 +629,11 @@ class pdf_einstein extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -761,8 +744,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -914,9 +896,7 @@ class pdf_einstein extends ModelePDFCommandes
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1273,25 +1253,20 @@ class pdf_einstein extends ModelePDFCommandes
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 1910dd0c048..b9db80a5cfc 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -232,9 +232,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		        {
 		            $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 		            $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-		        }
-		        else
-		        {
+		        } else {
 		            $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 		            $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 		        }
@@ -253,14 +251,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		                        if ($obj['photo_vignette'])
 		                        {
 		                            $filename = $obj['photo_vignette'];
-		                        }
-		                        else
-		                        {
+		                        } else {
 		                            $filename = $obj['photo'];
 		                        }
-		                    }
-		                    else
-		                    {
+		                    } else {
 		                        $filename = $obj['photo'];
 		                    }
 
@@ -288,9 +282,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -487,8 +479,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				            if ($i > $pageposbeforenote) {
 				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            }
-				            else {
+				            } else {
 				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 				            }
@@ -506,8 +497,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 				        $height_note = $posyafter - $tab_top_newpage;
 				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    }
-				    else // No pagebreak
+				    } else // No pagebreak
 				    {
 				        $pdf->commitTransaction();
 				        $posyafter = $pdf->GetY();
@@ -531,9 +521,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -583,8 +571,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 					    }
 
 					    if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -621,18 +608,14 @@ class pdf_eratosthene extends ModelePDFCommandes
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter + 1);
     							}
-    						}
-    						else
-    						{
+    						} else {
     							// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
     						}
-    					}
-    					else	// No pagebreak
+    					} else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -784,9 +767,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -800,9 +781,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					    if ($pagenb == $pageposafter)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else
-						{
+					    } else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -817,8 +796,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -860,15 +838,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -973,8 +947,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-        }
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+        } elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1129,9 +1102,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1441,25 +1412,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1848,13 +1814,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
     }
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 87e5666be4b..f37d06b83fd 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -129,9 +129,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index c938f40cfb2..30c12b46c44 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -136,8 +136,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -266,9 +265,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -300,9 +297,7 @@ class doc_generic_contract_odt extends ModelePDFContract
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -351,8 +346,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -368,8 +362,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -381,26 +374,22 @@ class doc_generic_contract_odt extends ModelePDFContract
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -419,15 +408,12 @@ class doc_generic_contract_odt extends ModelePDFContract
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -436,8 +422,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -450,8 +435,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -469,8 +453,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$this->error = $e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -489,9 +472,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index f8b7908654b..d612f4c0401 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -193,9 +193,7 @@ class pdf_strato extends ModelePDFContract
 			{
 				$dir = $conf->contrat->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->contrat->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -387,19 +385,15 @@ class pdf_strato extends ModelePDFContract
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else
-							{
+							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -425,9 +419,7 @@ class pdf_strato extends ModelePDFContract
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -441,9 +433,7 @@ class pdf_strato extends ModelePDFContract
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -461,9 +451,7 @@ class pdf_strato extends ModelePDFContract
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
@@ -498,15 +486,11 @@ class pdf_strato extends ModelePDFContract
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "CONTRACT_OUTPUTDIR");
 			return 0;
 		}
@@ -635,17 +619,13 @@ class pdf_strato extends ModelePDFContract
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index d5f0c0926f5..ebb8cbf610e 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -114,8 +114,7 @@ class mod_contract_olive extends ModelNumRefContracts
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index 52950778738..9cc63c5216c 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -138,9 +138,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 4c025750f04..657c24e615d 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -103,9 +103,7 @@ class html_cerfafr extends ModeleDon
 			{
 				$dir = $conf->don->dir_output;
 				$file = $dir."/SPECIMEN.html";
-			}
-			else
-			{
+			} else {
 				$donref = dol_sanitizeFileName($don->ref);
 				$dir = $conf->don->dir_output."/".$donref;
 				$file = $dir."/".$donref.".html";
@@ -130,20 +128,15 @@ class html_cerfafr extends ModeleDon
 				{
 					$formclass->load_cache_types_paiements();
 					$paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
-				}
-				else $paymentmode = '';
+				} else $paymentmode = '';
 
 				if ($don->modepaymentcode == 'CHQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				elseif ($don->modepaymentcode == 'LIQ') {
+				} elseif ($don->modepaymentcode == 'LIQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
+				} elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else
-				{
+				} else {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
 
@@ -216,9 +209,7 @@ class html_cerfafr extends ModeleDon
 					if ($conf->global->DONATION_ART200 >= 1)
 					{
 						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
-					}
-					else
-					{
+					} else {
 						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
 					}
 				}
@@ -229,9 +220,7 @@ class html_cerfafr extends ModeleDon
 					if ($conf->global->DONATION_ART238 >= 1)
 					{
 						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
-					}
-					else
-					{
+					} else {
 						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
 					}
 				}
@@ -242,9 +231,7 @@ class html_cerfafr extends ModeleDon
 					if ($conf->global->DONATION_ART978 >= 1)
 					{
 						$art978 = '<input type="checkbox" disabled="true" checked="checked" >978 du CGI';
-					}
-					else
-					{
+					} else {
 						$art978 = '<input type="checkbox" disabled="true">978 du CGI';
 					}
 				}
@@ -261,15 +248,11 @@ class html_cerfafr extends ModeleDon
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "DON_OUTPUTDIR");
 			return 0;
 		}
@@ -315,12 +298,10 @@ class html_cerfafr extends ModeleDon
 			if ($dix[$i] == 0) {
 				$secon[$i] = '';
 				$prim[$i] = $chif[$unite[$i]];
-			}
-			elseif ($dix[$i] == 1) {
+			} elseif ($dix[$i] == 1) {
 				$secon[$i] = '';
 				$prim[$i] = $chif[($unite[$i] + 10)];
-			}
-			elseif ($dix[$i] == 2) {
+			} elseif ($dix[$i] == 2) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'vingt et';
                     $prim[$i] = $chif[$unite[$i]];
@@ -328,8 +309,7 @@ class html_cerfafr extends ModeleDon
                     $secon[$i] = 'vingt';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 3) {
+			} elseif ($dix[$i] == 3) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'trente et';
                     $prim[$i] = $chif[$unite[$i]];
@@ -337,63 +317,51 @@ class html_cerfafr extends ModeleDon
                     $secon[$i] = 'trente';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 4) {
+			} elseif ($dix[$i] == 4) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quarante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quarante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 5) {
+			} elseif ($dix[$i] == 5) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'cinquante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'cinquante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 6) {
+			} elseif ($dix[$i] == 6) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'soixante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'soixante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 7) {
+			} elseif ($dix[$i] == 7) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'soixante et';
                     $prim[$i] = $chif[$unite[$i] + 10];
-				}
-				else {
+				} else {
                     $secon[$i] = 'soixante';
                     $prim[$i] = $chif[$unite[$i] + 10];
 				}
-			}
-			elseif ($dix[$i] == 8) {
+			} elseif ($dix[$i] == 8) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quatre-vingts et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quatre-vingt';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 9) {
+			} elseif ($dix[$i] == 9) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quatre-vingts et';
                     $prim[$i] = $chif[$unite[$i] + 10];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quatre-vingts';
                     $prim[$i] = $chif[$unite[$i] + 10];
 				}
@@ -412,15 +380,13 @@ class html_cerfafr extends ModeleDon
 			$somme = $trio[3].'  '.$secon[3].' '.$prim[3].' million ';
 		elseif (($cent[3] != 0 && $cent[3] != '') || ($dix[3] != 0 && $dix[3] != '') || ($unite[3] != 0 && $unite[3] != ''))
 			$somme = $trio[3].' '.$secon[3].' '.$prim[3].' millions ';
-		else
-			$somme = $trio[3].' '.$secon[3].' '.$prim[3];
+		else $somme = $trio[3].' '.$secon[3].' '.$prim[3];
 
 		if (($cent[2] == 0 || $cent[2] == '') && ($dix[2] == 0 || $dix[2] == '') && ($unite[2] == 1))
 			$somme = $somme.' mille ';
 		elseif (($cent[2] != 0 && $cent[2] != '') || ($dix[2] != 0 && $dix[2] != '') || ($unite[2] != 0 && $unite[2] != ''))
 			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2].' milles ';
-		else
-			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
+		else $somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
 
 		$somme = $somme.$trio[1].' '.$secon[1].' '.$prim[1];
 
@@ -428,7 +394,6 @@ class html_cerfafr extends ModeleDon
 
 		if (($cent_c == '0' || $cent_c == '') && ($dix_c == '0' || $dix_c == ''))
 			return $somme.' et z&eacute;ro '.$dev2;
-		else
-			return $somme.$trio_c.' '.$secon_c.' '.$dev2;
+		else return $somme.$trio_c.' '.$secon_c.' '.$dev2;
 	}
 }
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 1ea817709e1..b5b42de689b 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -138,8 +138,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -279,9 +278,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -350,8 +347,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -367,8 +363,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -384,13 +379,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -406,13 +399,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -430,13 +421,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -451,13 +440,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							{
 								if (file_exists($value)) $odfHandler->setImage($key, $value);
 								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-							}
-							else	// Text
+							} else // Text
 							{
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
-						}
-						catch (OdfException $e)
+						} catch (OdfException $e)
 						{
                             dol_syslog($e->getMessage(), LOG_INFO);
 						}
@@ -477,25 +464,21 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -512,15 +495,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -529,8 +509,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -543,8 +522,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -563,8 +541,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -584,9 +561,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index c232edbe81c..fb131c5b6bc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -195,9 +195,7 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product') . $object->lines[$i]->fk_product ."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -211,14 +209,10 @@ class pdf_espadon extends ModelePdfExpedition
                         if ($obj['photo_vignette'])
                         {
                             $filename = $obj['photo_vignette'];
-                        }
-                        else
-                        {
+                        } else {
                             $filename = $obj['photo'];
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $filename = $obj['photo'];
                     }
 
@@ -240,9 +234,7 @@ class pdf_espadon extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -412,9 +404,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -464,8 +454,7 @@ class pdf_espadon extends ModelePdfExpedition
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 					    }
 
 
@@ -503,18 +492,14 @@ class pdf_espadon extends ModelePdfExpedition
 					                //if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					                $pdf->setPage($pageposafter + 1);
 					            }
-					        }
-					        else
-					        {
+					        } else {
 					            // We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 					        }
-					    }
-					    else	// No pagebreak
+					    } else // No pagebreak
 					    {
 					        $pdf->commitTransaction();
 					    }
@@ -607,9 +592,7 @@ class pdf_espadon extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -623,9 +606,7 @@ class pdf_espadon extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -642,9 +623,7 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -677,15 +656,11 @@ class pdf_espadon extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -888,17 +863,13 @@ class pdf_espadon extends ModelePdfExpedition
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -907,9 +878,7 @@ class pdf_espadon extends ModelePdfExpedition
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else
-		{
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
@@ -1270,13 +1239,10 @@ class pdf_espadon extends ModelePdfExpedition
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 7899df494fc..11f675100e7 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -192,9 +192,7 @@ class pdf_merou extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -287,9 +285,7 @@ class pdf_merou extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -365,9 +361,7 @@ class pdf_merou extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -380,9 +374,7 @@ class pdf_merou extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -397,9 +389,7 @@ class pdf_merou extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -434,15 +424,11 @@ class pdf_merou extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $outputlangs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $outputlangs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -563,17 +549,13 @@ class pdf_merou extends ModelePdfExpedition
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -672,9 +654,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '', 'L');
 		}
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 2e0733f1ba2..70d9d55f6ed 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -218,9 +218,7 @@ class pdf_rouget extends ModelePdfExpedition
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -233,14 +231,10 @@ class pdf_rouget extends ModelePdfExpedition
                         if ($obj['photo_vignette'])
                         {
                             $filename = $obj['photo_vignette'];
-                        }
-                        else
-                        {
+                        } else {
                             $filename = $obj['photo'];
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $filename = $obj['photo'];
                     }
 
@@ -261,9 +255,7 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -421,9 +413,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -463,8 +453,7 @@ class pdf_rouget extends ModelePdfExpedition
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -502,19 +491,15 @@ class pdf_rouget extends ModelePdfExpedition
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -598,9 +583,7 @@ class pdf_rouget extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -614,9 +597,7 @@ class pdf_rouget extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -633,9 +614,7 @@ class pdf_rouget extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -668,15 +647,11 @@ class pdf_rouget extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -923,17 +898,13 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -942,9 +913,7 @@ class pdf_rouget extends ModelePdfExpedition
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else
-		{
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index afbeec748ea..c0203d688f8 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -133,9 +133,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 3a66a8ae961..ce226c5e031 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -226,9 +226,7 @@ class pdf_standard extends ModeleExpenseReport
 			if ($object->specimen) {
 				$dir = $conf->expensereport->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expensereport->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -339,9 +337,7 @@ class pdf_standard extends ModeleExpenseReport
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -409,18 +405,14 @@ class pdf_standard extends ModeleExpenseReport
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -458,9 +450,7 @@ class pdf_standard extends ModeleExpenseReport
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -474,9 +464,7 @@ class pdf_standard extends ModeleExpenseReport
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -492,9 +480,7 @@ class pdf_standard extends ModeleExpenseReport
 				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -560,15 +546,11 @@ class pdf_standard extends ModeleExpenseReport
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "EXPENSEREPORT_OUTPUTDIR");
 			return 0;
 		}
@@ -709,9 +691,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -842,8 +822,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($posx + 2, $posy);
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse, "day", false, $outputlangs), 0, 'L');
 				}
-			}
-			elseif ($object->fk_statut == 4)
+			} elseif ($object->fk_statut == 4)
 			{
 				if ($object->fk_user_cancel > 0) {
 					$userfee = new User($this->db);
@@ -857,9 +836,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($posx + 2, $posy);
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel, "day", false, $outputlangs), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				if ($object->fk_user_approve > 0) {
 					$userfee = new User($this->db);
 					$userfee->fetch($object->fk_user_approve); $posy += 6;
@@ -1105,9 +1082,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y);
 				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', 0);
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 9093e55f78f..f33bf47e38e 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -186,9 +186,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_expensereport_jade::getNextValue", LOG_DEBUG);
 			return 0;
 		}
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 5124cb3f160..973e7ae536a 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -217,9 +217,7 @@ class ExportCsv extends ModeleExports
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -253,9 +251,7 @@ class ExportCsv extends ModeleExports
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 779f2240155..6d7cbb5d05f 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -273,9 +273,7 @@ class ExportExcel2007new extends ModeleExports
     		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
-    		{
+    		} else {
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
     		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
                 {
@@ -332,9 +330,7 @@ class ExportExcel2007new extends ModeleExports
 			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg))
 			{
 				$newvalue = $outputlangs->transnoentities($reg[1]);
-			}
-			else
-			{
+			} else {
 				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
@@ -344,16 +340,13 @@ class ExportExcel2007new extends ModeleExports
         	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
         	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
+			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
 			{
         	    $newvalue = dol_stringtotime($newvalue);
         	    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
         	    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         	    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
-			}
-			else
-			{
+			} else {
     	    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     	    	{
     	    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
@@ -361,9 +354,7 @@ class ExportExcel2007new extends ModeleExports
     	    		$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
     	    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     	    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT);
-    	    	}
-    	    	else
-    	    	{
+    	    	} else {
     	    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
     	    	}
 			}
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index acbebd54da8..41c14324536 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -137,8 +137,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -279,9 +278,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -357,8 +354,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -374,8 +370,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -409,25 +404,21 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -446,15 +437,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -463,8 +451,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -477,8 +464,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -497,8 +483,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -518,9 +503,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index cf91ec4806c..60958526357 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -183,9 +183,7 @@ class pdf_crabe extends ModelePDFFactures
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else
-		{
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -287,9 +285,7 @@ class pdf_crabe extends ModelePDFFactures
 			{
 				$dir = $conf->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->facture->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -518,8 +514,7 @@ class pdf_crabe extends ModelePDFFactures
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -555,19 +550,15 @@ class pdf_crabe extends ModelePDFFactures
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -700,9 +691,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -716,9 +705,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -735,9 +722,7 @@ class pdf_crabe extends ModelePDFFactures
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -779,15 +764,11 @@ class pdf_crabe extends ModelePDFFactures
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 			return 0;
 		}
@@ -881,9 +862,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -935,9 +914,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			return $tab3_top + $y + 3;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1215,9 +1192,7 @@ class pdf_crabe extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 			    // FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
@@ -1654,25 +1629,20 @@ class pdf_crabe extends ModelePDFFactures
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 8f48f31fddb..b9cb334d48e 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -250,9 +250,7 @@ class pdf_sponge extends ModelePDFFactures
 	            {
 	                $pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 	                $pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-	            }
-	            else
-	            {
+	            } else {
 	                $pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 	                $pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 	            }
@@ -271,14 +269,10 @@ class pdf_sponge extends ModelePDFFactures
 	                            if ($obj['photo_vignette'])
 	                            {
 	                                $filename = $obj['photo_vignette'];
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                $filename = $obj['photo'];
 	                            }
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            $filename = $obj['photo'];
 	                        }
 
@@ -308,9 +302,7 @@ class pdf_sponge extends ModelePDFFactures
 	        {
 	            $dir = $conf->facture->dir_output;
 	            $file = $dir."/SPECIMEN.pdf";
-	        }
-	        else
-	        {
+	        } else {
 	            $objectref = dol_sanitizeFileName($object->ref);
 	            $dir = $conf->facture->dir_output."/".$objectref;
 	            $file = $dir."/".$objectref.".pdf";
@@ -541,8 +533,7 @@ class pdf_sponge extends ModelePDFFactures
 	                        if ($i > $pageposbeforenote) {
 	                            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 	                            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                        }
-	                        else {
+	                        } else {
 	                            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 	                            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 	                        }
@@ -560,8 +551,7 @@ class pdf_sponge extends ModelePDFFactures
 	                    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 	                    $height_note = $posyafter - $tab_top_newpage;
 	                    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                }
-	                else // No pagebreak
+	                } else // No pagebreak
 	                {
 	                    $pdf->commitTransaction();
 	                    $posyafter = $pdf->GetY();
@@ -585,9 +575,7 @@ class pdf_sponge extends ModelePDFFactures
 
 	                $tab_height = $tab_height - $height_note;
 	                $tab_top = $posyafter + 6;
-	            }
-	            else
-	            {
+	            } else {
 	                $height_note = 0;
 	            }
 
@@ -635,8 +623,7 @@ class pdf_sponge extends ModelePDFFactures
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
     	                }
 
     	                if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -673,18 +660,14 @@ class pdf_sponge extends ModelePDFFactures
     	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
     	                            $pdf->setPage($pageposafter + 1);
     	                        }
-    	                    }
-    	                    else
-    	                    {
+    	                    } else {
     	                        // We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
     	                    }
-    	                }
-    	                else	// No pagebreak
+    	                } else // No pagebreak
     	                {
     	                    $pdf->commitTransaction();
     	                }
@@ -848,9 +831,7 @@ class pdf_sponge extends ModelePDFFactures
                         $pdf->setPage($pagenb);
                         if ($pagenb == $pageposbeforeprintlines) {
                             $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        else
-                        {
+                        } else {
                         	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
                         }
                         $this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -863,9 +844,7 @@ class pdf_sponge extends ModelePDFFactures
                     if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
                         if ($pagenb == $pageposafter) {
                         	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        else
-                        {
+                        } else {
                         	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
                         }
                         $this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -882,9 +861,7 @@ class pdf_sponge extends ModelePDFFactures
 	            {
 	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
 	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
-	            else
-	            {
+	            } else {
 	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
 	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 	            }
@@ -926,15 +903,11 @@ class pdf_sponge extends ModelePDFFactures
 	                $this->result = array('fullpath'=>$file);
 
 	                return 1; // No error
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 	            return 0;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 	        return 0;
 	    }
@@ -1031,9 +1004,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1074,9 +1045,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			return $tab3_top + $y + 3;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1313,8 +1282,7 @@ class pdf_sponge extends ModelePDFFactures
 
 		if (!empty($i)) {
 		    $avancementGlobal = $percent / $i;
-		}
-		else {
+		} else {
 		    $avancementGlobal = 0;
 		}
 
@@ -1333,8 +1301,7 @@ class pdf_sponge extends ModelePDFFactures
 		if (!empty($avancementGlobal)) {
 		    $total_a_payer = $total_a_payer * 100 / $avancementGlobal;
 		    $total_a_payer_ttc = $total_a_payer_ttc * 100 / $avancementGlobal;
-		}
-		else {
+		} else {
 		    $total_a_payer = 0;
 		    $total_a_payer_ttc = 0;
 		}
@@ -1473,9 +1440,7 @@ class pdf_sponge extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 			    // FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
@@ -1558,8 +1523,7 @@ class pdf_sponge extends ModelePDFFactures
 					    if (!empty($sum_pdf_tva))
 					    {
 							$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
-					    }
-					    else {
+					    } else {
 					        $coef_fix_tva = 1;
 					    }
 
@@ -1900,25 +1864,20 @@ class pdf_sponge extends ModelePDFFactures
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1938,8 +1897,7 @@ class pdf_sponge extends ModelePDFFactures
 			if ($object->type == 0) {
 				if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("InvoiceSituation");
 				$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
-			}
-			elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
+			} elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
 			elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir");
 			elseif ($object->type == 3) $title .= $outputlangsbis->transnoentities("InvoiceDeposit");
 			elseif ($object->type == 4) $title .= $outputlangsbis->transnoentities("InvoiceProForma");
@@ -2391,13 +2349,10 @@ class pdf_sponge extends ModelePDFFactures
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 6b4b5f0451d..be9e9b782e9 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -173,9 +173,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
@@ -197,12 +195,10 @@ class mod_facture_mars extends ModeleNumRefFactures
             {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-		}
-		elseif ($mode == 'next')
+		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
     		$yymm = strftime("%y%m", $date);
@@ -212,8 +208,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('', 'Bad parameter for getNextValue');
+		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
     /**
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 80cd03f3e43..50b708baefc 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -150,8 +150,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
         	{
         		$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
         	}
-        }
-        elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+        } elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
         elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
         else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
         if (!$mask)
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index caa47db3529..00f911ff76b 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -202,9 +202,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
@@ -225,12 +223,10 @@ class mod_facture_terre extends ModeleNumRefFactures
             {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-		}
-		elseif ($mode == 'next')
+		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
     		$yymm = strftime("%y%m", $date);
@@ -240,8 +236,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('', 'Bad parameter for getNextValue');
+		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
     /**
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index d7509feff7c..d119cea1a45 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -185,9 +185,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 				$dir = $conf->ficheinter->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->ficheinter->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -288,9 +286,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -377,8 +373,7 @@ class pdf_soleil extends ModelePDFFicheinter
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -403,9 +398,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -419,9 +412,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -439,9 +430,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -469,15 +458,11 @@ class pdf_soleil extends ModelePDFFicheinter
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "FICHEINTER_OUTPUTDIR");
 			return 0;
 		}
@@ -590,17 +575,13 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index b592e65b0d3..65aabb47030 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -106,9 +106,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		if (!$fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 140ce27cf03..b9991a7d14e 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -178,9 +178,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 		if (!empty($conf->global->FICHEINTER_ADDON_PDF))
 		{
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			$modele = 'soleil';
 		}
 	}
@@ -234,16 +232,12 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "fichinter_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 3de92c4a05e..b24fe4f45ea 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -139,9 +139,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index de32e84d43a..51ad55cc937 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -198,9 +198,7 @@ class ImportCsv extends ModeleImports
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
 			$ret = -1;
-		}
-		else
-		{
+		} else {
 			$this->file = $file;
 		}
 
@@ -264,22 +262,17 @@ class ImportCsv extends ModeleImports
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
-					}
-					else
-					{
+					} else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
-				}
-				else	// Autodetect format (UTF8 or ISO)
+				} else // Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
-					}
-					else
-					{
+					} else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
@@ -346,9 +339,7 @@ class ImportCsv extends ModeleImports
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
-		}
-		else
-		{
+		} else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -372,11 +363,8 @@ class ImportCsv extends ModeleImports
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
+					} else dol_print_error($this->db);
+				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -411,8 +399,7 @@ class ImportCsv extends ModeleImports
 							$error++;
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
+						else {
 						    // We convert field if required
 						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
@@ -437,9 +424,7 @@ class ImportCsv extends ModeleImports
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
-										{
+                                        } else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -477,9 +462,7 @@ class ImportCsv extends ModeleImports
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval = $classinstance->id;
-                                            }
-                                            else
-                                            {
+                                            } else {
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                                 elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
                                                 else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
@@ -489,8 +472,7 @@ class ImportCsv extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
                                 {
                                     $isidorref = 'id';
                                     if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -527,12 +509,10 @@ class ImportCsv extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
                                     if (empty($newval)) $newval = '0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
                                 {
                                 	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                 	$class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -541,9 +521,7 @@ class ImportCsv extends ModeleImports
                                 	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	}
-                                	else
-                                	{
+                                	} else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -559,9 +537,7 @@ class ImportCsv extends ModeleImports
                                 		if ($classinstance->id > 0)	// we found record
                                 		{
                                 			$newval = $scaleorid ? $scaleorid : 0;
-                                		}
-                                		else
-                                		{
+                                		} else {
                                 			if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                 			else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
                                 			$this->errors[$error]['type'] = 'FOREIGNKEY';
@@ -569,8 +545,7 @@ class ImportCsv extends ModeleImports
                                 			$error++;
                                 		}
                                 	}
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -579,8 +554,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_client='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -589,8 +563,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -599,8 +572,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_compta='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -610,8 +582,7 @@ class ImportCsv extends ModeleImports
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
                                     $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -624,8 +595,7 @@ class ImportCsv extends ModeleImports
                                     }
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
                                     $newval = $defaultref;
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
                                 {
                                     $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                     $class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -645,8 +615,7 @@ class ImportCsv extends ModeleImports
                                         $errorforthistable++;
                                         $error++;
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -687,9 +656,7 @@ class ImportCsv extends ModeleImports
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
 											}
-										}
-										else
-										{
+										} else {
 											dol_print_error($this->db);
 										}
 									}
@@ -745,8 +712,7 @@ class ImportCsv extends ModeleImports
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/', $val))
+    				    } elseif (preg_match('/^lastrowid-/', $val))
     				    {
     				        $tmp = explode('-', $val);
     				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -754,15 +720,12 @@ class ImportCsv extends ModeleImports
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				    elseif (preg_match('/^const-/', $val))
+    				    } elseif (preg_match('/^const-/', $val))
     				    {
     				    	$tmp = explode('-', $val, 2);
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
-    				    }
-    				    else
-    				    {
+    				    } else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -811,9 +774,7 @@ class ImportCsv extends ModeleImports
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -840,9 +801,7 @@ class ImportCsv extends ModeleImports
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -871,9 +830,7 @@ class ImportCsv extends ModeleImports
 								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -906,9 +863,7 @@ class ImportCsv extends ModeleImports
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 35aee35869e..090d57645ea 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -374,9 +374,7 @@ class ImportXlsx extends ModeleImports
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
-		}
-		else
-		{
+		} else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -400,11 +398,8 @@ class ImportXlsx extends ModeleImports
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
+					} else dol_print_error($this->db);
+				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -439,8 +434,7 @@ class ImportXlsx extends ModeleImports
 							$error++;
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
+						else {
 						    // We convert field if required
 						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
@@ -464,9 +458,7 @@ class ImportXlsx extends ModeleImports
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
-										{
+                                        } else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -504,9 +496,7 @@ class ImportXlsx extends ModeleImports
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval = $classinstance->id;
-                                            }
-                                            else
-                                            {
+                                            } else {
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                                 elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
                                                 else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
@@ -516,8 +506,7 @@ class ImportXlsx extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
                                 {
                                     $isidorref = 'id';
                                     if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -554,12 +543,10 @@ class ImportXlsx extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
                                 {
                                     if (empty($newval)) $newval = '0';
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits')
                                 {
                                 	$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                 	$class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -568,9 +555,7 @@ class ImportXlsx extends ModeleImports
                                 	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	}
-                                	else
-                                	{
+                                	} else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -586,9 +571,7 @@ class ImportXlsx extends ModeleImports
                                         if ($classinstance->id > 0)	// we found record
                                         {
                                         	$newval = $scaleorid ? $scaleorid : 0;
-                                        }
-                                        else
-                                        {
+                                        } else {
                                         	if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
                                         	else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
                                 			$this->errors[$error]['type'] = 'FOREIGNKEY';
@@ -596,8 +579,7 @@ class ImportXlsx extends ModeleImports
                                 			$error++;
                                 		}
                                 	}
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -606,8 +588,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_client='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -616,8 +597,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -626,8 +606,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_compta='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -637,8 +616,7 @@ class ImportXlsx extends ModeleImports
                                         //print 'code_compta_fournisseur='.$newval;
                                     }
                                     if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto')
                                 {
                                     $defaultref = '';
                                     // TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -651,8 +629,7 @@ class ImportXlsx extends ModeleImports
                                     }
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
                                     $newval = $defaultref;
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
                                 {
                                     $file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
                                     $class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -672,8 +649,7 @@ class ImportXlsx extends ModeleImports
                                         $errorforthistable++;
                                         $error++;
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -714,9 +690,7 @@ class ImportXlsx extends ModeleImports
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
 											}
-										}
-										else
-										{
+										} else {
 											dol_print_error($this->db);
 										}
 									}
@@ -752,7 +726,7 @@ class ImportXlsx extends ModeleImports
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
 						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
 						elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0)	 $listvalues[] = "''";
-						else															 $listvalues[] = "'".$this->db->escape($newval)."'";
+						else $listvalues[] = "'".$this->db->escape($newval)."'";
 					}
 					$i++;
 				}
@@ -768,8 +742,7 @@ class ImportXlsx extends ModeleImports
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/', $val))
+    				    } elseif (preg_match('/^lastrowid-/', $val))
     				    {
     				        $tmp = explode('-', $val);
     				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -777,15 +750,12 @@ class ImportXlsx extends ModeleImports
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				    elseif (preg_match('/^const-/', $val))
+    				    } elseif (preg_match('/^const-/', $val))
     				    {
     				    	$tmp = explode('-', $val, 2);
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
-    				    }
-    				    else
-    				    {
+    				    } else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -833,9 +803,7 @@ class ImportXlsx extends ModeleImports
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -862,9 +830,7 @@ class ImportXlsx extends ModeleImports
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -893,9 +859,7 @@ class ImportXlsx extends ModeleImports
 								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -928,9 +892,7 @@ class ImportXlsx extends ModeleImports
 								{
 								    $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 								    $insertdone = true;
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index cda16561f8d..63f8088d528 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -204,9 +204,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 				$dir = $conf->expedition->dir_output."/receipt";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/receipt/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -357,9 +355,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -403,18 +399,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
                     			if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
                     			$pdf->setPage($pageposafter + 1);
                     		}
-                    	}
-                    	else
-                    	{
+                    	} else {
                     		// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
                     	}
-                    }
-                    else	// No pagebreak
+                    } else // No pagebreak
                     {
                     	$pdf->commitTransaction();
                     }
@@ -489,9 +481,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -505,9 +495,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -524,9 +512,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -626,9 +612,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -774,16 +758,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
+		} else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 2);
 		$pdf->SetXY($posx, $posy);
@@ -798,9 +779,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		if ($object->date_valid)
 		{
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$pdf->SetTextColor(255, 0, 0);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryNotValidated"), '', 'R');
 			$pdf->SetTextColor(0, 0, 60);
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 840b6a6f0a6..6b8d45fa368 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -142,9 +142,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 464c657fa7b..2d6ad7307b2 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -113,9 +113,7 @@ class mailing_advthirdparties extends MailingTargets
 
     					$i++;
     				}
-    			}
-    			else
-    			{
+    			} else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -168,9 +166,7 @@ class mailing_advthirdparties extends MailingTargets
 
     					$i++;
     				}
-    			}
-    			else
-    			{
+    			} else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -272,9 +268,7 @@ class mailing_advthirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 9d7a23ce9fd..2ba999fa8b7 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -153,8 +153,7 @@ class mailing_contacts1 extends MailingTargets
 				$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -190,13 +189,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= '<br>';
@@ -225,8 +221,7 @@ class mailing_contacts1 extends MailingTargets
 				$s .= '<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
 		$s .= '<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
@@ -265,13 +260,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -307,13 +299,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		return $s;
@@ -369,8 +358,7 @@ class mailing_contacts1 extends MailingTargets
 				$prospectlevel[$obj->code] = $obj->label;
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		// Request must return: id, email, fk_contact, lastname, firstname, other
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
@@ -447,9 +435,7 @@ class mailing_contacts1 extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 8a504ff28b5..f9c876b0230 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -154,9 +154,7 @@ class mailing_fraise extends MailingTargets
                 $s .= '</option>';
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -193,9 +191,7 @@ class mailing_fraise extends MailingTargets
         		$s .= '</option>';
         		$i++;
         	}
-        }
-        else
-        {
+        } else {
         	dol_print_error($this->db);
         }
 
@@ -313,9 +309,7 @@ class mailing_fraise extends MailingTargets
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog($this->db->error());
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index ffba2571d23..32222d619a0 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -98,9 +98,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         {
             $obj = $this->db->fetch_object($result);
             return $obj->nb;
-        }
-        else
-        {
+        } else {
         	$this->error = $this->db->lasterror();
             return -1;
         }
@@ -144,8 +142,7 @@ class MailingTargets // This can't be abstract as it is used for some method
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else {
+        } else {
             return -1;
         }
         return $nb;
@@ -192,9 +189,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         		if ($result)
         		{
         			$j++;
-        		}
-        		else
-        		{
+        		} else {
         			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
         			{
         				// Si erreur autre que doublon
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index aa3e9bbc703..38c7fc78065 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -213,9 +213,7 @@ class mailing_pomme extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 05e9f4f12c4..b286de97196 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -79,9 +79,7 @@ class mailing_thirdparties extends MailingTargets
 		    $sql .= " WHERE s.email <> ''";
 		    $sql .= " AND s.entity IN (".getEntity('societe').")";
 		    $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		}
-		else
-		{
+		} else {
             $addFilter = "";
             if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
             {
@@ -90,21 +88,16 @@ class mailing_thirdparties extends MailingTargets
                 if ($_POST["filter_client"] == 0)
                 {
                     $addDescription .= $langs->trans('NorProspectNorCustomer');
-                }
-                elseif ($_POST["filter_client"] == 1)
+                } elseif ($_POST["filter_client"] == 1)
                 {
                     $addDescription .= $langs->trans('Customer');
-                }
-                elseif ($_POST["filter_client"] == 2)
+                } elseif ($_POST["filter_client"] == 2)
                 {
                     $addDescription .= $langs->trans('Prospect');
-                }
-                elseif ($_POST["filter_client"] == 3)
+                } elseif ($_POST["filter_client"] == 3)
                 {
                     $addDescription .= $langs->trans('ProspectCustomer');
-                }
-                else
-                {
+                } else {
                     $addDescription .= "Unknown status ".$_POST["filter_client"];
                 }
             }
@@ -119,9 +112,7 @@ class mailing_thirdparties extends MailingTargets
                 {
                     $addFilter .= " AND s.status=1";
                     $addDescription .= $langs->trans("Enabled");
-                }
-                else
-                {
+                } else {
                     $addFilter .= " AND s.status=0";
                     $addDescription .= $langs->trans("Disabled");
                 }
@@ -186,9 +177,7 @@ class mailing_thirdparties extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
@@ -285,9 +274,7 @@ class mailing_thirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 866712d4bb0..852f05f837a 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -73,9 +73,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
                 $i++;
                 $this->arrayofproducts[$i] = $obj->ref;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -153,9 +151,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog($this->db->lasterror());
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 9d08cb3565d..3ab0735429e 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -179,9 +179,7 @@ class mailing_xinputfile extends MailingTargets
 									$old = $email;
 									$j++;
 								}
-					        }
-					        else
-					        {
+					        } else {
 					        	$i++;
 					        	$langs->load("errors");
                                 $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
@@ -196,27 +194,21 @@ class mailing_xinputfile extends MailingTargets
 				    {
 				    	return -$i;
 				    }
-				}
-				else
-				{
+				} else {
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
 				}
 
 				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
-				}
-				elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
+				} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
-				}
-				else	// Known error
+				} else // Known error
 				{
 					$this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
 				}
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 0875b02ed56..72614d39e9d 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -148,16 +148,12 @@ class mailing_xinputuser extends MailingTargets
 				);
 
 				return parent::addTargetsToDatabase($mailing_id, $cibles);
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorBadEMail", $email);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
             $langs->load("errors");
             $this->error = $langs->trans("ErrorBadEmail", $email);
 			return -1;
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 1582b1c1c34..dd4b15d6135 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -88,8 +88,7 @@ class pdf_standard extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -155,8 +154,7 @@ class pdf_standard extends CommonStickerGenerator
 		if ($tmp['height'])
 		{
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
@@ -166,13 +164,11 @@ class pdf_standard extends CommonStickerGenerator
 			// Output left area
 			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	//
+		} elseif ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
@@ -180,29 +176,25 @@ class pdf_standard extends CommonStickerGenerator
 				elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
+			} elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
 				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			else	// text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else	// Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
@@ -305,9 +297,7 @@ class pdf_standard extends CommonStickerGenerator
 	        }
 
     		$arrayofrecords = $arrayofmembers;
-		}
-		else
-		{
+		} else {
 		    $arrayofrecords = $object;
 		}
 
@@ -336,9 +326,7 @@ class pdf_standard extends CommonStickerGenerator
 		{
 			$title = $outputlangs->transnoentities('MembersCards');
 			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
-		{
+		} else {
 			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
@@ -349,9 +337,7 @@ class pdf_standard extends CommonStickerGenerator
 		    $outputdir = $conf->adherent->dir_output;
 		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 		    $file = $dir.'/'.$filename;
-		}
-		else
-		{
+		} else {
 		    $outputdir = $conf->adherent->dir_temp;
 		    $dir = $outputdir;
 		    $file = $dir.'/'.$filename;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index f9bdd58af24..65e9caef561 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -99,13 +99,10 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			$code = $modele;
 		}
-	}
-	else $code = $modele;
+	} else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -113,8 +110,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	}
-	else $srctemplatepath = $code;
+	} else $srctemplatepath = $code;
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -153,17 +149,12 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-
-	else
-	{
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 2184500db8c..49ea6402e20 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -97,9 +97,7 @@ class modAgenda extends DolibarrModules
 		        //if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 		        $this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
 		    }
-		}
-		else
-		{
+		} else {
 		    dol_print_error($this->db->lasterror());
 		}
 
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 5b645747380..447e3e625ac 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -233,9 +233,7 @@ class modBlockedLog extends DolibarrModules
         if ($b->alreadyUsed(1))
         {
             $res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
-        }
-        else
-        {
+        } else {
             $res = $b->create($user);
         }
         if ($res <= 0) {
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index e276fe1f5f7..03bd868bf02 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -137,8 +137,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -274,9 +273,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -308,9 +305,7 @@ class doc_generic_mo_odt extends ModelePDFMo
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -343,8 +338,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -360,8 +354,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -392,25 +385,21 @@ class doc_generic_mo_odt extends ModelePDFMo
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -429,15 +418,12 @@ class doc_generic_mo_odt extends ModelePDFMo
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -446,8 +432,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -460,8 +445,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -481,8 +465,7 @@ class doc_generic_mo_odt extends ModelePDFMo
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -503,9 +486,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 3fd3b1ad87e..80e26cef6d6 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -129,9 +129,7 @@ class mod_mo_standard extends ModeleNumRefMos
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_mo_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index 4320481abb1..7df6b007f26 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -142,8 +142,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -152,9 +151,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
+    } else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 68aba389f31..c15d1da5751 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -140,8 +140,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -150,9 +149,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
     	$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
+    } else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index b2ff4165563..c1d38080657 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -146,8 +146,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -156,9 +155,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
+    } else {
         //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
     	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
     	$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 925a55c7ca1..df468492921 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -146,8 +146,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -156,9 +155,7 @@ else // If entry on page with no parameter, we arrive here
 	if (GETPOST('state'))
 	{
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-	}
-	else
-	{
+	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
 		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
 		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 5650ad43707..7debf44e18e 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -136,9 +136,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 1a225518518..f68de863ab8 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -152,13 +152,10 @@ class printing_printgcp extends PrintingDriver
                     if ($endoflife == $token::EOL_NEVER_EXPIRES)
                     {
                         $expiredat = $langs->trans("Never");
-                    }
-                    elseif ($endoflife == $token::EOL_UNKNOWN)
+                    } elseif ($endoflife == $token::EOL_UNKNOWN)
                     {
                         $expiredat = $langs->trans("Unknown");
-                    }
-                    else
-                    {
+                    } else {
                         $expiredat = dol_print_date($endoflife, "dayhour");
                     }
 
@@ -219,9 +216,7 @@ class printing_printgcp extends PrintingDriver
             if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
             {
                 $html .= img_picto($langs->trans("Default"), 'on');
-            }
-            else
-                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+            } else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
             $html .= '</td>';
             $html .= '</tr>'."\n";
         }
@@ -325,15 +320,11 @@ class printing_printgcp extends PrintingDriver
             if ($obj)
             {
                 $printer_id = $obj->printer_id;
-            }
-            else
-            {
+            } else {
                 if (!empty($conf->global->PRINTING_GCP_DEFAULT))
                 {
                     $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
-                }
-                else
-                {
+                } else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
@@ -506,9 +497,7 @@ class printing_printgcp extends PrintingDriver
                 $html .= '<td>&nbsp;</td>';
                 $html .= '</tr>';
             }
-        }
-        else
-        {
+        } else {
                 $html .= '<tr class="oddeven">';
                 $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
                 $html .= '</tr>';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 5a3d2481c6d..b4b24b062df 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -115,16 +115,12 @@ class printing_printipp extends PrintingDriver
             {
             	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
                 $ipp->setPrinterURI($obj->printer_id);
-            }
-            else
-            {
+            } else {
                 if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
                 {
                     dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
                     $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
-                }
-                else
-                {
+                } else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index f85984ab9bd..79e47a8328a 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -86,8 +86,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -142,8 +141,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 		if ($tmp['height'])
 		{
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
@@ -153,13 +151,11 @@ class pdf_standardlabel extends CommonStickerGenerator
 			// Output left area
 			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	//
+		} elseif ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%')
 			{
@@ -167,29 +163,25 @@ class pdf_standardlabel extends CommonStickerGenerator
 				elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
+			} elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			else	// text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else	// Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 568d850765f..1acdfbae773 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -126,8 +126,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -166,14 +165,11 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			elseif ($code && !empty($encoding))
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			}
-			else
-			{
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	// left and right part
+		} elseif ($textleft != '' && $textright != '')	// left and right part
 		{
 			$logoHeight = $heighttouse / 2;
 			$logoWidth = $widthtouse / 2;
@@ -186,8 +182,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				}
 				$pdf->SetXY($_PosX + ($widthtouse / 2), $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
+			} elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $logoWidth, 0);
 				elseif ($code && !empty($encoding))
@@ -196,8 +191,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				}
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
+			} elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
@@ -207,8 +201,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->SetXY($_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 				}
-			}
-			elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
+			} elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX + $xleft + $widthtouse - $logoWidth + 1, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
@@ -218,25 +211,21 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				}
-			}
-			else	// text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else	// Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
 			elseif ($code && !empty($encoding))
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			}
-			else
-			{
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index f99ddafc4b8..215c3a854ad 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -100,13 +100,10 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
 		{
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
-		}
-		else
-		{
+		} else {
 			$code = $modele;
 		}
-	}
-	else $code = $modele;
+	} else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -114,8 +111,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	}
-	else $srctemplatepath = $code;
+	} else $srctemplatepath = $code;
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 
@@ -155,16 +151,12 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index c0fa4d0f6eb..38e4a18bda6 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -141,8 +141,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -293,9 +292,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -328,9 +325,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -366,8 +361,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -384,8 +378,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -416,20 +409,17 @@ class doc_generic_product_odt extends ModelePDFProduct
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
@@ -441,15 +431,12 @@ class doc_generic_product_odt extends ModelePDFProduct
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($array_lines as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -458,8 +445,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -472,8 +458,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -492,8 +477,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -513,9 +497,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index cbe618b488f..11fd721dfad 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -181,9 +181,7 @@ class pdf_standard extends ModelePDFProduct
 			{
 				$dir = $conf->product->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->product->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -334,9 +332,7 @@ class pdf_standard extends ModelePDFProduct
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -573,15 +569,11 @@ class pdf_standard extends ModelePDFProduct
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -740,17 +732,13 @@ class pdf_standard extends ModelePDFProduct
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else
-	        {
+	        } else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index ba6329004e3..0b5fcd5212c 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -207,13 +207,11 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		{
 			$field = 'ref';
 			//$where = ' AND client in (1,2)';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$field = 'ref';
 			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
+		} else return -1;
 
 		$now = dol_now();
 
@@ -275,13 +273,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
@@ -327,14 +322,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 706ea0c683a..cfdcbcdb404 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -134,8 +134,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 80bc9f7ce0a..308f98d7828 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -169,9 +169,7 @@ abstract class ModeleProductCode
 				$liste[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 		return $liste;
@@ -208,16 +206,14 @@ abstract class ModeleProductCode
 			$s .= yn(!$this->code_null, 1, 2);
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			$s .= '<br>';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$s .= $langs->trans("RequiredIfService").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
 			$s .= yn(!$this->code_null, 1, 2);
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			$s .= '<br>';
-		}
-		elseif ($type == -1)
+		} elseif ($type == -1)
 		{
 			$s .= $langs->trans("Required").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 542ea728f84..d4994823ffc 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -408,8 +408,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -543,9 +542,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -635,21 +632,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
 				// Replace tags of lines for tasks
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('tasks');
 
 					$taskstatic = new Task($this->db);
@@ -667,15 +661,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 						//complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -718,15 +709,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -768,15 +756,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -808,15 +793,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -841,15 +823,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 							//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -859,8 +838,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$ExceptionTrace = $e->getTrace();
 					// no segment defined on ODT is not an error
@@ -873,8 +851,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 
 				// Replace tags of project files
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -887,15 +864,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -903,8 +877,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -923,8 +896,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
 				{
-					try
-					{
+					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
 						foreach ($contact_arrray as $contact)
@@ -946,15 +918,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -962,8 +931,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -1084,8 +1052,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				);
 
 				//Insert reference
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectrefs');
 
 					foreach ($listofreferent as $keyref => $valueref)
@@ -1147,15 +1114,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 									foreach ($tmparray as $key => $val)
 									{
-										try
-										{
+										try {
 											$listlines->setVars($key, $val, true, 'UTF-8');
-										}
-										catch (OdfException $e)
+										} catch (OdfException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
-										}
-										catch (SegmentException $e)
+										} catch (SegmentException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
@@ -1216,9 +1180,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 59e3f855ebf..8cd73383a1a 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -300,9 +300,7 @@ class pdf_baleine extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -358,16 +356,13 @@ class pdf_baleine extends ModelePDFProjects
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 
 							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
@@ -396,8 +391,7 @@ class pdf_baleine extends ModelePDFProjects
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -451,9 +445,7 @@ class pdf_baleine extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -467,9 +459,7 @@ class pdf_baleine extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -484,8 +474,7 @@ class pdf_baleine extends ModelePDFProjects
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Footer of the page
@@ -513,15 +502,11 @@ class pdf_baleine extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -612,16 +597,13 @@ class pdf_baleine extends ModelePDFProjects
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 4044676461e..334fc16ca18 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -273,9 +273,7 @@ class pdf_beluga extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -508,16 +506,13 @@ class pdf_beluga extends ModelePDFProjects
 								            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								            $pdf->setPage($pageposafter + 1);
 							            }
-						            }
-						            else
-						            {
+						            } else {
 							            // We found a page break
 
 										// Allows data in the first page if description is long enough to break in multiples pages
 										if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 											$showpricebeforepagebreak = 1;
-										else
-											$showpricebeforepagebreak = 0;
+										else $showpricebeforepagebreak = 0;
 
 							            $forcedesconsamepage = 1;
 							            if ($forcedesconsamepage)
@@ -546,8 +541,7 @@ class pdf_beluga extends ModelePDFProjects
 							            }
 						            }
 						            //var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					            }
-					            else	// No pagebreak
+					            } else // No pagebreak
 					            {
 						            $pdf->commitTransaction();
 					            }
@@ -589,9 +583,7 @@ class pdf_beluga extends ModelePDFProjects
 						            $fuser = new User($this->db);
 						            $fuser->fetch($element->fk_user_author);
 						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
-					            }
-					            else
-					            {
+					            } else {
 						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty) ? $element->thirdparty->name : ''), 1, 'L');
 					            }
 
@@ -607,9 +599,7 @@ class pdf_beluga extends ModelePDFProjects
                                 	{
                                 		$textforamount = dol_trunc($element->label, 26);
                                 		$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
-                                	}
-                                	else
-                                	{
+                                	} else {
 	                                    $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
                                 	}
                                 }
@@ -687,15 +677,11 @@ class pdf_beluga extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -786,16 +772,13 @@ class pdf_beluga extends ModelePDFProjects
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 2a13aa8ab57..a6bf7fdace7 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -231,9 +231,7 @@ class pdf_timespent extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -289,16 +287,13 @@ class pdf_timespent extends ModelePDFProjects
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 
 							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
@@ -327,8 +322,7 @@ class pdf_timespent extends ModelePDFProjects
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -382,9 +376,7 @@ class pdf_timespent extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -398,9 +390,7 @@ class pdf_timespent extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -415,8 +405,7 @@ class pdf_timespent extends ModelePDFProjects
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Pied de page
@@ -444,15 +433,11 @@ class pdf_timespent extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -543,16 +528,13 @@ class pdf_timespent extends ModelePDFProjects
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 301e226020c..6c89120571b 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -106,9 +106,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,9 +138,7 @@ class mod_project_simple extends ModeleNumRefProjects
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 9b7b15a884d..26ab158ded9 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -377,8 +377,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -532,8 +531,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					return -1;
@@ -564,8 +562,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -575,8 +572,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 
 				// Replace tags of lines for tasks
-				try
-				{
+				try {
 					// Security check
 					$socid = 0;
 					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
@@ -632,8 +628,7 @@ class doc_generic_task_odt extends ModelePDFTask
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e) {
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -674,15 +669,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -709,15 +701,12 @@ class doc_generic_task_odt extends ModelePDFTask
 						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -727,8 +716,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					//$listlines->merge();
 
 					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -738,8 +726,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 
 				// Replace tags of project files
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -753,15 +740,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -769,8 +753,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -789,8 +772,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
 				{
-					try
-					{
+					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
 						foreach ($contact_arrray as $contact)
@@ -813,15 +795,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -829,8 +808,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -853,8 +831,7 @@ class doc_generic_task_odt extends ModelePDFTask
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -874,9 +851,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index cb186594b84..b4f02603660 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -107,9 +107,7 @@ class mod_task_simple extends ModeleNumRefTask
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,9 +138,7 @@ class mod_task_simple extends ModeleNumRefTask
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 33850c5d882..b646156079b 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -140,8 +140,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -308,9 +307,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -342,9 +339,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -380,8 +375,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -398,8 +392,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -430,25 +423,21 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -467,15 +456,12 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -484,8 +470,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -498,8 +483,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -518,8 +502,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -539,9 +522,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index b5000925672..82862e48c84 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -172,9 +172,7 @@ class pdf_azur extends ModelePDFPropales
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else
-		{
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -244,9 +242,7 @@ class pdf_azur extends ModelePDFPropales
 				{
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else
-				{
+				} else {
 					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
@@ -269,14 +265,10 @@ class pdf_azur extends ModelePDFPropales
 								if ($obj['photo_vignette'])
 								{
 									$filename = $obj['photo_vignette'];
-								}
-								else
-								{
+								} else {
 									$filename = $obj['photo'];
 								}
-							}
-							else
-							{
+							} else {
 								$filename = $obj['photo'];
 							}
 
@@ -303,9 +295,7 @@ class pdf_azur extends ModelePDFPropales
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -509,8 +499,7 @@ class pdf_azur extends ModelePDFPropales
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -547,19 +536,15 @@ class pdf_azur extends ModelePDFPropales
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -676,9 +661,7 @@ class pdf_azur extends ModelePDFPropales
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -692,9 +675,7 @@ class pdf_azur extends ModelePDFPropales
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -711,9 +692,7 @@ class pdf_azur extends ModelePDFPropales
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -781,9 +760,7 @@ class pdf_azur extends ModelePDFPropales
 											} elseif (!empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
-										}
-										else
-										{
+										} else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -835,15 +812,11 @@ class pdf_azur extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -910,8 +883,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1100,9 +1072,7 @@ class pdf_azur extends ModelePDFPropales
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1485,25 +1455,20 @@ class pdf_azur extends ModelePDFPropales
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1af66ca645e..b1ef6e022ef 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -231,9 +231,7 @@ class pdf_cyan extends ModelePDFPropales
 				{
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-				}
-				else
-				{
+				} else {
 					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
@@ -256,14 +254,10 @@ class pdf_cyan extends ModelePDFPropales
 								if ($obj['photo_vignette'])
 								{
 									$filename = $obj['photo_vignette'];
-								}
-								else
-								{
+								} else {
 									$filename = $obj['photo'];
 								}
-							}
-							else
-							{
+							} else {
 								$filename = $obj['photo'];
 							}
 
@@ -291,9 +285,7 @@ class pdf_cyan extends ModelePDFPropales
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -507,8 +499,7 @@ class pdf_cyan extends ModelePDFPropales
 					        if ($i > $pageposbeforenote) {
 					            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 					            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					        }
-					        else {
+					        } else {
 					            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 					            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 					        }
@@ -526,8 +517,7 @@ class pdf_cyan extends ModelePDFPropales
 					    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					    $height_note = $posyafter - $tab_top_newpage;
 					    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-					}
-					else // No pagebreak
+					} else // No pagebreak
 					{
 					    $pdf->commitTransaction();
 					    $posyafter = $pdf->GetY();
@@ -550,9 +540,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $posyafter + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -602,8 +590,7 @@ class pdf_cyan extends ModelePDFPropales
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
     					}
 
 
@@ -643,18 +630,14 @@ class pdf_cyan extends ModelePDFPropales
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter + 1);
     							}
-    						}
-    						else
-    						{
+    						} else {
     							// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
     						}
-    					}
-    					else	// No pagebreak
+    					} else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -807,9 +790,7 @@ class pdf_cyan extends ModelePDFPropales
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -823,9 +804,7 @@ class pdf_cyan extends ModelePDFPropales
 					    if ($pagenb == $pageposafter)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -842,9 +821,7 @@ class pdf_cyan extends ModelePDFPropales
 				{
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -912,9 +889,7 @@ class pdf_cyan extends ModelePDFPropales
 											} elseif (!empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
-										}
-										else
-										{
+										} else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -966,15 +941,11 @@ class pdf_cyan extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -1035,8 +1006,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1231,9 +1201,7 @@ class pdf_cyan extends ModelePDFPropales
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1559,25 +1527,20 @@ class pdf_cyan extends ModelePDFPropales
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -2001,13 +1964,10 @@ class pdf_cyan extends ModelePDFPropales
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index 4dde423a5e6..44a803ec58b 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -108,9 +108,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -141,9 +139,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 103d0fdffba..1a4400ae84d 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -211,8 +211,7 @@ class pdf_paiement
 				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD))
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
-				else
-					$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
 				break;
 			case "fourn":
 				$sql = "SELECT p.datep as dp, f.ref as ref";
@@ -245,8 +244,7 @@ class pdf_paiement
                 // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
 				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
-				else
-					$sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
 				break;
 		}
 
@@ -273,9 +271,7 @@ class pdf_paiement
 				$lines[$i][9] = $objp->paiement_amount;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 89a532c2556..ae345b21b7c 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -132,8 +132,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -271,9 +270,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -300,9 +297,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					// On peut utiliser le nom de la societe du contact
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else $socobject = $object->thirdparty;
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -339,8 +334,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					return -1;
@@ -370,8 +364,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -390,8 +383,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -408,8 +400,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -430,8 +421,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -440,8 +430,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('lines');
 					foreach ($object->lines as $line)
 					{
@@ -463,8 +452,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -494,8 +482,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$this->error = $e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -512,9 +499,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$odfHandler = null; // Destroy object
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 25b7b62388f..b5fe6c53c36 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -148,14 +148,10 @@ class pdf_squille extends ModelePdfReception
                         if ($obj['photo_vignette'])
                         {
                             $filename = $obj['photo_vignette'];
-                        }
-                        else
-                        {
+                        } else {
                             $filename = $obj['photo'];
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $filename = $obj['photo'];
                     }
 
@@ -176,9 +172,7 @@ class pdf_squille extends ModelePdfReception
 			{
 				$dir = $conf->reception->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$rcpref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->reception->dir_output."/".$rcpref;
 				$file = $dir."/".$rcpref.".pdf";
@@ -335,9 +329,7 @@ class pdf_squille extends ModelePdfReception
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -378,8 +370,7 @@ class pdf_squille extends ModelePdfReception
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -418,19 +409,15 @@ class pdf_squille extends ModelePdfReception
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -511,9 +498,7 @@ class pdf_squille extends ModelePdfReception
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -526,9 +511,7 @@ class pdf_squille extends ModelePdfReception
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -544,9 +527,7 @@ class pdf_squille extends ModelePdfReception
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -577,15 +558,11 @@ class pdf_squille extends ModelePdfReception
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -821,17 +798,13 @@ class pdf_squille extends ModelePdfReception
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -840,9 +813,7 @@ class pdf_squille extends ModelePdfReception
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else
-		{
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 66576eaab76..8a9f2af0917 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -113,9 +113,7 @@ class mod_reception_beryl extends ModelNumRefReception
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 2a7e0cf287f..2af48507e94 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -117,8 +117,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) { unset($listofdir[$key]); continue; }
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -249,9 +248,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -277,8 +274,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 	    					'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -313,8 +309,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 }
                 if ((is_array($contact_arrray) && count($contact_arrray) > 0))
                 {
-                	try
-                	{
+                	try {
                 		$listlines = $odfHandler->setSegment('companycontacts');
 
                 		foreach ($contact_arrray as $array_key => $contact_id)
@@ -323,15 +318,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
                 			foreach ($tmparray as $key => $val)
                 			{
-                				try
-                				{
+                				try {
                 					$listlines->setVars($key, $val, true, 'UTF-8');
-                				}
-                				catch (OdfException $e)
+                				} catch (OdfException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                				catch (SegmentException $e)
+                				} catch (SegmentException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
                 				}
@@ -339,8 +331,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			$listlines->merge();
                 		}
                 		$odfHandler->mergeSegment($listlines);
-                	}
-                	catch (OdfException $e)
+                	} catch (OdfException $e)
                 	{
                 		$this->error = $e->getMessage();
                 		dol_syslog($this->error, LOG_WARNING);
@@ -369,13 +360,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// setVars failed, probably because key not found
                         dol_syslog($e->getMessage(), LOG_INFO);
@@ -388,8 +377,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -408,8 +396,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 				    try {
                         $odfHandler->creator = $user->getFullName($outputlangs);
                         $odfHandler->title = $object->builddoc_filename;
@@ -438,9 +425,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 22ec06c8aa6..665d1266468 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -218,13 +218,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		{
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
+		} else return -1;
 
 		$now = dol_now();
 
@@ -281,13 +279,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
@@ -335,14 +330,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 1bfeab38865..c3ce858ec0d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -126,8 +126,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 15519688f98..6d12d7c3e19 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -144,9 +144,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
@@ -184,33 +182,24 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			if ($this->verif_syntax($code) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
 				if ($is_dispo <> 0)
 				{
 					$result = -3;
-				}
-				else
-				{
+				} else {
 					$result = 0;
 				}
-			}
-			else
-			{
+			} else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
-				}
-				else
-				{
+				} else {
 					$result = -1;
 				}
 			}
@@ -249,14 +238,10 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -277,9 +262,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (dol_strlen($code) < 11)
 		{
 			$res = -1;
-		}
-		else
-		{
+		} else {
 			$res = 0;
 		}
 		return $res;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 78b0e2fae8e..fc993a0d671 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -141,14 +141,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		{
 			$codetouse = (!empty($societe->code_client) ? $societe->code_client : 'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		elseif ($type == 'supplier')
+		} elseif ($type == 'supplier')
 		{
 			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else
-		{
+		} else {
 			$this->error = 'Bad value for parameter type';
 			return -1;
 		}
@@ -171,9 +168,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		if (!$is_dispo)
 		{
 			$this->code = $codetouse;
-		}
-		else
-		{
+		} else {
 			// Pour retour
 			$this->code = $codetouse;
 		}
@@ -210,15 +205,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1; // Dispo
-			}
-			else
-			{
+			} else {
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0; // Non dispo
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $db->error()." sql=".$sql;
 			return -1; // Erreur
 		}
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index d97ac5df0ff..20edc26f219 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -163,15 +163,12 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
                 $codetouse = $societe->name;
                 $prefix = $this->prefixsupplieraccountancycode;
                 $width = $this->supplieraccountancycodecharacternumber;
-			}
-			elseif ($type == 'customer')
+			} elseif ($type == 'customer')
             {
                 $codetouse = $societe->name;
                 $prefix = $this->prefixcustomeraccountancycode;
                 $width = $this->customeraccountancycodecharacternumber;
-            }
-            else
-            {
+            } else {
                 $this->error = 'Bad value for parameter type';
                 return -1;
             }
@@ -220,9 +217,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         if ($disponibility == 0)
         {
             return 0; // return ok
-        }
-        else
-        {
+        } else {
             return -1; // return ko
         }
 	}
@@ -240,13 +235,10 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         if ($type == 'supplier')
         {
             $typethirdparty = 'code_compta_fournisseur';
-        }
-        elseif ($type == 'customer')
+        } elseif ($type == 'customer')
         {
             $typethirdparty = 'code_compta';
-        }
-        else
-        {
+        } else {
             $this->error = 'Bad value for parameter type';
             return -1;
         }
@@ -261,15 +253,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
             {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
                 return 0; // Available
-            }
-            else
-            {
+            } else {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
                 return -1; // Not available
             }
-        }
-        else
-        {
+        } else {
             $this->error = $db->error()." sql=".$sql;
             return -2; // Error
         }
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index a6df7aaea20..df280e11679 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -172,9 +172,7 @@ abstract class ModeleThirdPartyCode
 				$liste[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 		return $liste;
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index d5ccf5dbd89..5fbee68d41b 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -141,8 +141,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -294,9 +293,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -329,9 +326,7 @@ class doc_generic_stock_odt extends ModelePDFStock
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -367,8 +362,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						    'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -385,8 +379,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -417,20 +410,17 @@ class doc_generic_stock_odt extends ModelePDFStock
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
@@ -442,15 +432,12 @@ class doc_generic_stock_odt extends ModelePDFStock
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($array_lines as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -459,8 +446,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -473,8 +459,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -493,8 +478,7 @@ class doc_generic_stock_odt extends ModelePDFStock
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -514,9 +498,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index c50f3d2a2f8..d4c8adb74f2 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -210,9 +210,7 @@ class pdf_standard extends ModelePDFStock
 			{
 				$dir = $conf->stock->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->stock->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -379,19 +377,15 @@ class pdf_standard extends ModelePDFStock
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else
-							{
+							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -475,9 +469,7 @@ class pdf_standard extends ModelePDFStock
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -491,9 +483,7 @@ class pdf_standard extends ModelePDFStock
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -543,9 +533,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->SetXY($this->postotalht, $curY);
 						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 
@@ -569,9 +557,7 @@ class pdf_standard extends ModelePDFStock
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -704,9 +690,7 @@ class pdf_standard extends ModelePDFStock
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -744,15 +728,11 @@ class pdf_standard extends ModelePDFStock
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -912,17 +892,13 @@ class pdf_standard extends ModelePDFStock
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else
-	        {
+	        } else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
@@ -964,9 +940,7 @@ class pdf_standard extends ModelePDFStock
 		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
-		}
-		else
-		{
+		} else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -1003,18 +977,14 @@ class pdf_standard extends ModelePDFStock
 		{
 			$obj = $db->fetch_object($resqlbis);
 			$lastmovementdate = $db->jdate($obj->datem);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
 		if ($lastmovementdate)
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		}
-		else
-		{
+		} else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index d0e9ba9d1e4..59769df9987 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -286,10 +286,8 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			if ($year > 0)
 			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, $month, false))."' AND '".$db->idate(dol_get_last_day($year, $month, false))."'";
-			else
-			$sql .= " AND date_format(m.datem, '%m') = '$month'";
-		}
-		elseif ($year > 0)
+			else $sql .= " AND date_format(m.datem, '%m') = '$month'";
+		} elseif ($year > 0)
 		{
 			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 		}
@@ -363,8 +361,7 @@ class pdf_stdmovement extends ModelePDFMovement
 				$i = 0;
 				$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 				if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-				else
-				{
+				else {
 					$texte = $langs->trans("ListOfStockMovements");
 					if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 				}
@@ -375,9 +372,7 @@ class pdf_stdmovement extends ModelePDFMovement
 			{
 				$dir = $conf->stock->dir_output."/movement";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
 				if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
@@ -539,19 +534,15 @@ class pdf_stdmovement extends ModelePDFMovement
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else
-							{
+							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
+								else $showpricebeforepagebreak = 0;
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -666,9 +657,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -682,9 +671,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -719,9 +706,7 @@ class pdf_stdmovement extends ModelePDFMovement
 					// Total Qty
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $totalunit, 0, 'R', 0);
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 
@@ -745,9 +730,7 @@ class pdf_stdmovement extends ModelePDFMovement
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -762,9 +745,7 @@ class pdf_stdmovement extends ModelePDFMovement
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -802,15 +783,11 @@ class pdf_stdmovement extends ModelePDFMovement
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -993,17 +970,13 @@ class pdf_stdmovement extends ModelePDFMovement
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else
-	        {
+	        } else {
 	            $pdf->SetTextColor(200, 0, 0);
 	            $pdf->SetFont('', 'B', $default_font_size - 2);
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 	            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
@@ -1045,9 +1018,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
-		}
-		else
-		{
+		} else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -1084,18 +1055,14 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			$obj = $db->fetch_object($resqlbis);
 			$lastmovementdate = $db->jdate($obj->datem);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
 		if ($lastmovementdate)
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		}
-		else
-		{
+		} else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 2e3b4e177d7..49d5dd4ca2d 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -233,9 +233,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			{
 				$dir = $conf->fournisseur->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$objectref;
@@ -424,18 +422,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -535,9 +529,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -551,9 +543,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -570,9 +560,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -614,15 +602,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -732,9 +716,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
 			}
-		}
-		else
-		{
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 			//Local tax 1
@@ -1048,9 +1030,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1147,9 +1127,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index c821e6b60aa..65649e5d2e1 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -192,9 +192,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	$obj = $db->fetch_object($resql);
         	if ($obj) $max = intval($obj->max);
         	else $max = 0;
-        }
-        else
-        {
+        } else {
         	return -1;
         }
 
@@ -215,12 +213,10 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	{
         		$obj = $db->fetch_object($resql);
         		if ($obj) $ref = $obj->ref;
-        	}
-        	else dol_print_error($db);
+        	} else dol_print_error($db);
 
         	return $ref;
-        }
-        elseif ($mode == 'next')
+        } elseif ($mode == 'next')
         {
         	$date = $object->date; // This is invoice date (not creation date)
         	$yymm = strftime("%y%m", $date);
@@ -230,8 +226,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 
         	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
         	return $prefix.$yymm."-".$num;
-        }
-        else dol_print_error('', 'Bad parameter for getNextValue');
+        } else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
 
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index 8d35c5d1758..3805a941476 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -168,8 +168,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 			{
 				$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 			}
-		}
-		elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+		} elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
 		elseif (is_object($object) && $object->type == 3) $mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
 		else $mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 		if (!$mask)
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index d7f48915308..71c39650f50 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -138,8 +138,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -238,9 +237,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -273,9 +270,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -307,9 +302,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
             			$contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -346,8 +339,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -363,8 +355,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -395,25 +386,21 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -432,15 +419,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -449,8 +433,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -463,8 +446,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -484,8 +466,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -506,9 +487,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 657160a9a1b..7679a555483 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -221,9 +221,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -257,9 +255,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -446,8 +442,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				            if ($i > $pageposbeforenote) {
 				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            }
-				            else {
+				            } else {
 				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 				            }
@@ -465,8 +460,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 				        $height_note = $posyafter - $tab_top_newpage;
 				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    }
-				    else // No pagebreak
+				    } else // No pagebreak
 				    {
 				        $pdf->commitTransaction();
 				        $posyafter = $pdf->GetY();
@@ -490,9 +484,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
-				}
-				else
-				{
+				} else {
 				    $height_note = 0;
 				}
 
@@ -535,8 +527,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -573,18 +564,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					                //if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					                $pdf->setPage($pageposafter + 1);
 					            }
-					        }
-					        else
-					        {
+					        } else {
 					            // We found a page break
 					        	// Allows data in the first page if description is long enough to break in multiples pages
 					        	if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 					        		$showpricebeforepagebreak = 1;
-					        	else
-					        		$showpricebeforepagebreak = 0;
+					        	else $showpricebeforepagebreak = 0;
 					        }
-					    }
-					    else	// No pagebreak
+					    } else // No pagebreak
 					    {
 					        $pdf->commitTransaction();
 					    }
@@ -733,9 +720,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					    if ($pagenb == $pageposbeforeprintlines)
 					    {
 					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else
-						{
+					    } else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -749,9 +734,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					    if ($pagenb == $pageposafter)
 					    {
 					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else
-						{
+					    } else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -768,9 +751,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				{
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-			    }
-				else
-				{
+			    } else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -812,15 +793,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -1008,9 +985,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
-		}
-		else
-		{
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
@@ -1242,17 +1217,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1295,9 +1266,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
@@ -1640,13 +1609,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
 	}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 4a27b58f8ae..06dd3c0aed3 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -237,9 +237,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -273,9 +271,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -447,8 +443,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -466,9 +461,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if ($posYAfterImage > 0)
 					{
 						$descWidth = $this->posxpicture - $curX;
-					}
-					else
-					{
+					} else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -491,18 +484,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -616,9 +605,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -632,9 +619,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -651,9 +636,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -695,15 +678,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -891,9 +870,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
-		}
-		else
-		{
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
@@ -1158,17 +1135,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1211,9 +1184,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index df4a60b10e2..d26329fc388 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -116,9 +116,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 0ad8b391faf..d5ae49114f6 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -230,9 +230,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			{
 				$dir = $conf->fournisseur->payment->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
                 $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
@@ -359,18 +357,14 @@ class pdf_standard extends ModelePDFSuppliersPayments
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -432,9 +426,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -448,9 +440,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -467,9 +457,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -505,15 +493,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -662,17 +646,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 9baa8d2dafe..604ab634bdd 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -136,9 +136,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index c97d2f94d63..380f7a1dcb4 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -142,8 +142,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -306,9 +305,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -337,16 +334,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
 					{
 						$socobject = $object->contact;
-					}
-					else
-					{
+					} else {
 						$socobject = $object->thirdparty;
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -383,8 +376,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -400,8 +392,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -431,25 +422,21 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -468,15 +455,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -485,8 +469,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -499,8 +482,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -519,8 +501,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -540,9 +521,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index afaf4987e04..25777895543 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -233,9 +233,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
-				}
-				else
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -265,9 +263,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			{
 				$dir = $conf->supplier_proposal->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->supplier_proposal->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -432,8 +428,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						// Allows data in the first page if description is long enough to break in multiples pages
 						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 							$showpricebeforepagebreak = 1;
-						else
-							$showpricebeforepagebreak = 0;
+						else $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -451,9 +446,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if ($posYAfterImage > 0)
 					{
 						$descWidth = $this->posxpicture - $curX;
-					}
-					else
-					{
+					} else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -479,18 +472,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
+							else $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -612,9 +601,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -628,9 +615,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -647,9 +632,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -693,15 +676,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_PROPOSAL_OUTPUTDIR");
 			return 0;
 		}
@@ -758,8 +737,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-		else {
+		} else {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -942,9 +920,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1314,17 +1290,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1452,9 +1424,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
 				else $socname = $object->thirdparty->name;
 				$carac_client_name = $outputlangs->convToOutputCharset($socname);
-			}
-			else
-			{
+			} else {
 				$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name);
 			}
 
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 37ba98b0058..4126c8402e9 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -108,9 +108,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -141,9 +139,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index dedf0844245..4f70dc6544c 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -90,8 +90,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 		if (file_exists($filename) && is_writable($filename))
 		{
 			dol_syslog('admin/syslog: file '.$filename);
-		}
-		else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
+		} else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
 
 		return $errors;
 	}
@@ -151,9 +150,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				//throw new Exception('Failed to open log file '.basename($logfile));
 				print 'Failed to open log file '.($dolibarr_main_prod ?basename($logfile) : $logfile);
 			}
-		}
-		else
-		{
+		} else {
 			$logLevels = array(
 				LOG_EMERG => 'EMERG',
 				LOG_ALERT => 'ALERT',
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 56ca1825ab4..91a3cdb9b44 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -92,9 +92,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
-		{
+		} else {
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
 
@@ -116,8 +114,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 		if (!empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
-		}
-		else $facility = constant('LOG_USER');
+		} else $facility = constant('LOG_USER');
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 48b1e856aab..91f9a9052b2 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -160,12 +160,10 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
             if ($resql) {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-        }
-        elseif ($mode == 'next')
+        } elseif ($mode == 'next')
         {
             $date = $invoice->date; // This is invoice date (not creation date)
             $yymm = strftime("%y%m", $date);
@@ -175,8 +173,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 
             dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
             return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
-        }
-        else dol_print_error('', 'Bad parameter for getNextValue');
+        } else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
     /**
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 881ba4cb469..b9f9ffe69e8 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -139,8 +139,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -288,9 +287,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -321,9 +318,7 @@ class doc_generic_user_odt extends ModelePDFUser
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -339,8 +334,7 @@ class doc_generic_user_odt extends ModelePDFUser
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
@@ -369,13 +363,11 @@ class doc_generic_user_odt extends ModelePDFUser
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -387,8 +379,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -407,8 +398,7 @@ class doc_generic_user_odt extends ModelePDFUser
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -428,9 +418,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 1b1d6ba1dab..9cf9a00c796 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -142,8 +142,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -291,9 +290,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				    $format = $conf->global->MAIN_DOC_USE_TIMING;
 				    if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -324,9 +321,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
                         // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
                         $contactobject = $object->contact;
                     }
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -377,8 +372,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_WARNING);
 				}
@@ -402,31 +396,26 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				foreach ($tmparray as $key=>$value)
 				{
-					try
-					{
+					try {
 						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -445,17 +434,14 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									if (!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_WARNING);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_WARNING);
 								}
@@ -464,8 +450,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -478,8 +463,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -498,8 +482,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -519,9 +502,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 2686efa6419..eeb39fd5020 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -50,44 +50,37 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product');
 	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     $result = restrictedArea($user, 'projet', $id);
 	if (!$user->rights->projet->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'bom')
+} elseif ($modulepart == 'bom')
 {
 	$result = restrictedArea($user, $modulepart, $id, 'bom_bom');
 	if (!$user->rights->bom->read) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
 	if (!$user->rights->adherent->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (!$user->rights->user->user->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	$result = restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
 	if (!$user->rights->tax->charges->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'bank')
+} elseif ($modulepart == 'bank')
 {
 	$result = restrictedArea($user, 'banque', $id, 'bank_account');
 	if (!$user->rights->banque->lire) accessforbidden();
 	$accessallowed = 1;
-}
-else	// ticket, holiday, expensereport, societe...
+} else // ticket, holiday, expensereport, societe...
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (empty($user->rights->$modulepart->read) && empty($user->rights->$modulepart->lire)) accessforbidden();
@@ -114,8 +107,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 		if ($object->type == Product::TYPE_PRODUCT) $dir = $conf->product->multidir_output[$object->entity];
 		if ($object->type == Product::TYPE_SERVICE) $dir = $conf->service->multidir_output[$object->entity];
 	}
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $object = new Project($db);
@@ -125,8 +117,7 @@ elseif ($modulepart == 'project')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->project->multidir_output[$object->entity]; // By default
     }
-}
-elseif ($modulepart == 'propal')
+} elseif ($modulepart == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$object = new Propal($db);
@@ -136,8 +127,7 @@ elseif ($modulepart == 'propal')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->propal->multidir_output[$object->entity]; // By default
 	}
-}
-elseif ($modulepart == 'holiday')
+} elseif ($modulepart == 'holiday')
 {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$object = new Holiday($db);
@@ -147,8 +137,7 @@ elseif ($modulepart == 'holiday')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	$object = new Adherent($db);
@@ -158,8 +147,7 @@ elseif ($modulepart == 'member')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->adherent->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'societe')
+} elseif ($modulepart == 'societe')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new Societe($db);
@@ -169,8 +157,7 @@ elseif ($modulepart == 'societe')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->$modulepart->dir_output;
     }
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new User($db);
@@ -180,8 +167,7 @@ elseif ($modulepart == 'user')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->$modulepart->dir_output; // By default
     }
-}
-elseif ($modulepart == 'expensereport')
+} elseif ($modulepart == 'expensereport')
 {
     require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $object = new ExpenseReport($db);
@@ -191,8 +177,7 @@ elseif ($modulepart == 'expensereport')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->expensereport->dir_output; // By default
     }
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 	$object = new ChargeSociales($db);
@@ -202,8 +187,7 @@ elseif ($modulepart == 'tax')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'ticket')
+} elseif ($modulepart == 'ticket')
 {
 	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 	$object = new Ticket($db);
@@ -213,8 +197,7 @@ elseif ($modulepart == 'ticket')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'bom')
+} elseif ($modulepart == 'bom')
 {
 	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 	$object = new BOM($db);
@@ -224,8 +207,7 @@ elseif ($modulepart == 'bom')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'mrp')
+} elseif ($modulepart == 'mrp')
 {
 	require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 	$object = new MO($db);
@@ -235,8 +217,7 @@ elseif ($modulepart == 'mrp')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'bank')
+} elseif ($modulepart == 'bank')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 	$object = new Account($db);
@@ -246,8 +227,7 @@ elseif ($modulepart == 'bank')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->bank->dir_output; // By default
 	}
-}
-else {
+} else {
 	print 'Action crop for modulepart = '.$modulepart.' is not supported yet by photos_resize.php.';
 }
 
@@ -268,8 +248,7 @@ if (empty($backtourl))
     elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
     	$num = $regs[1];
     	$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
-    }
-    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+    } elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
     elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
     else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
 }
@@ -285,9 +264,7 @@ if ($cancel)
 	{
 		header("Location: ".$backtourl);
 		exit;
-	}
-	else
-	{
+	} else {
 	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
 	    exit;
 	}
@@ -319,8 +296,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0)   // If not found
 		{
 		    $filename = basename($rel_filename);
 		    $rel_dir = dirname($rel_filename);
@@ -346,15 +322,11 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else
-		{
+		} else {
     	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
@@ -389,8 +361,7 @@ if ($action == 'confirm_crop')
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0)   // If not found
 		{
 		    $filename = basename($rel_filename);
 		    $rel_dir = dirname($rel_filename);
@@ -416,15 +387,11 @@ if ($action == 'confirm_crop')
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else
-		{
+		} else {
     	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index b82536edbd2..b0a61f5bd71 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -147,8 +147,6 @@ if (!empty($_SERVER['HTTP_REFERER']))
 {
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;
-}
-else
-{
+} else {
 	print 'The wrapper search.php was called without any search criteria';
 }
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 119d7ff9a41..e502648b805 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -74,9 +74,7 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 	if (!is_object($form)) $form = new Form($db);
 	$selected = -1;
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else
-{
+} else {
 	$usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
@@ -107,8 +105,7 @@ $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note t
 if (empty($reshook))
 {
 	$searchform .= $hookmanager->resPrint;
-}
-else $searchform = $hookmanager->resPrint;
+} else $searchform = $hookmanager->resPrint;
 
 
 print "\n";
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 80a7cac7de3..eaf2c58eb4b 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -177,8 +177,7 @@ if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_a
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
-}
-elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
+} elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
 {
 	$paramlist = array_keys($param['options']);
 	$param_chain = $paramlist[0];
@@ -217,9 +216,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
         else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
     }
     print '</select>';
-}
-else
-{
+} else {
 	print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 96620da28d9..8b92f4e183c 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -100,8 +100,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 			if (empty($extrafields->attributes[$elementtype]['entityid'][$key]))
 			{
 				print $langs->trans("All");
-			}
-			else {
+			} else {
 				global $multicompanylabel_cache;
 				if (!is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();
 				if (empty($multicompanylabel_cache[$extrafields->attributes[$elementtype]['entityid'][$key]])) {
@@ -117,9 +116,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&attrname='.$key.'">'.img_delete().'</a></td>'."\n";
 		print "</tr>";
 	}
-}
-else
-{
+} else {
 	$colspan = 13;
 	if (!empty($conf->multicompany->enabled))  $colspan++;
 
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index 0e9e63bff12..02a32110779 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -111,9 +111,7 @@ if (!empty($object->comments))
         {
             $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
             print $doleditor->Create(1);
-        }
-        else
-        {
+        } else {
             print $comment->description;
         }
 		print '</div>'; // End comment-description
@@ -124,9 +122,7 @@ if (!empty($object->comments))
             print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
 
             print '</form>';
-        }
-        else
-        {
+        } else {
             if ($fk_user == $user->id || $user->admin == 1)
             {
                 print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 7e2dc1f420e..0e19e5dbb45 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -51,9 +51,7 @@ if ($action == 'presend')
 		if ($object->element == 'invoice_supplier')
 		{
 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-		}
-		else
-		{
+		} else {
 			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		}
 
@@ -103,9 +101,7 @@ if ($action == 'presend')
 			if ($object->element == 'invoice_supplier')
 			{
 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-			}
-			else
-			{
+			} else {
 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			}
 
@@ -146,23 +142,18 @@ if ($action == 'presend')
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
+	} elseif ($object->element == 'societe')
 	{
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
 		}
-	}
-	elseif ($object->element == 'contact')
+	} elseif ($object->element == 'contact')
 	{
 		$liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
+	} elseif ($object->element == 'user' || $object->element == 'member')
 	{
 		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
-	}
-	else
-	{
+	} else {
 		if (is_object($object->thirdparty))
 		{
 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 13d0267817f..a521876a2e7 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -83,8 +83,7 @@ foreach ($object->fields as $key => $val)
 	{
 		if (!empty($keyforbreak) && $key == $keyforbreak) {
 			$alreadyoutput = 0; // key used for break on second column
-		}
-		else {
+		} else {
 			continue;
 		}
 	}
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e9f881accd2..7665c4e2211 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -40,21 +40,27 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; }
-elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
-elseif ($module == 'reception') { $permission = $user->rights->reception->creer; }
-elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
-elseif (!isset($permission) && isset($user->rights->$module->creer))
-{
+if ($module == 'propal') {
+	$permission = $user->rights->propale->creer;
+} elseif ($module == 'fichinter') {
+	$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'order_supplier') {
+	$permission = $user->rights->fournisseur->commande->creer;
+} elseif ($module == 'invoice_supplier') {
+	$permission = $user->rights->fournisseur->facture->creer;
+} elseif ($module == 'project') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'action') {
+	$permission = $user->rights->agenda->myactions->create;
+} elseif ($module == 'shipping') {
+	$permission = $user->rights->expedition->creer;
+} elseif ($module == 'reception') {
+	$permission = $user->rights->reception->creer;
+} elseif ($module == 'project_task') {
+	$permission = $user->rights->projet->creer;
+} elseif (!isset($permission) && isset($user->rights->$module->creer)) {
 	$permission = $user->rights->$module->creer;
-}
-elseif (!isset($permission) && isset($user->rights->$module->write))
-{
+} elseif (!isset($permission) && isset($user->rights->$module->write)) {
 	$permission = $user->rights->$module->write;
 }
 
@@ -177,9 +183,7 @@ foreach (array('internal', 'external') as $source)
 	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc))
 	{
 		$contactlist = $objectsrc->liste_contact(-1, $source);
-	}
-	else
-	{
+	} else {
 		$contactlist = $object->liste_contact(-1, $source);
 	}
 
@@ -198,9 +202,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->nature = $langs->trans("User");
-		}
-		elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$entry->nature = $langs->trans("ThirdPartyContact");
 		}
 
@@ -209,9 +211,7 @@ foreach (array('internal', 'external') as $source)
 			$companystatic->fetch($contact['socid']);
 			$entry->thirdparty_html = $companystatic->getNomUrl(1);
 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));
-		}
-		elseif ($contact['socid'] < 0)
-		{
+		} elseif ($contact['socid'] < 0) {
 			$entry->thirdparty_html = $conf->global->MAIN_INFO_SOCIETE_NOM;
 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);
 		}
@@ -221,9 +221,7 @@ foreach (array('internal', 'external') as $source)
 			$userstatic->fetch($contact['id']);
 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			$entry->contact_name = strtolower($userstatic->getFullName($langs));
-		}
-		elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$contactstatic->fetch($contact['id']);
 			$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
 			$entry->contact_name = strtolower($contactstatic->getFullName($langs));
@@ -232,9 +230,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);
-		}
-		elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);
 		}
 
@@ -321,9 +317,6 @@ print '</div>';
 
 print "</form>";
 
-
-
-
 print "<!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->\n";
 if (is_object($hookmanager)) {
 	$hookmanager->initHooks(array('contacttpl'));
@@ -331,4 +324,3 @@ if (is_object($hookmanager)) {
 	$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
 }
 print "<!-- END PHP TEMPLATE CONTACTS -->\n";
-
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 0d2949b4e24..f80ae568071 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -35,9 +35,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
 					$value = $datenotinstring;
-				}
-				else
-				{
+				} else {
 					$value = $obj->$tmpkey;
 				}
 				// If field is a computed field, we make computation to get value
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index d6ebb8b919f..8d09f6840b3 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -33,14 +33,11 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
                     if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
                     if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
                     print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
-                }
-                elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
+                } elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
                 {
                 	// TODO
                 	// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
-                }
-                else
-                {
+                } else {
                     // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
                     $morecss = '';
                     if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss = 'maxwidth200';
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 03d487ee0c0..42dc67d2b87 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -24,16 +24,14 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
 			$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
-		}
-		elseif (in_array($typ, array('boolean')))
+		} elseif (in_array($typ, array('boolean')))
 		{
 			if ($crit !== '-1' && $crit !== '') {
 				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." = '".$db->escape($crit)."'";
 				if ($crit == '0') $sql .= " OR ".$extrafieldsobjectprefix.$tmpkey." IS NULL";
 				$sql .= ")";
 			}
-		}
-		elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
+		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
 		{
 			$mode_search = 0;
 			if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 9a83cbb42aa..bb231424396 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -26,9 +26,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
 					print '<th class="liste_titre thseparator"></th>';
-				}
-				else
-				{
+				} else {
 					$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
 
 					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'" data-titlekey="'.$key.'"' : 'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', $disablesortlink, $tooltip)."\n";
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 198a3910747..6652f8f8fab 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -86,9 +86,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		if ($action == 'edit_extras')
 		{
 			$value = (isset($_POST["options_".$key]) ? $_POST["options_".$key] : $object->array_options["options_".$key]);
-		}
-		else
-		{
+		} else {
 			$value = $object->array_options["options_".$key];
 			//var_dump($key.' - '.$value);
 		}
@@ -113,9 +111,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print $extrafields->showSeparator($key, $object);
 
 			$lastseparatorkeyfound = $key;
-		}
-		else
-		{
+		} else {
 			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;
 			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
 				print ' trextrafields_collapse_new';
@@ -191,9 +187,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 				print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Modify')).'">';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				//var_dump($key.'-'.$value.'-'.$object->table_element);
 				print $extrafields->showOutputField($key, $value, '', $object->table_element);
 			}
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index b7d083e8626..7ebc718cb25 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -77,9 +77,7 @@ if ($permtoadd)
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
-}
-else
-{
+} else {
     print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
@@ -116,8 +114,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile = new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
-}
-else print '&nbsp;';
+} else print '&nbsp;';
 
 print '</div>';
 // End "Add new file" area
@@ -177,8 +174,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
 	    print '</td></tr>';
-    }
-    else	// Show filtree when ajax is disabled (rare)
+    } else // Show filtree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 33be5fb99d1..2cd485a9510 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -15,14 +15,12 @@ if (isset($totalarray['pos']))
 	{
 		$i++;
 		if (!empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
-		{
+		else {
 			if ($i == 1)
 			{
 				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
 				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-			}
-			else print '<td></td>';
+			} else print '<td></td>';
 		}
 	}
 	print '</tr>';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 97bece99852..a4a8908f374 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -165,8 +165,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -254,8 +253,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 
 	$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 	if (!empty($url)) print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
-	else
-	{
+	else {
 		$langs->load("errors");
 		print '<font class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</font>';
 	}
@@ -330,8 +328,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 			echo $option."\n";
 		}
 	}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 492590c65e4..900d0366d87 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -98,9 +98,7 @@ if ($massaction == 'presend')
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
-		}
-		else
-		{
+		} else {
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
 			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -158,9 +156,7 @@ if ($massaction == 'presend')
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
-	}
-	else
-	{
+	} else {
 		print $formmail->get_form();
 	}
 
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 28eb78fa61b..f387725bece 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -57,17 +57,29 @@ if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 }
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; }
-elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; }
-elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
-elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
-elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
-elseif ($module == 'societe') { $permission = $user->rights->societe->creer; }
-elseif ($module == 'contact') { $permission = $user->rights->societe->creer; }
-elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
-elseif ($module == 'product') { $permission = $user->rights->produit->creer; }
+if ($module == 'propal') {
+	$permission = $user->rights->propale->creer;
+} elseif ($module == 'supplier_proposal') {
+	$permission = $user->rights->supplier_proposal->creer;
+} elseif ($module == 'fichinter') {
+	$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'project') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'project_task') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'invoice_supplier') {
+	$permission = $user->rights->fournisseur->facture->creer;
+} elseif ($module == 'order_supplier') {
+	$permission = $user->rights->fournisseur->commande->creer;
+} elseif ($module == 'societe') {
+	$permission = $user->rights->societe->creer;
+} elseif ($module == 'contact') {
+	$permission = $user->rights->societe->creer;
+} elseif ($module == 'shipping') {
+	$permission = $user->rights->expedition->creer;
+} elseif ($module == 'product') {
+	$permission = $user->rights->produit->creer;
+}
 //else dol_print_error('','Bad value '.$module.' for param module');
 
 if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 8af029ce071..e3e921c20c5 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -42,9 +42,7 @@ if ($fixedDiscount > 0)
 {
 	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
-}
-else
-{
+} else {
 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
 	print $langs->trans($translationKey).'.';
 }
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 0fb1aff011d..06fe9a6ec72 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -60,26 +60,19 @@ if (!empty($extrafields))
 {
 	if ($this->table_element_line == 'commandedet') {
 		$objectline = new OrderLine($this->db);
-	}
-	elseif ($this->table_element_line == 'propaldet') {
+	} elseif ($this->table_element_line == 'propaldet') {
 		$objectline = new PropaleLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'supplier_proposaldet') {
+	} elseif ($this->table_element_line == 'supplier_proposaldet') {
 		$objectline = new SupplierProposalLine($this->db);
-	}
-	elseif ($this->table_element_line == 'facturedet') {
+	} elseif ($this->table_element_line == 'facturedet') {
 		$objectline = new FactureLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'contratdet') {
+	} elseif ($this->table_element_line == 'contratdet') {
 		$objectline = new ContratLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'commande_fournisseurdet') {
+	} elseif ($this->table_element_line == 'commande_fournisseurdet') {
 		$objectline = new CommandeFournisseurLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'facture_fourn_det') {
+	} elseif ($this->table_element_line == 'facture_fourn_det') {
 		$objectline = new SupplierInvoiceLine($this->db);
-	}
-	elseif ($this->table_element_line == 'facturedet_rec') {
+	} elseif ($this->table_element_line == 'facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
 	}
 }
@@ -131,13 +124,11 @@ if ($nolinesbefore) {
 		{
 			if (empty($user->rights->margins->creer)) {
 				$colspan++;
-			}
-			else {
+			} else {
 				print '<td class="margininfos linecolmargin1 right">';
 				if ($conf->global->MARGIN_TYPE == "1")
 					echo $langs->trans('BuyingPrice');
-				else
-					echo $langs->trans('CostPrice');
+				else echo $langs->trans('CostPrice');
 				echo '</td>';
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
 				if (!empty($conf->global->DISPLAY_MARK_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
@@ -186,9 +177,7 @@ if ($nolinesbefore) {
 				echo $langs->trans("FreeLineOfType");
 				echo '</label>';
 				echo ' ';
-			}
-			else
-			{
+			} else {
 				echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 				// Show type selector
 				if ($forceall >= 0)
@@ -213,9 +202,7 @@ if ($nolinesbefore) {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
 				elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
 				else echo $langs->trans('PredefinedProductsAndServicesToSell');
-			}
-			else
-			{
+			} else {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
 				elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 				else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
@@ -231,9 +218,7 @@ if ($nolinesbefore) {
 				{
 					// hide products in closed warehouse, but show products for internal transfer
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-				}
-				else
-				{
+				} else {
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 				}
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
@@ -254,9 +239,7 @@ if ($nolinesbefore) {
 				</script>
 					<?php
 				}
-			}
-			else
-			{
+			} else {
 				// $senderissupplier=2 is the same as 1 but disables test on minimum qty and disable autofill qty with minimum
 				if ($senderissupplier != 2)
 				{
@@ -266,9 +249,7 @@ if ($nolinesbefore) {
 					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for example shown we select a disabled option into combo)
 					);
 					$alsoproductwithnosupplierprice = 0;
-				}
-				else
-				{
+				} else {
 					$ajaxoptions = array(
 					'update' => array('remise_percent' => 'discount')			// html id tags that will be edited with each ajax json response key
 					);
@@ -448,9 +429,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 		print $form->selectDate($date_start, "date_start", $usehm, $usehm, 1, "addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
 		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
-	}
-	else
-	{
+	} else {
 		print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 		print ' '.$langs->trans('to').' ';
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d316afb6966..ba63288b58f 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -231,18 +231,15 @@ $coldisplay++;
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-				else
-					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
-			}
-			elseif (!empty($conf->global->DISPLAY_MARK_RATES))
+			} elseif (!empty($conf->global->DISPLAY_MARK_RATES))
 			{
 				$mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-				else
-					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 8849020b885..1e90b04fba7 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -89,8 +89,7 @@ if (($line->info_bits & 2) == 2) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-		}
-		elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
@@ -98,35 +97,27 @@ if (($line->info_bits & 2) == 2) {
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
 			    print ' ('.dol_print_date($discount->datec).')';
-		}
-		elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-		}
-		elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-		}
-		else
-		{
+		} else {
 			print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
 		}
 	}
-}
-else
-{
+} else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
     if ($line->fk_product > 0)
 	{
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
-	}
-	else
-	{
+	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 		else $text = img_object($langs->trans('Product'), 'product');
@@ -139,8 +130,7 @@ else
 			if (preg_match('/^\(DEPOSIT\)/', $line->description)) {
 				$newdesc = preg_replace('/^\(DEPOSIT\)/', $langs->trans("Deposit"), $line->description);
 				print $text.' '.dol_htmlentitiesbr($newdesc);
-			}
-			else {
+			} else {
 				print $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
@@ -153,8 +143,7 @@ else
 		if ($line->date_start_fill && $line->date_end_fill) print ' - ';
 		if ($line->date_end_fill) print $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
 		if ($line->date_start_fill || $line->date_end_fill) print '</div>';
-	}
-	else {
+	} else {
 		if ($line->date_start || $line->date_end) print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 		//print get_date_range($line->date_start, $line->date_end, $format);
 	}
@@ -177,9 +166,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
 	if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here
 	{
 		print $productfourn->getNomUrl();
-	}
-	else
-	{
+	} else {
 		print $productfourn->ref_supplier;
 	}
 }
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 63ff6a8a0a7..ad62ad43686 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -120,8 +120,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -214,8 +213,7 @@ if (!empty($morelogincontent)) {
 			echo $option."\n";
 		}
 	}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 2680a763a59..50eb0167f36 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -49,9 +49,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '<div class="tagtd center">'.$form->selectyesno('mandatory', $linked_resource['mandatory'] ? 1 : 0, 1).'</div>';
 			print '<div class="tagtd right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			$class = '';
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
 				$class = 'highlight';
@@ -87,8 +85,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '</div>';
 		}
 	}
-}
-else {
+} else {
 	print '<div class="tagtr oddeven">';
 	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
 	print '<div class="tagtd opacitymedium"></div>';
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index fceb1552f0b..4f368f95473 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -106,8 +106,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewUserCreated", $object->login);
             $desc = $langs->transnoentities("NewUserCreated", $object->login);
-		}
-        elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -115,8 +114,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("EventUserModified", $object->login);
             $desc = $langs->transnoentities("EventUserModified", $object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
+        } elseif ($action == 'USER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -124,8 +122,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewUserPassword", $object->login);
             $desc = $langs->transnoentities("NewUserPassword", $object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
+        } elseif ($action == 'USER_ENABLEDISABLE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -140,8 +137,7 @@ class InterfaceLogevents extends DolibarrTriggers
 				$text = $langs->transnoentities("UserDisabled", $object->login);
 				$desc = $langs->transnoentities("UserDisabled", $object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
+        } elseif ($action == 'USER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -158,16 +154,14 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewGroupCreated", $object->name);
             $desc = $langs->transnoentities("NewGroupCreated", $object->name);
-		}
-        elseif ($action == 'USERGROUP_MODIFY')
+		} elseif ($action == 'USERGROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("GroupModified", $object->name);
             $desc = $langs->transnoentities("GroupModified", $object->name);
-		}
-        elseif ($action == 'USERGROUP_DELETE')
+		} elseif ($action == 'USERGROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -202,9 +196,7 @@ class InterfaceLogevents extends DolibarrTriggers
         if ($result > 0)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $error = "Failed to insert security event: ".$event->error;
             $this->errors[] = $error;
             $this->error = $error;
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 49939277f49..2807a3b5a56 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -96,8 +96,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			$object->socid = $object->id;
-        }
-        elseif ($action == 'COMPANY_SENTBYMAIL')
+        } elseif ($action == 'COMPANY_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -106,8 +105,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-        elseif ($action == 'CONTRACT_VALIDATE')
+		} elseif ($action == 'CONTRACT_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "contracts"));
@@ -116,8 +114,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'CONTRACT_SENTBYMAIL')
+		} elseif ($action == 'CONTRACT_SENTBYMAIL')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "contracts"));
@@ -130,8 +127,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_VALIDATE')
+		} elseif ($action == 'PROPAL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -140,8 +136,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-        elseif ($action == 'PROPAL_SENTBYMAIL')
+		} elseif ($action == 'PROPAL_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -154,8 +149,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_SIGNED')
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -164,8 +158,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
+		} elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -174,8 +167,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_REFUSED')
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -184,8 +176,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_VALIDATE')
+		} elseif ($action == 'ORDER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "orders"));
@@ -194,8 +185,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CLOSE')
+		} elseif ($action == 'ORDER_CLOSE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -204,8 +194,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CLASSIFY_BILLED')
+		} elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -214,8 +203,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CANCEL')
+		} elseif ($action == 'ORDER_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -224,8 +212,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SENTBYMAIL')
+		} elseif ($action == 'ORDER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -238,8 +225,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_VALIDATE')
+		} elseif ($action == 'BILL_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -248,8 +234,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_UNVALIDATE')
+		} elseif ($action == 'BILL_UNVALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -258,8 +243,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-        elseif ($action == 'BILL_SENTBYMAIL')
+		} elseif ($action == 'BILL_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -272,8 +256,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_PAYED')
+		} elseif ($action == 'BILL_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -283,8 +266,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_CANCEL')
+		} elseif ($action == 'BILL_CANCEL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -293,8 +275,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'FICHINTER_CREATE')
+		} elseif ($action == 'FICHINTER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -305,8 +286,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_VALIDATE')
+		} elseif ($action == 'FICHINTER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -317,8 +297,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_MODIFY')
+		} elseif ($action == 'FICHINTER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -329,8 +308,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_SENTBYMAIL')
+		} elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -343,8 +321,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-        elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
+        } elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -353,8 +330,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
            	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-        }
-	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+        } elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -363,8 +339,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
            	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-        }
-        elseif ($action == 'FICHINTER_DELETE')
+        } elseif ($action == 'FICHINTER_DELETE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "interventions"));
@@ -375,8 +350,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->sendtoid = 0;
 			$object->fk_element = 0;
 			$object->elementtype = '';
-		}
-        elseif ($action == 'SHIPPING_VALIDATE')
+		} elseif ($action == 'SHIPPING_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "sendings"));
@@ -389,8 +363,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        }
-		elseif ($action == 'SHIPPING_SENTBYMAIL')
+        } elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "sendings"));
@@ -417,8 +390,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        }
-		elseif ($action == 'RECEPTION_SENTBYMAIL')
+        } elseif ($action == 'RECEPTION_SENTBYMAIL')
         {
             $langs->load("agenda");
             $langs->load("other");
@@ -432,8 +404,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -442,8 +413,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -456,8 +426,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -466,8 +435,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
 		{
 			// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "propal"));
@@ -476,8 +444,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_CREATE')
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -486,8 +453,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -496,8 +462,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+		} elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -506,8 +471,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+		} elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -516,8 +480,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
+		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -526,8 +489,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
+		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "orders"));
@@ -536,8 +498,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -550,8 +511,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
+        } elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -563,8 +523,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             }
 
             $object->sendtoid = 0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
+        } elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -573,8 +532,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
             $object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
+		} elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -583,8 +541,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
             $object->sendtoid = 0;
-		}
-        elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills", "orders"));
@@ -597,8 +554,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_PAYED')
+        } elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -607,8 +563,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_CANCELED')
+		} elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "bills"));
@@ -631,8 +586,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-        }
-		elseif ($action == 'MEMBER_MODIFY')
+        } elseif ($action == 'MEMBER_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -643,8 +597,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
             $object->sendtoid = 0;
-		}
-        elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -666,8 +619,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			$object->sendtoid = 0;
 			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
+        } elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
         {
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -689,8 +641,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	$object->sendtoid = 0;
         	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
+        } elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
         {
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -704,8 +655,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
         	$object->sendtoid = 0;
         	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_RESILIATE')
+        } elseif ($action == 'MEMBER_RESILIATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -716,8 +666,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-        }
-        elseif ($action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_DELETE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "members"));
@@ -741,8 +690,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
         	$object->sendtoid = 0;
-        }
-        elseif ($action == 'PROJECT_VALIDATE')
+        } elseif ($action == 'PROJECT_VALIDATE')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -752,8 +700,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
             $object->sendtoid = 0;
-        }
-        elseif ($action == 'PROJECT_MODIFY')
+        } elseif ($action == 'PROJECT_MODIFY')
         {
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -776,8 +723,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TASK_MODIFY')
+		} elseif ($action == 'TASK_MODIFY')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -787,8 +733,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TASK_DELETE')
+		} elseif ($action == 'TASK_DELETE')
 		{
             // Load translation files required by the page
             $langs->loadLangs(array("agenda", "other", "projects"));
@@ -798,8 +743,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TICKET_ASSIGNED')
+		} elseif ($action == 'TICKET_ASSIGNED')
 		{
 		    // Load translation files required by the page
 		    $langs->loadLangs(array("agenda", "other", "projects"));
@@ -811,9 +755,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		        $tmpuser = new User($this->db);
 		        $tmpuser->fetch($object->oldcopy->fk_user_assign);
 		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
-		    }
-		    else
-		    {
+		    } else {
 		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
 		    }
 		    if ($object->fk_user_assign > 0)
@@ -821,15 +763,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		        $tmpuser = new User($this->db);
 		        $tmpuser->fetch($object->fk_user_assign);
 		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
-		    }
-		    else
-		    {
+		    } else {
 		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
 		    }
 		    $object->sendtoid = 0;
 		}
 		// TODO Merge all previous cases into this generic one
-		else	// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+		else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
 		{
 		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
 		    // Note that these key can be set in agenda setup, only if defined into c_action_trigger
@@ -866,9 +806,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         if (is_array($object->sendtoid))
         {
             if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
-        }
-        else
-        {
+        } else {
             if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
         }
         // Set societeforaction.
@@ -951,9 +889,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		{
 			$_SESSION['LAST_ACTION_CREATED'] = $ret;
 			return 1;
-		}
-		else
-		{
+		} else {
             $this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
             $this->errors = $actioncomm->errors;
 
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 2135f463ca7..19eab2e5974 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -93,8 +93,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			}
-			else $amounts = (double) $object->total_ttc;
+			} else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -112,8 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -142,9 +140,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else
-		{
+		} else {
 			return 1;
 		}
     }
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 8b8c392615a..9c3987cbeb1 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -91,8 +91,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -130,8 +129,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_NEW_PASSWORD')
+		} elseif ($action == 'USER_NEW_PASSWORD')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -167,12 +165,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_ENABLEDISABLE')
+		} elseif ($action == 'USER_ENABLEDISABLE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		}
-		elseif ($action == 'USER_DELETE')
+		} elseif ($action == 'USER_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -190,8 +186,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_SETINGROUP')
+		} elseif ($action == 'USER_SETINGROUP')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -228,8 +223,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_REMOVEFROMGROUP')
+		} elseif ($action == 'USER_REMOVEFROMGROUP')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -292,8 +286,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USERGROUP_MODIFY')
+		} elseif ($action == 'USERGROUP_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -329,8 +322,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USERGROUP_DELETE')
+		} elseif ($action == 'USERGROUP_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -369,8 +361,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'CONTACT_MODIFY')
+		} elseif ($action == 'CONTACT_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -406,8 +397,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'CONTACT_DELETE')
+		} elseif ($action == 'CONTACT_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -475,8 +465,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'MEMBER_VALIDATE')
+		} elseif ($action == 'MEMBER_VALIDATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -499,8 +488,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_SUBSCRIPTION')
+		} elseif ($action == 'MEMBER_SUBSCRIPTION')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -527,8 +515,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_MODIFY')
+		} elseif ($action == 'MEMBER_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -626,8 +613,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_NEW_PASSWORD')
+		} elseif ($action == 'MEMBER_NEW_PASSWORD')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -653,8 +639,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_RESILIATE')
+		} elseif ($action == 'MEMBER_RESILIATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -680,8 +665,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_DELETE')
+		} elseif ($action == 'MEMBER_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -764,8 +748,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_MODIFY')
+		} elseif ($action == 'MEMBER_TYPE_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
@@ -807,8 +790,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_DELETE')
+		} elseif ($action == 'MEMBER_TYPE_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index be5465c06f2..59005b2f34d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -71,15 +71,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
     			$this->error = $object->context['linkto']->error;
     			$this->errors = $object->context['linkto']->errors;
     			$return = -1;
-    		}
-			else
-			{
+    		} else {
 				$return = 1;
 			}
 
         	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
+        } elseif ($action == 'CATEGORY_UNLINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -89,9 +86,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
         		$this->error = $object->context['unlinkoff']->error;
         		$this->errors = $object->context['unlinkoff']->errors;
         		$return = -1;
-        	}
-        	else
-        	{
+        	} else {
         		$return = 1;
         	}
 
@@ -109,15 +104,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                 $this->errors = $object->errors;
                 if (!empty($object->error)) $this->errors[] = $object->error;
                 $return = -1;
-            }
-            else
-            {
+            } else {
                 $return = 1;
             }
 
             return $return;
-        }
-        elseif ($action == 'MEMBER_MODIFY')
+        } elseif ($action == 'MEMBER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -132,9 +124,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                         $this->errors = $object->oldcopy->errors;
                         if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
                         $return = -1;
-                    }
-                    else
-                    {
+                    } else {
                         $return = 1;
                     }
                 }
@@ -144,16 +134,13 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                     $this->errors = $object->errors;
                     if (!empty($object->error)) $this->errors[] = $object->error;
                     $return = -1;
-                }
-                else
-                {
+                } else {
                     $return = 1;
                 }
             }
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -164,9 +151,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				$this->errors = $object->errors;
 				if (!empty($object->error)) $this->errors[] = $object->error;
 				$return = -1;
-			}
-			else
-			{
+			} else {
 				$return = 1;
 			}
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 760a2101087..a7157ea866a 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -140,8 +140,7 @@ class InterfaceNotification extends DolibarrTriggers
 
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $ret;
 	}
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 6bd33c5b2f9..3b915dee032 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -170,9 +170,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						}
 
 						$ok = 1;
-					}
-					else
-					{
+					} else {
 						$this->error = $userstat->error;
 						$this->errors = $userstat->errors;
 					}
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index e6c2df36ee1..5c0f17dd90d 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -177,9 +177,7 @@ class InterfaceStripe extends DolibarrTriggers
 										//$taxids = $customer->allTaxIds($customer->id);
 										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
 									}
-								}
-								else
-								{
+								} else {
 									$taxids = $customer->allTaxIds($customer->id);
 									if (is_array($taxids->data))
 									{
@@ -193,8 +191,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 							// Update Customer on Stripe
 							$customer->save();
-						}
-						catch (Exception $e)
+						} catch (Exception $e)
 						{
 						    //var_dump(\Stripe\Stripe::getApiVersion());
 							$this->errors[] = $e->getMessage();
@@ -214,8 +211,7 @@ class InterfaceStripe extends DolibarrTriggers
 			{
 				try {
 					$customer->delete();
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
 				}
@@ -254,8 +250,7 @@ class InterfaceStripe extends DolibarrTriggers
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save();
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 5c618b089a3..00379c36329 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -117,9 +117,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing
 					if (defined('USEDOLIBARRSERVER')) {
 						header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l', 'aZ09'));
 						exit;
-					}
-					else
-					{
+					} else {
 						$newpageref = $obj->pageurl;
 						header("Location: ".$newpageref.'.php?l='.GETPOST('l', 'aZ09'));
 						exit;
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index b9c00885d69..55a205bffd8 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -50,9 +50,7 @@ if (!empty($actionsave))
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -96,9 +94,7 @@ if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
     print '<input type="text" class="flat minwidth200"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
     if (!empty($conf->use_javascript_ajax))
     	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
-}
-else
-{
+} else {
     print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
     print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
 }
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 9ebbcda6c44..461c78efbdb 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -65,16 +65,12 @@ if (!empty($cancel))
     if (!empty($id) && empty($backtourl))
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 	    if ($backtourl)
 	    {
 	        header("Location: ".$backtourl);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		    exit;
 	    }
@@ -90,9 +86,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else
-	{
+	} else {
 		Header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		exit;
 	}
@@ -105,9 +99,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     {
         setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
         $action = '';
-    }
-    else
-    {
+    } else {
         $now = dol_now(); // Date we start
 
     	$result = $object->run_jobs($user->login);
@@ -116,18 +108,14 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     	{
     		setEventMessages($object->error, $object->errors, 'errors');
     		$action = '';
-    	}
-    	else
-    	{
+    	} else {
     		$res = $object->reprogram_jobs($user->login, $now);
     		if ($res > 0)
     		{
     			if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
     			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
     			$action = '';
-    		}
-    		else
-    		{
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$action = '';
     		}
@@ -163,8 +151,7 @@ if ($action == 'add')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'create';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -199,8 +186,7 @@ if ($action == 'update')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -217,8 +203,7 @@ if ($action == 'activate')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -236,8 +221,7 @@ if ($action == 'inactive')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -257,8 +241,7 @@ llxHeader('', $langs->trans("CronTask"));
 if ($action == 'edit' || empty($action) || $action == 'delete' || $action == 'execute')
 {
 	$head = cron_prepare_head($object);
-}
-elseif ($action == 'create')
+} elseif ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("CronTask"), '', 'title_setup');
 }
@@ -415,9 +398,7 @@ if (($action == "create") || ($action == "edit"))
 	    if ($object->frequency == $i)
 	    {
 	        print "<option value='".$i."' selected>".$i."</option>";
-	    }
-	    else
-	    {
+	    } else {
 	        print "<option value='".$i."'>".$i."</option>";
 	    }
 	}
@@ -426,8 +407,7 @@ if (($action == "create") || ($action == "edit"))
 	if ($object->unitfrequency == "60")
 	{
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
@@ -436,8 +416,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if ($object->unitfrequency == "3600") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
@@ -446,8 +425,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if ($object->unitfrequency == "86400") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
@@ -456,8 +434,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if ($object->unitfrequency == "604800") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_semaine\">".$langs->trans('Weeks')."</label>";
@@ -472,9 +449,7 @@ if (($action == "create") || ($action == "edit"))
 	if (!empty($object->datestart))
 	{
         print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
-	}
-	else
-	{
+	} else {
         print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -486,8 +461,7 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if (!empty($object->dateend)) {
         print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
-	}
-	else {
+	} else {
         print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
 	}
 	print "</td>";
@@ -526,9 +500,7 @@ if (($action == "create") || ($action == "edit"))
 	if (!empty($object->datenextrun))
 	{
         print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
-	}
-	else
-	{
+	} else {
         print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -547,9 +519,7 @@ if (($action == "create") || ($action == "edit"))
 	print "</div>";
 
 	print "</form>\n";
-}
-else
-{
+} else {
 	/*
 	 * view card
 	 */
@@ -621,9 +591,7 @@ else
 		if (!$object->entity)
 		{
 			print $langs->trans("AllEntities");
-		}
-		else
-		{
+		} else {
 			$mc->getInfo($object->entity);
 			print $mc->label;
 		}
@@ -681,8 +649,7 @@ else
 	print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
 	if (!$object->status) print $langs->trans("Disabled");
-	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); }
-	else { print $langs->trans('CronNone'); }
+	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); } else { print $langs->trans('CronNone'); }
 	if ($object->status == Cronjob::STATUS_ENABLED)
 	{
 		if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached"));
@@ -737,12 +704,10 @@ else
 	if ((empty($user->rights->cron->execute)))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronExecute").'</a>';
-	}
-	elseif (empty($object->status))
+	} elseif (empty($object->status))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
 	}
 
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 92a132a6789..47347cce82d 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -279,9 +279,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -377,9 +375,7 @@ class Cronjob extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -517,9 +513,7 @@ class Cronjob extends CommonObject
     		$this->db->free($resql);
 
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -654,9 +648,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -696,9 +688,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -752,9 +742,7 @@ class Cronjob extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -848,8 +836,7 @@ class Cronjob extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -894,9 +881,7 @@ class Cronjob extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -951,9 +936,7 @@ class Cronjob extends CommonObject
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			$conf->entity = $savcurrententity;
 			return -1;
-		}
-		else
-		{
+		} else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1056,9 +1039,7 @@ class Cronjob extends CommonObject
 				if (!is_array($params_arr))
 				{
 					$result = call_user_func(array($object, $this->methodename), $this->params);
-				}
-				else
-				{
+				} else {
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
 
@@ -1078,9 +1059,7 @@ class Cronjob extends CommonObject
 					$this->lastresult = is_numeric($result) ? $result : -1;
 		            $retval = $this->lastresult;
 		            $error++;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::run_jobs END");
 				    $this->lastoutput = $object->output;
 					$this->lastresult = var_export($result, true);
@@ -1116,9 +1095,7 @@ class Cronjob extends CommonObject
 			if (!is_array($params_arr))
 			{
 				$result = call_user_func($this->methodename, $this->params);
-			}
-			else
-			{
+			} else {
 				$result = call_user_func_array($this->methodename, $params_arr);
 			}
 
@@ -1131,9 +1108,7 @@ class Cronjob extends CommonObject
 			    $this->lastresult = is_numeric($result) ? $result : -1;
 			    $retval = $this->lastresult;
 			    $error++;
-			}
-			else
-			{
+			} else {
                 $this->lastoutput = var_export($result, true);
                 $this->lastresult = var_export($result, true); // Return code
                 $retval = $this->lastresult;
@@ -1201,9 +1176,7 @@ class Cronjob extends CommonObject
 			$this->error = "User Error : ".$user->error;
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
-		}
-		else
-		{
+		} else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1229,9 +1202,7 @@ class Cronjob extends CommonObject
 
 		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
 		    }
-		}
-		else
-		{
+		} else {
 			//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
 		    dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
 		}
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index e9afad3b48b..45c938da7bf 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -132,9 +132,7 @@ if (empty($reshook))
 	    {
 	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 	        $action = '';
-	    }
-	    else
-	    {
+	    } else {
 	        $object = new Cronjob($db);
 	    	$job = $object->fetch($id);
 
@@ -155,9 +153,7 @@ if (empty($reshook))
 	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
 	    		}
 	    		$action = '';
-	    	}
-	    	else
-	    	{
+	    	} else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    		$action = '';
 	    	}
@@ -196,9 +192,7 @@ if (empty($reshook))
 				elseif ($massaction == 'enable') $result = $tmpcron->setStatut(Cronjob::STATUS_ENABLED);
 				//else dol_print_error($db, 'Bad value for massaction');
 				if ($result < 0) setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -444,9 +438,7 @@ if ($num > 0)
 			$object->ref = $langs->trans($obj->label);
 			print $object->getNomUrl(0, '', 1);
 			$object->ref = $obj->rowid;
-		}
-		else
-		{
+		} else {
 			//print $langs->trans('CronNone');
 		}
 		print '</td>';
@@ -466,8 +458,7 @@ if ($num > 0)
 			$texttoshow .= $langs->trans('CronMethod').': '.$obj->methodename;
 			$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
 			$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
-		}
-		elseif ($obj->jobtype == 'command')
+		} elseif ($obj->jobtype == 'command')
 		{
 			$text = $langs->trans('CronCommand');
 			$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($obj->command);
@@ -586,9 +577,7 @@ if ($num > 0)
 
 		$i++;
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }
 
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 8e3cfe10874..280f900f307 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -505,9 +505,7 @@ class DataPolicyCron
 	                                	$error++;
 	                                }
 	                            }
-                            }
-                            else
-                            {
+                            } else {
                             	$errormsg = $object->error;
                             	$error++;
                             }
@@ -538,9 +536,7 @@ class DataPolicyCron
         if (!$error)
         {
         	$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
-        }
-        else
-        {
+        } else {
         	$this->error = $errormsg;
         }
 
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 60912b86a8a..195f8e800a7 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -88,9 +88,7 @@ class CdavLib
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
-		}
-		else
-		{
+		} else {
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
@@ -105,9 +103,7 @@ class CdavLib
 			if ($ouri === false)
 			{
 				$sql .= ' AND a.id = '.intval($oid);
-			}
-			else
-			{
+			} else {
 				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
 		}
@@ -161,8 +157,7 @@ class CdavLib
 
 		if ($obj->percent == -1 && trim($obj->datep) != '')
 			$type = 'VEVENT';
-		else
-			$type = 'VTODO';
+		else $type = 'VTODO';
 
 		$timezone = date_default_timezone_get();
 
@@ -176,8 +171,7 @@ class CdavLib
 		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		if ($obj->sourceuid == '')
 			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.constant('CDAV_URI_KEY')."\n";
-		else
-			$caldata .= "UID:".$obj->sourceuid."\n";
+		else $caldata .= "UID:".$obj->sourceuid."\n";
 		$caldata .= "SUMMARY:".$obj->label."\n";
 		$caldata .= "LOCATION:".$location."\n";
 		$caldata .= "PRIORITY:".$obj->priority."\n";
@@ -188,30 +182,23 @@ class CdavLib
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-				else
-					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
-			}
-			elseif (trim($obj->datep2) != '')
+				else $caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
+			} elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-		}
-		else
-		{
+		} else {
 			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			if ($type == 'VEVENT')
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else
-					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			}
-			elseif (trim($obj->datep2) != '')
+				else $caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			} elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
 		$caldata .= "CLASS:PUBLIC\n";
 		if ($obj->transparency == 1)
 			$caldata .= "TRANSP:TRANSPARENT\n";
-		else
-			$caldata .= "TRANSP:OPAQUE\n";
+		else $caldata .= "TRANSP:OPAQUE\n";
 
 		if ($type == 'VEVENT')
 			$caldata .= "STATUS:CONFIRMED\n";
@@ -219,8 +206,7 @@ class CdavLib
 			$caldata .= "STATUS:NEEDS-ACTION\n";
 		elseif ($obj->percent == 100)
 			$caldata .= "STATUS:COMPLETED\n";
-		else
-		{
+		else {
 			$caldata .= "STATUS:IN-PROCESS\n";
 			$caldata .= "PERCENT-COMPLETE:".$obj->percent."\n";
 		}
@@ -284,9 +270,7 @@ class CdavLib
 						'size' => strlen($calendardata),
 						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
-				}
-				else
-				{
+				} else {
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present
 						'uri' => $obj->id.'-ev-'.constant('CDAV_URI_KEY'),
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index b306ec7161a..bb4835c4d52 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -26,8 +26,7 @@ if (!defined('CDAV_CONTACT_TAG'))
 {
 	if (isset($conf->global->CDAV_CONTACT_TAG))
 		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-	else
-		define('CDAV_CONTACT_TAG', '');
+	else define('CDAV_CONTACT_TAG', '');
 }
 
 // define CDAV_URI_KEY if not
@@ -35,8 +34,7 @@ if (!defined('CDAV_URI_KEY'))
 {
 	if (isset($conf->global->CDAV_URI_KEY))
 		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-	else
-		define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+	else define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
 }
 
 
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index fd9f993e1e8..1ff336a16b8 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -77,9 +77,7 @@ class DolLogsCollector extends MessagesCollector
 		if ($uselogfile)
 		{
     		$this->getStorageLogs($this->path);
-		}
-		else
-		{
+		} else {
     	    $log_levels = $this->getLevels();
 
     	    foreach ($conf->logbuffer as $line) {
diff --git a/htdocs/document.php b/htdocs/document.php
index c1ed149649e..3afa7d252cf 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -133,20 +133,14 @@ if (!empty($hashp))
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else
-			{
+			} else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
-		}
-		else
-		{
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -184,9 +178,7 @@ if (!empty($hashp))
 {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-}
-else
-{
+} else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index e8e7fa4f5b9..5c0d8fc8576 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -70,15 +70,11 @@ if ($action == 'specimen')
         {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
             return;
-        }
-        else
-        {
+        } else {
             setEventMessages($obj->error, $obj->errors, 'errors');
             dol_syslog($obj->error, LOG_ERR);
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -106,9 +102,7 @@ elseif ($action == 'setdoc')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -129,9 +123,7 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -147,9 +139,7 @@ if ($action == 'set_DONATION_MESSAGE')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -164,9 +154,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -178,9 +166,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -222,9 +208,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -275,16 +259,12 @@ if (is_resource($handle))
 						print "<td class=\"center\">\n";
 						print img_picto($langs->trans("Enabled"), 'switch_on');
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print "<td class=\"center\">\n";
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 						print '</td>';
 					}
-				}
-				else
-				{
+				} else {
 					print "<td class=\"center\">\n";
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 					print "</td>";
@@ -296,9 +276,7 @@ if (is_resource($handle))
 					print "<td class=\"center\">";
 					print img_picto($langs->trans("Default"), 'on');
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					print "<td class=\"center\">";
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 					print '</td>';
@@ -370,9 +348,7 @@ print '<td class="center">';
 if (!empty($conf->accounting->enabled))
 {
 	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
-}
-else
-{
+} else {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
 }
 print '</td><td class="center">';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 505d2fbed29..90498568d6e 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -180,9 +180,7 @@ if ($action == 'add')
 		{
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -195,9 +193,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
     {
         header("Location: index.php");
         exit;
-    }
-    else
-    {
+    } else {
         dol_syslog($object->error, LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -211,8 +207,7 @@ if ($action == 'valid_promesse')
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -223,8 +218,7 @@ if ($action == 'set_cancel')
     {
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -235,12 +229,10 @@ if ($action == 'set_paid')
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-elseif ($action == 'classin' && $user->rights->don->creer)
+} elseif ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
 	$object->setProject($projectid);
@@ -354,9 +346,7 @@ if ($action == 'create')
 			}
 			print ')';
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
@@ -519,9 +509,7 @@ if (!empty($id) && $action == 'edit')
 	if ($object->statut == 0)
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.price($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 		print '</td></tr>';
@@ -776,9 +764,7 @@ if (!empty($id) && $action != 'edit')
 		}
 		print "</table>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -814,9 +800,7 @@ if (!empty($id) && $action != 'edit')
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
@@ -833,14 +817,10 @@ if (!empty($id) && $action != 'edit')
 		if ($object->statut == -1 || $object->statut == 0)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
 
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 872e2009b9b..5d35b24707f 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -157,8 +157,7 @@ class Donations extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve donation list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -230,9 +229,7 @@ class Donations extends DolibarrApi
         if ($this->don->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
         	throw new RestException(500, $this->don->error);
         }
     }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 59c293e6386..6b6cbb3d36e 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -314,9 +314,7 @@ class Don extends CommonObject
             {
             	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
                 $err++;
-            }
-            else
-            {
+            } else {
                 if ($this->amount < $minimum && $minimum > 0)
                 {
                 	$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
@@ -329,9 +327,7 @@ class Don extends CommonObject
         {
             $this->errors = $error_string;
             return 0;
-        }
-        else
-		{
+        } else {
             return 1;
         }
     }
@@ -422,9 +418,7 @@ class Don extends CommonObject
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $error++;
@@ -452,9 +446,7 @@ class Don extends CommonObject
         {
             $this->db->commit();
             return $ret;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -533,15 +525,11 @@ class Don extends CommonObject
             {
                 $this->db->commit();
                 $result = 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 $result = -1;
             }
-        }
-        else
-		{
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
             $this->db->rollback();
@@ -612,9 +600,7 @@ class Don extends CommonObject
     	{
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
         	foreach ($this->errors as $errmsg)
         	{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -652,8 +638,7 @@ class Don extends CommonObject
         if (!empty($id))
         {
         	$sql .= " AND d.rowid=".$id;
-        }
-        elseif (!empty($ref))
+        } elseif (!empty($ref))
         {
         	$sql .= " AND d.ref='".$this->db->escape($ref)."'";
         }
@@ -708,9 +693,7 @@ class Don extends CommonObject
                 $this->fetch_optionals();
             }
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -761,9 +744,7 @@ class Don extends CommonObject
             		// End call triggers
             	}
             }
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
         }
@@ -772,9 +753,7 @@ class Don extends CommonObject
         {
         	$this->db->commit();
         	return 1;
-        }
-        else
-        {
+        } else {
         	$this->db->rollback();
         	return -1;
         }
@@ -804,14 +783,10 @@ class Don extends CommonObject
             if ($this->db->affected_rows($resql))
             {
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -835,14 +810,10 @@ class Don extends CommonObject
             if ($this->db->affected_rows($resql))
             {
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -904,9 +875,7 @@ class Don extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -990,9 +959,7 @@ class Don extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1088,17 +1055,13 @@ class Don extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				dol_delete_preview($object);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$outputlangs->charset_output = $sav_charset_output;
 				dol_syslog("Erreur dans don_create");
 				dol_print_error($this->db, $obj->error);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			return 0;
 		}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 64644d18971..e9a38c50bef 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -167,9 +167,7 @@ class PaymentDonation extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
 				$this->ref = $this->id;
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -188,9 +186,7 @@ class PaymentDonation extends CommonObject
             $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -258,9 +254,7 @@ class PaymentDonation extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -341,9 +335,7 @@ class PaymentDonation extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -411,9 +403,7 @@ class PaymentDonation extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -466,9 +456,7 @@ class PaymentDonation extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -592,9 +580,7 @@ class PaymentDonation extends CommonObject
                         dol_print_error($this->db);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -603,9 +589,7 @@ class PaymentDonation extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -628,9 +612,7 @@ class PaymentDonation extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index f2994b95577..0d56ff5bd63 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -186,9 +186,7 @@ if ($object->id)
     $permtoedit = $user->rights->don->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index d8df1f910fc..030d61d03de 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -246,8 +246,7 @@ if ($resql)
         }
     }
     print "</table><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 65ec24b1458..cc12daabb6c 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -269,8 +269,7 @@ if ($resql)
 				$projectstatic->public = $objp->public;
 				$projectstatic->title = $objp->title;
 				print $projectstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print "</td>\n";
 		}
 		print '<td class="right">'.price($objp->amount).'</td>';
@@ -283,9 +282,7 @@ if ($resql)
     print '</div>';
     print "</form>\n";
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index e1784dc4b8b..6d1285b5f17 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -63,9 +63,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/don/index.php");
         exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -101,9 +99,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree
 
 		header('Location: card.php?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -253,9 +249,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -289,9 +283,7 @@ if (empty($action))
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index b3ab7e2d360..50c469a5f1a 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -137,9 +137,7 @@ if ($action == 'add_payment')
                 $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -260,9 +258,7 @@ if ($action == 'create')
 		{
 			$namef = "amount_".$objp->id;
 			print '<input type="text" size="8" name="'.$namef.'">';
-		}
-		else
-		{
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 46b0d93d564..bda437fa6b5 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -75,9 +75,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
@@ -285,8 +283,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 9f4820cd723..5ba61c53a8d 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -114,15 +114,11 @@ if (isset($action) && !empty($action))
 						//print "Yes with id ".$parentdirisindatabase."<br>\n";
 						$fk_parent = $parentdirisindatabase;
 						//break;  // We found parent, we can stop the while loop
-					}
-					else
-					{
+					} else {
 						dol_syslog("No");
 						//print "No<br>\n";
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog("Parent is root");
 					$fk_parent = 0; // Parent is root
 				}
@@ -148,13 +144,10 @@ if (isset($action) && !empty($action))
 						$sqltree[] = $newdirsql; // We complete fulltree for following loops
 						//var_dump($sqltree);
 						$adirwascreated = 1;
-					}
-					else
-					{
+					} else {
 						dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
 					}
-				}
-				else {
+				} else {
 					$txt = "Parent of ".$dirdesc['fullname']." not found";
 					dol_syslog($txt);
 					//print $txt."<br>\n";
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 3bddd70bfaa..9c09ee0f534 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -164,9 +164,7 @@ class EcmDirectory // extends CommonObject
 			$this->error = "ErrorDirAlreadyExists";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->db->begin();
 
 			// Insert request
@@ -207,15 +205,11 @@ class EcmDirectory // extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -273,9 +267,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -302,9 +294,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
-		}
-		else
-		{
+		} else {
 		    if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
 		    elseif ($value == '+') $this->cachenbofdoc++;
 		    elseif ($value == '-') $this->cachenbofdoc--;
@@ -358,9 +348,7 @@ class EcmDirectory // extends CommonObject
 			$this->db->free($resql);
 
 			return $obj ? 1 : 0;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -398,9 +386,7 @@ class EcmDirectory // extends CommonObject
 			$this->db->rollback();
 			$this->error = "Error ".$this->db->lasterror();
 			return -2;
-		}
-		else
-		{
+		} else {
             // Call trigger
             $result = $this->call_trigger('MYECMDIR_DELETE', $user);
             if ($result < 0)
@@ -417,9 +403,7 @@ class EcmDirectory // extends CommonObject
 			if ($deletedirrecursive)
 			{
 				$result = @dol_delete_dir_recursive($file, 0, 0);
-			}
-			else
-			{
+			} else {
 				$result = @dol_delete_dir($file, 0);
 			}
 		}
@@ -427,9 +411,7 @@ class EcmDirectory // extends CommonObject
 		if ($result || !@is_dir(dol_osencode($file)))
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorFailToDeleteDir';
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -529,8 +511,7 @@ class EcmDirectory // extends CommonObject
 				$idtosearch = $this->cats[$cursorindex]['id_mere'];
 				$i++;
 			}
-		}
-		while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
+		} while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
 
 		return $ret;
 	}
@@ -564,9 +545,7 @@ class EcmDirectory // extends CommonObject
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -672,18 +651,14 @@ class EcmDirectory // extends CommonObject
 						$newelempos = count($this->cats[$obj->rowid]['id_children']);
 						//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements<br>";
 						$this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille;
-					}
-					else
-					{
+					} else {
 						//print "this->cats[".$obj->rowid."]['id_children'] n'est pas encore un tableau<br>";
 						$this->cats[$obj->rowid]['id_children'] = array($obj->rowid_fille);
 					}
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -722,9 +697,7 @@ class EcmDirectory // extends CommonObject
             $this->cats[$id_categ]['fullrelativename'] .= '/'.$this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fulllabel'];
 			$this->cats[$id_categ]['fulllabel'] .= ' >> '.$this->cats[$id_categ]['label'];
-		}
-		else
-		{
+		} else {
 			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
             $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
@@ -767,9 +740,7 @@ class EcmDirectory // extends CommonObject
 		if (empty($all))  // By default
 		{
 			$sql .= " WHERE rowid = ".$this->id;
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 		}
 
@@ -779,9 +750,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->cachenbofdoc = count($filelist);
 			return $this->cachenbofdoc;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -812,9 +781,7 @@ class EcmDirectory // extends CommonObject
             if (!empty($this->errors))
             {
                 $this->errors = array_merge($this->errors, $interface->errors);
-            }
-            else
-            {
+            } else {
                 $this->errors = $interface->errors;
             }
         }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 6921b8aabd6..8006b864d87 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -182,8 +182,7 @@ class EcmFiles extends CommonObject
 		if (!empty($this->ref))
 		{
 			$ref = $this->ref;
-		}
-		else {
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 			$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
 		}
@@ -199,16 +198,12 @@ class EcmFiles extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$maxposition = (int) $obj->maxposition;
-			}
-			else
-			{
+			} else {
 				$this->errors[] = 'Error '.$this->db->lasterror();
 				return --$error;
 			}
 			$maxposition = $maxposition + 1;
-		}
-		else
-		{
+		} else {
 			$maxposition = $this->position;
 		}
 
@@ -353,26 +348,21 @@ class EcmFiles extends CommonObject
 		if ($relativepath) {
 			$sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."' AND t.filename = '".$this->db->escape(basename($relativepath))."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($ref)) {		// hash of file path
+		} elseif (!empty($ref)) {		// hash of file path
 			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($hashoffile)) {	// hash of content
+		} elseif (!empty($hashoffile)) {	// hash of content
 			$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($hashforshare)) {
+		} elseif (!empty($hashforshare)) {
 			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
 			//$sql .= " AND t.entity = ".$conf->entity;							// hashforshare already unique
-		}
-		elseif ($src_object_type && $src_object_id)
+		} elseif ($src_object_type && $src_object_id)
 		{
 			// Warning: May return several record, and only first one is returned !
 			$sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
 			$sql .= " AND t.entity = ".$conf->entity;
-		}
-		else {
+		} else {
 			$sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique
 		}
 
@@ -789,8 +779,7 @@ class EcmFiles extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index de9f289eb79..5c84cade8e4 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -69,8 +69,7 @@ class FormEcm
 		{
 			$cat = new EcmDirectory($this->db);
 			$cate_arbo = $cat->get_full_arbo();
-		}
-		elseif ($module == 'medias')
+		} elseif ($module == 'medias')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			$path = $conf->medias->multidir_output[$conf->entity];
@@ -81,8 +80,7 @@ class FormEcm
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
@@ -90,9 +88,7 @@ class FormEcm
 					if ($selected && $valueforoption == $selected)
 					{
 						$add = 'selected ';
-					}
-					else
-					{
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.dol_escape_htmltag($valueforoption).'">'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).'</option>';
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index a826c6382ce..e17892097af 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -56,8 +56,7 @@ if (empty($urlsection)) $urlsection = 'misc';
 if ($module == 'ecm')
 {
 	$upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
-}
-else	// For example $module == 'medias'
+} else // For example $module == 'medias'
 {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
@@ -115,9 +114,7 @@ if ($action == 'add' && $permtoadd)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module ? '&module='.$module : ''));
 			exit;
 		}
@@ -155,8 +152,7 @@ if ($action == 'add' && $permtoadd)
 				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 				$action = 'create';
 			}
-		}
-		else	// For example $module == 'medias'
+		} else // For example $module == 'medias'
 		{
 			$dirfornewdir = '';
 			if ($module == 'medias')
@@ -177,9 +173,7 @@ if ($action == 'add' && $permtoadd)
 				{
 					setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
 					$error++;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("ECMSectionWasCreated", $label), null, 'mesgs');
 				}
 			}
@@ -192,9 +186,7 @@ if ($action == 'add' && $permtoadd)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager');
 			exit;
 		}
@@ -301,9 +293,7 @@ if (empty($action) || $action == 'delete_section')
 	if ($user->rights->ecm->setup)
 	{
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_section">'.$langs->trans('Delete').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 9b3da9d8aae..27d08e9119f 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -74,8 +74,7 @@ if ($module == 'ecm')
 
 	$relativepath = $ecmdir->getRelativePath();
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-}
-else	// For example $module == 'medias'
+} else // For example $module == 'medias'
 {
 	$relativepath = $section;
 	$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
@@ -110,9 +109,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
-		}
-		else
-		{
+		} else {
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -120,15 +117,12 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
 				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else	// Known error
+			} else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Failed transfer (exceeding the limit file?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -167,20 +161,15 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 			$langs->load('errors');
 			setEventMessages($langs->trans($ecmdir->error, $ecmdir->label), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		if ($deletedirrecursive)
 		{
 			$resbool = dol_delete_dir_recursive($upload_dir, 0, 1);
-		}
-		else
-		{
+		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
 		if ($resbool) $result = 1;
-		else
-		{
+		else {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
 			$result = 0;
@@ -203,9 +192,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$oldlabel = $ecmdir->label;
 		$olddir = $ecmdir->getRelativePath(0);
 		$olddir = $conf->ecm->dir_output.'/'.$olddir;
-	}
-	else
-	{
+	} else {
 		$olddir = GETPOST('section', 'alpha');
 		$olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
 	}
@@ -242,20 +229,14 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 				// Set new value after renaming
 				$relativepath = $ecmdir->getRelativePath();
 				$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
 		$result = @rename($olddir, $newdir);
@@ -334,15 +315,12 @@ if ($module == 'ecm')
 		if ($i == 0 && $action == 'edit')
 		{
 			$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-		}
-		else $s = $tmpecmdir->getNomUrl(1).$s;
+		} else $s = $tmpecmdir->getNomUrl(1).$s;
 		if ($tmpecmdir->fk_parent)
 		{
 			$s = ' -> '.$s;
 			$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-		}
-		else
-		{
+		} else {
 			$tmpecmdir = 0;
 		}
 		$i++;
@@ -365,8 +343,7 @@ if ($module == 'medias')
 				$s .= '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$subdir.'">';
 				$s .= '<input type="hidden" name="oldrelparentdir" value="'.dirname($section).'">';
 				$s .= '<input type="hidden" name="oldreldir" value="'.basename($section).'">';
-			}
-			else $s .= $subdir;
+			} else $s .= $subdir;
 		}
 		if ($i < (count($subdirs) - 1))
 		{
@@ -397,8 +374,7 @@ if ($module == 'ecm')
 		print '<textarea class="flat quatrevingtpercent" name="description">';
 		print $ecmdir->description;
 		print '</textarea>';
-	}
-	else print dol_nl2br($ecmdir->description);
+	} else print dol_nl2br($ecmdir->description);
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';
@@ -411,9 +387,7 @@ print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>'
 if ($module == 'ecm')
 {
 	print dol_print_date($ecmdir->date_c, 'dayhour');
-}
-else
-{
+} else {
 	//var_dump($upload_dir);
 	print dol_print_date(dol_filemtime($upload_dir), 'dayhour');
 }
@@ -422,9 +396,7 @@ print '<tr><td>'.$langs->trans("ECMDirectoryForFiles").'</td><td>';
 if ($module == 'ecm')
 {
 	print '/ecm/'.$relativepath;
-}
-else
-{
+} else {
 	print '/'.$module.'/'.$relativepath;
 }
 print '</td></tr>';
@@ -477,9 +449,7 @@ if ($action != 'edit' && $action != 'delete')
 	if ($permtoadd)
 	{
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
 
@@ -488,9 +458,7 @@ if ($action != 'edit' && $action != 'delete')
 	if ($permtoadd)
 	{
 		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir'.($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	/*}
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 1c94fd1700b..9a4c86aba02 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -113,9 +113,7 @@ if ($cancel)
     {
         header("Location: ".$backtopage);
         exit;
-    }
-    else
-    {
+    } else {
     	header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
         exit;
     }
@@ -170,9 +168,7 @@ if ($action == 'update')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$object->share = getRandomPassword(true);
-		}
-		else
-		{
+		} else {
 			$object->share = '';
 		}
 
@@ -184,9 +180,7 @@ if ($action == 'update')
 			{
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
-		}
-		else
-		{
+		} else {
 			// Call create to insert record
 			$object->entity = $conf->entity;
 			$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
@@ -211,9 +205,7 @@ if ($action == 'update')
         $urlfile = $newlabel;
         header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
         exit;
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 }
@@ -257,9 +249,7 @@ while ($tmpecmdir && $result > 0)
 	{
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-	}
-	else
-	{
+	} else {
 		$tmpecmdir = 0;
 	}
 	$i++;
@@ -298,9 +288,7 @@ $object->fetch(0, '', $filepathtodocument);
 if (!empty($object->label))
 {
 	print $object->label;
-}
-else
-{
+} else {
 	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
 }
 print '</td></tr>';
@@ -348,20 +336,14 @@ if (!empty($object->share))
 		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 		else print $fulllink;
 		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
-	}
-	else
-	{
+	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
-}
-else
-{
+} else {
 	if ($action != 'edit')
 	{
 		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
-	}
-	else
-	{
+	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 }
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 43b9ca6dcce..adb1df99ab5 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -101,8 +101,7 @@ if (GETPOST("sendit", 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			$error++;
 			if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 				setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 			}
 		}
@@ -135,9 +134,7 @@ if ($action == 'confirm_deletefile')
 		{
 			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile', 'alpha')), null, 'mesgs');
 			$result = $ecmdir->changeNbOfFiles('-');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile', 'alpha')), null, 'errors');
 		}
 
@@ -158,9 +155,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -246,15 +241,11 @@ if ($action == 'refreshmanual')
                     //print "Yes with id ".$parentdirisindatabase."<br>\n";
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
-                }
-                else
-				{
+                } else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -280,13 +271,10 @@ if ($action == 'refreshmanual')
                     $sqltree[] = $newdirsql; // We complete fulltree for following loops
                     //var_dump($sqltree);
                     $adirwascreated = 1;
-                }
-                else
-                {
+                } else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 $txt = "Parent of ".$dirdesc['fullname']." not found";
                 dol_syslog($txt);
                 //print $txt."<br>\n";
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 39bdc9a1612..c9a8e1dc551 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -102,9 +102,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -127,8 +125,7 @@ if ($action == 'confirm_deletefile')
 	    		exit;
 	    	}
 	    	$relativepath = $ecmdir->getRelativePath();
-    	}
-    	else $relativepath = '';
+    	} else $relativepath = '';
     	$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
     	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
@@ -221,15 +218,11 @@ if ($action == 'refreshmanual')
                     //print "Yes with id ".$parentdirisindatabase."<br>\n";
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
-                }
-                else
-				{
+                } else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -255,13 +248,10 @@ if ($action == 'refreshmanual')
                     $sqltree[] = $newdirsql; // We complete fulltree for following loops
                     //var_dump($sqltree);
                     $adirwascreated = 1;
-                }
-                else
-                {
+                } else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 $txt = "Parent of ".$dirdesc['fullname']." not found";
                 dol_syslog($txt);
                 //print $txt."<br>\n";
@@ -418,9 +408,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
    			    print '</a>';
-			}
-			else
-			{
+			} else {
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
 			    print '</a>';
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index bf1a4e26de7..55bd07d7789 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -478,8 +478,7 @@ class EmailCollector extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -585,9 +584,7 @@ class EmailCollector extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -629,8 +626,7 @@ class EmailCollector extends CommonObject
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else dol_print_error($this->db);
+        } else dol_print_error($this->db);
 
         return 1;
     }
@@ -661,8 +657,7 @@ class EmailCollector extends CommonObject
                 $i++;
             }
             $this->db->free($resql);
-        }
-        else dol_print_error($this->db);
+        } else dol_print_error($this->db);
     }
 
 
@@ -713,8 +708,7 @@ class EmailCollector extends CommonObject
 	    		$this->error = "error: is not possible to encode this string '".$str."'";
 	     		return false;
 	    	}
-    	}
-    	else {
+    	} else {
     		return $str;
     	}
     }
@@ -772,9 +766,7 @@ class EmailCollector extends CommonObject
             {
                 $tmpclass = $tmparray[0];
                 $tmpproperty = $tmparray[1];
-            }
-            else
-            {
+            } else {
                 $tmpproperty = $tmparray[0];
             }
             if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
@@ -792,8 +784,7 @@ class EmailCollector extends CommonObject
                     $sourcefield = $regforregex[1];
                     $regexstring = $regforregex[2];
                     //$transofrmationstring=$regforregex[3];
-                }
-                elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
+                } elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
                 {
                     $sourcefield = $regforregex[1];
                     $regexstring = $regforregex[2];
@@ -817,22 +808,17 @@ class EmailCollector extends CommonObject
                             //var_dump($regforval[count($regforval)-1]);exit;
                             // Overwrite param $tmpproperty
                             $object->$tmpproperty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
-                        }
-                        else
-                        {
+                        } else {
                             // Regex not found
                             $object->$tmpproperty = null;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         // Nothing can be done for this param
                         $errorforthisaction++;
                         $this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
                         $this->errors[] = $this->error;
                     }
-                }
-                elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
+                } elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
                 {
                     $valuecurrent = '';
                     if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
@@ -862,9 +848,7 @@ class EmailCollector extends CommonObject
                         if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
                         else $object->$tmpproperty = $valuetouse;
                     }
-                }
-                else
-                {
+                } else {
                     $errorforthisaction++;
                     $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
                     $this->errors[] = $this->error;
@@ -1143,8 +1127,7 @@ class EmailCollector extends CommonObject
                 // Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
                 if (function_exists('iconv_mime_decode')) {
                 	$overview[0]->subject = iconv_mime_decode($overview[0]->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
-                }
-                elseif (function_exists('imap_mime_header_decode')) {
+                } elseif (function_exists('imap_mime_header_decode')) {
                 	$elements = imap_mime_header_decode($overview[0]->subject);
                 	$newstring = '';
                 	if (!empty($elements)) {
@@ -1154,8 +1137,7 @@ class EmailCollector extends CommonObject
 	                	}
 	                	$overview[0]->subject = $newstring;
                 	}
-                }
-                elseif (function_exists('mb_decode_mimeheader')) {
+                } elseif (function_exists('mb_decode_mimeheader')) {
                 	$overview[0]->subject = mb_decode_mimeheader($overview[0]->subject);
                 }
                 // Removed emojis
@@ -1238,9 +1220,7 @@ class EmailCollector extends CommonObject
                 {
                     $from = $reg[2];
                     $fromtext = $reg[1];
-                }
-                else
-                {
+                } else {
                     $from = $fromstring;
                     $fromtext = '';
                 }
@@ -1313,8 +1293,7 @@ class EmailCollector extends CommonObject
                     {
                         $result = $projectstatic->fetch($projectid);
                         if ($result <= 0) $projectstatic->id = 0;
-                        else
-                        {
+                        else {
                             $projectid = $projectstatic->id;
                             $projectfoundby = 'trackid ('.$trackid.')';
                             if (empty($contactid)) $contactid = $projectstatic->fk_contact;
@@ -1326,8 +1305,7 @@ class EmailCollector extends CommonObject
                     {
                         $result = $contactstatic->fetch($contactid);
                         if ($result <= 0) $contactstatic->id = 0;
-                        else
-                        {
+                        else {
                             $contactid = $contactstatic->id;
                             $contactfoundby = 'trackid ('.$trackid.')';
                             if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
@@ -1338,8 +1316,7 @@ class EmailCollector extends CommonObject
                     {
                         $result = $thirdpartystatic->fetch($thirdpartyid);
                         if ($result <= 0) $thirdpartystatic->id = 0;
-                        else
-                        {
+                        else {
                             $thirdpartyid = $thirdpartystatic->id;
                             $thirdpartyfoundby = 'trackid ('.$trackid.')';
                         }
@@ -1408,9 +1385,7 @@ class EmailCollector extends CommonObject
                             $errorforactions++;
                             $this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
                             $this->errors[] = $this->error;
-                        }
-                        else
-                        {
+                        } else {
                             $actionparam = $operation['actionparam'];
                             $nametouseforthirdparty = '';
 
@@ -1444,30 +1419,23 @@ class EmailCollector extends CommonObject
                                             //var_dump($regforval[count($regforval)-1]);exit;
                                             // Overwrite param $tmpproperty
                                             $nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
-                                        }
-                                        else
-                                        {
+                                        } else {
                                             // Regex not found
                                             $nametouseforthirdparty = null;
                                         }
                                         //var_dump($object->$tmpproperty);exit;
-                                    }
-                                    else
-                                    {
+                                    } else {
                                         // Nothing can be done for this param
                                         $errorforactions++;
                                         $this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
                                         $this->errors[] = $this->error;
                                     }
-                                }
-                                elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
+                                } elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
                                 {
                                     //if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
                                     //else $object->$tmpproperty = $reg[1];
                                     $nametouseforthirdparty = $reg[2];
-                                }
-                                else
-                                {
+                                } else {
                                     $errorforactions++;
                                     $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
                                     $this->errors[] = $this->error;
@@ -1484,8 +1452,7 @@ class EmailCollector extends CommonObject
                                     $this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
                                     $this->errors[] = $this->error;
                                     break;
-                                }
-                                elseif ($result == 0)
+                                } elseif ($result == 0)
                                 {
                                     if ($operation['type'] == 'loadthirdparty')
                                     {
@@ -1494,8 +1461,7 @@ class EmailCollector extends CommonObject
                                         $errorforactions++;
                                         $this->error = 'ErrorFailedToLoadThirdParty';
                                         $this->errors[] = 'ErrorFailedToLoadThirdParty';
-                                    }
-                                    elseif ($operation['type'] == 'loadandcreatethirdparty')
+                                    } elseif ($operation['type'] == 'loadandcreatethirdparty')
                                     {
                                         dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
 
@@ -1510,9 +1476,7 @@ class EmailCollector extends CommonObject
                                         if ($errorforthisaction)
                                         {
                                             $errorforactions++;
-                                        }
-                                        else
-                                        {
+                                        } else {
                                             $result = $thirdpartystatic->create($user);
                                             if ($result <= 0)
                                             {
@@ -1597,9 +1561,7 @@ class EmailCollector extends CommonObject
 	                        if ($errorforthisaction)
 	                        {
 	                            $errorforactions++;
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            $result = $actioncomm->create($user);
 	                            if ($result <= 0)
 	                            {
@@ -1684,8 +1646,7 @@ class EmailCollector extends CommonObject
                                         $errorforactions++;
                                         setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$projecttocreate->socid.') by setting socid in operation with a different value', null, 'errors');
                                     }
-                                }
-                                else {
+                                } else {
                                     if ($projecttocreate->socid > 0)
                                     {
                                         $thirdpartystatic->fetch($projecttocreate->socid);
@@ -1700,16 +1661,12 @@ class EmailCollector extends CommonObject
                         if ($errorforthisaction)
                         {
                             $errorforactions++;
-                        }
-                        else
-                        {
+                        } else {
                             if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
                             {
                                 $errorforactions++;
                                 $this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
-                            }
-                            else
-                            {
+                            } else {
                                 // Create project
                                 $result = $projecttocreate->create($user);
                                 if ($result <= 0)
@@ -1799,8 +1756,7 @@ class EmailCollector extends CommonObject
                                         $errorforactions++;
                                         setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$tickettocreate->socid.') by setting socid in operation with a different value', null, 'errors');
                                     }
-                                }
-                                else {
+                                } else {
                                     if ($tickettocreate->socid > 0)
                                     {
                                         $thirdpartystatic->fetch($tickettocreate->socid);
@@ -1848,16 +1804,12 @@ class EmailCollector extends CommonObject
                         if ($errorforthisaction)
                         {
                             $errorforactions++;
-                        }
-                        else
-                        {
+                        } else {
                             if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
                             {
                                 $errorforactions++;
                                 $this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
-                            }
-                            else
-                            {
+                            } else {
                                 // Create project
                                 $result = $tickettocreate->create($user);
                                 if ($result <= 0)
@@ -1889,14 +1841,10 @@ class EmailCollector extends CommonObject
                             $this->errors[] = $this->error;
                             dol_syslog(imap_last_error());
                         }
-                    }
-                    else
-                    {
+                    } else {
                         dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
                     }
-                }
-                else
-                {
+                } else {
                     $errorforemail++;
                 }
 
@@ -1920,9 +1868,7 @@ class EmailCollector extends CommonObject
                         dol_syslog("EmailCollect::doCollectOneCollector We reach maximum of ".$nbemailok." collected with success, so we stop this collector now.");
                         break;
                     }
-                }
-                else
-                {
+                } else {
                     $error++;
 
                     $this->db->rollback();
@@ -1932,9 +1878,7 @@ class EmailCollector extends CommonObject
             $output = $langs->trans('XEmailsDoneYActionsDone', $nbemailprocessed, $nbemailok, $nbactiondone);
 
             dol_syslog("End of loop on emails", LOG_INFO, -1);
-        }
-        else
-        {
+        } else {
             $output = $langs->trans('NoNewEmailToProcess');
         }
 
@@ -2071,8 +2015,7 @@ class EmailCollector extends CommonObject
             // so append parts together with blank row.
             if (strtolower($p->subtype) == 'plain')
                 $plainmsg .= trim($data)."\n\n";
-            else
-                $htmlmsg .= $data."<br><br>";
+            else $htmlmsg .= $data."<br><br>";
             $charset = $params['charset']; // assume all parts are same charset
         }
 
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index d0d6239a7f2..ed6942f34d6 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -369,8 +369,7 @@ class EmailCollectorAction extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -425,32 +424,26 @@ class EmailCollectorAction extends CommonObject
         if ($mode == 0)
         {
             return $this->labelStatus[$status];
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             return $this->labelStatus[$status];
-        }
-        elseif ($mode == 2)
+        } elseif ($mode == 2)
         {
             if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
             elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        }
-        elseif ($mode == 3)
+        } elseif ($mode == 3)
         {
             if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-        elseif ($mode == 4)
+        } elseif ($mode == 4)
         {
             if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
             elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        }
-        elseif ($mode == 5)
+        } elseif ($mode == 5)
         {
             if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-        elseif ($mode == 6)
+        } elseif ($mode == 6)
         {
             if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
@@ -503,9 +496,7 @@ class EmailCollectorAction extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 63521e81c3a..8e4f5814db4 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -344,8 +344,7 @@ class EmailCollectorFilter extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -400,32 +399,26 @@ class EmailCollectorFilter extends CommonObject
 		if ($mode == 0)
 		{
 			return $this->labelStatus[$status];
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $this->labelStatus[$status];
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
 			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
 			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
 			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
 			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
 			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
@@ -478,9 +471,7 @@ class EmailCollectorFilter extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 95b6f6208a5..3d0a58dac7a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -265,9 +265,7 @@ if (empty($reshook))
     				$batch_line[$i]['ix_l'] = GETPOST($idl, 'int');
 
     				$totalqty += $subtotalqty;
-			    }
-			    else
-			    {
+			    } else {
 			        // No detail were provided for lots
 			        if (!empty($_POST[$qty]))
 			        {
@@ -277,8 +275,7 @@ if (empty($reshook))
     			        setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
 			        }
 			    }
-			}
-			elseif (GETPOSTISSET($stockLocation))
+			} elseif (GETPOSTISSET($stockLocation))
 			{
 			    //shipment line from multiple stock locations
 			    $qty .= '_'.$j;
@@ -295,9 +292,7 @@ if (empty($reshook))
 			        $stockLocation = "ent1".$i."_".$j;
 			        $qty = "qtyl".$i.'_'.$j;
 			    }
-			}
-			else
-			{
+			} else {
 			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
@@ -341,9 +336,7 @@ if (empty($reshook))
     					        }
     					    }
     					}
-					}
-					else
-					{
+					} else {
 						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
 						{
 							$ent = "entl".$i;
@@ -360,9 +353,7 @@ if (empty($reshook))
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					// batch mode
 					if ($batch_line[$i]['qty'] > 0)
 					{
@@ -388,9 +379,7 @@ if (empty($reshook))
 	                $error++;
 	            }
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -400,9 +389,7 @@ if (empty($reshook))
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
@@ -419,14 +406,10 @@ if (empty($reshook))
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
        	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 	)
@@ -439,9 +422,7 @@ if (empty($reshook))
 	    {
 			$langs->load("errors");
 			setEventMessages($langs->trans($object->error), $object->errors, 'errors');
-	    }
-	    else
-	    {
+	    } else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -460,23 +441,17 @@ if (empty($reshook))
 	    		if ($result < 0) dol_print_error($db, $result);
 	    	}
 	    }
-	}
-
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 	    $result = $object->cancel(0, $also_update_stock);
 	    if ($result > 0)
 	    {
 	        $result = $object->setStatut(-1);
-	    }
-	    else
-		{
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
 	    $also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 	    $result = $object->delete(0, $also_update_stock);
@@ -484,9 +459,7 @@ if (empty($reshook))
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 	        exit;
-	    }
-	    else
-		{
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -552,9 +525,7 @@ if (empty($reshook))
 	    }
 
 	    $action = "";
-	}
-
-	elseif ($action == 'classifybilled')
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -563,9 +534,7 @@ if (empty($reshook))
 	    	exit();
 	    }
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -600,9 +569,7 @@ if (empty($reshook))
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					// delete single warehouse line
 					$line->id = $line_id;
 					if (!$error && $line->delete($user) < 0)
@@ -617,9 +584,7 @@ if (empty($reshook))
 		if (!$error) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
-		}
-		else
-		{
+		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -683,9 +648,7 @@ if (empty($reshook))
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else
-							{
+							} else {
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 								$error++;
 							}
@@ -712,8 +675,7 @@ if (empty($reshook))
 								{
 									$lineIdToAddLot = $line_id;
 								}
-							}
-							elseif (count($lines[$i]->details_entrepot) > 1)
+							} elseif (count($lines[$i]->details_entrepot) > 1)
 							{
 								// multi warehouse shipment lines
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -737,15 +699,11 @@ if (empty($reshook))
 										setEventMessages($line->error, $line->errors, 'errors');
 										$error++;
 									}
-								}
-								else
-								{
+								} else {
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else
-							{
+							} else {
 								// create new line with new lot
 								$line->origin_line_id = $lines[$i]->origin_line_id;
 								$line->entrepot_id = $lotStock->warehouseid;
@@ -760,16 +718,12 @@ if (empty($reshook))
 									$error++;
 								}
 							}
-						}
-						else
-						{
+						} else {
 							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					if ($lines[$i]->fk_product > 0)
 					{
 						// line without lot
@@ -787,8 +741,7 @@ if (empty($reshook))
 							}
 							unset($_POST[$stockLocation]);
 							unset($_POST[$qty]);
-						}
-						elseif (count($lines[$i]->details_entrepot) > 1)
+						} elseif (count($lines[$i]->details_entrepot) > 1)
 						{
 							// multi warehouse shipment lines
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -812,9 +765,7 @@ if (empty($reshook))
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
                         // Product no predefined
 						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
@@ -849,9 +800,7 @@ if (empty($reshook))
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 			exit();
 		}
@@ -1132,9 +1081,7 @@ if ($action == 'create')
 					if (empty($conf->productbatch->enabled))
 					{
                     	print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
                 }
@@ -1194,9 +1141,7 @@ if ($action == 'create')
 	                    }
 
 	                    print '</td>';
-	                }
-	                else
-					{
+	                } else {
 					    print "<td>";
 	                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 	                    else $text = img_object($langs->trans('Product'), 'product');
@@ -1231,9 +1176,7 @@ if ($action == 'create')
 					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 					{
 						$quantityToBeDelivered = 0;
-					}
-					else
-					{
+					} else {
 						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 					}
 	                $warehouse_id = GETPOST('entrepot_id', 'int');
@@ -1255,8 +1198,7 @@ if ($action == 'create')
 	                            if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
 	                            print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-							}
-							else print $langs->trans("NA");
+							} else print $langs->trans("NA");
 							print '</td>';
 
 							// Stock
@@ -1288,9 +1230,7 @@ if ($action == 'create')
 											}
 										}
 									}
-								}
-								else
-								{
+								} else {
 									print $langs->trans("Service");
 								}
 								print '</td>';
@@ -1320,9 +1260,7 @@ if ($action == 'create')
 									}
 								}
 							}
-						}
-						else
-						{
+						} else {
 						    // Product need lot
 							print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 							print '<!-- Case product need lot -->';
@@ -1376,9 +1314,7 @@ if ($action == 'create')
 									$subj++;
 									print '</td></tr>';
 								}
-							}
-							else
-							{
+							} else {
 							    print '<!-- Case there is no details of lot at all -->';
 							    print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
 							    print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
@@ -1389,9 +1325,7 @@ if ($action == 'create')
 							    print '</td></tr>';
 							}
 						}
-					}
-					else
-					{
+					} else {
 						// ship from multiple locations
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch())
 						{
@@ -1425,8 +1359,7 @@ if ($action == 'create')
 									{
 										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
-									}
-									else print $langs->trans("NA");
+									} else print $langs->trans("NA");
 									print '</td>';
 
 									// Stock
@@ -1439,9 +1372,7 @@ if ($action == 'create')
 
 											print '<!-- Show details of stock -->';
 											print '('.$stock.')';
-										}
-										else
-										{
+										} else {
 											print $langs->trans("Service");
 										}
 										print '</td>';
@@ -1479,9 +1410,7 @@ if ($action == 'create')
 									}
 								}
 							}
-						}
-						else
-						{
+						} else {
 						    print '<!-- Case warehouse not already known and product need lot -->';
 						    print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 
@@ -1552,9 +1481,7 @@ if ($action == 'create')
 	                                $disabled = 'disabled="disabled"';
 							    }
 	    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
-							}
-							else
-							{
+							} else {
 							    print $langs->trans("NA");
 							}
 							print '</td>';
@@ -1568,15 +1495,11 @@ if ($action == 'create')
 	    							$warehouseObject = new Entrepot($db);
 	    							$warehouseObject->fetch($warehouse_selected_id);
 	    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
-	    						}
-	    						else
-	    						{
+	    						} else {
 	    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
 	    						    else print '';
 	    						}
-							}
-							else
-							{
+							} else {
 							    print $langs->trans("Service");
 							}
 							print '</td>';
@@ -1616,14 +1539,11 @@ if ($action == 'create')
             print '</form>';
 
             print '<br>';
-        }
-        else
-		{
+        } else {
             dol_print_error($db);
         }
     }
-}
-elseif ($id || $ref)
+} elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
@@ -1686,9 +1606,7 @@ elseif ($id || $ref)
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -1833,9 +1751,7 @@ elseif ($id || $ref)
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1857,9 +1773,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1892,9 +1806,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1925,8 +1837,7 @@ elseif ($id || $ref)
 			if ($volumeUnit < 50)
 			{
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-			}
-			else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
 		{
@@ -1970,9 +1881,7 @@ elseif ($id || $ref)
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -2003,9 +1912,7 @@ elseif ($id || $ref)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 	        print '</td></tr>';
@@ -2064,9 +1971,7 @@ elseif ($id || $ref)
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToShip").' - ';
-			}
-			else
-			{
+			} else {
 				print $langs->trans("QtyShipped").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2078,15 +1983,11 @@ elseif ($id || $ref)
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2195,9 +2096,7 @@ elseif ($id || $ref)
 						$prod = new Product($db);
 						$prod->fetch($lines[$i]->fk_product);
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-					}
-					else
-						$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
+					} else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
 
 					print '<td class="linecoldescription">';
 
@@ -2230,9 +2129,7 @@ elseif ($id || $ref)
 						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
 					print "</td>\n";
-				}
-				else
-				{
+				} else {
 					print '<td class="linecoldescription" >';
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -2311,8 +2208,7 @@ elseif ($id || $ref)
 						// Batch number managment
 						print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 						print '</tr>';
-					}
-					elseif (!empty($conf->stock->enabled))
+					} elseif (!empty($conf->stock->enabled))
 					{
 						if ($lines[$i]->fk_product > 0)
 						{
@@ -2327,8 +2223,7 @@ elseif ($id || $ref)
 								// Batch number managment
 								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
-							}
-							elseif (count($lines[$i]->details_entrepot) > 1)
+							} elseif (count($lines[$i]->details_entrepot) > 1)
 							{
 								print '<!-- case edit 3 -->';
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2342,15 +2237,11 @@ elseif ($id || $ref)
 									print '<td> - '.$langs->trans("NA").'</td>';
 									print '</tr>';
 								}
-							}
-							else
-							{
+							} else {
 								print '<!-- case edit 4 -->';
 								print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
 							}
-						}
-						else
-						{
+						} else {
 							print '<!-- case edit 5 -->';
 							print '<tr>';
 							// Qty to ship or shipped
@@ -2364,9 +2255,7 @@ elseif ($id || $ref)
 					}
 
 					print '</table></td>';
-				}
-				else
-				{
+				} else {
 					// Qty to ship or shipped
 					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
 
@@ -2379,8 +2268,7 @@ elseif ($id || $ref)
 							$entrepot = new Entrepot($db);
 							$entrepot->fetch($lines[$i]->entrepot_id);
 							print $entrepot->getNomUrl(1);
-						}
-						elseif (count($lines[$i]->details_entrepot) > 1)
+						} elseif (count($lines[$i]->details_entrepot) > 1)
 						{
 							$detail = '';
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2416,9 +2304,7 @@ elseif ($id || $ref)
 									$detail .= '<br>';
 								}
 								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-							}
-							else
-							{
+							} else {
 								print $langs->trans("NA");
 							}
 							print '</td>';
@@ -2449,8 +2335,7 @@ elseif ($id || $ref)
 					print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 					print '</td>';
-				}
-				elseif ($object->statut == Expedition::STATUS_DRAFT)
+				} elseif ($object->statut == Expedition::STATUS_DRAFT)
 				{
 					// edit-delete buttons
 					print '<td class="linecoledit center">';
@@ -2483,9 +2368,7 @@ elseif ($id || $ref)
 					if ($action == 'editline' && $line->id == $line_id)
 					{
 						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
-					}
-					else
-					{
+					} else {
 						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 					}
 				}
@@ -2525,9 +2408,7 @@ elseif ($id || $ref)
 	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2539,9 +2420,7 @@ elseif ($id || $ref)
 				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else
-				{
+				} else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
@@ -2553,8 +2432,7 @@ elseif ($id || $ref)
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-					}
-					else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 				}
 			}
 
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index e337ee5ffb8..7bc4db0a511 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -166,8 +166,7 @@ class Shipments extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -398,9 +397,7 @@ class Shipments extends DolibarrApi
         $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(405, $this->shipment->error);
         }
     }
@@ -435,9 +432,7 @@ class Shipments extends DolibarrApi
         if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->shipment->error);
         }
     }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b6cb00ec091..6b08d4db5e6 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -251,15 +251,11 @@ class Expedition extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
 			return "";
 		}
@@ -367,9 +363,7 @@ class Expedition extends CommonObject
 						{
 							$error++;
 						}
-					}
-					else
-					{	// with batch management
+					} else {	// with batch management
 						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
@@ -407,9 +401,7 @@ class Expedition extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -418,25 +410,19 @@ class Expedition extends CommonObject
 						$this->db->rollback();
 						return -1 * $error;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -505,9 +491,7 @@ class Expedition extends CommonObject
 			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
 			{
 				$error++;
-			}
-			else
-			{
+			} else {
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
@@ -648,16 +632,12 @@ class Expedition extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -708,9 +688,7 @@ class Expedition extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
-		}
-		else
-		{
+		} else {
 			$numref = "EXP".$this->id;
 		}
 		$this->newref = dol_sanitizeFileName($numref);
@@ -761,9 +739,7 @@ class Expedition extends CommonObject
 					if (empty($obj->edbrowid))
 					{
 						$qty = $obj->qty;
-					}
-					else
-					{
+					} else {
 						$qty = $obj->edbqty;
 					}
 					if ($qty <= 0) continue;
@@ -785,9 +761,7 @@ class Expedition extends CommonObject
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -801,9 +775,7 @@ class Expedition extends CommonObject
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -877,9 +849,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -909,16 +879,12 @@ class Expedition extends CommonObject
 				if ($result > 0)
 				{
 					return $result;
-				}
-				else
-				{
+				} else {
 					$this->error = $delivery->error;
 					return $result;
 				}
-			}
-			else return 0;
-		}
-		else return 0;
+			} else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -969,9 +935,7 @@ class Expedition extends CommonObject
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
-				}
-				else
-					$product_stock = $product->stock_reel;
+				} else $product_stock = $product->stock_reel;
 
 				$product_type = $product->type;
 				if ($product_type == 0 && $product_stock < $qty)
@@ -1167,9 +1131,7 @@ class Expedition extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1263,9 +1225,7 @@ class Expedition extends CommonObject
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1280,9 +1240,7 @@ class Expedition extends CommonObject
 						if ($error) break; // break for loop incase of error
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1360,36 +1318,26 @@ class Expedition extends CommonObject
 							}
 
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}//*/
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1483,9 +1431,7 @@ class Expedition extends CommonObject
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1500,9 +1446,7 @@ class Expedition extends CommonObject
 						if ($error) break; // break for loop incase of error
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1586,36 +1530,26 @@ class Expedition extends CommonObject
 							}
 
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1772,9 +1706,7 @@ class Expedition extends CommonObject
 						if ($originline != $obj->fk_origin_line)
 						{
 							$line->detail_batch = $newdetailbatch;
-						}
-						else
-						{
+						} else {
 							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 						}
 					}
@@ -1784,9 +1716,7 @@ class Expedition extends CommonObject
 				{
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
-				}
-				else
-				{
+				} else {
 					$line->total_ht += $tabprice[0];
 					$line->total_localtax1 	+= $tabprice[9];
 					$line->total_localtax2 	+= $tabprice[10];
@@ -1799,9 +1729,7 @@ class Expedition extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1833,15 +1761,11 @@ class Expedition extends CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -2041,15 +1965,11 @@ class Expedition extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -2134,9 +2054,7 @@ class Expedition extends CommonObject
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
 			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
 			$resql = $this->db->query($sql);
-		}
-		else
-		{
+		} else {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
 			$sql .= " code='".$this->db->escape($this->update['code'])."'";
 			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -2210,9 +2128,7 @@ class Expedition extends CommonObject
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
-		}
-		else
-		{
+		} else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -2302,9 +2218,7 @@ class Expedition extends CommonObject
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
-						{
+						} else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2324,9 +2238,7 @@ class Expedition extends CommonObject
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2338,9 +2250,7 @@ class Expedition extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2354,9 +2264,7 @@ class Expedition extends CommonObject
 					$error++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$error++;
 		}
@@ -2365,9 +2273,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->db->rollback();
 			return -1;
@@ -2410,9 +2316,7 @@ class Expedition extends CommonObject
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->billed = 0;
 			$this->db->rollback();
@@ -2479,9 +2383,7 @@ class Expedition extends CommonObject
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
-						{
+						} else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2502,9 +2404,7 @@ class Expedition extends CommonObject
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2516,9 +2416,7 @@ class Expedition extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2540,9 +2438,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->statut = self::STATUS_CLOSED;
 			$this->billed = $oldbilled;
 			$this->db->rollback();
@@ -2794,9 +2690,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2888,9 +2782,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 	}
@@ -2949,9 +2841,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror()." - sql=$sql";
 			$error++;
 		}
@@ -2959,9 +2849,7 @@ class ExpeditionLigne extends CommonObjectLine
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -3003,9 +2891,7 @@ class ExpeditionLigne extends CommonObjectLine
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
 				$this->errors[] = 'ErrorBadParameters';
 				$error++;
-			}
-			else
-			{
+			} else {
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
 				$expedition_batch_id = $this->detail_batch[0]->id;
@@ -3017,8 +2903,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 				$qty = price2num($this->detail_batch[0]->qty);
 			}
-		}
-		elseif (!empty($this->detail_batch))
+		} elseif (!empty($this->detail_batch))
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
@@ -3059,9 +2944,7 @@ class ExpeditionLigne extends CommonObjectLine
 			{
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
-			}
-			else
-			{
+			} else {
 				// caculate new total line qty
 				foreach ($lotArray as $lot)
 				{
@@ -3158,9 +3041,7 @@ class ExpeditionLigne extends CommonObjectLine
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 6c9942dd9a8..703d44e6896 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -90,9 +90,7 @@ class ExpeditionLineBatch extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -135,9 +133,7 @@ class ExpeditionLineBatch extends CommonObject
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -166,9 +162,7 @@ class ExpeditionLineBatch extends CommonObject
 		if ($db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -230,9 +224,7 @@ class ExpeditionLineBatch extends CommonObject
 			}
 			$db->free($resql);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 36d471b59d3..c20e2bb4088 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -87,9 +87,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -117,8 +115,7 @@ elseif ($action == 'deletecontact' && $user->rights->expedition->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 6047be5fe0e..69f59cb3385 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -176,12 +176,10 @@ if ($id > 0 || !empty($ref)) {
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index d3fec260d95..849e2054cd6 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -120,8 +120,7 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-	} else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("None").'</td><td></td><td></td></tr>';
 	}
 
@@ -193,8 +192,7 @@ if ($resql)
 		print "</table></div><br>";
 	}
 	$db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 /*
  * Open orders
@@ -259,8 +257,7 @@ if ($resql)
 
 		print "</table></div><br>";
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 0efd01fc10d..74efaaeb27a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -700,9 +700,7 @@ if ($resql)
 				$tmparray = $object->getTotalWeightVolume();
 				print showDimensionInBestUnit($tmparray['weight'], 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 				print $form->textwithpicto('', $langs->trans('EstimatedWeight'), 1);
-			}
-			else
-			{
+			} else {
 				print $object->trueWeight;
 				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 			}
@@ -823,9 +821,7 @@ if ($resql)
 	$title      = '';
 
 	print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 99cf77ce1f3..f494ef563fb 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -377,9 +377,7 @@ if ($id > 0 || !empty($ref))
 			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->date_livraison, 'dayhour');
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
 			    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
@@ -531,9 +529,7 @@ if ($id > 0 || !empty($ref))
 		    if ($action != 'editincoterm')
 		    {
 		        print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		    }
-		    else
-		    {
+		    } else {
 		        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		    }
 		    print '</td></tr>';
@@ -644,9 +640,7 @@ if ($id > 0 || !empty($ref))
 			if (!empty($conf->stock->enabled))
 			{
 				print '<td class="center">'.$langs->trans("RealStock").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			print "</tr>\n";
@@ -697,9 +691,7 @@ if ($id > 0 || !empty($ref))
 							}
 
 							$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-						}
-						else
-							$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
+						} else $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 
 						print '<td>';
 						print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
@@ -739,9 +731,7 @@ if ($id > 0 || !empty($ref))
 						}
 
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print "<td>";
 						if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -776,9 +766,7 @@ if ($id > 0 || !empty($ref))
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
-					}
-					else
-					{
+					} else {
 						print '0 ('.$langs->trans("Service").')';
 					}
 					print '</td>';
@@ -799,9 +787,7 @@ if ($id > 0 || !empty($ref))
 							print ' '.img_warning($langs->trans("StockTooLow"));
 						}
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td>&nbsp;</td>';
 					}
 					print "</tr>\n";
@@ -844,9 +830,7 @@ if ($id > 0 || !empty($ref))
 			}
 
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -871,9 +855,7 @@ if ($id > 0 || !empty($ref))
 					{
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 					}
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				}
 			}
@@ -935,9 +917,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$somethingshown = 1;
-			}
-			else
-			{
+			} else {
 				print '<div class="tabsAction">';
 				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				print '</div>';
@@ -945,9 +925,7 @@ if ($id > 0 || !empty($ref))
 		}
 
 		show_list_sending_receive('commande', $object->id);
-	}
-	else
-	{
+	} else {
 		/* Order not found */
 		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
 	}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index db28b094e65..fcccb545a33 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -74,9 +74,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
@@ -290,8 +288,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index b2c89f68e41..413bc061fbf 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -52,22 +52,18 @@ $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
 
 if (empty($fk_expense) || $fk_expense < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense')));
 elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat')));
-else
-{
+else {
 	// @see ndfp.class.php:3576 (method: compute_total_km)
 	$expense = new ExpenseReport($db);
 	if ($expense->fetch($fk_expense) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense));
-	else
-	{
+	else {
 		$userauthor = new User($db);
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
-		else
-		{
+		else {
 			$range = ExpenseReportIk::getRangeByUser($userauthor, $fk_c_exp_tax_cat);
 
 			if (empty($range)) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range));
-			else
-			{
+			else {
 				$ikoffset = price($range->ikoffset, 0, $langs, 1, -1, -1, $conf->currency);
 				echo json_encode(array('up' => $range->coef, 'ikoffset' => $range->ikoffset, 'title' => $langs->transnoentitiesnoconv('ExpenseRangeOffset', $offset), 'comment' => 'offset should be apply on addline or updateline'));
 			}
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 2fdb0cd4fdb..49a7bd4201e 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -76,13 +76,9 @@ if (GETPOST('fk_projet') != '')
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else
-	{
+	} else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
-}
-else
-{
+} else {
     echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 2a0f804b196..f5348bb4261 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -177,9 +177,7 @@ if (empty($reshook))
         if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha'))
         {
             setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else
-        {
+        } else {
             if ($object->id > 0)
             {
                 // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
@@ -190,9 +188,7 @@ if (empty($reshook))
                 {
                     header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
                     exit;
-                }
-                else
-                {
+                } else {
                     setEventMessages($object->error, $object->errors, 'errors');
                     $object = $orig;
                     $action = '';
@@ -210,9 +206,7 @@ if (empty($reshook))
     	{
     		header("Location: index.php");
     		exit;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -264,9 +258,7 @@ if (empty($reshook))
     			$db->commit();
     			Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
-    		}
-    		else
-    		{
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$db->rollback();
     			$action = 'create';
@@ -297,9 +289,7 @@ if (empty($reshook))
     	{
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
     		exit;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -356,9 +346,7 @@ if (empty($reshook))
 
     			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     		$error++;
     	}
@@ -415,9 +403,7 @@ if (empty($reshook))
     				{
     					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
     					setEventMessages($mesg, null, 'mesgs');
-    				}
-    				else
-    				{
+    				} else {
     					$langs->load("other");
     					if ($mailfile->error)
     					{
@@ -425,21 +411,15 @@ if (empty($reshook))
     						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
     						$mesg .= '<br>'.$mailfile->error;
     						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
+    					} else {
     						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
-    			}
-    			else
-    			{
+    			} else {
     				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
     				$action = '';
     			}
-    		}
-    		else
-    		{
+    		} else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
@@ -450,9 +430,7 @@ if (empty($reshook))
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
     }
@@ -542,9 +520,7 @@ if (empty($reshook))
     					setEventMessages($mesg, null, 'mesgs');
     					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     					exit;
-    				}
-    				else
-    				{
+    				} else {
     					$langs->load("other");
     					if ($mailfile->error)
     					{
@@ -552,27 +528,19 @@ if (empty($reshook))
     						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
     						$mesg .= '<br>'.$mailfile->error;
     						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
+    					} else {
     						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
     					}
     				}
-    			}
-    			else
-    			{
+    			} else {
     				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
     				$action = '';
     			}
-    		}
-    		else
-    		{
+    		} else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -665,9 +633,7 @@ if (empty($reshook))
        					setEventMessages($mesg, null, 'mesgs');
        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
        					exit;
-       				}
-       				else
-       				{
+       				} else {
        					$langs->load("other");
        					if ($mailfile->error)
        					{
@@ -675,27 +641,19 @@ if (empty($reshook))
        						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
        						$mesg .= '<br>'.$mailfile->error;
        						setEventMessages($mesg, null, 'errors');
-       					}
-       					else
-       					{
+       					} else {
        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
        					}
        				}
-       			}
-       			else
-       			{
+       			} else {
        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
        				$action = '';
        			}
-   			}
-    		else
-    		{
+   			} else {
     			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     			$action = '';
     		}
-    	}
-   		else
-   		{
+    	} else {
    			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
    			$action = '';
    		}
@@ -786,9 +744,7 @@ if (empty($reshook))
         				setEventMessages($mesg, null, 'mesgs');
         				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         				exit;
-        			}
-        			else
-        			{
+        			} else {
         				$langs->load("other");
         				if ($mailfile->error)
         				{
@@ -796,27 +752,19 @@ if (empty($reshook))
         					$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
         					$mesg .= '<br>'.$mailfile->error;
         					setEventMessages($mesg, null, 'errors');
-        				}
-        				else
-        				{
+        				} else {
         					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
         				}
         			}
-        		}
-        		else
-        		{
+        		} else {
         			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
         			$action = '';
         		}
-        	}
-        	else
-        	{
+        	} else {
         		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
         		$action = '';
         	}
-    	}
-    	else
-    	{
+    	} else {
     	    setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
     	    $action = '';
     	}
@@ -828,9 +776,7 @@ if (empty($reshook))
     	if (!GETPOST('detail_cancel', 'alpha'))
     	{
     		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
-    	}
-    	else
-    	{
+    	} else {
 	    	$object = new ExpenseReport($db);
 	    	$object->fetch($id);
 
@@ -916,9 +862,7 @@ if (empty($reshook))
 	        					setEventMessages($mesg, null, 'mesgs');
 	        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 	        					exit;
-	        				}
-	        				else
-	        				{
+	        				} else {
 	        					$langs->load("other");
 	        					if ($mailfile->error)
 	        					{
@@ -926,33 +870,23 @@ if (empty($reshook))
 	        						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 	        						$mesg .= '<br>'.$mailfile->error;
 	        						setEventMessages($mesg, null, 'errors');
-	        					}
-	        					else
-	        					{
+	        					} else {
 	        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
 	        					}
 	        				}
-	        			}
-	        			else
-	        			{
+	        			} else {
 	        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 	        				$action = '';
 	        			}
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
 	    			    $action = '';
 	    			}
-	    		}
-	    		else
-	    		{
+	    		} else {
 	    			setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
 	    			$action = '';
 	    		}
-	    	}
-	    	else
-	    	{
+	    	} else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    	}
     	}
@@ -990,14 +924,10 @@ if (empty($reshook))
     		{
     			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			exit;
-    		}
-    		else
-    		{
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages("NOT_AUTHOR", '', 'errors');
     	}
     }
@@ -1131,9 +1061,7 @@ if (empty($reshook))
         				setEventMessages($mesg, null, 'mesgs');
         				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
         				exit;
-        			}
-        			else
-        			{
+        			} else {
     					$langs->load("other");
         				if ($mailfile->error)
         				{
@@ -1141,27 +1069,19 @@ if (empty($reshook))
         					$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
         					$mesg .= '<br>'.$mailfile->error;
         					setEventMessages($mesg, null, 'errors');
-        				}
-        				else
-        				{
+        				} else {
         					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
         				}
         			}
-        		}
-        		else
-        		{
+        		} else {
         			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
         			$action = '';
         		}
-    		}
-    		else
-    		{
+    		} else {
     		    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
     		    $action = '';
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
     		$action = '';
     	}
@@ -1312,9 +1232,7 @@ if (empty($reshook))
     		$object->update_totaux_del($object_ligne->total_ht, $object_ligne->total_tva);
     		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
     		exit;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -1407,9 +1325,7 @@ if (empty($reshook))
 
     			//header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
     			//exit;
-    		}
-    		else
-    		{
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     		}
     	}
@@ -1497,8 +1413,7 @@ if ($action == 'create')
 	$object = new ExpenseReport($db);
 	$include_users = $object->fetch_users_approver_expensereport();
 	if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
-	else
-	{
+	else {
     	$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
     	if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
     	if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int');
@@ -1558,9 +1473,7 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	if ($id > 0 || $ref)
 	{
 		$result = $object->fetch($id, $ref);
@@ -1601,9 +1514,7 @@ else
 				if ($object->fk_statut == 99)
 				{
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="action" value="update">';
 				}
 
@@ -1660,9 +1571,7 @@ else
 					print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 					print '</td>';
 					print '</tr>';
-				}
-				else
-				{
+				} else {
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDOR").'</td>';
 					print '<td>';
@@ -1697,9 +1606,7 @@ else
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
@@ -1871,8 +1778,7 @@ else
 						}
 					}
 					print '</td></tr>';
-				}
-				elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED)
+				} elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
@@ -1893,9 +1799,7 @@ else
 					print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
 					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td></tr>';
 					print '</tr>';
-				}
-				else
-				{
+				} else {
 					print '<tr>';
 					print '<td>'.$langs->trans("ApprovedBy").'</td>';
 					print '<td>';
@@ -2080,8 +1984,7 @@ else
 				    {
 				    	$cssforamountpaymentcomplete = 'amountpaymentneutral';
 				    	$resteapayeraffiche = 0;
-				    }
-			    	elseif ($object->paid == 0)
+				    } elseif ($object->paid == 0)
 			    	{
 			    		$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			    	}
@@ -2092,9 +1995,7 @@ else
 			        print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
 
 				    $db->free($resql);
-				}
-				else
-				{
+				} else {
 				    dol_print_error($db);
 				}
 				print "</table>";
@@ -2200,9 +2101,7 @@ else
 							if (!empty($line->value_unit_ht))
 							{
 							    print price($line->value_unit_ht);
-							}
-							else
-							{
+							} else {
 							    $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
 							    $pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
 							    print $pricenettoshow;
@@ -2245,9 +2144,7 @@ else
                                         }
                                         print '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
                                         print '</a>';
-                                    }
-                                    else
-                                    {
+                                    } else {
                                         $modulepart = 'expensereport';
                                         $thumbshown = 0;
                                         if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
@@ -2625,8 +2522,7 @@ else
 				dol_fiche_end();
 			} // end edit or not edit
 		}	// end of if result
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	} //fin si id > 0
@@ -2748,9 +2644,7 @@ if ($action != 'create' && $action != 'edit')
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
@@ -2794,8 +2688,7 @@ if ($action != 'create' && $action != 'edit')
 	{
 	    // Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-	}
-	elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
+	} elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
 	{
     	// Delete
 	    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 18fef29e04c..c246da650af 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -145,8 +145,7 @@ class ExpenseReports extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve Expense Report list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -411,9 +410,7 @@ class ExpenseReports extends DolibarrApi
         if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->expensereport->error);
         }
     }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 092e29ba642..e2ea2b377a4 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -308,8 +308,7 @@ class ExpenseReport extends CommonObject
     	            		$newndfline->rule_warning_message = $line->rule_warning_message;
     	            		$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
     	            		$newndfline->fk_ecm_files = $line->fk_ecm_files;
-    	            	}
-    	            	else {
+    	            	} else {
     	            		$newndfline = $line;
     	            	}
     	                //$newndfline=new ExpenseReportLine($this->db);
@@ -351,28 +350,20 @@ class ExpenseReport extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						return -4;
 					}
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -3;
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -440,9 +431,7 @@ class ExpenseReport extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -504,16 +493,12 @@ class ExpenseReport extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
-        }
-        else
-        {
+        } else {
 			$this->db->rollback();
             $this->error = $this->db->error();
             return -1;
@@ -605,14 +590,10 @@ class ExpenseReport extends CommonObject
                 $result = $this->fetch_lines();
 
                 return $result;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -658,22 +639,16 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+            } else {
 				$this->db->commit();
                 return 0;
             }
-        }
-        else
-        {
+        } else {
 			$this->db->rollback();
             dol_print_error($this->db);
             return -1;
@@ -780,9 +755,7 @@ class ExpenseReport extends CommonObject
                 }
             }
             $this->db->free($resql);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -946,9 +919,7 @@ class ExpenseReport extends CommonObject
                 print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_TTC).'</td>';
                 print '<td>&nbsp;</td>';
                 print '</tr>';
-            }
-            else
-            {
+            } else {
                 $this->error = $db->lasterror();
                 return -1;
             }
@@ -992,14 +963,12 @@ class ExpenseReport extends CommonObject
             if ($result):
                 $this->db->free($result);
                 return 1;
-            else:
+            else :
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
                 return -3;
             endif;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
             return -3;
@@ -1031,9 +1000,7 @@ class ExpenseReport extends CommonObject
         if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
         {
         	$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
-        }
-        else
-        {
+        } else {
         	$sql .= ' ORDER BY de.rang ASC, de.date ASC';
         }
 
@@ -1082,9 +1049,7 @@ class ExpenseReport extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
             return -3;
@@ -1113,17 +1078,13 @@ class ExpenseReport extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error()." sql=".$sql;
                 dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -6;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -1158,9 +1119,7 @@ class ExpenseReport extends CommonObject
         if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
         {
             $num = $this->getNextNumRef();
-        }
-        else
-		{
+        } else {
             $num = $this->ref;
         }
         if (empty($num) || $num < 0) return -1;
@@ -1243,16 +1202,12 @@ class ExpenseReport extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
-        }
-        else
-        {
+        } else {
 			$this->db->rollback();
             $this->error = $this->db->lasterror();
             return -1;
@@ -1293,15 +1248,11 @@ class ExpenseReport extends CommonObject
             if ($this->db->query($sql))
             {
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
         }
     }
@@ -1345,23 +1296,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+            } else {
 				$this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
         }
 
@@ -1412,23 +1357,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+            } else {
 				$this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
         }
     }
@@ -1473,23 +1412,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
 			}
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
         }
     }
@@ -1537,23 +1470,17 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+            } else {
 				$this->db->rollback();
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
         }
     }
@@ -1596,17 +1523,13 @@ class ExpenseReport extends CommonObject
             if ($numref != "")
             {
             	return $numref;
-            }
-            else
-			{
+            } else {
 				$this->error = $obj->error;
 				$this->errors = $obj->errors;
             	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
             	return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Error_EXPENSEREPORT_ADDON_NotDefined";
             return -2;
         }
@@ -1703,7 +1626,7 @@ class ExpenseReport extends CommonObject
         $result = $this->db->query($sql);
         if ($result):
             return 1;
-        else:
+        else :
             $this->error = $this->db->error();
             return -1;
         endif;
@@ -1733,7 +1656,7 @@ class ExpenseReport extends CommonObject
         $result = $this->db->query($sql);
         if ($result):
             return 1;
-        else:
+        else :
             $this->error = $this->db->error();
             return -1;
         endif;
@@ -1822,23 +1745,17 @@ class ExpenseReport extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->line->error;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
-		}
-		else
-        {
+		} else {
             dol_syslog(get_class($this)."::addline status of expense report must be Draft to allow use of ->addline()", LOG_ERR);
 			$this->error = 'ErrorExpenseNotDraft';
             return -3;
@@ -1887,9 +1804,7 @@ class ExpenseReport extends CommonObject
 
 					$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
 					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('by'.$rule->code_expense_rules_type, price($new_current_total_ttc, 0, $langs, 1, -1, -1, $conf->currency)));
-				}
-				else
-				{
+				} else {
 					$this->error = 'ExpenseReportConstraintViolationWarning';
 					$this->errors[] = $this->error;
 
@@ -1912,8 +1827,7 @@ class ExpenseReport extends CommonObject
 			$this->line->total_tva = $tmp[1];
 
 			return false;
-		}
-		else return true;
+		} else return true;
 	}
 
 	/**
@@ -1984,9 +1898,7 @@ class ExpenseReport extends CommonObject
 		{
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) return true;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -2105,9 +2017,7 @@ class ExpenseReport extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->line->error;
                 $this->errors = $this->line->errors;
                 $this->db->rollback();
@@ -2187,14 +2097,10 @@ class ExpenseReport extends CommonObject
 
                 if ($existe) return 1;
                 else return 0;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
             return -1;
@@ -2235,9 +2141,7 @@ class ExpenseReport extends CommonObject
                 $i++;
             }
             return $users_validator;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
             return -1;
@@ -2301,9 +2205,7 @@ class ExpenseReport extends CommonObject
                 $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
         return $ret;
@@ -2340,9 +2242,7 @@ class ExpenseReport extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2390,9 +2290,7 @@ class ExpenseReport extends CommonObject
 	            $response->label = $langs->trans("ExpenseReportsToApprove");
 	            $response->labelShort = $langs->trans("ToApprove");
 	            $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=2';
-	        }
-	        else
-	        {
+	        } else {
 	            $response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
 	            $response->label = $langs->trans("ExpenseReportsToPay");
 	            $response->labelShort = $langs->trans("StatusToPay");
@@ -2409,9 +2307,7 @@ class ExpenseReport extends CommonObject
 	                if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
 	                    $response->nbtodolate++;
 	                }
-	            }
-	            else
-	            {
+	            } else {
                     if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->payment->warning_delay)) {
     	                $response->nbtodolate++;
                     }
@@ -2419,9 +2315,7 @@ class ExpenseReport extends CommonObject
             }
 
             return $response;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2446,9 +2340,7 @@ class ExpenseReport extends CommonObject
         if ($option == 'toapprove')
         {
             return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
-        }
-        else
-            return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+        } else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
     }
 
     /**
@@ -2471,9 +2363,7 @@ class ExpenseReport extends CommonObject
     		{
     			$alreadydispatched = $obj->nb;
     		}
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -2506,9 +2396,7 @@ class ExpenseReport extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
 			return $obj->amount;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2702,9 +2590,7 @@ class ExpenseReportLine
 					$this->errors = $tmpparent->errors;
 				}
 			}
-        }
-		else
-		{
+        } else {
 			$error++;
 		}
 
@@ -2712,9 +2598,7 @@ class ExpenseReportLine
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -2755,9 +2639,7 @@ class ExpenseReportLine
 				$obj = $this->db->fetch_object($resql);
 				$amount = (double) $obj->total_amount;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -2820,16 +2702,12 @@ class ExpenseReportLine
                     $this->error = $tmpparent->error;
                     $this->errors = $tmpparent->errors;
                 }
-            }
-            else
-            {
+            } else {
                 $error++;
                 $this->error = $tmpparent->error;
                 $this->errors = $tmpparent->errors;
             }
-        }
-        else
-        {
+        } else {
             $error++;
             dol_print_error($this->db);
         }
@@ -2838,9 +2716,7 @@ class ExpenseReportLine
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
             $this->db->rollback();
@@ -2875,9 +2751,7 @@ function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $u
         if ($selected != '' && $selected == $key)
         {
             print '<option value="'.$key.'" selected>';
-        }
-        else
-        {
+        } else {
             print '<option value="'.$key.'">';
         }
         print $langs->trans($val);
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index c7bf959e27e..59de531a662 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -122,9 +122,7 @@ class ExpenseReportIk extends CoreObject
 			{
 				$categories[$obj->rowid] = $obj;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -182,9 +180,7 @@ class ExpenseReportIk extends CoreObject
 					$ranges[] = $object;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -222,9 +218,7 @@ class ExpenseReportIk extends CoreObject
 				if (!isset($ranges[$obj->fk_c_exp_tax_cat])) $ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
 				$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -255,9 +249,7 @@ class ExpenseReportIk extends CoreObject
 		{
 			$obj = $db->fetch_object($resql);
 			return $obj->nbRange;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index b98552f681d..7ed3a5ecb09 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -185,9 +185,7 @@ class ExpenseReportRule extends CoreObject
 				if ($rule->fetch($obj->rowid) > 0) $rules[$rule->id] = $rule;
 				else dol_print_error($db);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -209,9 +207,7 @@ class ExpenseReportRule extends CoreObject
 			if ($group->fetch($this->fk_usergroup) > 0)
 			{
 				return $group->nom;
-			}
-			else
-			{
+			} else {
 				$this->error = $group->error;
 				$this->errors[] = $this->error;
 			}
@@ -235,9 +231,7 @@ class ExpenseReportRule extends CoreObject
 			if ($u->fetch($this->fk_user) > 0)
 			{
 				return dolGetFirstLastname($u->firstname, $u->lastname);
-			}
-			else
-			{
+			} else {
 				$this->error = $u->error;
 				$this->errors[] = $this->error;
 			}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index d06303364dd..cad3d62420e 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -159,9 +159,7 @@ class PaymentExpenseReport extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_expensereport");
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -171,9 +169,7 @@ class PaymentExpenseReport extends CommonObject
 		    $this->amount = $totalamount;
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -240,9 +236,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -311,9 +305,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -368,9 +360,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -419,9 +409,7 @@ class PaymentExpenseReport extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -574,9 +562,7 @@ class PaymentExpenseReport extends CommonObject
                         }
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -585,9 +571,7 @@ class PaymentExpenseReport extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -610,9 +594,7 @@ class PaymentExpenseReport extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -684,9 +666,7 @@ class PaymentExpenseReport extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
     }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 17b7eb57619..82ac70b7ccb 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -133,9 +133,7 @@ if ($object->id)
     $permtoedit = $user->rights->expensereport->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 0597d1b29a2..3c30154f7f1 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -233,14 +233,11 @@ if ($result)
 
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table></div><br>';
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 print '</div></div></div>';
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 07f0e332276..6b165c1042e 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -226,9 +226,7 @@ if (empty($reshook))
     					if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
     						$langs->load("errors");
     						setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
-    					}
-    					else
-    					{
+    					} else {
     						setEventMessages($objectuser->error, $objectuser->errors, 'errors');
     					}
     				}
@@ -237,8 +235,7 @@ if (empty($reshook))
     			if (!$error && !count($objectuser->errors)) {
     				setEventMessages($langs->trans("UserModified"), null, 'mesgs');
     				$db->commit();
-    			}
-    			else {
+    			} else {
     				$db->rollback();
     			}
     		}
@@ -407,9 +404,7 @@ if ($resql)
 				$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($fuser->default_c_exp_tax_cat);
 				print $form->selectarray('default_range', range(0, $maxRangeNum), $fuser->default_range);
 				print '</td></tr>';
-			}
-			else
-			{
+			} else {
 				print '<tr><td class="titlefield">'.$langs->trans("DefaultCategoryCar").'</td>';
 				print '<td class="fk_c_exp_tax_cat">';
 				print dol_getIdFromCode($db, $fuser->default_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
@@ -458,16 +453,12 @@ if ($resql)
 			}
 
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 			print '</div><br>';
 		}
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans("ListTripsAndExpenses");
 
 		$newcardbutton = '';
@@ -805,9 +796,7 @@ if ($resql)
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -842,9 +831,7 @@ if ($resql)
 
 		print $formfile->showdocuments('massfilesarea_expensereport', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 85bc3cc300c..3e8da949bff 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -64,9 +64,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
         exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -102,9 +100,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 
 		header('Location: card.php?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -280,9 +276,7 @@ if ($resql)
 	print '</div>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -300,9 +294,7 @@ if ($action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($title_button).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 872bd5a0792..00d690f20d5 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -158,9 +158,7 @@ if ($action == 'add_payment')
                 $loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -321,9 +319,7 @@ if ($action == 'create' || empty($action))
 			$remaintopay = $objp->total_ttc - $sumpaid; // autofill remainder amount
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">'; // autofill remainder amount
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
-		}
-		else
-		{
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 3b931bd4418..eff10cd9323 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -151,9 +151,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ordersaverage-'.$year.'.png';
     if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
     if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
@@ -289,8 +287,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index d0096390489..f4f460719a0 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -42,9 +42,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
                 print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
                 print '</div>';
                 print '</a>';
-            }
-            else
-            {
+            } else {
                 $error = 0;
                 $thumbshown = '';
 
@@ -106,8 +104,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 	                {
 	                    $checked = ' checked';
 	                    break;
-	                }
-	                elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
+	                } elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
 	                    $checked = ' checked';
 	                    break;
 	                }
@@ -132,9 +129,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
         print '</script>';
 
         print '</td></tr>';
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven nohover trattachnewfilenow"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
         print '<td colspan="'.$colspan.'">';
         print '<span class="opacitymedium">'.$langs->trans("NoFilesUploadedYet").'</span>';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 978a3059ace..e04b8f20dfb 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -141,9 +141,7 @@ class Export
 	    									if (!empty($perm[2]))
 	    									{
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
-	    									{
+	    									} else {
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
 	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
@@ -295,8 +293,7 @@ class Export
 			case 'Text':
 				if (!(strpos($ValueField, '%') === false))
 					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
+				else $szFilterQuery .= " ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -305,13 +302,10 @@ class Export
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
 					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
-				}
-				else
-				{
+				} else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
-					else
-						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
+					else $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
 				}
 				break;
 			case 'Duree':
@@ -324,13 +318,10 @@ class Export
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
-				{
+				} else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = " ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
+					else $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
 				}
 				break;
 			case 'Boolean':
@@ -343,8 +334,7 @@ class Export
 				else {
                     if (!(strpos($ValueField, '%') === false))
                         $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
-                    else
-                        $szFilterQuery = " ".$NameField." = '".$ValueField."'";
+                    else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
@@ -367,7 +357,7 @@ class Export
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
 		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
 		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
     }
 
@@ -428,8 +418,7 @@ class Export
 
 				if (!empty($InfoFieldList[3]))
 					$keyList = $InfoFieldList[3];
-				else
-					$keyList = 'rowid';
+				else $keyList = 'rowid';
 				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
@@ -473,9 +462,7 @@ class Export
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
-							{
+							} else {
 								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
@@ -484,8 +471,7 @@ class Export
 					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
-				}
-				else dol_print_error($this->db);
+				} else dol_print_error($this->db);
 				break;
 		}
 
@@ -564,8 +550,7 @@ class Export
 		$objmodel = new $classname($this->db);
 
 		if (!empty($sqlquery)) $sql = $sqlquery;
-        else
-		{
+        else {
 			// Define value for indice from $datatoexport
 			$foundindice = 0;
 			foreach ($this->array_export_code as $key => $dataset)
@@ -595,8 +580,7 @@ class Export
 			//$this->array_export_label[$indice]
 			if ($conf->global->EXPORT_PREFIX_SPEC)
 				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename = "export_".$datatoexport;
+			else $filename = "export_".$datatoexport;
 			$filename .= '.'.$objmodel->getDriverExtension();
 			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
@@ -664,9 +648,7 @@ class Export
 								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias = $remaintopay;
-							}
-							else
-							{
+							} else {
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
 							    $computestring = $this->array_export_special[$indice][$key];
 							    $tmp = dol_eval($computestring, 1, 0);
@@ -688,16 +670,12 @@ class Export
 				$objmodel->close_file();
 
         		return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
@@ -739,9 +717,7 @@ class Export
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -776,15 +752,11 @@ class Export
 				$this->hexafiltervalue = $obj->filter;
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = "ModelNotFound";
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -822,9 +794,7 @@ class Export
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 6543747d1f7..98353d42bf1 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -173,9 +173,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
 		    //print_r($array_selected);
 		    $_SESSION["export_selected_fields"] = $array_selected;
 		}
-    }
-    else
-    {
+    } else {
         $warnings = array();
 
         $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
@@ -190,8 +188,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
             $tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
             if (is_array($tmp)) $listofdependencies = $tmp;
             else $listofdependencies = array($tmp);
-        }
-        elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
+        } elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
         {
             // We found a dependency on a dedicated field
             $tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
@@ -222,9 +219,7 @@ if ($action == 'unselectfield')
     {
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
-    }
-    else
-    {
+    } else {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
 	    asort($array_selected);
@@ -287,9 +282,7 @@ if ($action == 'builddoc')
 	{
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport = $objexport->sqlusedforexport;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	    $sqlusedforexport = $objexport->sqlusedforexport;
     }
@@ -350,18 +343,13 @@ if ($action == 'add_export_model')
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else
-				setEventMessages($objexport->error, $objexport->errors, 'errors');
+			else setEventMessages($objexport->error, $objexport->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
 	}
 }
@@ -472,16 +460,12 @@ if ($step == 1 || !$datatoexport)
             if ($objexport->array_export_perms[$key])
             {
             	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
-            }
-            else
-            {
+            } else {
             	print $langs->trans("NotEnoughPermissions");
             }
            	print '</td></tr>';
         }
-    }
-    else
-    {
+    } else {
         print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
     print '</table>';
@@ -546,8 +530,7 @@ if ($step == 2 && $datatoexport)
     print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
     if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
     	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
-    }
-    else {
+    } else {
     	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
     }
     print ' ';
@@ -614,9 +597,7 @@ if ($step == 2 && $datatoexport)
         if (!empty($objexport->array_export_special[0][$code]))
         {
             $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else
-        {
+        } else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
    		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -642,9 +623,7 @@ if ($step == 2 && $datatoexport)
             print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
             print '</td>';
-        }
-        else
-        {
+        } else {
         	// Fields not selected
             print '<td>';
 			//print $text.'-'.$htmltext."<br>";
@@ -672,14 +651,10 @@ if ($step == 2 && $datatoexport)
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
 		{
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
 
@@ -810,9 +785,7 @@ if ($step == 3 && $datatoexport)
         if (!empty($objexport->array_export_special[0][$code]))
 		{
 		    $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-		}
-		else
-		{
+		} else {
 		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
 		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -841,9 +814,7 @@ if ($step == 3 && $datatoexport)
 			{
 				$tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
-			}
-			else
-			{
+			} else {
 				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 			}
 		}
@@ -1005,9 +976,7 @@ if ($step == 4 && $datatoexport)
         if (!empty($objexport->array_export_special[0][$code]))
         {
             $htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
-        }
-        else
-        {
+        } else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
         if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -1111,8 +1080,7 @@ if ($step == 4 && $datatoexport)
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1306,6 +1274,5 @@ function getablenamefromfield($code, $sqlmaxforexport)
 	if (preg_match($regexstring, $newsql, $reg))
 	{
 		return $reg[1]; // The tablename
-	}
-	else return '';
+	} else return '';
 }
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index b1e3dc7fac8..e2af9e5267d 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -59,9 +59,7 @@ if ($action == 'update')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	}
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 3a1b1c04b82..4827d832af4 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -63,19 +63,15 @@ if (!empty($keyforcontent))
 	{
 		$langs->load("errors");
 		print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_');
-	}
-	elseif (empty($conf->global->$keyforcontent))
+	} elseif (empty($conf->global->$keyforcontent))
 	{
 		$langs->load("errors");
 		print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
-	}
-	else
-	{
+	} else {
 		if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
 		{
 			print $conf->global->$keyforcontent;
-		}
-		elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
+		} elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
 		{
 			/*print "
 			<html>
@@ -114,9 +110,7 @@ if (!empty($keyforcontent))
 
 	print '<div>';
 	llxFooter();
-}
-else
-{
+} else {
 	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
 	{
 		print "
@@ -150,9 +144,7 @@ else
 
 	</html>
 	";
-	}
-	else
-	{
+	} else {
 		llxHeader();
 		print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight'] - 90).'px">';
 		print $conf->global->EXTERNALSITE_URL;
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index b5b259f2430..55ad529df3b 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -424,8 +424,7 @@ if ($action == 'create') {
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else {
+	} else {
 		dol_print_error('', "Error, no fichinter ".$object->id);
 	}
 } elseif ($action == 'selsocforcreatefrommodel') {
@@ -596,8 +595,7 @@ if ($action == 'create') {
 			} else {
 				if ($object->frequency > 0)
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				else
-					print $langs->trans("NotARecurringInterventionalTemplate");
+				else print $langs->trans("NotARecurringInterventionalTemplate");
 			}
 			print '</td></tr>';
 
@@ -619,15 +617,12 @@ if ($action == 'create') {
 			print '<tr><td>';
 			if ($user->rights->ficheinter->creer && ($action == 'nb_gen_max' || $object->frequency > 0)) {
 				print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-			} else
-				print $langs->trans("MaxPeriodNumber");
+			} else print $langs->trans("MaxPeriodNumber");
 
 			print '</td><td>';
 			if ($action == 'nb_gen_max' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-			}
-			else
-				print '';
+			} else print '';
 
 			print '</td>';
 			print '</tr>';
@@ -693,8 +688,7 @@ if ($action == 'create') {
 				// Show product and description
 				if (isset($object->lines[$i]->product_type))
 					$type = $object->lines[$i]->product_type;
-				else
-					$object->lines[$i]->fk_product_type;
+				else $object->lines[$i]->fk_product_type;
 				// Try to enhance type detection using date_start and date_end for free lines when type
 				// was not saved.
 				if (!empty($objp->date_start)) $type = 1;
@@ -731,8 +725,7 @@ if ($action == 'create') {
 				print $langs->trans('Delete').'</a></div>';
 			}
 			print '</div>';
-		} else
-			print $langs->trans("ErrorRecordNotFound");
+		} else print $langs->trans("ErrorRecordNotFound");
 	} else {
 		/*
 		 *  List mode
@@ -860,10 +853,8 @@ if ($action == 'create') {
 								print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel';
 								print '&socid='.$objp->socid.'&id='.$objp->fich_rec.'">';
 								print $langs->trans("CreateFichInter").'</a>';
-							} else
-								print $langs->trans("DateIsNotEnough");
-						} else
-							print "&nbsp;";
+							} else print $langs->trans("DateIsNotEnough");
+						} else print "&nbsp;";
 
 						print "</td>";
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 28878443518..ed01164b3df 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -129,9 +129,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -142,9 +140,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -176,14 +172,10 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
-	}
-
-	elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->setDraft($user);
 		if ($result >= 0)
@@ -205,14 +197,10 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
-	}
-
-	elseif ($action == 'add' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'add' && $user->rights->ficheinter->creer)
 	{
 	    $object->socid = $socid;
 	    $object->duration = GETPOST('duration', 'int');
@@ -383,21 +371,15 @@ if (empty($reshook))
 								}
 							}
 						}
-		            }
-		            else
-		            {
+		            } else {
 		                $mesg = $srcobject->error;
 		                $error++;
 		            }
-		        }
-		        else
-		        {
+		        } else {
 		            $mesg = $object->error;
 		            $error++;
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		    	// Fill array 'array_options' with data from add form
 		    	$ret = $extrafields->setOptionalsFromPost(null, $object);
 		    	if ($ret < 0) {
@@ -416,24 +398,18 @@ if (empty($reshook))
 		    		if ($result > 0)
 		    		{
 		    			$id = $result; // Force raffraichissement sur fiche venant d'etre cree
-		    		}
-		    		else
-		    		{
+		    		} else {
 		    			$langs->load("errors");
 		    			setEventMessages($object->error, $object->errors, 'errors');
 		    			$action = 'create';
 		    		}
 		    	}
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	    	$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'</div>';
 	        $action = 'create';
 	    }
-	}
-
-	elseif ($action == 'update' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'update' && $user->rights->ficheinter->creer)
 	{
 		$object->socid = $socid;
 		$object->fk_project		= GETPOST('projectid', 'int');
@@ -460,9 +436,7 @@ if (empty($reshook))
 	{
 		$result = $object->set_contrat($user, GETPOST('contratid', 'int'));
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
 	{
 		$result = $object->delete($user);
 		if ($result < 0) {
@@ -471,9 +445,7 @@ if (empty($reshook))
 
 		header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter&restore_lastsearch_values=1');
 		exit;
-	}
-
-	elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->set_description($user, GETPOST('description'));
 		if ($result < 0) dol_print_error($db, $object->error);
@@ -537,9 +509,7 @@ if (empty($reshook))
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$mesg = $object->error;
 				$db->rollback();
 			}
@@ -554,9 +524,7 @@ if (empty($reshook))
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -569,9 +537,7 @@ if (empty($reshook))
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -584,9 +550,7 @@ if (empty($reshook))
 	    {
 	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -698,9 +662,7 @@ if (empty($reshook))
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
 		exit;
-	}
-
-	elseif ($action == 'down' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'down' && $user->rights->ficheinter->creer)
 	{
 		$object->line_down($lineid);
 
@@ -769,16 +731,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-				}
-				else
-				{
+				} else {
 					$mesg = '<div class="error">'.$object->error.'</div>';
 				}
 			}
@@ -799,8 +757,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -845,9 +802,7 @@ if ($action == 'create')
         if ($element == 'project')
         {
             $projectid = GETPOST('originid', 'int');
-        }
-        else
-		{
+        } else {
             // For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
@@ -881,8 +836,7 @@ if ($action == 'create')
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid', 'int');
 	}
 
@@ -1061,9 +1015,7 @@ if ($action == 'create')
 
 			print '</table>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -1094,8 +1046,7 @@ if ($action == 'create')
 
 		print '</form>';
 	}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	/*
 	 * Affichage en mode visu
@@ -1134,9 +1085,7 @@ elseif ($id > 0 || !empty($ref))
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$numref = $object->ref;
 		}
 		$text = $langs->trans('ConfirmValidateIntervention', $numref);
@@ -1290,18 +1239,14 @@ elseif ($id > 0 || !empty($ref))
 		{
 			$formcontract = new Formcontract($db);
 			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
-		}
-		else
-		{
+		} else {
 			if ($object->fk_contrat)
             {
                 $contratstatic = new Contrat($db);
                 $contratstatic->fetch($object->fk_contrat);
                 //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
                 print $contratstatic->getNomUrl(0, '', 1);
-            }
-            else
-            {
+            } else {
                 print "&nbsp;";
             }
 		}
@@ -1363,9 +1308,7 @@ elseif ($id > 0 || !empty($ref))
 		{
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id', 'int').'">';
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="action" value="addline">';
 		}
 
@@ -1446,9 +1389,7 @@ elseif ($id > 0 || !empty($ref))
 							}
 						}
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td colspan="2">&nbsp;</td>';
 					}
 
@@ -1584,9 +1525,7 @@ elseif ($id > 0 || !empty($ref))
 			}
 
 			if ($num) print '</table>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1636,8 +1575,7 @@ elseif ($id > 0 || !empty($ref))
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						}
-						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -1674,9 +1612,7 @@ elseif ($id > 0 || !empty($ref))
 						if ($object->statut != Fichinter::STATUS_BILLED)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
-						}
-						else
-						{
+						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
 						}
 					}
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 4f81930355e..b36ca265b6f 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -172,8 +172,7 @@ class Interventions extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve intervention list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 1f14d8aa4c8..754fc8dd507 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -206,9 +206,7 @@ class Fichinter extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -334,17 +332,13 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = join(',', $this->errors);
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -404,9 +398,7 @@ class Fichinter extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -431,8 +423,7 @@ class Fichinter extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 			$sql .= " AND f.ref='".$this->db->escape($ref)."'";
-		}
-		else $sql .= " WHERE f.rowid=".$rowid;
+		} else $sql .= " WHERE f.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -480,9 +471,7 @@ class Fichinter extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -535,9 +524,7 @@ class Fichinter extends CommonObject
 			    $this->db->rollback();
 			    return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -568,9 +555,7 @@ class Fichinter extends CommonObject
 			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 			{
 				$num = $this->getNextNumRef($this->thirdparty);
-			}
-			else
-			{
+			} else {
 				$num = $this->ref;
 			}
 			$this->newref = dol_sanitizeFileName($num);
@@ -655,9 +640,7 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 				return -1;
@@ -877,15 +860,11 @@ class Fichinter extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				dol_print_error($db, "Fichinter::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined");
 			return "";
@@ -943,9 +922,7 @@ class Fichinter extends CommonObject
 				}
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1064,9 +1041,7 @@ class Fichinter extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1096,9 +1071,7 @@ class Fichinter extends CommonObject
 			{
 				$this->date_delivery = $date_delivery;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_date_delivery Erreur SQL");
 				return -1;
@@ -1130,9 +1103,7 @@ class Fichinter extends CommonObject
 			{
 				$this->description = $description;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_description Erreur SQL");
 				return -1;
@@ -1164,9 +1135,7 @@ class Fichinter extends CommonObject
 			{
 				$this->fk_contrat = $contractid;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -1256,9 +1225,7 @@ class Fichinter extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1302,9 +1269,7 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -1;
@@ -1395,9 +1360,7 @@ class Fichinter extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1500,9 +1463,7 @@ class FichinterLigne extends CommonObjectLine
 
 			$this->db->free($result);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1536,9 +1497,7 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$obj = $this->db->fetch_object($resql);
 				$rangToUse = $obj->max + 1;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				$this->db->rollback();
 				return -1;
@@ -1590,15 +1549,11 @@ class FichinterLigne extends CommonObjectLine
 			if (!$error) {
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -1658,16 +1613,12 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1711,16 +1662,12 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1770,22 +1717,16 @@ class FichinterLigne extends CommonObjectLine
 
 					$this->db->commit();
 					return $result;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index fa0ec89d558..e991efb2009 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -66,9 +66,7 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -95,8 +93,7 @@ elseif ($action == 'deletecontact' && $user->rights->ficheinter->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index a6b4c88ed09..9825c0a58d1 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -170,9 +170,7 @@ if ($object->id)
     $permtoedit = $user->rights->ficheinter->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 1ee24997e87..ccadf89f1e4 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -179,9 +179,7 @@ if ($resql)
     //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</td></tr>';
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -298,8 +296,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -369,8 +366,7 @@ if (!empty($conf->ficheinter->enabled))
 		}
 
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 print '</div></div></div>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 64a3c3812bb..4d18a54cb54 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -652,9 +652,7 @@ if ($resql)
 	$delallowed = $user->rights->ficheinter->creer;
 
 	print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 0ca948312c6..cb076e01ef1 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -81,9 +81,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
 }
@@ -121,9 +119,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
 }
@@ -160,9 +156,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
 }
@@ -313,8 +307,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     /*print "<br>\n";
     print $px2->show();
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index b70419de5f4..d1a33d24344 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -87,9 +87,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
     	// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
     	// but we don't want to change this because when URL is correct, we must be sure the redirect to install/index.php will be correct.
         $path = '';
-    }
-    else
-    {
+    } else {
         // If what we look is not index.php, we can try to guess location of root. May not work all the time.
     	// There is no real solution, because the only way to know the apache url relative path is to have it into conf file.
     	// If it fails to find correct $path, then only solution is to ask user to enter the correct URL to index.php or install/index.php
@@ -114,9 +112,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
 if (!empty($dolibarr_strict_mode))
 {
 	error_reporting(E_ALL | E_STRICT);
-}
-else
-{
+} else {
 	error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 }
 
@@ -156,8 +152,7 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
     {
     	$csrfattack = false;
     	if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
-    	else
-    	{
+    	else {
     		$tmpa = parse_url($_SERVER['HTTP_HOST']);
     		$tmpb = parse_url($_SERVER['HTTP_REFERER']);
     		if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6470b7db313..c10b9dbf162 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -235,9 +235,7 @@ if ($object->id > 0)
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -254,9 +252,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -334,9 +330,7 @@ if ($object->id > 0)
         {
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
-        }
-        else
-        {
+        } else {
             print $langs->trans("ThirdpartyNotLinkedToMember");
         }
         print '</td>';
@@ -566,9 +560,7 @@ if ($object->id > 0)
 	            if ($obj->dc)
 	            {
 	                print dol_print_date($db->jdate($obj->dc), 'day');
-	            }
-	            else
-	            {
+	            } else {
 	                print "-";
 	            }
 	            print '</td>';
@@ -579,9 +571,7 @@ if ($object->id > 0)
 	        $db->free($resql);
 
 	        if ($num > 0) print "</table>";
-	    }
-	    else
-	    {
+	    } else {
 	        dol_print_error($db);
 	    }
 	}
@@ -606,9 +596,7 @@ if ($object->id > 0)
 		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
 		{
 			$sql2 .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; //  Must match filter in htdocs/fourn/orderstoinvoice.php
-		}
-		else
-		{
+		} else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 			$sql2 .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
 		}
@@ -677,9 +665,7 @@ if ($object->id > 0)
 				if ($obj->dc)
 				{
 					print dol_print_date($db->jdate($obj->dc), 'day');
-				}
-				else
-				{
+				} else {
 					print "-";
 				}
 				print '</td>';
@@ -690,9 +676,7 @@ if ($object->id > 0)
 			$db->free($resql);
 
 			if ($num > 0) print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -761,9 +745,7 @@ if ($object->id > 0)
 			}
 			$db->free($resql);
 			if ($num > 0) print '</table>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -817,13 +799,10 @@ if ($object->id > 0)
 				{
 					// Company is open
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 				}
-			}
-			else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+			} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 		}
 
 		if ($user->rights->fournisseur->facture->creer)
@@ -842,9 +821,7 @@ if ($object->id > 0)
         	if ($user->rights->agenda->myactions->create)
         	{
             	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-        	}
-        	else
-        	{
+        	} else {
             	print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
         	}
     	}
@@ -870,9 +847,7 @@ if ($object->id > 0)
     	// List of done actions
     	show_actions_done($conf, $langs, $db, $object);
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 1f20965fab3..5ec2b6f49a6 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -177,8 +177,7 @@ class SupplierInvoices extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -669,9 +668,7 @@ class SupplierInvoices extends DolibarrApi
     	$updateRes = $this->invoice->deleteline($lineid);
     	if ($updateRes > 0) {
     		return $this->get($id);
-    	}
-    	else
-    	{
+    	} else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 9e22d952920..bee6346386b 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -175,8 +175,7 @@ class SupplierOrders extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve supplier order list : '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 30995b3b0df..e9ba334313c 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -95,9 +95,7 @@ class Fournisseur extends Societe
 		{
 			$obj = $this->db->fetch_object($resql);
 			return $obj->nb;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -136,9 +134,7 @@ class Fournisseur extends Societe
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -166,9 +162,7 @@ class Fournisseur extends Societe
 		{
 			dol_syslog("Fournisseur::CreateCategory : Success");
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog("Fournisseur::CreateCategory : Failed (".$this->error.")");
 			return -1;
@@ -204,9 +198,7 @@ class Fournisseur extends Societe
 			{
 				$arr[$obj->rowid] = $obj->name;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 		}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 48b8661e041..c544658a921 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -422,14 +422,10 @@ class CommandeFournisseur extends CommonOrder
             if ($result < 0)
             {
             	return -1;
-            }
-            else
-            {
+            } else {
             	return 1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             return -1;
         }
@@ -547,9 +543,7 @@ class CommandeFournisseur extends CommonOrder
     		$this->db->free($result);
 
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->error()." sql=".$sql;
     		return -1;
     	}
@@ -585,9 +579,7 @@ class CommandeFournisseur extends CommonOrder
             if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
-            }
-            else
-			{
+            } else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -666,15 +658,11 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = 'NotAuthorized';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
@@ -881,15 +869,11 @@ class CommandeFournisseur extends CommonOrder
             if ($numref != "")
             {
                 return $numref;
-            }
-            else
-			{
+            } else {
                 $this->error = $obj->error;
                 return -1;
             }
-        }
-        else
-		{
+        } else {
             $this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
             return -2;
         }
@@ -923,15 +907,11 @@ class CommandeFournisseur extends CommonOrder
 
         	    $this->db->commit();
         	    return 1;
-        	}
-        	else
-        	{
+        	} else {
         	    $this->db->rollback();
                 return -1;
         	}
-        }
-        else
-        {
+        } else {
         	dol_print_error($this->db);
 
         	$this->db->rollback();
@@ -970,9 +950,7 @@ class CommandeFournisseur extends CommonOrder
             if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
-            }
-            else
-			{
+            } else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -995,8 +973,7 @@ class CommandeFournisseur extends CommonOrder
     	        	    $comment = ' (first level)';
     	        	}
     	        }
-			}
-			else	// request a second level approval
+			} else // request a second level approval
 			{
             	$sql .= " date_approve2='".$this->db->idate($now)."',";
             	$sql .= " fk_user_approve2 = ".$user->id;
@@ -1063,8 +1040,7 @@ class CommandeFournisseur extends CommonOrder
 					{
 			            $this->date_approve = $now;
 		    	        $this->user_approve_id = $user->id;
-					}
-					else	// request a second level approval
+					} else // request a second level approval
 					{
 			            $this->date_approve2 = $now;
 		    	        $this->user_approve_id2 = $user->id;
@@ -1072,22 +1048,16 @@ class CommandeFournisseur extends CommonOrder
 
                     $this->db->commit();
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
         }
         return -1;
@@ -1126,22 +1096,16 @@ class CommandeFournisseur extends CommonOrder
                     {
                         $error++;
                         $this->db->rollback();
-                    }
-                    else
-                    	$this->db->commit();
+                    } else $this->db->commit();
 					// End call triggers
                 }
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::refuse Error -1");
                 $result = -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::refuse Not Authorized");
         }
         return $result;
@@ -1187,23 +1151,17 @@ class CommandeFournisseur extends CommonOrder
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
                 dol_syslog(get_class($this)."::cancel ".$this->error);
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::cancel Not Authorized");
             return -1;
         }
@@ -1247,9 +1205,7 @@ class CommandeFournisseur extends CommonOrder
                 $result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
                 if ($result < 0) $error++;
                 // End call triggers
-            }
-            else
-            {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
                 $this->errors[] = $this->db->lasterror();
@@ -1258,14 +1214,10 @@ class CommandeFournisseur extends CommonOrder
             if (!$error)
             {
                 $this->db->commit();
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
             }
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
@@ -1428,8 +1380,7 @@ class CommandeFournisseur extends CommonOrder
 							                $error++;
 							            }
 							        }
-							    }
-							    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 							    {
 							        $origin_id = $tmp_origin_id;
 									$ret = $this->add_object_linked($origin, $origin_id);
@@ -1463,17 +1414,13 @@ class CommandeFournisseur extends CommonOrder
 
 	                $this->db->commit();
 	                return $this->id;
-	            }
-	            else
-	            {
+	            } else {
 	                $this->error = $this->db->lasterror();
 	                $this->db->rollback();
 	                return -2;
 	            }
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1557,9 +1504,7 @@ class CommandeFournisseur extends CommonOrder
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1626,9 +1571,7 @@ class CommandeFournisseur extends CommonOrder
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 			$desc = trim($desc);
@@ -1698,9 +1641,7 @@ class CommandeFournisseur extends CommonOrder
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
                         }
-                    }
-                    else
-    				{
+                    } else {
                         $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
@@ -1715,9 +1656,7 @@ class CommandeFournisseur extends CommonOrder
 					if ($qty < $prod->packaging)
 					{
 						$qty = $prod->packaging;
-					}
-					else
-					{
+					} else {
 						if (($qty % $prod->packaging) > 0)
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
@@ -1726,9 +1665,7 @@ class CommandeFournisseur extends CommonOrder
 						}
 					}
 				}
-            }
-            else
-            {
+            } else {
                 $product_type = $type;
             }
 
@@ -1841,15 +1778,11 @@ class CommandeFournisseur extends CommonOrder
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->line->error;
                 $this->errors = $this->line->errors;
                 dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
@@ -1925,9 +1858,7 @@ class CommandeFournisseur extends CommonOrder
                     }
 					// End call triggers
                 }
-            }
-            else
-			{
+            } else {
                 $this->error = $this->db->lasterror();
                 $error++;
             }
@@ -1955,15 +1886,11 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-		{
+        } else {
             $this->error = 'BadStatusForObject';
             return -2;
         }
@@ -1991,16 +1918,12 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->update_price();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $line->error;
                 $this->errors = $line->errors;
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             return -2;
         }
     }
@@ -2065,9 +1988,7 @@ class CommandeFournisseur extends CommonOrder
                 $this->errors[] = $this->db->lasterror();
                 $error++;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->db->lasterror();
             $error++;
@@ -2129,9 +2050,7 @@ class CommandeFournisseur extends CommonOrder
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -$error;
@@ -2166,9 +2085,7 @@ class CommandeFournisseur extends CommonOrder
                 $i++;
             }
             return 0;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -2218,8 +2135,7 @@ class CommandeFournisseur extends CommonOrder
 
 				$i++;
 			}
-		}
-		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+		} else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
 
 		return $ret;
     }
@@ -2315,25 +2231,19 @@ class CommandeFournisseur extends CommonOrder
                     if (!$error)
                     {
                         $this->db->commit();
-                    }
-                    else
-                    {
+                    } else {
                         $this->statut = $old_statut;
                         $this->db->rollback();
                         $this->error = $this->db->lasterror();
                         $result = -1;
                     }
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     $this->error = $this->db->lasterror();
                     $result = -1;
                 }
             }
-        }
-        else
-        {
+        } else {
             $this->error = $langs->trans('NotAuthorized');
             $this->errors[] = $langs->trans('NotAuthorized');
             dol_syslog(get_class($this)."::Livraison Not Authorized");
@@ -2390,9 +2300,7 @@ class CommandeFournisseur extends CommonOrder
         	{
         		$this->db->commit();
         		return 1;
-        	}
-        	else
-        	{
+        	} else {
         		foreach ($this->errors as $errmsg)
         		{
         			dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2401,9 +2309,7 @@ class CommandeFournisseur extends CommonOrder
         		$this->db->rollback();
         		return -1 * $error;
         	}
-        }
-        else
-        {
+        } else {
             return -2;
         }
     }
@@ -2457,9 +2363,7 @@ class CommandeFournisseur extends CommonOrder
             {
             	$this->db->commit();
             	return 1;
-            }
-            else
-            {
+            } else {
             	foreach ($this->errors as $errmsg)
             	{
             		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2468,9 +2372,7 @@ class CommandeFournisseur extends CommonOrder
             	$this->db->rollback();
             	return -1 * $error;
             }
-        }
-        else
-        {
+        } else {
             return -2;
         }
     }
@@ -2557,9 +2459,7 @@ class CommandeFournisseur extends CommonOrder
             $result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$triggerName[$status], $user);
             if ($result < 0) { $error++; }
             // End call triggers
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this)."::setStatus ".$this->error);
@@ -2570,9 +2470,7 @@ class CommandeFournisseur extends CommonOrder
             $this->statut = $status;
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -2695,9 +2593,7 @@ class CommandeFournisseur extends CommonOrder
 				if ($qty < $this->line->packaging)
 				{
 					$qty = $this->line->packaging;
-				}
-				else
-				{
+				} else {
 					if (($qty % $this->line->packaging) > 0)
 					{
 						$coeff = intval($qty / $this->line->packaging) + 1;
@@ -2762,16 +2658,12 @@ class CommandeFournisseur extends CommonOrder
                 $this->update_price('', 'auto');
 				$this->db->commit();
 				return $result;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Order status makes operation forbidden";
             dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
             return -2;
@@ -2849,9 +2741,7 @@ class CommandeFournisseur extends CommonOrder
                 $line->total_ttc = 59.8;
                 $line->total_tva = 9.8;
                 $line->remise_percent = 50;
-            }
-            else
-            {
+            } else {
                 $line->total_ht = 100;
                 $line->total_ttc = 119.6;
                 $line->total_tva = 19.6;
@@ -2902,9 +2792,7 @@ class CommandeFournisseur extends CommonOrder
                 $this->date_validation   = $this->db->idate($obj->date_validation);
             }
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2943,9 +2831,7 @@ class CommandeFournisseur extends CommonOrder
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2978,8 +2864,7 @@ class CommandeFournisseur extends CommonOrder
         $sql .= $clause." c.entity = ".$conf->entity;
         if ($mode === 'awaiting') {
             $sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
-        }
-        else {
+        } else {
             $sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
         }
         if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
@@ -3016,9 +2901,7 @@ class CommandeFournisseur extends CommonOrder
             }
 
             return $response;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3054,8 +2937,7 @@ class CommandeFournisseur extends CommonOrder
                     }
                     return $string;
                 }
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
         }
 
         return '';
@@ -3218,9 +3100,7 @@ class CommandeFournisseur extends CommonOrder
     		{
     			$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
     			return $ret;
-    		}
-    		else
-    		{
+    		} else {
     			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
     			{
     				$date_liv = dol_now();
@@ -3253,9 +3133,7 @@ class CommandeFournisseur extends CommonOrder
         						return -1;
         					}
     					    return 5;
-    					}
-    					else
-    					{
+    					} else {
     					    //Diff => received partially
     					    //$ret=$this->setStatus($user,4);
     						$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
@@ -3293,9 +3171,7 @@ class CommandeFournisseur extends CommonOrder
         						    return -1;
         					    }
     					        return 5;
-    					    }
-    					    else
-    					    {
+    					    } else {
     					        //Diff => received partially
     					        $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 							    if ($ret < 0) {
@@ -3303,9 +3179,7 @@ class CommandeFournisseur extends CommonOrder
 							    }
 							    return 4;
 						    }
-					    }
-					    else
-					    {
+					    } else {
                             //all the products are not received
 						    $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 						    if ($ret < 0) {
@@ -3313,9 +3187,7 @@ class CommandeFournisseur extends CommonOrder
 						    }
 						    return 4;
 					    }
-				    }
-    				else
-    				{
+				    } else {
     					//Diff => received partially
     					$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
     					if ($ret < 0) {
@@ -3370,9 +3242,7 @@ class CommandeFournisseur extends CommonOrder
             $this->db->free();
 
             return $num;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -3533,16 +3403,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 	            $this->db->free($result);
     	        return 1;
-            }
-    	    else
-    	    {
+            } else {
     	        $this->error = 'Supplier order line  with id='.$rowid.' not found';
     	        dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
     	        return 0;
     	    }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3603,8 +3469,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
         $sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
         $sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
         $sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-        if ($this->fk_product) { $sql .= $this->fk_product.","; }
-        else { $sql .= "null,"; }
+        if ($this->fk_product) { $sql .= $this->fk_product.","; } else { $sql .= "null,"; }
         $sql .= "'".$this->db->escape($this->product_type)."',";
         $sql .= "'".$this->db->escape($this->special_code)."',";
         $sql .= "'".$this->db->escape($this->rang)."',";
@@ -3666,9 +3531,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->errors[] = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3753,15 +3616,11 @@ class CommandeFournisseurLigne extends CommonOrderLine
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -3817,9 +3676,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 19ea5880346..518c6885411 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -227,9 +227,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -297,9 +295,7 @@ class CommandeFournisseurDispatch extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -392,9 +388,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -459,9 +453,7 @@ class CommandeFournisseurDispatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -514,9 +506,7 @@ class CommandeFournisseurDispatch extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -552,28 +542,23 @@ class CommandeFournisseurDispatch extends CommonObject
         if ($mode == 0)
         {
             return $langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             return $langs->trans($this->statutshort[$status]);
-        }
-        elseif ($mode == 2)
+        } elseif ($mode == 2)
         {
             return $langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 3)
+        } elseif ($mode == 3)
         {
             if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
             elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
             elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-        }
-        elseif ($mode == 4)
+        } elseif ($mode == 4)
         {
             if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
             elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
             elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 5)
+        } elseif ($mode == 5)
         {
             if ($status == 0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
             elseif ($status == 1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 37dbc2752ca..9949c4d3253 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -455,8 +455,7 @@ class FactureFournisseur extends CommonInvoice
 				                $error++;
 				            }
 				        }
-				    }
-				    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+				    } else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
 				    {
 				        $origin_id = $tmp_origin_id;
     					$ret = $this->add_object_linked($origin, $origin_id);
@@ -502,16 +501,13 @@ class FactureFournisseur extends CommonInvoice
                             $this->lines[$i]->fk_unit,
                             $this->lines[$i]->pu_ht_devise
                         );
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return -5;
                     }
                 }
-			}
-			else	// If this->lines is an array of invoice line arrays
+			} else // If this->lines is an array of invoice line arrays
 			{
 			    dol_syslog("There is ".count($this->lines)." lines that are array lines");
 			    foreach ($this->lines as $i => $val)
@@ -543,9 +539,7 @@ class FactureFournisseur extends CommonInvoice
 			                (!empty($line->info_bits) ? $line->info_bits : ''),
 			                $line->product_type
 			                );
-			        }
-			        else
-			        {
+			        } else {
 			            $this->error = $this->db->lasterror();
 			            $this->db->rollback();
 			            return -5;
@@ -579,30 +573,22 @@ class FactureFournisseur extends CommonInvoice
                 {
                     $this->db->commit();
                     return $this->id;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -4;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $langs->trans('FailedToUpdatePrice');
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else
-        {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans('ErrorRefAlreadyExists');
                 $this->db->rollback();
                 return -1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
@@ -757,9 +743,7 @@ class FactureFournisseur extends CommonInvoice
                     $this->error = $this->db->lasterror();
                     return -3;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = 'Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
@@ -767,9 +751,7 @@ class FactureFournisseur extends CommonInvoice
 
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -869,9 +851,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->free($resql_rows);
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -1007,9 +987,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -1096,23 +1074,17 @@ class FactureFournisseur extends CommonInvoice
 
     				$this->db->commit();
     				return 1;
-    			}
-    			else
-    			{
+    			} else {
     				$this->error = $facligne->error;
     				$this->db->rollback();
     				return -1;
     			}
-    		}
-    		else
-    		{
+    		} else {
     			$this->error = $facligne->error;
     			$this->db->rollback();
     			return -2;
     		}
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->rollback();
     		return -3;
     	}
@@ -1195,8 +1167,7 @@ class FactureFournisseur extends CommonInvoice
                 if (!$resql2) {
                 	$error++;
                 }
-            }
-            else {
+            } else {
             	$error++;
             }
         }
@@ -1262,9 +1233,7 @@ class FactureFournisseur extends CommonInvoice
         	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
         	$this->db->commit();
         	return 1;
-        }
-        else
-        {
+        } else {
         	$this->error = $this->db->lasterror();
         	$this->db->rollback();
         	return -$error;
@@ -1301,9 +1270,7 @@ class FactureFournisseur extends CommonInvoice
             $result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->error();
             dol_print_error($this->db);
@@ -1313,9 +1280,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1351,9 +1316,7 @@ class FactureFournisseur extends CommonInvoice
             $result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
             if ($result < 0) $error++;
             // End call triggers
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
             dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
@@ -1363,9 +1326,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1420,13 +1381,10 @@ class FactureFournisseur extends CommonInvoice
         if ($force_number)
         {
             $num = $force_number;
-        }
-        elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+        } elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
         {
             $num = $this->getNextNumRef($this->thirdparty);
-        }
-        else
-		{
+        } else {
             $num = $this->ref;
         }
         $this->newref = dol_sanitizeFileName($num);
@@ -1525,15 +1483,11 @@ class FactureFournisseur extends CommonInvoice
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1607,15 +1561,11 @@ class FactureFournisseur extends CommonInvoice
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1739,17 +1689,13 @@ class FactureFournisseur extends CommonInvoice
 	        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
 	        				return -1;
 	        			}
-	        		}
-	        		else
-	        		{
+	        		} else {
 	        			$this->error = $prod->error;
 	        			$this->db->rollback();
 	        			return -1;
 	        		}
 	        	}
-	        }
-	        else
-	        {
+	        } else {
 	        	$product_type = $type;
 	        }
 
@@ -1861,24 +1807,18 @@ class FactureFournisseur extends CommonInvoice
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
-        }
-        else
-        {
+        } else {
         	return 0;
         }
     }
@@ -1976,9 +1916,7 @@ class FactureFournisseur extends CommonInvoice
             $product = new Product($this->db);
             $result = $product->fetch($idproduct);
             $product_type = $product->type;
-        }
-        else
-        {
+        } else {
             $product_type = $type;
         }
 
@@ -2092,9 +2030,7 @@ class FactureFournisseur extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -4;
@@ -2146,9 +2082,7 @@ class FactureFournisseur extends CommonInvoice
                 //$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
             }
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2196,9 +2130,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2249,9 +2181,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2308,9 +2238,7 @@ class FactureFournisseur extends CommonInvoice
             }
             $this->db->free($resql);
             return $response;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2464,9 +2392,7 @@ class FactureFournisseur extends CommonInvoice
         if ($numref != "")
         {
         	return $numref;
-        }
-        else
-        {
+        } else {
             $this->error = $obj->error;
             //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
             return false;
@@ -2549,9 +2475,7 @@ class FactureFournisseur extends CommonInvoice
 				    $line->total_ttc = 59.8;
 				    $line->total_tva = 9.8;
 	    			$line->remise_percent = 50;
-				}
-				else
-				{
+				} else {
 				    $line->total_ht = 100;
 				    $line->total_ttc = 119.6;
 				    $line->total_tva = 19.6;
@@ -2616,9 +2540,7 @@ class FactureFournisseur extends CommonInvoice
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2693,9 +2615,7 @@ class FactureFournisseur extends CommonInvoice
         {
             $this->db->commit();
             return $object->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -2724,9 +2644,7 @@ class FactureFournisseur extends CommonInvoice
 			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
 			{
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -2734,9 +2652,7 @@ class FactureFournisseur extends CommonInvoice
 		if (empty($modele))
 		{
 		    return 0;
-		}
-		else
-		{
+		} else {
             $modelpath = "core/modules/supplier_invoice/doc/";
 
             return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
@@ -3176,9 +3092,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3434,9 +3348,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3470,9 +3382,7 @@ class SupplierInvoiceLine extends CommonObjectLine
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index c00ee77df53..a2ed4b6c0aa 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -149,9 +149,7 @@ class ProductFournisseur extends Product
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -287,8 +285,7 @@ class ProductFournisseur extends Product
 			$localtax1 = $localtaxes_array['1'];
 			$localtaxtype2 = $localtaxes_array['2'];
 			$localtax2 = $localtaxes_array['3'];
-		}
-		else     // old method. deprecated because ot can't retreive type
+		} else // old method. deprecated because ot can't retreive type
 		{
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
@@ -384,22 +381,16 @@ class ProductFournisseur extends Product
 				{
 					$this->db->commit();
 					return $this->product_fourn_price_id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -2;
 			}
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this).'::update_buyprice without knowing id of line, so we delete from company, quantity and supplier_ref and insert again', LOG_DEBUG);
 
             // Delete price for this quantity
@@ -447,8 +438,7 @@ class ProductFournisseur extends Product
                 $resql = $this->db->query($sql);
                 if ($resql) {
                     $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
-                }
-                else {
+                } else {
                     $error++;
                 }
 
@@ -566,23 +556,17 @@ class ProductFournisseur extends Product
 	                    if ($this->fourn_qty != 0)
 	                    {
 	                        $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
-	                    }
-	                    else
-	                    {
+	                    } else {
 	                        $this->fourn_unitprice = "";
 	                    }
                     }
                 }
 
             	return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -685,9 +669,7 @@ class ProductFournisseur extends Product
                     if ($prodfourn->fourn_qty != 0)
                     {
                         $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
-                    }
-                    else
-                    {
+                    } else {
                         $prodfourn->fourn_unitprice = "";
                     }
                 }
@@ -697,9 +679,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -775,9 +755,7 @@ class ProductFournisseur extends Product
             {
                 $this->db->free($resql);
                 return 0;
-            }
-            else
-            {
+            } else {
                 $min = -1;
                 foreach ($record_array as $record)
                 {
@@ -798,9 +776,7 @@ class ProductFournisseur extends Product
                             if ($record["quantity"] != 0)
                             {
                                 $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
-                            }
-                            else
-                            {
+                            } else {
                                 $fourn_unitprice = $fourn_price;
                             }
                         }
@@ -835,9 +811,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return 1;
-        }
-        else
-		{
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -868,9 +842,7 @@ class ProductFournisseur extends Product
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -997,9 +969,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -1087,8 +1057,7 @@ class ProductFournisseur extends Product
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index a95aefede0f..a2df6ba9b74 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -131,15 +131,11 @@ class PaiementFourn extends Paiement
 				$this->type_label = $obj->paiement_type;
 				$this->statut         = $obj->statut;
 				$error = 1;
-			}
-			else
-			{
+			} else {
 				$error = -2; // TODO Use 0 instead
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$error = -1;
 		}
@@ -171,9 +167,7 @@ class PaiementFourn extends Paiement
 		{
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		}
-		else
-		{
+		} else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -202,9 +196,7 @@ class PaiementFourn extends Paiement
 			{
 				$total = $totalamount;
 				$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
-			}
-			else
-			{
+			} else {
 				$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 				$mtotal = $totalamount;
 			}
@@ -247,8 +239,7 @@ class PaiementFourn extends Paiement
 								if ($remaintopay == 0)
 								{
 									$result = $invoice->set_paid($user, '', '');
-								}
-								else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
+								} else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
 							}
 
 							// Regenerate documents of invoices
@@ -268,15 +259,11 @@ class PaiementFourn extends Paiement
 									$error++;
 								}
 							}
-						}
-						else
-						{
+						} else {
 							$this->error = $this->db->lasterror();
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 					}
 				}
@@ -288,15 +275,11 @@ class PaiementFourn extends Paiement
 					if ($result < 0) $error++;
 					// End call triggers
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "ErrorTotalIsNull";
 			dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR);
 			$error++;
@@ -310,9 +293,7 @@ class PaiementFourn extends Paiement
 			$this->db->commit();
 			dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -346,9 +327,7 @@ class PaiementFourn extends Paiement
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -414,9 +393,7 @@ class PaiementFourn extends Paiement
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -460,9 +437,7 @@ class PaiementFourn extends Paiement
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -496,9 +471,7 @@ class PaiementFourn extends Paiement
 			}
 
 			return $billsarray;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error);
 			return -1;
@@ -705,9 +678,7 @@ class PaiementFourn extends Paiement
 			}
 
 			return $numref;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier"));
 			return "";
@@ -737,9 +708,7 @@ class PaiementFourn extends Paiement
 			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF))
 			{
 				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -747,9 +716,7 @@ class PaiementFourn extends Paiement
 		if (empty($modele))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			$modelpath = "core/modules/supplier_payment/doc/";
 
 			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 71ed66ffc09..4c4f83baf38 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -99,8 +99,7 @@ if ($id > 0 || !empty($ref))
 	if ($ret < 0) dol_print_error($db, $object->error);
 	$ret = $object->fetch_thirdparty();
 	if ($ret < 0) dol_print_error($db, $object->error);
-}
-elseif (!empty($socid) && $socid > 0)
+} elseif (!empty($socid) && $socid > 0)
 {
 	$fourn = new Fournisseur($db);
 	$ret = $fourn->fetch($socid);
@@ -238,8 +237,7 @@ if (empty($reshook))
                             $l->total_ttc = 0;
                             $l->ref_supplier = '';
                             $l->update();
-                        }
-                        else {
+                        } else {
                             // No need for loop to keep best supplier price
                             $obj = $db->fetch_object($resql);
                             $l->subprice = $obj->unitprice;
@@ -250,8 +248,7 @@ if (empty($reshook))
                             $l->ref_supplier = $obj->ref_fourn;
                             $l->update();
                         }
-                    }
-                    else {
+                    } else {
                         dol_print_error($db);
                     }
                     $db->free($resql);
@@ -284,8 +281,7 @@ if (empty($reshook))
 				//$newstatus=3;  // Submited
 				// TODO If there is at least one reception, we can set to Received->Received partially
 				$newstatus = 4; // Received partially
-			}
-			elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
+			} elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
 			elseif ($object->statut == 7) $newstatus = 3; // Canceled->Process running
 			elseif ($object->statut == 9) $newstatus = 1; // Refused->Validated
 			else $newstatus = 2;
@@ -316,9 +312,7 @@ if (empty($reshook))
 
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -356,9 +350,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -441,14 +433,11 @@ if (empty($reshook))
 					{
 						$productsupplier->ref_supplier = '';
 					}
-				}
-				else
-				{
+				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			}
-			elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 			{
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
@@ -534,8 +523,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		}
-		elseif (empty($error)) // $price_ht is already set
+		} elseif (empty($error)) // $price_ht is already set
 		{
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
@@ -555,9 +543,7 @@ if (empty($reshook))
 			if ($price_ht !== '')
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-			}
-			else
-			{
+			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -623,9 +609,7 @@ if (empty($reshook))
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -674,9 +658,7 @@ if (empty($reshook))
 		{
 			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'));
-		}
-		else
-		{
+		} else {
 			$vatratecleaned = $vat_rate;
 			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"
 			{
@@ -768,9 +750,7 @@ if (empty($reshook))
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0) dol_print_error($db, $result);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db, $object->error);
 			exit;
 		}
@@ -800,9 +780,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -836,9 +814,7 @@ if (empty($reshook))
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0) dol_print_error($db, $result);
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
@@ -857,9 +833,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -892,9 +866,7 @@ if (empty($reshook))
 				}
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -907,9 +879,7 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -944,9 +914,7 @@ if (empty($reshook))
 			$action = '';
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -959,9 +927,7 @@ if (empty($reshook))
 		{
 			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -972,9 +938,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0)
 			{
 				$orig = clone $object;
@@ -984,9 +948,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -1008,18 +970,13 @@ if (empty($reshook))
 				$langs->load("deliveries");
 				setEventMessages($langs->trans("DeliveryStateSaved"), null);
 				$action = '';
-			}
-			elseif ($result == -3)
+			} elseif ($result == -3)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 		}
 	}
@@ -1031,9 +988,7 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -1128,14 +1083,11 @@ if (empty($reshook))
 					{
 						$classname = 'Propal';
 						$element = 'comm/propal'; $subelement = 'propal';
-					}
-					elseif ($origin == 'order' || $origin == 'commande')
+					} elseif ($origin == 'order' || $origin == 'commande')
 					{
 						$classname = 'Commande';
 						$element = $subelement = 'commande';
-					}
-					else
-					{
+					} else {
 						$classname = 'SupplierProposal';
 						$element = 'supplier_proposal';
 						$subelement = 'supplier_proposal';
@@ -1207,9 +1159,7 @@ if (empty($reshook))
 										$ref_supplier = $productsupplier->ref_supplier;
 										$product_fourn_price_id = $productsupplier->product_fourn_price_id;
 									}
-								}
-								else
-								{
+								} else {
 									$ref_supplier = $lines[$i]->ref_fourn;
 									$product_fourn_price_id = 0;
 								}
@@ -1276,9 +1226,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				}
-				else
-				{
+				} else {
 			   		$id = $object->create($user);
 					if ($id < 0)
 					{
@@ -1294,9 +1242,7 @@ if (empty($reshook))
 				$db->rollback();
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
-			}
-			else
-			{
+			} else {
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				exit;
@@ -1383,13 +1329,10 @@ if (empty($reshook))
 			if (empty($result_order["result"]["result_code"])) //No result, check error str
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-			}
-			elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
+			} elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs');
 			}
 		}
@@ -1409,16 +1352,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1439,8 +1378,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1492,14 +1430,11 @@ if ($action == 'create')
 		{
 			$classname = 'Propal';
 			$element = 'comm/propal'; $subelement = 'propal';
-		}
-		elseif ($origin == 'order' || $origin == 'commande')
+		} elseif ($origin == 'order' || $origin == 'commande')
 		{
 			$classname = 'Commande';
 			$element = $subelement = 'commande';
-		}
-		else
-		{
+		} else {
 			$classname = 'SupplierProposal';
 			$element = 'supplier_proposal';
 			$subelement = 'supplier_proposal';
@@ -1544,9 +1479,7 @@ if ($action == 'create')
 
 		// Object source contacts list
 		$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 
@@ -1584,9 +1517,7 @@ if ($action == 'create')
 	{
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
-	}
-	else
-	{
+	} else {
 		print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -1770,8 +1701,7 @@ if ($action == 'create')
 		print '</table>';
 	}
     print "</form>\n";
-}
-elseif (!empty($object->id))
+} elseif (!empty($object->id))
 {
 	$result = $object->fetch($id, $ref);
 
@@ -1819,16 +1749,13 @@ elseif (!empty($object->id))
 		if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) // empty should not happened, but when it occurs, the test save life
 		{
 			$newref = $object->getNextNumRef($object->thirdparty);
-		}
-		else $newref = $object->ref;
+		} else $newref = $object->ref;
 
 		if ($newref < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$text = $langs->trans('ConfirmValidateOrder', $newref);
 			if (!empty($conf->notification->enabled))
 			{
@@ -1849,9 +1776,7 @@ elseif (!empty($object->id))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1958,20 +1883,17 @@ elseif (!empty($object->id))
                 $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
                 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 $morehtmlref .= '</form>';
-            }
-            else {
+            } else {
                 $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
             }
-        }
-        else {
+        } else {
             if (!empty($object->fk_project)) {
                 $proj = new Project($db);
                 $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
                 $morehtmlref .= '</a>';
-            }
-            else {
+            } else {
                 $morehtmlref .= '';
             }
         }
@@ -2044,9 +1966,7 @@ elseif (!empty($object->id))
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-	}
-	else
-	{
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -2064,9 +1984,7 @@ elseif (!empty($object->id))
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -2159,9 +2077,7 @@ elseif (!empty($object->id))
 		print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
 		print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : '&nbsp;';
@@ -2192,9 +2108,7 @@ elseif (!empty($object->id))
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else
-		{
+		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 		}
 		print '</td></tr>';
@@ -2393,14 +2307,10 @@ elseif (!empty($object->id))
 					if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("ApproveOrder").'</a>';
 				}
 			}
@@ -2415,14 +2325,10 @@ elseif (!empty($object->id))
 						if (!empty($object->user_approve_id2))
 						{
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
-						}
-						else
-						{
+						} else {
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve2">'.$langs->trans("Approve2Order").'</a>';
 						}
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Approve2Order").'</a>';
 					}
 				}
@@ -2434,9 +2340,7 @@ elseif (!empty($object->id))
 				if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
 				{
 					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
 				}
 			}
@@ -2503,9 +2407,7 @@ elseif (!empty($object->id))
 				if ($user->rights->fournisseur->commande->commander)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
 				}
 			}
@@ -2537,18 +2439,14 @@ elseif (!empty($object->id))
 				if (empty($conf->facture->enabled))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
-				}
-				else
-				{
+				} else {
 					if (!empty($object->linkedObjectsIds['invoice_supplier']))
 					{
 						if ($user->rights->fournisseur->facture->creer)
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 						}
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NeedAtLeastOneInvoice")).'">'.$langs->trans("ClassifyBilled").'</a>';
 					}
 				}
@@ -2733,9 +2631,7 @@ elseif (!empty($object->id))
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-				}
-				else
-				{
+				} else {
 					$textinput_size = "50";
 					// Webservice url
 					print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
@@ -2755,8 +2651,7 @@ elseif (!empty($object->id))
 				//End table/form
 				print '</form>';
 				print '</table>';
-			}
-			elseif ($mode == "check")
+			} elseif ($mode == "check")
 			{
 				$ws_entity = '';
 				$ws_thirdparty = '';
@@ -2782,9 +2677,7 @@ elseif (!empty($object->id))
 					{
 						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
 						$error_occurred = true;
-					}
-					else
-					{
+					} else {
 						//Create SOAP client and connect it to product/service
 						$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
 						$soapclient_product->soap_defencoding = 'UTF-8';
@@ -2813,15 +2706,12 @@ elseif (!empty($object->id))
 							if (empty($status_code)) //No result, check error str
 							{
 								setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-							}
-							elseif ($status_code != "OK") //Something went wrong
+							} elseif ($status_code != "OK") //Something went wrong
 							{
 								if ($status_code == "NOT_FOUND")
 								{
 									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
-								}
-								else
-								{
+								} else {
 									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
 									$error_occurred = true;
 									break;
@@ -2856,19 +2746,15 @@ elseif (!empty($object->id))
 							}
 						}
 					}
-				}
-				elseif ($user_status_code == "PERMISSION_DENIED")
+				} elseif ($user_status_code == "PERMISSION_DENIED")
 				{
 					setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
 					$error_occurred = true;
-				}
-				elseif ($user_status_code == "BAD_CREDENTIALS")
+				} elseif ($user_status_code == "BAD_CREDENTIALS")
 				{
 					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
 					$error_occurred = true;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
 					$error_occurred = true;
 				}
@@ -2885,9 +2771,7 @@ elseif (!empty($object->id))
 				if ($error_occurred)
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-				}
-				else
-				{
+				} else {
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
 					print ' &nbsp; &nbsp; ';
 				}
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 7ff0dd1c85a..b3d2e3aa664 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->cree
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -193,9 +186,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else
-	{
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 0f6efeb8943..d7ad3785338 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -132,9 +132,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -175,9 +173,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -218,9 +214,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -395,8 +389,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 		$errors = $object->errors;
 		$error++;
 	}
-	else
-	{
+	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
 		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
@@ -418,8 +411,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
-	else
-	{
+	else {
 		$db->commit();
 	}
 }
@@ -452,8 +444,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$error++;
 		$errors=$supplierorderdispatch->errors;
 	}
-	else
-	{
+	else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
 		if ($entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 		{
@@ -467,8 +458,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 					$errors=$mouv->errors;
 					$error++;
 				}
-				else
-				{
+				else {
 					$mouv->origin = &$object;
 					$result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
 					if ($result < 0)
@@ -485,8 +475,7 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
-	else
-	{
+	else {
 		$db->commit();
 	}
 }
@@ -714,14 +703,11 @@ if ($id > 0 || !empty($ref)) {
 				print '<tr class="liste_titre">';
 
 				print '<td>'.$langs->trans("Description").'</td>';
-				if (!empty($conf->productbatch->enabled))
-				{
+				if (!empty($conf->productbatch->enabled)) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td></td>';
 					print '<td></td>';
 					print '<td></td>';
@@ -743,12 +729,9 @@ if ($id > 0 || !empty($ref)) {
 				print '<td align="right">'.$langs->trans("Warehouse");
 
 				// Select warehouse to force it everywhere
-				if (count($listwarehouses) > 1)
-				{
+				if (count($listwarehouses) > 1) {
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
-				}
-				elseif (count($listwarehouses) == 1)
-				{
+				} elseif (count($listwarehouses) == 1) {
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
 				}
 
@@ -875,9 +858,7 @@ if ($id > 0 || !empty($ref)) {
 							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
 							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
-							}
-							else
-							{
+							} else {
 							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
@@ -931,9 +912,7 @@ if ($id > 0 || !empty($ref)) {
 							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
 							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
-							}
-							else
-							{
+							} else {
 							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
@@ -949,9 +928,7 @@ if ($id > 0 || !empty($ref)) {
 						if (!empty($conf->productbatch->enabled) && $objp->tobatch == 1) {
 						    $type = 'batch';
 						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
-						}
-						else
-						{
+						} else {
 						    $type = 'dispatch';
 						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 						}
@@ -1049,8 +1026,7 @@ if ($id > 0 || !empty($ref)) {
 		    print "<br>\n";
 		    if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED))
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>'; // No predefined line at all
-			else
-				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
+			else print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
 		}
 
 		print '</form>';
@@ -1114,8 +1090,7 @@ if ($id > 0 || !empty($ref)) {
 			// Status
 			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
 				print '<td class="center" colspan="2">'.$langs->trans("Status").'</td>';
-			}
-			elseif (!empty($conf->reception->enabled)) {
+			} elseif (!empty($conf->reception->enabled)) {
 				print '<td class="center"></td>';
 			}
 
@@ -1167,8 +1142,7 @@ if ($id > 0 || !empty($ref)) {
 				{
 					print '<input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" />';
 				}
-				else
-				{
+				else {
 					print $objp->qty;
 				}
 				print '<input type="hidden" name="price" value="'.$objp->subprice.'" />';
@@ -1187,8 +1161,7 @@ if ($id > 0 || !empty($ref)) {
 						print $langs->trans("ErrorNoWarehouseDefined");
 					}
 				}
-				else
-				{
+				else {
 					$warehouse_static->id = $objp->warehouse_id;
 					$warehouse_static->libelle = $objp->entrepot;
 					print $warehouse_static->getNomUrl(1);
@@ -1257,8 +1230,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</a>';
 					print '</td>';
 				}
-				else
-				{
+				else {
 					print '<td class="center valignmiddle">';
 					print '<input type="submit" class="button" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
 					print '</td>';
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 7db240abf94..56516b440f7 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -177,9 +177,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->fournisseur->commande->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index c0272d58a03..6891e3bdf92 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -160,9 +160,7 @@ if ($resql)
 	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
 
 	print "</table></div><br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -226,9 +224,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 	$sql .= " OR u.entity = 0)"; // Show always superadmin
-}
-else
-{
+} else {
 	$sql .= " WHERE (u.entity IN (".getEntity('user')."))";
 }
 $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved
@@ -269,9 +265,7 @@ if ($resql)
 	}
 	print "</table></div><br>";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -344,8 +338,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index f41e9e3fece..195e87e5b5d 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -55,9 +55,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -196,9 +194,7 @@ if (!empty($conf->agenda->enabled))
     if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     {
         print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
-    }
-    else
-    {
+    } else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     }
 }
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index acd79212052..8ffc6be6c05 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -335,16 +335,12 @@ if (empty($reshook))
 							{
 								$result = $object->insert_discount($discountid);
 								//$result=$discount->link_to_invoice($lineid,$id);
-							}
-							else
-							{
+							} else {
 								setEventMessages($discount->error, $discount->errors, 'errors');
 								$error++;
 								break;
 							}
-						}
-						else
-						{
+						} else {
 							// Positive line
 							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 							// Date start
@@ -391,9 +387,7 @@ if (empty($reshook))
 							if ($result > 0)
 							{
 								$lineid = $result;
-							}
-							else
-							{
+							} else {
 								$lineid = 0;
 								$error++;
 								break;
@@ -447,9 +441,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
@@ -596,9 +588,7 @@ if ($resql)
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfSupplierOrders');
 	}
 
@@ -1261,9 +1251,7 @@ if ($resql)
 	$delallowed = $user->rights->fournisseur->commande->creer;
 
 	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 87effcd5863..53efd68faa6 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -145,9 +145,7 @@ if ($id > 0 || !empty($ref))
         print '</div>';
 
         dol_fiche_end();
-    }
-    else
-    {
+    } else {
         /* Order not found */
         $langs->load("errors");
         print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 909dec03796..d7f8ef489ab 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -83,9 +83,7 @@ if ($action == 'create')
 	if (!GETPOST('createbill'))
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 		if (!is_array($selected))
 		{
 			//$error++;
@@ -448,9 +446,7 @@ if (($action != 'create' && $action != 'add') && !$error) {
 	if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
 	{
 		$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php
-	}
-	else
-	{
+	} else {
 		// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 		$sql .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
 	}
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 40773f0eca6..edcccbc6a88 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -124,9 +124,7 @@ if ($result)
     }
     print "</table>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 7a3d3f02ae7..0cde9145a51 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -154,16 +154,12 @@ if (empty($reshook))
         {
         	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
         	exit;
-        }
-        else
-        {
+        } else {
         	$langs->load("errors");
         	setEventMessages($objectutil->error, $objectutil->errors, 'errors');
         	$action = '';
         }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
 	)
@@ -177,9 +173,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -221,9 +215,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes')
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		$object->fetch($id);
 		$object->fetch_thirdparty();
@@ -238,9 +230,7 @@ if (empty($reshook))
 			{
 				header('Location: list.php?restore_lastsearch_values=1');
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -270,9 +260,7 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -285,9 +273,7 @@ if (empty($reshook))
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	}
-
-	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$result = $object->set_paid($user);
@@ -304,9 +290,7 @@ if (empty($reshook))
 
 		if ($object->update($user) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
@@ -367,8 +351,7 @@ if (empty($reshook))
 		$object->label = GETPOST('label');
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db);
-	}
-	elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
 	{
 		$newdate = dol_mktime(0, 0, 0, $_POST['datefmonth'], $_POST['datefday'], $_POST['datefyear']);
 		if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE) ? 0 : $conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)))
@@ -392,8 +375,7 @@ if (empty($reshook))
 
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-	elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$object->date_echeance = dol_mktime(12, 0, 0, $_POST['date_lim_reglementmonth'], $_POST['date_lim_reglementday'], $_POST['date_lim_reglementyear']);
@@ -404,8 +386,7 @@ if (empty($reshook))
 		}
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	} elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -594,18 +575,14 @@ if (empty($reshook))
 					if ($result >= 0)
 					{
 						$db->commit();
-					}
-					else
-					{
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
 				} else {
 					$db->commit();
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
@@ -972,9 +949,7 @@ if (empty($reshook))
 								{
 									$pu = 0;
 									$pu_currency = $lines[$i]->multicurrency_subprice;
-								}
-								else
-								{
+								} else {
 									$pu = $lines[$i]->subprice;
 									$pu_currency = 0;
 								}
@@ -1014,18 +989,13 @@ if (empty($reshook))
 
 							// Now reload line
 							$object->fetch_lines();
-						}
-						else
-						{
+						} else {
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$error++;
 					}
-				}
-				elseif (!$error)
+				} elseif (!$error)
 				{
 					$id = $object->create($user);
 					if ($id < 0)
@@ -1044,9 +1014,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 			$_GET['socid'] = $_POST['socid'];
-		}
-		else
-		{
+		} else {
 			$db->commit();
 
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1078,9 +1046,7 @@ if (empty($reshook))
 		{
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';
-		}
-		else
-		{
+		} else {
 			$up = price2num(GETPOST('price_ttc'));
 			$price_base_type = 'TTC';
 		}
@@ -1102,9 +1068,7 @@ if (empty($reshook))
 			if (trim($_POST['product_desc']) != trim($label)) $label = $_POST['product_desc'];
 
 			$type = $prod->type;
-		}
-		else
-		{
+		} else {
 			$label = $_POST['product_desc'];
 			$type = $_POST["type"] ? $_POST["type"] : 0;
 		}
@@ -1154,15 +1118,11 @@ if (empty($reshook))
 			unset($_POST['date_endyear']);
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
 	{
 		$db->begin();
 
@@ -1189,9 +1149,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -1274,14 +1232,11 @@ if (empty($reshook))
 					{
 						$productsupplier->ref_supplier = '';
 					}
-				}
-				else
-				{
+				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			}
-			elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 			{
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
@@ -1365,8 +1320,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		}
-		elseif (empty($error)) // $price_ht is already set
+		} elseif (empty($error)) // $price_ht is already set
 		{
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
@@ -1386,9 +1340,7 @@ if (empty($reshook))
 			if ($price_ht !== '')
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-			}
-			else
-			{
+			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -1453,17 +1405,13 @@ if (empty($reshook))
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		$action = '';
-	}
-
-	elseif ($action == 'classin' && $user->rights->fournisseur->facture->creer)
+	} elseif ($action == 'classin' && $user->rights->fournisseur->facture->creer)
 	{
 		$object->fetch($id);
 		$result = $object->setProject($projectid);
@@ -1494,9 +1442,7 @@ if (empty($reshook))
 	            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 	            {
 	                $qualified_for_stock_change = $object->hasProductsOrServices(2);
-	            }
-	            else
-	            {
+	            } else {
 	                $qualified_for_stock_change = $object->hasProductsOrServices(1);
 	            }
 
@@ -1549,9 +1495,7 @@ if (empty($reshook))
 			{
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1627,16 +1571,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1648,9 +1588,7 @@ if (empty($reshook))
 			if ($object->fetch($id))
 			{
 				$result = $object->swapContactStatus(GETPOST('ligne'));
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1665,8 +1603,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1766,9 +1703,7 @@ if ($action == 'create')
 		// Replicate extrafields
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 		$fk_account         = $societe->fk_account;
@@ -1781,14 +1716,12 @@ if ($action == 'create')
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
-	if(empty($cond_reglement_id))
-	{
+	if (empty($cond_reglement_id)) {
 		$cond_reglement_id = GETPOST("cond_reglement_id");
 	}
 
 	// when payment mode is empty (means not override by payment condition form a other object, like third-party), try to use default value
-	if(empty($mode_reglement_id))
-	{
+	if (empty($mode_reglement_id)) {
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
@@ -1816,9 +1749,7 @@ if ($action == 'create')
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
-	}
-	else
-	{
+	} else {
 		print $form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -2028,9 +1959,7 @@ if ($action == 'create')
 
 				print '</div></div>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			$text = $tmp.$langs->trans("InvoiceAvoir").' ';
@@ -2233,9 +2162,7 @@ if ($action == 'create')
 
 		print '</table>';
 	}
-}
-else
-{
+} else {
 	if ($id > 0 || !empty($ref))
 	{
 		/* *************************************************************************** */
@@ -2328,9 +2255,7 @@ else
 			{
 				$savdate = $object->date;
 				$numref = $object->getNextNumRef($societe);
-			}
-			else
-			{
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -2348,9 +2273,7 @@ else
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2385,9 +2308,7 @@ else
             if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
             {
                 $qualified_for_stock_change = $object->hasProductsOrServices(2);
-            }
-            else
-            {
+            } else {
                 $qualified_for_stock_change = $object->hasProductsOrServices(1);
             }
             if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
@@ -2594,9 +2515,7 @@ else
 		if ($action == 'editconditions')
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-		}
-		else
-		{
+		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
 		print "</td>";
@@ -2616,9 +2535,7 @@ else
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
-		}
-		else
-		{
+		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -2704,9 +2621,7 @@ else
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 			print '</td></tr>';
@@ -2749,7 +2664,7 @@ else
 		if (GETPOST('calculationrule')) $calculationrule = GETPOST('calculationrule', 'alpha');
 		else $calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
 		if ($calculationrule == 'totalofround') $calculationrulenum = 1;
-		else  $calculationrulenum = 2;
+		else $calculationrulenum = 2;
 		// Show link for "recalculate"
 		if ($object->getVentilExportCompta() == 0) {
 			$s = $langs->trans("ReCalculate").' ';
@@ -2878,9 +2793,7 @@ else
 					$totalpaye += $objp->amount;
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td colspan="'.$nbcols.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 			}
 
@@ -2898,9 +2811,7 @@ else
 			*/
 
 			$db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -2910,8 +2821,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($object->type != FactureFournisseur::TYPE_DEPOSIT)
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-			else
-				print $langs->trans('AlreadyPaid');
+			else print $langs->trans('AlreadyPaid');
 			print ' :</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 			//$resteapayer = $object->total_ttc - $totalpaye;
@@ -3000,13 +2910,11 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($resteapayeraffiche >= 0)
 				print $langs->trans('RemainderToPay');
-			else
-				print $langs->trans('ExcessPaid');
+			else print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
-		}
-		else // Credit note
+		} else // Credit note
 		{
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
@@ -3022,8 +2930,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($resteapayeraffiche <= 0)
 				print $langs->trans('RemainderToPayBack');
-			else
-				print $langs->trans('ExcessPaid');
+			else print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
@@ -3130,9 +3037,7 @@ else
 					if ($ventilExportCompta == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span></div>';
 					}
 				}
@@ -3148,9 +3053,7 @@ else
 					if (!$facidnext && $object->close_code != 'replaced' && $user->rights->fournisseur->facture->creer)	// Not replaced by another invoice
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
-					}
-					else
-					{
+					} else {
 						if ($user->rights->fournisseur->facture->creer) {
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span></div>';
 						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
@@ -3166,8 +3069,7 @@ else
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						}
-						else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -3194,9 +3096,7 @@ else
 						if ($resteapayer == 0)
 						{
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span></div>';
-						}
-						else
-						{
+						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
 						}
 					}
@@ -3229,9 +3129,7 @@ else
 	                    {
 	                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
 	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    }
-	                    else
-	                    {
+	                    } else {
 	                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
 	                        print '>'.$langs->trans('Validate').'</a></div>';
 	                    }
@@ -3266,22 +3164,16 @@ else
 	            	//var_dump($isErasable);
 	            	if ($isErasable == -4) {
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -3) {	// Should never happen with supplier invoice
+	            	} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -2) {	// Should never happen with supplier invoice
+	            	} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -1) {
+	            	} elseif ($isErasable == -1) {
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable <= 0)	// Any other cases
+	            	} elseif ($isErasable <= 0)	// Any other cases
 	            	{
 	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-                    else
-                    {
+	            	} else {
     	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';
                     }
 	            }
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index ebe3573bd99..5cd1043de8f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -267,9 +260,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else
-	{
+	} else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 022028bb483..3b06f1276d6 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -253,9 +253,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->fournisseur->facture->creer;
 	$param = '&facid='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans('ErrorUnknown');
 }
 
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 5368b491728..b37de34301d 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -290,9 +290,7 @@ if ($user->rights->fournisseur->facture->lire)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 164255d4a61..1be897fa411 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -414,9 +414,7 @@ if (!$search_all)
 			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key : '');
 		}
 	}
-}
-else
-{
+} else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
@@ -1301,9 +1299,7 @@ if ($resql)
     $title = '';
 
     print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index e26357bd4ca..db5bc9acfb5 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -168,8 +168,7 @@ if (empty($reshook))
 	            }
 
 	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        }
-			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
 	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
@@ -345,9 +344,7 @@ if (empty($reshook))
 	            else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
 	            header('Location: '.$loc);
 	            exit;
-	        }
-	        else
-	        {
+	        } else {
 	            $db->rollback();
 	        }
 	    }
@@ -497,9 +494,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
                 $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
                 print '</td></tr>';
-            }
-            else
-            {
+            } else {
                 print '<tr><td>&nbsp;</td></tr>';
             }
             print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
@@ -531,9 +526,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
 	            {
 	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-	            }
-	            else
-	            {
+	            } else {
 	                $sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
 	            }
                 // Group by because we have a total
@@ -627,9 +620,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        {
 	                            print '<td class="center nowraponall">';
 	                            print dol_print_date($db->jdate($objp->df), 'day').'</td>';
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            print '<td class="center"><b>!!!</b></td>';
 	                        }
 
@@ -645,9 +636,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                            }
 
 	                            print '</td>';
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            print '<td class="center"><b>--</b></td>';
 	                        }
 
@@ -700,9 +689,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        		print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
 	                        		print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 	                        		print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                        	print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
 	                        	print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
 	                        }
@@ -725,9 +712,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 											print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
 											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-									}
-									else
-									{
+									} else {
 										print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
 										print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
 									}
@@ -767,9 +752,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print "</div>";
 	                }
 	                $db->free($resql);
-	            }
-	            else
-	            {
+	            } else {
 	                dol_print_error($db);
 	            }
 			}
@@ -802,8 +785,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
             print '</form>';
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 }
 
 /*
@@ -1050,9 +1032,7 @@ if (empty($action) || $action == 'list')
         print "</table>";
         print "</div>";
         print "</form>\n";
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 9f38c4c4f9e..7873dd81b2d 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -72,9 +72,7 @@ if ($action == 'builddoc')
     if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
     {
         $outputlangs->charset_output = $sav_charset_output;
-    }
-    else
-    {
+    } else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 1b85082616a..0826a4ab200 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -59,9 +59,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 				// If not abandonned
     			$total = $total + $sign * $objectlink->total_ht;
     			echo price($objectlink->total_ht);
-    		}
-    		else
-    		{
+    		} else {
     			echo '<strike>'.price($objectlink->total_ht).'</strike>';
     		}
     	} ?></td>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 31638abf848..5d82021bf3c 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -89,9 +89,7 @@ if ($resql)
 	print "</table>";
 	print "<br>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -210,9 +208,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print "<br>\n";
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -264,9 +260,7 @@ if ($resql)
 	print "</table>\n";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 09ed7acc1e4..a93d093022c 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -59,9 +59,7 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
 	{
 		$db->commit();
 		$action = '';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -78,9 +76,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 		$db->commit();
 		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -99,9 +95,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
 		$db->commit();
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -114,9 +108,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -129,9 +121,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -326,9 +316,7 @@ if ($result > 0)
 
 		print "</table>\n";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -358,9 +346,7 @@ if ($result > 0)
 			if ($allow_delete)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 			}
 		}
@@ -397,9 +383,7 @@ if ($result > 0)
 	*/
 
 	print '</div></div></div>';
-}
-else
-{
+} else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 5e83ae93923..91cd3636bbe 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -331,9 +331,7 @@ if ($resql)
 	print "</table>";
 
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 8cda5a20d98..540ed1cbc18 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -173,23 +173,17 @@ if ($socid > 0)
                     }
 
                     $db->free($resqlp);
-                }
-                else
-                {
+                } else {
                     dol_print_error($db);
                 }
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
         print "</table>";
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 39f5cc61bd2..49af7141d84 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -50,9 +50,7 @@ if ($result)
 	$obj = $db->fetch_object($result);
 	preg_match('/([0-9]+)$/i', $obj->name, $reg);
 	if ($reg[1]) $lastftpentry = $reg[1];
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -96,9 +94,7 @@ if ($action == 'add' || GETPOST('modify', 'alpha'))
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -123,9 +119,7 @@ if (GETPOST('delete', 'alpha'))
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -148,9 +142,7 @@ print '<br>';
 if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
-{
+} else {
 	// Formulaire ajout
 	print '<form name="ftpconfig" action="ftpclient.php" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -300,9 +292,7 @@ else
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 0c7f8409992..5310a0b3bf8 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -102,8 +102,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -111,15 +110,12 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
                 // Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else	// Known error
+			} else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -138,9 +134,7 @@ if ($action == 'add' && $user->rights->ftp->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
 		$action = "create";
 	}
@@ -174,9 +168,7 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 		if ($result)
 		{
 			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
@@ -184,9 +176,7 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 		//ftp_close($conn_id);	Close later
 
 		$action = '';
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -224,9 +214,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				if ($result)
 				{
 					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 					setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 				}
@@ -236,9 +224,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				$action = '';
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -267,18 +253,14 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 		if ($result)
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("FTPFailedToRemoveDir", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
 		$action = '';
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -334,14 +316,10 @@ if ($action == 'download')
 			ftp_close($conn_id);
 
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 
@@ -398,9 +376,7 @@ print $langs->trans("FTPAreaDesc")."<br>";
 if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
-{
+} else {
     if (!empty($ftp_server))
 	{
 		// Confirm remove file
@@ -497,9 +473,7 @@ else
                 {
                     $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
                 }
-    		}
-    		else
-    		{
+    		} else {
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
         		//var_dump($contents);
@@ -534,9 +508,7 @@ else
 				{
 					if (preg_match('/^d/', $vals[0])) $is_directory = 1;
 					if (preg_match('/^l/', $vals[0])) $is_link = 1;
-				}
-				else
-				{
+				} else {
 					// Remote file
 					$filename = $file;
 					//print "section=".$section.' file='.$file.'X';
@@ -586,15 +558,12 @@ else
 				{
 					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
 					else print '&nbsp;';
-				}
-				elseif ($is_link)
+				} elseif ($is_link)
 				{
 					$newfile = $file;
 					$newfile = preg_replace('/ ->.*/', '', $newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
 					print ' &nbsp; ';
 					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
@@ -635,9 +604,7 @@ else
 		print '</div>';
 
 		print "</form>";
-	}
-	else
-	{
+	} else {
 		$foundsetup = false;
 		$MAXFTP = 20;
 		$i = 1;
@@ -655,9 +622,7 @@ else
 	    if (!$foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else
-	    {
+	    } else {
 	        print $langs->trans("ChooseAFTPEntryIntoMenu");
 	    }
 	}
@@ -670,13 +635,10 @@ if ($conn_id)
 {
     if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
-    }
-    elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+    } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
-    }
-    else
-    {
+    } else {
         ftp_close($conn_id);
     }
 }
@@ -718,14 +680,11 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 		{
 		    dol_syslog('Try to connect with ssh2_ftp');
 		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		}
-		elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
 		{
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		else
-		{
+		} else {
 		    dol_syslog('Try to connect with ftp_connect');
 		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
@@ -750,16 +709,12 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
     	   				    $ok = 0;
         				    $error++;
 		                }
-    				}
-    				else
-    				{
+    				} else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
-				}
-				else
-				{
+				} else {
 				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
     				{
     					// Turn on passive mode transfers (must be after a successful login
@@ -768,18 +723,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
     					// Change the dir
     					$newsectioniso = utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else
-    				{
+    				} else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
 				}
 			}
-		}
-		else
-		{
+		} else {
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
 			$ok = 0;
@@ -804,9 +755,7 @@ function ftp_isdir($connect_id, $dir)
 	{
 		ftp_cdup($connect_id);
 		return 1;
-	}
-	else
-	{
+	} else {
 		return 0;
 	}
 }
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index c5554a40fb1..6e639370aa9 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -228,9 +228,7 @@ if (empty($reshook))
 
 		    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		        exit;
-		    }
-		    else
-			{
+		    } else {
 		    	$db->rollback();
 		    }
 	    }
@@ -252,9 +250,7 @@ if (empty($reshook))
 	        {
 	            setEventMessages($object->error, $object->errors, 'warnings');
 	            $action = 'editvalidator';
-	        }
-	        else
-	        {
+	        } else {
 	            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            exit;
 	        }
@@ -339,21 +335,15 @@ if (empty($reshook))
 				{
 					setEventMessages($object->error, $object->errors, 'warnings');
 					$action = 'edit';
-				}
-				else
-				{
+				} else {
 					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 					exit;
 				}
-	        }
-	        else
-	        {
+	        } else {
 	        	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 	        	$action = '';
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	    	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
 	    	$action = '';
 	    }
@@ -375,9 +365,7 @@ if (empty($reshook))
 			if ($candelete)
 			{
 				$result = $object->delete($user);
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
 				$action = '';
@@ -389,9 +377,7 @@ if (empty($reshook))
 			$db->commit();
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -484,15 +470,11 @@ if (empty($reshook))
 	            {
 	                setEventMessages($mail->error, $mail->errors, 'warnings');
 	                $action = '';
-	            }
-	            else
-	            {
+	            } else {
 	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            	exit;
 	            }
-	        }
-	        else
-	        {
+	        } else {
 	        	setEventMessages($object->error, $object->errors, 'errors');
 	        	$action = '';
 	        }
@@ -580,9 +562,7 @@ if (empty($reshook))
 	            if (!$emailTo)
 	            {
 	                dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-	            }
-	            else
-	            {
+	            } else {
 	                // From
 	                $expediteur = new User($db);
 	                $expediteur->fetch($object->fk_validator);
@@ -625,9 +605,7 @@ if (empty($reshook))
 
 	           	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	           	exit;
-	        }
-	        else
-	        {
+	        } else {
 	            $db->rollback();
 	        	$action = '';
 	        }
@@ -668,9 +646,7 @@ if (empty($reshook))
 	                if (!$emailTo)
 	                {
 	                    dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-	                }
-	                else
-	                {
+	                } else {
 	                    // From
 	                    $expediteur = new User($db);
 	                    $expediteur->fetch($object->fk_validator);
@@ -706,9 +682,7 @@ if (empty($reshook))
 	                    	$action = '';
 	                    }
 	                }
-	            }
-	            else
-	            {
+	            } else {
 	            	$action = '';
 	            }
 
@@ -718,9 +692,7 @@ if (empty($reshook))
 
 	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	                exit;
-	            }
-	            else
-	            {
+	            } else {
 	                $db->rollback();
 	                $action = '';
 	            }
@@ -755,9 +727,7 @@ if (empty($reshook))
 
 	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	    }
 	}
@@ -805,9 +775,7 @@ if (empty($reshook))
 	        if (!$error)
 	        {
 	        	$db->commit();
-	        }
-	        else
-	        {
+	        } else {
 	        	$db->rollback();
 	        }
 
@@ -857,9 +825,7 @@ if (empty($reshook))
 	            {
 	            	setEventMessages($mail->error, $mail->errors, 'warnings');
 	            	$action = '';
-	            }
-	            else
-	            {
+	            } else {
 	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	            	exit;
 	            }
@@ -903,9 +869,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
     if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
     {
         $errors[] = $langs->trans('CantCreateCP');
-    }
-    else
-    {
+    } else {
         // Formulaire de demande de congés payés
         print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
 
@@ -999,8 +963,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
 			print $out;
 
 	        dol_fiche_end();
-        }
-        elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+        } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
         {
         	print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
         }
@@ -1021,8 +984,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
         {
         	print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
         	//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
-        }
-        else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+        } else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
         print '</td>';
         print '</tr>';
 
@@ -1089,8 +1051,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
         $object = new Holiday($db);
         $include_users = $object->fetch_users_approver_holiday();
         if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-        else
-        {
+        else {
         	$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
         	if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
         	if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
@@ -1126,18 +1087,14 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
 
         print '</from>'."\n";
     }
-}
-else
-{
+} else {
     if ($error)
     {
         print '<div class="tabBar">';
         print $error;
         print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
         print '</div>';
-    }
-    else
-    {
+    } else {
         // Affichage de la fiche d'une demande de congés payés
         if (($id > 0) || $ref)
         {
@@ -1246,9 +1203,7 @@ else
 			        print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
                     print '</td>';
                     print '</tr>';
-                }
-                else
-                {
+                } else {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
                     print '<td>';
@@ -1268,9 +1223,7 @@ else
                     print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
                     print '</td>';
                     print '</tr>';
-                }
-                else
-                {
+                } else {
                     print '<tr>';
                     print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
                     print '<td>';
@@ -1311,9 +1264,7 @@ else
                     print '<td>'.$langs->trans('DescCP').'</td>';
                     print '<td>'.nl2br($object->description).'</td>';
                     print '</tr>';
-                }
-                else
-                {
+                } else {
                     print '<tr>';
                     print '<td>'.$langs->trans('DescCP').'</td>';
                     print '<td class="tdtop">';
@@ -1373,8 +1324,7 @@ else
                         $include_users[] = $object->fk_validator;
                     }
                     if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-                    else
-                    {
+                    else {
                     	$arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id)) ? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
                     	$s = $form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
                     	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
@@ -1497,9 +1447,7 @@ else
                         {
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
                             print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                        else
-                        {
+                        } else {
                             print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
                             print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
                         }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index d2e32766088..ce4c74d786a 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -204,16 +204,12 @@ class Holiday extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_HOLIDAY_ADDON_NotDefined");
 			return "";
 		}
@@ -238,9 +234,7 @@ class Holiday extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -344,9 +338,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -427,16 +419,13 @@ class Holiday extends CommonObject
 				$this->fetch_optionals();
 
 				$result = 1;
-			}
-			else {
+			} else {
 				$result = 0;
 			}
 			$this->db->free($resql);
 
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -560,9 +549,7 @@ class Holiday extends CommonObject
 			// Returns 1 with the filled array
 			$this->holiday = $tab_result;
 			return 1;
-		}
-		else
-		{
+		} else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -685,9 +672,7 @@ class Holiday extends CommonObject
 			// Returns 1 and adds the array to the variable
 			$this->holiday = $tab_result;
 			return 1;
-		}
-		else
-		{
+		} else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -711,9 +696,7 @@ class Holiday extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref) || $this->ref == $this->id))
 		{
 			$num = $this->getNextNumRef(null);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -757,9 +740,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -871,9 +852,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -984,9 +963,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1037,9 +1014,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1082,8 +1057,7 @@ class Holiday extends CommonObject
 				{
 					return false;
 				}
-			}
-			elseif ($halfday == -1)
+			} elseif ($halfday == -1)
 			{
 				// new start afternoon, new end afternoon
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1095,8 +1069,7 @@ class Holiday extends CommonObject
 					if ($dateStart < $dateEnd) return false;
 					if ($dateEnd < $infos_CP['date_fin'] || in_array($infos_CP['halfday'], array(0, -1))) return false;
 				}
-			}
-			elseif ($halfday == 1)
+			} elseif ($halfday == 1)
 			{
 				// new start morning, new end morning
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1108,8 +1081,7 @@ class Holiday extends CommonObject
 				{
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
-			}
-			elseif ($halfday == 2)
+			} elseif ($halfday == 2)
 			{
 				// new start afternoon, new end morning
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1120,9 +1092,7 @@ class Holiday extends CommonObject
 				{
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
 			}
 		}
@@ -1189,8 +1159,7 @@ class Holiday extends CommonObject
 					break;
 				}
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
 	}
@@ -1307,8 +1276,7 @@ class Holiday extends CommonObject
 		for ($i = 1; $i < $nb; $i++) {
 			if ($i == $selected) {
 				$statut .= '<option value="'.$i.'" selected>'.$langs->trans($name[$i - 1]).'</option>'."\n";
-			}
-			else {
+			} else {
 				$statut .= '<option value="'.$i.'">'.$langs->trans($name[$i - 1]).'</option>'."\n";
 			}
 		}
@@ -1370,20 +1338,14 @@ class Holiday extends CommonObject
 					if ($result)
 					{
 						return $createifnotfound;
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						return -2;
 					}
-				}
-				else
-				{
+				} else {
 					return '';
 				}
-			}
-			else
-			{
+			} else {
 				return $obj->value;
 			}
 		} else {
@@ -1463,18 +1425,14 @@ class Holiday extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
 
 			return 0;
-		}
-		else
-		{
+		} else {
 			// Mise à jour pour un utilisateur
 			$nbHoliday = price2num($nbHoliday, 5);
 
@@ -1497,9 +1455,7 @@ class Holiday extends CommonObject
 						$error++;
 						$this->errors[] = $this->db->lasterror();
 					}
-				}
-				else
-				{
+				} else {
 					// Insert for user
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
 					$sql .= $nbHoliday;
@@ -1511,9 +1467,7 @@ class Holiday extends CommonObject
 						$this->errors[] = $this->db->lasterror();
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
@@ -1521,9 +1475,7 @@ class Holiday extends CommonObject
 			if (!$error)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
 		}
@@ -1579,9 +1531,7 @@ class Holiday extends CommonObject
 				$resql = $this->db->query($sql);
 				if (!$resql) dol_print_error($this->db);
 			}
-		}
-		else
-		{
+		} else {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
 			$sql .= " (fk_user, nb_holiday)";
 			$sql .= " VALUES ('".$userid."','0')";
@@ -1629,9 +1579,7 @@ class Holiday extends CommonObject
 			//return number_format($obj->nb_holiday,2);
 			if ($obj) return $obj->nb_holiday;
 			else return null;
-		}
-		else
-		{
+		} else {
 			return null;
 		}
 	}
@@ -1668,9 +1616,7 @@ class Holiday extends CommonObject
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
-				}
-				else
-				{
+				} else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 				$sql .= " AND u.statut > 0";
@@ -1699,16 +1645,12 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
-				}
-				else
-				{
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				// We want only list of vacation balance for user ids
 				$sql = "SELECT DISTINCT cpu.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1738,17 +1680,13 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
-				}
-				else
-				{
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			// Si faux donc return array
 			// List for Dolibarr users
 			if ($type)
@@ -1767,9 +1705,7 @@ class Holiday extends CommonObject
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
-				}
-				else
-				{
+				} else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 
@@ -1810,9 +1746,7 @@ class Holiday extends CommonObject
 					$this->errors[] = "Error ".$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				// List of vacation balance users
 				$sql = "SELECT cpu.fk_type, cpu.nb_holiday, u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1850,9 +1784,7 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $tab_result;
-				}
-				else
-				{
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
@@ -1895,9 +1827,7 @@ class Holiday extends CommonObject
 				$i++;
 			}
 			return $users_validator;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_users_approver_holiday  Error ".$this->error, LOG_ERR);
 			return -1;
@@ -2018,9 +1948,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->optRowid;
 		}
@@ -2091,9 +2019,7 @@ class Holiday extends CommonObject
 			// Retourne 1 et ajoute le tableau à la variable
 			$this->logs = $tab_result;
 			return 1;
-		}
-		else
-		{
+		} else {
 			// Erreur SQL
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -2131,8 +2057,7 @@ class Holiday extends CommonObject
 
 				return $types;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return array();
 	}
@@ -2195,9 +2120,7 @@ class Holiday extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2253,9 +2176,7 @@ class Holiday extends CommonObject
             }
 
             return $response;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index d957ade168e..51145fb1f42 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -232,9 +232,7 @@ if (count($typeleaves) == 0)
     print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
     print $langs->trans("GoIntoDictionaryHolidayTypes");
     //print '</div>';
-}
-else
-{
+} else {
     $canedit = 0;
     if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
 
@@ -260,9 +258,7 @@ else
         {
             print '<td class="liste_titre" style="text-align:center"></td>';
         }
-    }
-    else
-    {
+    } else {
         print '<td class="liste_titre"></td>';
     }
     print '<td class="liste_titre"></td>';
@@ -285,9 +281,7 @@ else
         	$labeltype = ($langs->trans($val['code']) != $val['code']) ? $langs->trans($val['code']) : $langs->trans($val['label']);
         	print_liste_field_titre($labeltype, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
         }
-    }
-    else
-    {
+    } else {
         print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
     }
     print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
@@ -342,9 +336,7 @@ else
         	    //print ' '.$langs->trans('days');
             	print '</td>'."\n";
         	}
-        }
-        else
-        {
+        } else {
             print '<td></td>';
         }
 
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index a0f8723b92d..256e69028f2 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -146,9 +146,7 @@ if ($object->id)
         print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
         print '</td>';
         print '</tr>';
-    }
-    else
-    {
+    } else {
         print '<tr>';
         print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
         print '<td>';
@@ -168,9 +166,7 @@ if ($object->id)
         print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
         print '</td>';
         print '</tr>';
-    }
-    else
-    {
+    } else {
         print '<tr>';
         print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
         print '<td>';
@@ -200,9 +196,7 @@ if ($object->id)
         print '<td>'.$langs->trans('DescCP').'</td>';
         print '<td>'.nl2br($object->description).'</td>';
         print '</tr>';
-    }
-    else
-    {
+    } else {
         print '<tr>';
         print '<td>'.$langs->trans('DescCP').'</td>';
         print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
@@ -289,9 +283,7 @@ if ($object->id)
     $permtoedit = $user->rights->holiday->write;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 42faecc5588..5a4f782deac 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -429,9 +429,7 @@ if ($resql)
 		}
 
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans("ListeCP");
 
 		$newcardbutton = '';
@@ -523,9 +521,7 @@ if ($resql)
 		    foreach ($valideurobjects as $val) $valideurarray[$val->id] = $val->id;
 		    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
 		    print '</td>';
-		}
-		else
-		{
+		} else {
 		    print '<td class="liste_titre">&nbsp;</td>';
 		}
 	}
@@ -643,8 +639,7 @@ if ($resql)
 		$langs->load("errors");
 		print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
 		$result = 0;
-	}
-	elseif ($num > 0 && !empty($mysoc->country_id))
+	} elseif ($num > 0 && !empty($mysoc->country_id))
 	{
 	    // Lines
 	    $userstatic = new User($db);
@@ -793,9 +788,7 @@ if ($resql)
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 0444157704b..0c4ffe76335 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -120,9 +120,7 @@ print '</tr>';
 if ($num == 0)
 {
     print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
-}
-else
-{
+} else {
     while ($obj = $db->fetch_object($resql))
     {
         $user = new User($db);
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index ce394cbd691..0d987844924 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -166,8 +166,7 @@ if ($lastUpdate)
     $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
     print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
     print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
-}
-else print $langs->trans('None');
+} else print $langs->trans('None');
 print "</div><br>\n";
 
 $moreforfilter = '';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index ba98812f1b2..a260941ab0d 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -129,16 +129,12 @@ if ($result)
 
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
 
 	print '</table>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 621f93ca247..37ae050cd9b 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -260,9 +260,7 @@ class Establishment extends CommonObject
             $this->country      = $obj->country;
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -286,9 +284,7 @@ class Establishment extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -322,27 +318,22 @@ class Establishment extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
@@ -388,9 +379,7 @@ class Establishment extends CommonObject
 				}
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -417,9 +406,7 @@ class Establishment extends CommonObject
 				$obj = $this->db->fetch_object($result);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 0122e92090f..aa1ac36a9f1 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -63,14 +63,10 @@ if ($action == 'confirm_delete' && $confirm == "yes")
     {
         header("Location: ../admin/admin_establishment.php");
         exit;
-    }
-    else
-    {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-
-elseif ($action == 'add')
+} elseif ($action == 'add')
 {
     if (!$cancel)
     {
@@ -100,19 +96,13 @@ elseif ($action == 'add')
             {
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                 exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-        }
-        else
-        {
+        } else {
             $action = 'create';
         }
-    }
-    else
-    {
+    } else {
         header("Location: ../admin/admin_establishment.php");
         exit;
     }
@@ -147,9 +137,7 @@ elseif ($action == 'update')
             {
                 header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
                 exit;
-            }
-			else
-			{
+            } else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -340,8 +328,7 @@ if (($id || $ref) && $action == 'edit')
 
             print '</form>';
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 }
 
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index e31266f755c..7cc72c1792e 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -160,8 +160,7 @@ if (!empty($conf->holiday->enabled))
 	    print '</td>';
 	    print '</tr>';
 	    print '</table></div><br>';
-	}
-	elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+	} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 	{
 		print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
 	}
@@ -241,16 +240,13 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         print '</table>';
         print '</div>';
         print '<br>';
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 }
 
 
@@ -314,15 +310,12 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
 		print '</div>';
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index f2aad5baee3..12dfc5d19e9 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -260,9 +260,7 @@ class Import
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -295,15 +293,11 @@ class Import
 				$this->datatoimport         = $obj->type;
 				$this->fk_user              = $obj->fk_user;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = "Model not found";
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -353,9 +347,7 @@ class Import
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index a84b255601d..eb0d7470dbb 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -141,9 +141,7 @@ if ($action == 'builddoc')
 	if ($result < 0)
 	{
 		setEventMessages($objimport->error, $objimport->errors, 'errors');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	}
 }
@@ -178,21 +176,16 @@ if ($action == 'add_import_model')
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("ErrorImportDuplicateProfil"), null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($objimport->error, null, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ImportModelName")), null, 'errors');
 	}
 }
@@ -208,9 +201,7 @@ if ($step == 3 && $datatoimport)
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $fullpath, 1) > 0)
 		{
 			dol_syslog("File ".$fullpath." was added for import");
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 		}
@@ -371,16 +362,12 @@ if ($step == 1 || !$datatoimport)
 			if ($objimport->array_import_perms[$key])
 			{
 				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
 			print '</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
@@ -612,9 +599,7 @@ if ($step == 3 && $datatoimport)
         $langs->load('other');
         $out .= ' ';
         $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
-	}
-	else
-	{
+	} else {
 	    $out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
@@ -976,15 +961,12 @@ if ($step == 4 && $datatoimport)
 		// Source field info
 		$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
 		if ($filecolumn > count($fieldssource)) $htmltext .= $langs->trans("DataComeFromNoWhere").'<br>';
-		else
-		{
+		else {
 			if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 			{
 				$filecolumntoshow = $filecolumn;
 				$htmltext .= $langs->trans("DataComeFromFileFieldNb", $filecolumntoshow).'<br>';
-			}
-			else
-			{
+			} else {
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataComeFromIdFoundFromRef", $filecolumn, $langs->transnoentitiesnoconv($entitylang)).'<br>';
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $filecolumn, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).'<br>';
 			}
@@ -996,9 +978,7 @@ if ($step == 4 && $datatoimport)
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
 		    if ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
-		}
-		else
-		{
+		} else {
 		    if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')        $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
 		    elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
 		    elseif ($example) $htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
@@ -1014,9 +994,7 @@ if ($step == 4 && $datatoimport)
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
 			$htmltext .= $langs->trans("DataIsInsertedInto").'<br>';
-		}
-		else
-		{
+		} else {
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataIDSourceIsInsertedInto").'<br>';
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataCodeIDSourceIsInsertedInto").'<br>';
 		}
@@ -1126,9 +1104,7 @@ if ($step == 4 && $datatoimport)
 		if ($mandatoryfieldshavesource)
 		{
 			print '<a class="butAction" href="import.php?step=5'.$param.'&filetoimport='.urlencode($filetoimport).'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SomeMandatoryFieldHaveNoSource")).'">'.$langs->trans("NextStep").'</a>';
 		}
 	}
@@ -1189,8 +1165,7 @@ if ($step == 4 && $datatoimport)
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1326,9 +1301,7 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-	}
-	else
-	{
+	} else {
 	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
 	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
@@ -1337,9 +1310,7 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-	}
-	else
-	{
+	} else {
 	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
@@ -1354,9 +1325,7 @@ if ($step == 5 && $datatoimport)
 		if (count($updatekeys))
 		{
 			print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%', 'disabled');
-		}
-		else
-		{
+		} else {
 			print '<span class="opacitymedium">'.$langs->trans("NoUpdateAttempt").'</span> &nbsp; -';
 		}
 		foreach ($updatekeys as $val) {
@@ -1368,9 +1337,7 @@ if ($step == 5 && $datatoimport)
         {   //TODO dropdown UL is created inside nested SPANS
 			print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
 			print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
-		}
-		else
-		{
+		} else {
 			print '<span class="opacitymedium">'.$langs->trans("UpdateNotYetSupportedForThisImport").'</span>';
 		}
 	}
@@ -1425,8 +1392,7 @@ if ($step == 5 && $datatoimport)
 			}*/
 			print $newval;
 		}
-	}
-	else print $langs->trans("Error");
+	} else print $langs->trans("Error");
 	print '</td></tr>';
 
 	// Fields imported
@@ -1468,15 +1434,11 @@ if ($step == 5 && $datatoimport)
         if ($user->rights->import->run)
         {
             print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
-        }
-        else
-        {
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
         }
         print '</div>';
-    }
-    else
-    {
+    } else {
         // Launch import
         $arrayoferrors = array();
         $arrayofwarnings = array();
@@ -1526,9 +1488,7 @@ if ($step == 5 && $datatoimport)
             }
             // Close file
             $obj->import_close_file();
-        }
-        else
-        {
+        } else {
             print $langs->trans("ErrorFailedToOpenFile", $pathfile);
         }
 
@@ -1558,8 +1518,7 @@ if ($step == 5 && $datatoimport)
         	print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
 			print $langs->trans("NbInsert", $obj->nbinsert).'<br>';
 			print $langs->trans("NbUpdate", $obj->nbupdate).'<br><br>';
-		}
-        else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
+		} else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
 
         // Show Errors
         //var_dump($arrayoferrors);
@@ -1626,16 +1585,12 @@ if ($step == 5 && $datatoimport)
             if (empty($nboferrors))
             {
                 print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
-            }
-            else
-            {
+            } else {
                 //print '<input type="submit" class="butAction" value="'.dol_escape_htmltag($langs->trans("RunSimulateImportFile")).'">';
 
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
             }
-        }
-        else
-        {
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
@@ -1821,8 +1776,7 @@ if ($step == 6 && $datatoimport)
 			}*/
 			print $newval;
 		}
-	}
-	else print $langs->trans("Error");
+	} else print $langs->trans("Error");
 	print '</td></tr>';
 
 	// Fields imported
@@ -1894,15 +1848,12 @@ if ($step == 6 && $datatoimport)
 		}
 		// Close file
 		$obj->import_close_file();
-	}
-	else
-	{
+	} else {
 		print $langs->trans("ErrorFailedToOpenFile", $pathfile);
 	}
 
 	if (count($arrayoferrors) > 0) $db->rollback(); // We force rollback because this was errors.
-	else
-	{
+	else {
 	    $error = 0;
 
 		// Run the sql after import if defined
@@ -1987,8 +1938,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print $langs->trans("NoFields");
 		print '</td>';
 		print '</tr>';
-	}
-	elseif ($key == 'none')	// Empty line
+	} elseif ($key == 'none')	// Empty line
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
@@ -1998,8 +1948,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print '&nbsp;';
 		print '</td>';
 		print '</tr>';
-	}
-	else	// Print field of source file
+	} else // Print field of source file
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
diff --git a/htdocs/index.php b/htdocs/index.php
index 8d6e02594ee..231be576cfa 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -301,9 +301,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	                $board = new $class($db);
 	                $board->load_state_board();
 	                $boardloaded[$class] = $board;
-	            }
-	            else
-	            {
+	            } else {
 	                $board = $boardloaded[$class];
 	            }
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index e0af0718283..267e1629f36 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -82,14 +82,11 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // M
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
 	$checksok = 0; // 0=error, 1=warning
-}
-elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
+} elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
     $checksok = 0; // 0=error, 1=warning
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
 if (empty($force_install_nophpinfo)) print ' (<a href="phpinfo.php" target="_blank">'.$langs->trans("MoreInformation").'</a>)';
@@ -103,9 +100,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
 	print "<br>\n";
 	$checksok = 0;
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk")."<br>\n";
 }
 
@@ -115,9 +110,7 @@ if (!function_exists("session_id"))
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions")."<br>\n";
 	$checksok = 0;
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportSessions")."<br>\n";
 }
 
@@ -128,9 +121,7 @@ if (!function_exists("imagecreate"))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportGD")."<br>\n";
 }
 
@@ -141,9 +132,7 @@ if (!function_exists("curl_init"))
     $langs->load("errors");
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
     // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
 }
 
@@ -151,9 +140,7 @@ else
 if (!function_exists("easter_date"))
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
-}
-else
-{
+} else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
 }
 
@@ -164,9 +151,7 @@ if (!function_exists("utf8_encode"))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportUTF8")."<br>\n";
 }
 
@@ -179,9 +164,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 	    $langs->load("errors");
 	    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
 	    // $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-	}
-	else
-	{
+	} else {
 	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
 	}
 }
@@ -191,9 +174,7 @@ if (!class_exists('ZipArchive'))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "ZIP")."<br>\n";
 }
 
@@ -214,9 +195,7 @@ if ($memmaxorig != '')
 	if ($memmax >= $memrequired || $memmax == -1)
 	{
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPMemoryOK", $memmaxorig, $memrequiredorig)."<br>\n";
-	}
-	else
-	{
+	} else {
 		print '<img src="../theme/eldy/img/warning.png" alt="Warning"> '.$langs->trans("PHPMemoryTooLow", $memmaxorig, $memrequiredorig)."<br>\n";
 	}
 }
@@ -235,14 +214,10 @@ if (is_readable($conffile) && filesize($conffile) > 8)
 	{
 		// Already installed for all parts (config and database). We can propose upgrade.
 		$allowupgrade = true;
-	}
-	else
-	{
+	} else {
 		$allowupgrade = false;
 	}
-}
-else
-{
+} else {
 	// If not, we create it
 	dolibarr_install_syslog("check: we try to create conf file '".$conffile."'");
 	$confexists = 0;
@@ -252,9 +227,7 @@ else
 	{
 		// Success
 		dolibarr_install_syslog("check: successfully copied file ".$conffile.".example into ".$conffile);
-	}
-	else
-	{
+	} else {
 		// If failed, we try to create an empty file
 		dolibarr_install_syslog("check: failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
 
@@ -264,8 +237,7 @@ else
 			@fwrite($fp, '<?php');
 			@fputs($fp, "\n");
 			fclose($fp);
-		}
-		else dolibarr_install_syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
+		} else dolibarr_install_syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
 	}
 
 	// First install: no upgrade necessary/required
@@ -284,9 +256,7 @@ if (!file_exists($conffile))
 
 	print $langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok');
 	$err++;
-}
-else
-{
+} else {
 	if (dol_is_dir($conffile))
 	{
 		print '<img src="../theme/eldy/img/error.png" alt="Warning"> '.$langs->trans("ConfFileMustBeAFileNotADir", $conffiletoshow);
@@ -299,9 +269,7 @@ else
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
-		}
-		else
-		{
+		} else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -311,14 +279,11 @@ else
 		$allowinstall = 0;
 	}
 	// File exists and can be modified
-	else
-	{
+	else {
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
-		}
-		else
-		{
+		} else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -344,9 +309,7 @@ else
 				{
                     print '<span class="error">A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.</span><br>'."\n";
 				    dol_syslog("A '".$conffiletoshow."' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '".$conffiletoshow."' file.", LOG_WARNING);
-				}
-				else
-				{
+				} else {
                     require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
                     // If password is encoded, we decode it
@@ -357,8 +320,7 @@ else
                         {
                             $dolibarr_main_db_encrypted_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass); // We need to set this as it is used to know the password was initially crypted
                             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-                        }
-                        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+                        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
                     }
 
     				// $conf already created in inc.php
@@ -404,8 +366,7 @@ else
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
 			print '<br>';
-		}
-		else print "<br>\n";
+		} else print "<br>\n";
 
 		//print $langs->trans("InstallEasy")." ";
 		print '<h3><span class="soustitre">'.$langs->trans("ChooseYourSetupMode").'</span></h3>';
@@ -439,9 +400,7 @@ else
 		if ($allowinstall)
 		{
             $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
-		}
-		else
-		{
+		} else {
 			$choice .= ($foundrecommandedchoice ? '<span class="warning">' : '').$langs->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 		}
         $choice .= '</td>'."\n";
@@ -517,8 +476,7 @@ else
                         $foundrecommandedchoice = 1; // To show only once
                         $recommended_choice = true;
                     }
-                }
-                else {
+                } else {
                     // We cannot recommend a choice.
                     // A version of install may be known, but we need last upgrade.
                 }
@@ -559,14 +517,10 @@ else
 				if ($disabled)
                 {
                     $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
-                }
-				else
-                {
+                } else {
                     $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
                 }
-			}
-			else
-			{
+			} else {
                 $choice .= $langs->trans("NotAvailable");
 			}
             $choice .= '</td>';
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 3a3adc2322c..ff983618c41 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -123,14 +123,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
                     $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
                 }
             }
-        }
-        else
-        {
+        } else {
             $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
         }
-    }
-    else
-    {
+    } else {
         $includeconferror = 'ErrorBadFormatForConfFile';
     }
 }
@@ -209,9 +205,7 @@ if (@file_exists($lockfile))
         print '<a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
         print $langs->trans("ClickHereToGoToApp");
         print '</a>';
-    }
-    else
-    {
+    } else {
         print 'If you always reach this page, you must remove install.lock file manually.<br>';
     }
     exit;
@@ -364,9 +358,7 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
     {
         $jQueryCustomPath = $forcejqueryurl;
         $jQueryUiCustomPath = $forcejqueryurl;
-    }
-    else
-    {
+    } else {
         $jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
         $jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
     }
@@ -547,11 +539,9 @@ function detect_dolibarr_main_url_root()
 		$proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? 'https' : 'http';
 		if (!empty($_SERVER["HTTP_HOST"])) {
 			$serverport = $_SERVER["HTTP_HOST"];
-		}
-		elseif (!empty($_SERVER["SERVER_NAME"])) {
+		} elseif (!empty($_SERVER["SERVER_NAME"])) {
 			$serverport = $_SERVER["SERVER_NAME"];
-		}
-		else {
+		} else {
 			$serverport = 'localhost';
 		}
 		$dolibarr_main_url_root = $proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index 9e58ac4230f..19b91bb0a26 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -40,8 +40,7 @@ function checkElementExist($id, $table)
 		$num = $db->num_rows($resql);
 		if ($num > 0) return true;
 		else return false;
-	}
-	else return true; // for security
+	} else return true; // for security
 }
 
 /**
@@ -137,8 +136,7 @@ function clean_data_ecm_directories()
 				if (!$resqlupdate) dol_print_error($db, 'Failed to update');
 			}
 		}
-	}
-	else dol_print_error($db, 'Failed to run request');
+	} else dol_print_error($db, 'Failed to run request');
 
 	return;
 }
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 034741c7c7e..d427e529a8d 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -99,8 +99,7 @@ if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_d
         $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
         $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
         $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-    }
-    else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+    } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 }
 
 // $conf is already instancied inside inc.php
@@ -123,9 +122,7 @@ if ($db->connected)
     print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
     dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection").": ".$dolibarr_main_db_host.$langs->transnoentities("OK"));
     $ok = 1;
-}
-else
-{
+} else {
     print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->transnoentities("Error")."</td></tr>";
     dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
     $ok = 0;
@@ -139,9 +136,7 @@ if ($ok)
         print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
         dolibarr_install_syslog("repair: database connection successful: ".$dolibarr_main_db_name);
         $ok = 1;
-    }
-    else
-    {
+    } else {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>";
         dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
@@ -256,9 +251,7 @@ if ($ok && GETPOST('standard', 'alpha'))
 	            {
 	                $fieldname = $obj->Field;
 	                $fieldtype = $obj->Type;
-	            }
-	            else
-	            {
+	            } else {
 	                $fieldname = isset($obj->Key) ? $obj->Key : $obj->attname;
 	                $fieldtype = isset($obj->Type) ? $obj->Type : 'varchar';
 	            }
@@ -285,7 +278,7 @@ if ($ok && GETPOST('standard', 'alpha'))
         			} elseif ($type == 'phone') {
         				$typedb = 'varchar';
         				$lengthdb = '20';
-        			}elseif ($type == 'mail') {
+        			} elseif ($type == 'mail') {
         				$typedb = 'varchar';
         				$lengthdb = '128';
         			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
@@ -317,23 +310,17 @@ if ($ok && GETPOST('standard', 'alpha'))
 		                if ($result < 0)
 		                {
 	    	                print "KO ".$db->lasterror."<br>\n";
-	        	        }
-	            	    else
-	                	{
+	        	        } else {
 	                    	print "OK<br>\n";
 		                }
-	                }
-	                else
-	                {
+	                } else {
 	                	print ' - Mode test, no column added.';
 	                }
 	            }
 	        }
 
 	        print "</td><td>&nbsp;</td></tr>\n";
-	    }
-	    else
-	    {
+	    } else {
 	    	dol_print_error($db);
 	    }
 	}
@@ -398,14 +385,10 @@ if ($ok && GETPOST('standard', 'alpha'))
 								$db->query($sqldelete);
 
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we delete record</td></tr>';
-							}
-							else
-							{
+							} else {
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
-						}
-						else
-						{
+						} else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -471,14 +454,10 @@ if ($ok && GETPOST('standard', 'alpha'))
 								$db->query($sqldeleteb);
 
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
-							}
-							else
-							{
+							} else {
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
-						}
-						else
-						{
+						} else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -566,9 +545,7 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -670,9 +647,7 @@ if ($ok && GETPOST('restore_user_pictures', 'alpha'))
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -729,9 +704,7 @@ if ($ok && GETPOST('rebuild_product_thumbs', 'alpha'))
 
             $i++;
         }
-    }
-    else
-    {
+    } else {
         $ok = 0;
         dol_print_error($db);
     }
@@ -815,17 +788,11 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 							{
 								$error++;
 								dol_print_error($db);
-							}
-							else
-								print ' - <span class="warning">Cleaned</span>';
-						}
-						else
-						{
+							} else print ' - <span class="warning">Cleaned</span>';
+						} else {
 							print ' - <span class="warning">Canceled (test mode)</span>';
 						}
-					}
-					else
-					{
+					} else {
 						print ' - Module condition '.$modulecond.' is ok, we do nothing.';
 					}
 				}
@@ -839,14 +806,10 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr><td>No menu entries of disabled menus found</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -884,33 +847,27 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha'))
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
             $object_instance = new Facture($db);
-        }
-        elseif ($modulepart == 'invoice_supplier')
+        } elseif ($modulepart == 'invoice_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
             $object_instance = new FactureFournisseur($db);
-        }
-        elseif ($modulepart == 'propal')
+        } elseif ($modulepart == 'propal')
         {
             include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
             $object_instance = new Propal($db);
-        }
-        elseif ($modulepart == 'order')
+        } elseif ($modulepart == 'order')
         {
             include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
             $object_instance = new Commande($db);
-        }
-        elseif ($modulepart == 'order_supplier')
+        } elseif ($modulepart == 'order_supplier')
         {
             include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
             $object_instance = new CommandeFournisseur($db);
-        }
-        elseif ($modulepart == 'contract')
+        } elseif ($modulepart == 'contract')
         {
             include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
             $object_instance = new Contrat($db);
-        }
-        elseif ($modulepart == 'tax')
+        } elseif ($modulepart == 'tax')
         {
             include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
             $object_instance = new ChargeSociales($db);
@@ -969,8 +926,7 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha'))
                             dol_delete_dir(dirname($file['fullname']), 1);
                         }
                         print "</td></tr>";
-                    }
-                    elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
+                    } elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
                 }
             }
         }
@@ -1048,9 +1004,7 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
                                     $error++;
                                     dol_print_error($db);
                                 }
-                            }
-                            else
-                            {
+                            } else {
                                 $error++;
                                 dol_print_error($db);
                             }
@@ -1065,14 +1019,10 @@ if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print '<tr><td colspan="2">Nothing to do</td></tr>';
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -1155,14 +1105,10 @@ if ($ok && GETPOST('set_empty_time_spent_amount', 'alpha'))
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print '<tr><td>No time spent with empty line on users with a hourly rate defined</td></tr>';
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -1230,8 +1176,7 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 		                    	//var_dump($key.' - '.$value.' - '.$reloffile);
 		                    	try {
 		                        	$result = dol_buildpath($reloffile, 0, 2);
-		                    	}
-		                    	catch (Exception $e)
+		                    	} catch (Exception $e)
 		                    	{
 									// No catch yet
 									$result = 'found'; // If error, we force lke if we found to avoid any deletion
@@ -1256,17 +1201,11 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 	                                {
 	                                    $error++;
 	                                    dol_print_error($db);
-	                                }
-	                                else
-	                                    print ' - <span class="warning">Cleaned</span>';
-	                            }
-	                            else
-	                            {
+	                                } else print ' - <span class="warning">Cleaned</span>';
+	                            } else {
 	                                print ' - <span class="warning">Canceled (test mode)</span>';
 	                            }
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            print ' - File of '.$key.' ('.$reloffile.') found, we do nothing.';
 	                        }
 	                    }
@@ -1281,14 +1220,10 @@ if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 
 	                $i++;
 	            }
-	        }
-	        else
-	        {
+	        } else {
 	            print '<tr><td>No active module with missing files found by searching on MAIN_MODULE_(.*)_'.strtoupper($key).'</td></tr>';
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        dol_print_error($db);
 	    }
     }
@@ -1333,14 +1268,10 @@ if ($ok && GETPOST('clean_perm_table', 'alpha'))
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr><td>No lines of a disabled external module (with id > 100000) found into table rights_def</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1379,8 +1310,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
             {
             	$resql = $db->query($sql);
             	print ' - Done ('.($resql ? 'OK' : 'KO').')';
-            }
-            else print ' - Disabled';
+            } else print ' - Disabled';
             print '</td></tr>';
         }
 
@@ -1391,9 +1321,7 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
         	print '<!-- '.$sql.' -->';
         	$resql = $db->query($sql);
         }
-    }
-    else
-    {
+    } else {
         print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
     }
 }
@@ -1495,9 +1423,7 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
                 if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed')
                 {
 	                $resql_attach = $db->query($sql_attach);
-                }
-                else
-                {
+                } else {
                 	$resql_attach = true; // Force success in test mode
                 }
 
@@ -1551,9 +1477,7 @@ if ($oneoptionset)
 	print '<div class="center" style="padding-top: 10px"><a href="../index.php?mainmenu=home&leftmenu=home'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
 	print $langs->trans("GoToDolibarr");
 	print '</a></div>';
-}
-else
-{
+} else {
 	print '<div class="center warning" style="padding-top: 10px">';
 	print $langs->trans("SetAtLeastOneOptionAsUrlParameter");
 	print '</div>';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index a5e6b9d3377..62a10a0b7b3 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -226,13 +226,10 @@ if (!$error) {
                 if ($db_type == 'mysql' || $db_type == 'mysqli')
                 {
                     $databasefortest = 'mysql';
-                }
-                elseif ($db_type == 'pgsql')
+                } elseif ($db_type == 'pgsql')
                 {
                     $databasefortest = 'postgres';
-                }
-                else
-                {
+                } else {
                     $databasefortest = 'master';
                 }
             }
@@ -274,9 +271,7 @@ if (!$error) {
                 $error++;
             }
         }
-    }
-    else
-    {
+    } else {
         print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
         print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter", $langs->transnoentities("WebPagesDirectory")).'</div>';
         //print '<a href="#" onClick="javascript: history.back();">';
@@ -284,10 +279,7 @@ if (!$error) {
         //print '</a>';
         $error++;
     }
-}
-
-else
-{
+} else {
     if (isset($db)) print $db->lasterror();
     if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
     print $langs->trans("ErrorGoBackAndCorrectParameters");
@@ -317,8 +309,7 @@ if (!$error && $db->connected)
 
         $defaultCharacterSet = $db->forcecharset;
     	$defaultDBSortingCollation = $db->forcecollate;
-    }
-    else	// If already created, we take current value
+    } else // If already created, we take current value
     {
         $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
         $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
@@ -400,9 +391,7 @@ if (!$error && $db->connected && $action == "set")
             print "</td></tr>";
             print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
             $error++;
-        }
-        else
-        {
+        } else {
             // Create .htaccess file in document directory
             $pathhtaccess = $main_data_dir.'/.htaccess';
             if (!file_exists($pathhtaccess))
@@ -437,9 +426,7 @@ if (!$error && $db->connected && $action == "set")
                 if (is_dir($dir[$i]))
                 {
                     dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
-                }
-                else
-                {
+                } else {
                     if (dol_mkdir($dir[$i]) < 0)
                     {
                         print "<tr><td>";
@@ -448,9 +435,7 @@ if (!$error && $db->connected && $action == "set")
                         print $langs->trans("Error");
                         print "</td></tr>";
                         $error++;
-                    }
-                    else
-                    {
+                    } else {
                         dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
                     }
                 }
@@ -471,9 +456,7 @@ if (!$error && $db->connected && $action == "set")
                 print '<span class="error">'.$langs->trans("Error").'</span>';
                 print "</td></tr>";
                 print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
-            }
-            else
-            {
+            } else {
             	//ODT templates
             	$srcroot = $main_dir.'/install/doctemplates';
             	$destroot = $main_data_dir.'/doctemplates';
@@ -546,12 +529,10 @@ if (!$error && $db->connected && $action == "set")
             if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
             {
                 $databasefortest = 'mysql';
-            }
-            elseif ($conf->db->type == 'pgsql')
+            } elseif ($conf->db->type == 'pgsql')
             {
                 $databasefortest = 'postgres';
-            }
-            elseif ($conf->db->type == 'mssql')
+            } elseif ($conf->db->type == 'mssql')
             {
                 $databasefortest = 'master';
             }
@@ -591,9 +572,7 @@ if (!$error && $db->connected && $action == "set")
                         print $dolibarr_main_db_user;
                         print '</td>';
                         print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                    }
-                    else
-                    {
+                    } else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
@@ -604,9 +583,7 @@ if (!$error && $db->connected && $action == "set")
                             print $dolibarr_main_db_user;
                             print '</td>';
                             print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
-                        }
-                        else
-                        {
+                        } else {
                             dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
                             print '<tr><td>';
                             print $langs->trans("UserCreation").' : ';
@@ -617,9 +594,7 @@ if (!$error && $db->connected && $action == "set")
                     }
 
                     $db->close();
-                }
-                else
-                {
+                } else {
                     print '<tr><td>';
                     print $langs->trans("UserCreation").' : ';
                     print $dolibarr_main_db_user;
@@ -667,9 +642,7 @@ if (!$error && $db->connected && $action == "set")
                     // If values differs, we save conf file again
                     //if ($check1 != $dolibarr_main_db_character_set) dolibarr_install_syslog('step1: value for character_set is not the one asked for database creation', LOG_WARNING);
                     //if ($check2 != $dolibarr_main_db_collation)     dolibarr_install_syslog('step1: value for collation is not the one asked for database creation', LOG_WARNING);
-                }
-                else
-                {
+                } else {
                     // warning message
                     print '<tr><td colspan="2"><br>';
                     print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
@@ -682,8 +655,7 @@ if (!$error && $db->connected && $action == "set")
                     $error++;
                 }
                 $newdb->close();
-            }
-            else {
+            } else {
                 print '<tr><td>';
                 print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
                 print $dolibarr_main_db_name;
@@ -734,9 +706,7 @@ if (!$error && $db->connected && $action == "set")
                     print "</td></tr>";
 
                     $error = 0;
-                }
-                else
-                {
+                } else {
                     dolibarr_install_syslog("step1: connection to database ".$conf->db->name." by user ".$conf->db->user." failed", LOG_ERR);
                     print "<tr><td>";
                     print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
@@ -754,9 +724,7 @@ if (!$error && $db->connected && $action == "set")
 
                     $error++;
                 }
-            }
-            else
-            {
+            } else {
                 dolibarr_install_syslog("step1: connection to server by user ".$conf->db->user." failed", LOG_ERR);
                 print "<tr><td>";
                 print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
@@ -1030,9 +998,7 @@ function write_conf_file($conffile)
 			print "</td><td>";
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
 			print "</td></tr>";
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 	}
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 5b794b781bd..1a56019f321 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -99,9 +99,7 @@ if ($action == "set")
         print "<tr><td>";
         print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
         $ok = 1;
-    }
-    else
-    {
+    } else {
         print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
     }
 
@@ -110,9 +108,7 @@ if ($action == "set")
         if ($db->database_selected)
         {
             dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
-        }
-        else
-        {
+        } else {
             dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
             print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 0;
@@ -201,9 +197,7 @@ if ($action == "set")
                 if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')	// For Mysql 5.5+, we must replace type=innodb with ENGINE=innodb
                 {
                     $buffer = preg_replace('/type=innodb/i', 'ENGINE=innodb', $buffer);
-                }
-                else
-                {
+                } else {
                     // Keyword ENGINE is MySQL-specific, so scrub it for
                     // other database types (mssql, pgsql)
                     $buffer = preg_replace('/type=innodb/i', '', $buffer);
@@ -225,16 +219,12 @@ if ($action == "set")
                 {
                     // print "<td>OK requete ==== $buffer</td></tr>";
                     $db->free($resql);
-                }
-                else
-                {
+                } else {
                     if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
                     $db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS')
                     {
                         //print "<td>Deja existante</td></tr>";
-                    }
-                    else
-                    {
+                    } else {
                         print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                         print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
                         print "\n</td>";
@@ -242,9 +232,7 @@ if ($action == "set")
                         $error++;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                 print "</td>";
                 print '<td><span class="error">'.$langs->trans("Error").' Failed to open file '.$dir.$file.'</span></td></tr>';
@@ -261,9 +249,7 @@ if ($action == "set")
                 print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                 $ok = 1;
             }
-        }
-        else
-        {
+        } else {
             print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
         }
@@ -368,9 +354,7 @@ if ($action == "set")
                         {
                             //print "<td>OK requete ==== $buffer</td></tr>";
                             $db->free($resql);
-                        }
-                        else
-                        {
+                        } else {
                             if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
                             $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
                             $db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
@@ -379,9 +363,7 @@ if ($action == "set")
                             {
                                 //print "<td>Deja existante</td></tr>";
                                 $key_exists = 1;
-                            }
-                            else
-                            {
+                            } else {
                                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                                 print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
                                 print "\n</td>";
@@ -391,9 +373,7 @@ if ($action == "set")
                         }
                     }
                 }
-            }
-            else
-            {
+            } else {
                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                 print "</td>";
                 print '<td><span class="error">'.$langs->trans("Error")." Failed to open file ".$dir.$file."</span></td></tr>";
@@ -464,16 +444,12 @@ if ($action == "set")
                     {
                         $ok = 1;
                         $db->free($resql);
-                    }
-                    else
-                    {
+                    } else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
                         {
                             //print "Insert line : ".$buffer."<br>\n";
-                        }
-                        else
-                        {
+                        } else {
                             $ok = 0;
 
                             print "<tr><td>".$langs->trans("FunctionsCreation");
@@ -490,9 +466,7 @@ if ($action == "set")
             if ($ok)
             {
                 print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            }
-            else
-            {
+            } else {
                 print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
                 $ok = 1;
             }
@@ -588,15 +562,11 @@ if ($action == "set")
                     if ($resql)
                     {
                         //$db->free($resql);     // Not required as request we launch here does not return memory needs.
-                    }
-                    else
-                    {
+                    } else {
                         if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                         {
                             //print "<tr><td>Insertion ligne : $buffer</td><td>";
-                        }
-                        else
-                        {
+                        } else {
                             $ok = 0;
                             $okallfile = 0;
                             print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
@@ -613,17 +583,13 @@ if ($action == "set")
         if ($ok)
         {
             print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        }
-        else
-        {
+        } else {
             print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
             $ok = 1; // Data loading are not blocking errors
         }
     }
     print '</table>';
-}
-else
-{
+} else {
     print 'Parameter action=set not defined';
 }
 
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b74594ce8da..ed64de7cbb1 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -130,8 +130,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
 			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-		}
-		else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 	}
 
 	$conf->db->type = $dolibarr_main_db_type;
@@ -187,8 +186,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 					dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0); // All entities
 					if (function_exists('password_hash'))
 						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0); // All entities
-					else
-						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
+					else dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
 				}
 
 				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);
@@ -214,17 +212,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			{
 				print $langs->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";
 				$success = 1;
-			}
-			else
-			{
+			} else {
 				if ($newuser->error == 'ErrorLoginAlreadyExists')
 				{
 					dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
 					print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists", $login)."</div><br>";
 					$success = 1;
-				}
-				else
-				{
+				} else {
 					dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
 					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
 				}
@@ -240,9 +234,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				{
 					$conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					//if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
 					$db->commit();
 				}
@@ -292,9 +284,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 
 				$db->commit();
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
 	}
@@ -311,8 +301,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			// Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
 			$tagdatabase = false;
 			if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) $tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
-			else
-			{
+			else {
 				$mainversionlastupgradearray = preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
 				$targetversionarray = preg_split('/[.-]/', $targetversion);
 				if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) $tagdatabase = true;
@@ -326,19 +315,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
 				if (!$resql) dol_print_error($db, 'Error in setup program');
 				$conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
-			}
-			else
-			{
+			} else {
 				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', 'step5.php: unknown choice of action');
 	}
 
@@ -389,9 +372,7 @@ if ($action == "set" && $success)
 		print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
 		print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
 		print '</a></div>';
-	}
-	else
-	{
+	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
@@ -437,9 +418,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToDolibarr").'...';
 		print '</a></div><br>';
-	}
-	else
-	{
+	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
@@ -450,9 +429,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
 		print '</a></div>';
 	}
-}
-else
-{
+} else {
 	dol_print_error('', 'step5.php: unknown choice of action');
 }
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index b71707bef4b..af05fb374d2 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -120,8 +120,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
             $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-        }
-        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
     }
 
     // $conf is already instancied inside inc.php
@@ -150,9 +149,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
         $ok = 1;
-    }
-    else
-    {
+    } else {
         print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
@@ -166,9 +163,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
             $ok = 1;
-        }
-        else
-        {
+        } else {
             print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
             $ok = 0;
@@ -292,9 +287,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             				$i++;
             			}
             			$db->free($resql);
-            		}
-            		else
-            		{
+            		} else {
             			if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
             			{
             				print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
@@ -334,9 +327,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             	if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
             }
             sort($filesindir);
-        }
-        else
-		{
+        } else {
             print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
         }
 
@@ -346,8 +337,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             if (preg_match('/'.$from.'/i', $file))
             {
                 $filelist[] = $file;
-            }
-            elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
+            } elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
             {
                 $filelist[] = $file;
             }
@@ -356,9 +346,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if (count($filelist) == 0)
         {
         	print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
-        }
-		else
-		{
+        } else {
 			$listoffileprocessed = array(); // Protection to avoid to process twice the same file
 
 	        // Loop on each migrate files
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 765a8796a76..13e50732566 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -68,8 +68,7 @@ $err = error_reporting();
 error_reporting(0);
 if (!empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT))
 	@set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT);
-else
-	@set_time_limit(600);
+else @set_time_limit(600);
 error_reporting($err);
 
 $setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
@@ -127,8 +126,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
             $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
             $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-        }
-        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
     }
 
     // $conf is already instancied inside inc.php
@@ -158,9 +156,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if ($db->database_selected)
         {
             dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
-        }
-        else
-        {
+        } else {
             $error++;
         }
     }
@@ -535,17 +531,13 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
                 print $hookmanager->error;
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
-            }
-            else
-            {
+            } else {
                 print '<tr><td colspan="4">';
                 print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
             }
-        }
-        else
-        {
+        } else {
             //if (! empty($conf->modules))
             if (!empty($conf->modules_parts['hooks']))     // If there is at least one module with one hook, we show message to say nothing was done
             {
@@ -584,9 +576,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
     migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
 
     print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
-}
-else
-{
+} else {
     print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
     $error++;
 }
@@ -645,9 +635,7 @@ function migrate_paiements($db, $langs, $conf)
                 $row[$i][2] = $obj->amount;
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -677,20 +665,14 @@ function migrate_paiements($db, $langs, $conf)
             {
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
     }
 
@@ -752,9 +734,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -793,9 +773,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
 
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
-                }
-                else
-                {
+                } else {
                     print 'ERROR';
                 }
             }
@@ -803,21 +781,15 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
             if ($res > 0)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -878,9 +850,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -920,9 +890,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
 
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
-                }
-                else
-                {
+                } else {
                     print 'ERROR';
                     $nberr++;
                 }
@@ -931,16 +899,12 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
             if ($res > 0)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
 
@@ -953,15 +917,11 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
         if (!$nberr)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             print 'ERROR';
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -1031,9 +991,7 @@ function migrate_contracts_det($db, $langs, $conf)
                 if ($db->query($sql))
                 {
                     print $langs->trans('MigrationContractsLineCreation', $obj->cref)."<br>\n";
-                }
-                else
-                {
+                } else {
                     dol_print_error($db);
                     $nberr++;
                 }
@@ -1046,20 +1004,14 @@ function migrate_contracts_det($db, $langs, $conf)
                 //      $db->rollback();
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
         //    dol_print_error($db);
     }
@@ -1132,19 +1084,14 @@ function migrate_links_transfert($db, $langs, $conf)
                 //      $db->rollback();
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else {
+        } else {
             print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -1172,8 +1119,7 @@ function migrate_contracts_date1($db, $langs, $conf)
     if (!$resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
     print $langs->trans('MigrationContractsEmptyDatesUpdateSuccess')."<br>\n";
-    else
-    print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
+    else print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
 
     $sql = "update ".MAIN_DB_PREFIX."contrat set datec=tms where datec is null";
     dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
@@ -1181,8 +1127,7 @@ function migrate_contracts_date1($db, $langs, $conf)
     if (!$resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
     print $langs->trans('MigrationContractsEmptyCreationDatesUpdateSuccess')."<br>\n";
-    else
-    print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
+    else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1244,12 +1189,9 @@ function migrate_contracts_date2($db, $langs, $conf)
 
             if ($nbcontratsmodifie)
             print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
-            else
-            print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+            else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -1277,8 +1219,7 @@ function migrate_contracts_date3($db, $langs, $conf)
     if (!$resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
     print $langs->trans('MigrationContractsIncoherentCreationDateUpdateSuccess')."<br>\n";
-    else
-    print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
+    else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1333,11 +1274,9 @@ function migrate_contracts_open($db, $langs, $conf)
 
             if ($nbcontratsmodifie)
             print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
-            else
-            print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+            else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
         }
-    }
-    else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+    } else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1415,24 +1354,18 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
                         {
                             $nb++;
                             print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
-                        }
-                        else
-                        {
+                        } else {
                             print '<td><span style="color:red">Error on insert</span></td>';
                             $error++;
                         }
                         print '</tr>';
                     }
-                }
-                else
-                {
+                } else {
                     $error++;
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             $error++;
         }
 
@@ -1446,15 +1379,11 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
 
             $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
             $db->query($sql);
-        }
-        else
-        {
+        } else {
             print '<tr><td>'.$langs->trans("Error").'</td></tr>';
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
     }
 }
@@ -1539,15 +1468,11 @@ function migrate_price_facture($db, $langs, $conf)
                         if ($facture->update_price() > 0)
                         {
                             //print $facture->id;
-                        }
-                        else
-                        {
+                        } else {
                             print "Error id=".$facture->id;
                             $err++;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         print "Error #3";
                         $err++;
                     }
@@ -1556,17 +1481,13 @@ function migrate_price_facture($db, $langs, $conf)
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
         $db->free($resql);
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
         $err++;
 
@@ -1664,18 +1585,14 @@ function migrate_price_propal($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
         $db->free($resql);
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1753,18 +1670,14 @@ function migrate_price_contrat($db, $langs, $conf)
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
         $db->free($resql);
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1860,9 +1773,7 @@ function migrate_price_commande($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1879,9 +1790,7 @@ function migrate_price_commande($db, $langs, $conf)
          */
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1977,9 +1886,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1996,9 +1903,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
          */
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -2125,20 +2030,14 @@ function migrate_commande_expedition($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2201,9 +2100,7 @@ function migrate_commande_livraison($db, $langs, $conf)
                             $error++;
                             dol_print_error($db);
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2218,20 +2115,14 @@ function migrate_commande_livraison($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2309,15 +2200,11 @@ function migrate_detail_livraison($db, $langs, $conf)
                                 $error++;
                                 dol_print_error($db);
                             }
-                        }
-                        else
-                        {
+                        } else {
                             $error++;
                             dol_print_error($db);
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2332,20 +2219,14 @@ function migrate_detail_livraison($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraisondet CHANGE fk_commande_ligne fk_origin_line integer";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
         $obj = $db->fetch_object($result);
         if (!$obj)
@@ -2401,9 +2282,7 @@ function migrate_stocks($db, $langs, $conf)
                 $resql2 = $db->query($sql);
                 if ($resql2)
                 {
-                }
-                else
-                {
+                } else {
                     $error++;
                     dol_print_error($db);
                 }
@@ -2415,14 +2294,10 @@ function migrate_stocks($db, $langs, $conf)
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2477,9 +2352,7 @@ function migrate_menus($db, $langs, $conf)
                     $resql2 = $db->query($sql);
                     if ($resql2)
                     {
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2491,20 +2364,14 @@ function migrate_menus($db, $langs, $conf)
             if ($error == 0)
             {
                 $db->commit();
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2566,29 +2433,21 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
                     print ". ";
                     $i++;
                 }
-            }
-            else
-            {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
             if ($error == 0)
             {
                 $db->commit();
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2663,20 +2522,15 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 //print ". ";
                 $i++;
             }
-        }
-        else print $langs->trans('AlreadyDone')."<br>\n";
+        } else print $langs->trans('AlreadyDone')."<br>\n";
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2728,23 +2582,17 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 //print ". ";
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2825,25 +2673,17 @@ function migrate_project_user_resp($db, $langs, $conf)
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2917,25 +2757,17 @@ function migrate_project_task_actors($db, $langs, $conf)
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -3005,9 +2837,7 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                     print ". ";
                     $i++;
                 }
-            }
-            else
-            {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3017,25 +2847,17 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3103,9 +2925,7 @@ function migrate_project_task_time($db, $langs, $conf)
                     $oldtime++;
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
                     else $totaltime[$obj->fk_task] = $newtime;
-                }
-                else
-                {
+                } else {
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
                     else $totaltime[$obj->fk_task] = $obj->task_duration;
                 }
@@ -3130,33 +2950,23 @@ function migrate_project_task_time($db, $langs, $conf)
                             dol_print_error($db);
                         }
                     }
-                }
-                else
-                {
+                } else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
     if ($error == 0)
     {
         $db->commit();
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 
@@ -3228,36 +3038,26 @@ function migrate_customerorder_shipping($db, $langs, $conf)
                         print ". ";
                         $i++;
                     }
-                }
-                else
-                {
+                } else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
 
                 if ($error == 0)
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     dol_print_error($db);
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3330,17 +3130,13 @@ function migrate_shipping_delivery($db, $langs, $conf)
                             dol_print_error($db);
                         }
                         print ". ";
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
                     $i++;
                 }
-            }
-            else
-            {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3354,21 +3150,15 @@ function migrate_shipping_delivery($db, $langs, $conf)
                 // DDL commands must not be inside a transaction
                 $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
                 $db->query($sqlDrop);
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3435,24 +3225,18 @@ function migrate_shipping_delivery2($db, $langs, $conf)
                 print ". ";
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -3510,15 +3294,11 @@ function migrate_actioncomm_element($db, $langs, $conf)
 				//$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."actioncomm DROP COLUMN ".$field;
 				//$db->query($sqlDrop);
 				//print ". ";
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 	}
@@ -3602,15 +3382,11 @@ function migrate_mode_reglement($db, $langs, $conf)
 					if (!$error)
 					{
 						$db->commit();
-					}
-					else
-					{
+					} else {
 						dol_print_error($db);
 						$db->rollback();
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 					$db->rollback();
 				}
@@ -3693,17 +3469,13 @@ function migrate_clean_association($db, $langs, $conf)
                         print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
                         $db->commit();
-                    }
-                    else
-                    {
+                    } else {
                         print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
                         $db->rollback();
                     }
                 }
-            }
-            else
-            {
+            } else {
                 print '<tr><td>'.$langs->trans("Error").'</td>';
                 print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
             }
@@ -3763,9 +3535,7 @@ function migrate_categorie_association($db, $langs, $conf)
 					print ". ";
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print $langs->trans('AlreadyDone')."<br>\n";
 			}
 
@@ -3785,20 +3555,14 @@ function migrate_categorie_association($db, $langs, $conf)
 				*/
 
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 
@@ -3857,23 +3621,17 @@ function migrate_event_assignement($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -3934,23 +3692,17 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4021,9 +3773,7 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 						{
 							$error++;
 							dol_print_error($db);
-						}
-						else
-						{
+						} else {
 							// Add set line
 							$object = new stdClass();
 							$object->id = 1;
@@ -4040,36 +3790,26 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 								$error++;
 							}
 						}
-					}
-					else
-					{
+					} else {
 						print ' - '.$langs->trans('AlreadyInV7').'<br>';
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('NothingToDo')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4131,23 +3871,17 @@ function migrate_remise_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4199,16 +3933,13 @@ function migrate_remise_except_entity($db, $langs, $conf)
 					$sqlSelect2 = "SELECT f.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."facture as f";
 					$sqlSelect2 .= " WHERE f.rowid = ".$fk_facture;
-				}
-				elseif (!empty($obj->fk_facture_line))
+				} elseif (!empty($obj->fk_facture_line))
 				{
 					$sqlSelect2 = "SELECT f.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as fd";
 					$sqlSelect2 .= " WHERE fd.rowid = ".$obj->fk_facture_line;
 					$sqlSelect2 .= " AND fd.fk_facture = f.rowid";
-				}
-				else
-				{
+				} else {
 					$sqlSelect2 = "SELECT s.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."societe as s";
 					$sqlSelect2 .= " WHERE s.rowid = ".$obj->fk_soc;
@@ -4232,9 +3963,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 							dol_print_error($db);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					dol_print_error($db);
 				}
@@ -4242,23 +3971,17 @@ function migrate_remise_except_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4318,23 +4041,17 @@ function migrate_user_rights_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4394,23 +4111,17 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4593,8 +4304,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_API')
+		} elseif ($moduletoreload == 'MAIN_MODULE_API')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Rest API module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modApi.class.php';
@@ -4603,8 +4313,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
+		} elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
@@ -4613,8 +4322,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_CRON')
+		} elseif ($moduletoreload == 'MAIN_MODULE_CRON')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
@@ -4623,8 +4331,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
+		} elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
@@ -4633,8 +4340,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
+		} elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
@@ -4643,8 +4349,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
+		} elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
@@ -4653,8 +4358,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
@@ -4663,8 +4367,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
@@ -4673,8 +4376,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
@@ -4683,8 +4385,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
+		} elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Leave Request module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modHoliday.class.php';
@@ -4693,8 +4394,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
@@ -4703,8 +4403,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
+		} elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Expense Report module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modExpenseReport.class.php';
@@ -4713,8 +4412,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
@@ -4723,8 +4421,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
+		} elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
@@ -4733,8 +4430,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
@@ -4743,8 +4439,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
+		} elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Supplier Proposal module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSupplierProposal.class.php';
@@ -4753,8 +4448,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
@@ -4763,8 +4457,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Takepos module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modTakePos.class.php';
@@ -4773,9 +4466,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		}
-		else
-		{
+		} else {
 			$reg = array();
 			$tmp = preg_match('/MAIN_MODULE_([a-zA-Z0-9]+)/', $moduletoreload, $reg);
 			if (!empty($reg[1]))
@@ -4783,8 +4474,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				if (strtoupper($moduletoreload) == $moduletoreload)	// If key is un uppercase
 				{
 					$moduletoreloadshort = ucfirst(strtolower($reg[1]));
-				}
-				else												// If key is a mix of up and low case
+				} else // If key is a mix of up and low case
 				{
 					$moduletoreloadshort = $reg[1];
 				}
@@ -4795,9 +4485,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 					$mod = new $classname($db);
 					//$mod->remove('noboxes');
 					$mod->init($reloadmode);
-				}
-				else
-				{
+				} else {
 					dolibarr_install_syslog('Failed to include '.DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 
 					$res = @dol_include_once(strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
@@ -4806,15 +4494,11 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 						$mod = new $classname($db);
 						//$mod->remove('noboxes');
 						$mod->init($reloadmode);
-					}
-					else
-					{
+					} else {
 						dolibarr_install_syslog('Failed to include '.strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dolibarr_install_syslog("Error, can't find module with name ".$moduletoreload, LOG_WARNING);
 				print "Error, can't find module with name ".$moduletoreload;
 			}
@@ -4948,8 +4632,7 @@ function migrate_user_photospath()
 					    			}
 									// dol_delete_dir($origin.'/'.$file);
 			        			}
-			    			}
-			    			else								// it is a file
+			    			} else // it is a file
 			    			{
 			    				if (!dol_is_file($destin.'/'.$file))
 			    				{
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 82c6521e00f..544593dc16c 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -118,18 +118,14 @@ if ($action == 'add')
 		$db->commit();
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 
 		$_GET["commande_id"] = $_POST["commande_id"];
 		$action = 'create';
 	}
-}
-
-elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
     ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
 )
@@ -166,9 +162,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 		if (!empty($backtopage)) header("Location: ".$backtopage);
 		else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -261,8 +255,7 @@ $formfile = new FormFile($db);
 
 if ($action == 'create')    // Create. Seems to no be used
 {
-}
-else	// View
+} else // View
 {
 	if ($object->id > 0)
 	{
@@ -452,9 +445,7 @@ else	// View
 				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 1);
 				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 			}
 			print '</td>';
@@ -475,9 +466,7 @@ else	// View
 				if ($action != 'editincoterm')
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-				}
-				else
-				{
+				} else {
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 				}
 		        print '</td></tr>';
@@ -574,9 +563,7 @@ else	// View
 							}
 
 							$label = (!empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
-						}
-						else
-						{
+						} else {
 							$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : $object->lines[$i]->product_label);
 						}
 
@@ -596,9 +583,7 @@ else	// View
 						{
 							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>'.dol_htmlentitiesbr($object->lines[$i]->description) : '';
 						}
-					}
-					else
-					{
+					} else {
 						print "<td>";
 						if ($object->lines[$i]->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -674,9 +659,7 @@ else	// View
 					if ($conf->expedition_bon->enabled)
 					{
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
 					}
 				}
@@ -719,15 +702,11 @@ else	// View
 			// Rien a droite
 
 			print '</td></tr></table>';
-		}
-		else
-		{
+		} else {
 			/* Expedition non trouvee */
 			print "Expedition inexistante ou acces refuse";
 		}
-	}
-	else
-	{
+	} else {
 		/* Expedition non trouvee */
 		print "Expedition inexistante ou acces refuse";
 	}
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index acfe8b29d05..6199bc4ec88 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -215,25 +215,19 @@ class Livraison extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 			$this->db->rollback();
@@ -344,16 +338,12 @@ class Livraison extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -399,9 +389,7 @@ class Livraison extends CommonObject
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		            {
 		                $numref = $objMod->livraison_get_num($soc, $this);
-		            }
-		            else
-					{
+		            } else {
 		                $numref = $this->ref;
 		            }
             		$this->newref = dol_sanitizeFileName($numref);
@@ -500,17 +488,13 @@ class Livraison extends CommonObject
 			        {
 			            $this->db->commit();
 			            return 1;
-			        }
-			        else
-					{
+			        } else {
 			            $this->db->rollback();
 			            return -1;
 			        }
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -633,9 +617,7 @@ class Livraison extends CommonObject
 				$this->update_price();
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
 		}
@@ -704,23 +686,17 @@ class Livraison extends CommonObject
                     // End call triggers
 
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
@@ -990,16 +966,13 @@ class Livraison extends CommonObject
 					if ($row[0] == $objSourceLine->rowid)
 					{
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
-					}
-					else
-					{
+					} else {
 						$array[$i]['qty'] = $objSourceLine->qty;
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
-				}
-				elseif ($objSourceLine->qty - $row[1] < 0)
+				} elseif ($objSourceLine->qty - $row[1] < 0)
 				{
 					$array[$i]['qty'] = $objSourceLine->qty - $row[1]." Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
@@ -1009,9 +982,7 @@ class Livraison extends CommonObject
 					$i++;
 			}
 			return $array;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." - sql=$sqlSourceLine";
 			return -1;
 		}
@@ -1040,15 +1011,11 @@ class Livraison extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 56b12321bb2..8f82e94b8f9 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -68,9 +68,7 @@ if (empty($reshook))
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -85,9 +83,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
 			header("Location: index.php");
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -153,9 +149,7 @@ if (empty($reshook))
 					$action = 'create';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			header("Location: index.php");
 			exit();
 		}
@@ -176,9 +170,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 				$action = 'edit';
-			}
-			else
-			{
+			} else {
 				$object->datestart = $datestart;
 				$object->dateend	        = $dateend;
 				$object->capital	        = $capital;
@@ -201,15 +193,11 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		}
@@ -274,9 +262,7 @@ if ($action == 'create')
 		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
 		$form->select_comptes(GETPOST("accountid"), "accountid", 0, "courant=1", 1); // Show list of bank account with courant
 		print '</td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("Account").'</td><td>';
 		print $langs->trans("NoBankAccountDefined");
 		print '</td></tr>';
@@ -359,8 +345,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ?GETPOST('accountancy_account_interest') : $conf->global->LOAN_ACCOUNTING_ACCOUNT_INTEREST, 'accountancy_account_interest', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
@@ -483,9 +468,7 @@ if ($id > 0)
 			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("LoanCapital").'</td><td>';
 			print '<input name="capital" size="10" value="'.$object->capital.'"></td></tr>';
 			print '</td></tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -495,9 +478,7 @@ if ($id > 0)
 		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>';
 		    print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
 		    print '</td></tr>';
-		}
-		else
-		{
+		} else {
 		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -507,9 +488,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->datestart, 'start', 0, 0, 0, 'update', 1, 0);
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->datestart, "day");
 		}
 		print "</td></tr>";
@@ -520,9 +499,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->dateend, 'end', 0, 0, 0, 'update', 1, 0);
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->dateend, "day");
 		}
 		print "</td></tr>";
@@ -533,9 +510,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<input name="nbterm" size="4" value="'.$object->nbterm.'">';
-		}
-		else
-		{
+		} else {
 			print $object->nbterm;
 		}
 		print '</td></tr>';
@@ -546,9 +521,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<input name="rate" size="4" value="'.$object->rate.'">%';
-		}
-		else
-		{
+		} else {
 			print price($object->rate).'%';
 		}
 		print '</td></tr>';
@@ -564,15 +537,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
-			}
-			else
-			{
+			} else {
 				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
@@ -602,15 +571,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
-			}
-			else
-			{
+			} else {
 				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
@@ -640,15 +605,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
-			}
-			else
-			{
+			} else {
 				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
@@ -742,9 +703,7 @@ if ($id > 0)
 			print '</div>';
 
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -804,9 +763,7 @@ if ($id > 0)
 				print "</div>";
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Loan not found
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 1a24eb6be11..a072199dc01 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -160,15 +160,11 @@ class Loan extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->free($resql);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -258,9 +254,7 @@ class Loan extends CommonObject
 			//dol_syslog("Loans::create this->id=".$this->id);
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -329,9 +323,7 @@ class Loan extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -375,9 +367,7 @@ class Loan extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -501,8 +491,7 @@ class Loan extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -571,9 +560,7 @@ class Loan extends CommonObject
 
 			$this->db->free($resql);
 			return $amount;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -618,15 +605,11 @@ class Loan extends CommonObject
 
 				$this->db->free($result);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->free($result);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 3299e810991..7405a63e3b9 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -170,9 +170,7 @@ class LoanSchedule extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
-			{
+			} else {
                 $this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -183,9 +181,7 @@ class LoanSchedule extends CommonObject
 		    $this->amount_capital = $totalamount;
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -257,9 +253,7 @@ class LoanSchedule extends CommonObject
             $this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -321,9 +315,7 @@ class LoanSchedule extends CommonObject
 		{
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -363,9 +355,7 @@ class LoanSchedule extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -450,9 +440,7 @@ class LoanSchedule extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 0aa5b2dbf62..84aca12394d 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -170,9 +170,7 @@ class PaymentLoan extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -183,9 +181,7 @@ class PaymentLoan extends CommonObject
 			$this->amount_capital = $totalamount;
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -259,9 +255,7 @@ class PaymentLoan extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -331,9 +325,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -384,9 +376,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -464,9 +454,7 @@ class PaymentLoan extends CommonObject
 					$result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
 					if ($result <= 0) dol_print_error($this->db);
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $acc->error;
 				$error++;
 			}
@@ -475,9 +463,7 @@ class PaymentLoan extends CommonObject
 		if (!$error)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -501,9 +487,7 @@ class PaymentLoan extends CommonObject
 		{
 		    $this->fk_bank = $id_bank;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 6ae646a93a1..442f8768390 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -158,9 +158,7 @@ if ($object->id)
     $permtoedit = $user->rights->loan->write;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 3f87f322ccb..fc0e766ed9b 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -120,9 +120,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -261,9 +259,7 @@ if ($resql)
 	print '</form>'."\n";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index b739b81ca54..31619be511b 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -63,9 +63,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 		$db->commit();
 		header("Location: ".DOL_URL_ROOT."/loan/list.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -101,9 +99,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
 
 		header('Location: card.php?id='.$payment->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -254,9 +250,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -286,9 +280,7 @@ if (empty($action) && !empty($user->rights->loan->delete))
 	if (!$disable_delete)
 	{
 		print '<a class="butActionDelete" href="card.php?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 	}
 }
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index ea37a298d49..de5a43220ef 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -155,8 +155,7 @@ if ($action == 'add_payment')
 				{
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
-				}
-				elseif (isset($line))
+				} elseif (isset($line))
 				{
 					$line->fk_bank = $payment->fk_bank;
 					$line->update($user);
@@ -169,9 +168,7 @@ if ($action == 'add_payment')
 				$loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid;
 				header('Location: '.$loc);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -290,9 +287,7 @@ if ($action == 'create')
 	if ($loan->datestart > 0)
 	{
 		print '<td class="left" valign="center">'.dol_print_date($loan->datestart, 'day').'</td>';
-	}
-	else
-	{
+	} else {
 		print '<td class="center" valign="center"><b>!!!</b></td>';
 	}
 
@@ -306,27 +301,21 @@ if ($action == 'create')
 	if ($sumpaid < $loan->capital)
 	{
 	    print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.$amount_capital.'">';
-	}
-	else
-	{
+	} else {
 		print '-';
 	}
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
 		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.$amount_insurance.'">';
-	}
-	else
-	{
+	} else {
 		print '-';
 	}
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
 		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.$amount_interest.'">';
-	}
-	else
-	{
+	} else {
 		print '-';
 	}
 	print "</td>";
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index fb3cd86ebe3..adcdf4ca049 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -237,8 +237,7 @@ if ($object->nbterm > 0 && count($echeance->lines) == 0)
 		$i++;
 		$capital = $cap_rest;
 	}
-}
-elseif (count($echeance->lines) > 0)
+} elseif (count($echeance->lines) > 0)
 {
 	$i = 1;
 	$capital = $object->capital;
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 41a221a7e72..46e8d017eca 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -208,14 +208,10 @@ class MailmanSpip
                     if ($result)
                     {
                         return 1;
-                    }
-                    else $this->error = $mydb->lasterror();
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                    } else $this->error = $mydb->lasterror();
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return 0;
     }
@@ -249,14 +245,10 @@ class MailmanSpip
                     if ($result)
                     {
                         return 1;
-                    }
-                    else $this->error = $mydb->lasterror();
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                    } else $this->error = $mydb->lasterror();
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return 0;
     }
@@ -290,25 +282,18 @@ class MailmanSpip
                             // nous avons au moins une reponse
                             $mydb->close($result);
                             return 1;
-                        }
-                        else
-                        {
+                        } else {
                             // nous n'avons pas de reponse => n'existe pas
                             $mydb->close($result);
                             return 0;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $mydb->lasterror();
                         $mydb->close();
                     }
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return -1;
     }
@@ -373,13 +358,10 @@ class MailmanSpip
 					{
 						$this->mladded_ko[$list] = $object->email;
 					    return -2;
-					}
-					else $this->mladded_ok[$list] = $object->email;
+					} else $this->mladded_ok[$list] = $object->email;
 	            }
 	            return count($lists);
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = "ADHERENT_MAILMAN_URL not defined";
 	            return -1;
 	        }
@@ -447,13 +429,10 @@ class MailmanSpip
 					{
 						$this->mlremoved_ko[$list] = $object->email;
 					    return -2;
-					}
-					else $this->mlremoved_ok[$list] = $object->email;
+					} else $this->mlremoved_ok[$list] = $object->email;
 	            }
 	            return count($lists);
-	        }
-	        else
-			{
+	        } else {
 	            $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
 	            return -1;
 	        }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0bc25d0c096..57e5a421208 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -131,17 +131,13 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
 			{
 				//$var[$key] = $value;	// This is useless
-			}
-			else
-			{
+			} else {
 				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
 				exit;
 			}
 		}
 		return true;
-	}
-	else
-	{
+	} else {
 		return (testSqlAndScriptInject($var, $type) <= 0);
 	}
 }
@@ -270,14 +266,11 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 			{
 				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
-		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
-		{
+		} else {
+			// Check HTTPS environment variable (Apache/mod_ssl only)
 			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
-	}
-	else
-	{
+	} else {
 		// Check HTTPS environment variable (Apache/mod_ssl only)
 		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
@@ -288,9 +281,7 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
 	}
 }
@@ -432,9 +423,7 @@ if (!defined('NOLOGIN'))
 	if (defined('MAIN_AUTHENTICATION_MODE'))
 	{
 		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
-	}
-	else
-	{
+	} else {
 		// Authentication mode
 		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
 		// Authentication mode: forceuser
@@ -658,9 +647,7 @@ if (!defined('NOLOGIN'))
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		// We are already into an authenticated session
 		$login = $_SESSION["dol_login"];
 		$entity = $_SESSION["dol_entity"];
@@ -710,9 +697,7 @@ if (!defined('NOLOGIN'))
 			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		    $hookmanager->initHooks(array('main'));
 
@@ -814,9 +799,7 @@ if (!defined('NOLOGIN'))
 			session_destroy();
 			dol_print_error($db, 'Error in some triggers USER_LOGIN or in some hooks afterLogin');
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->commit();
 		}
 
@@ -876,14 +859,12 @@ if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
 	{
 		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
-}
-else $conf->use_javascript_ajax = 0;
+} else $conf->use_javascript_ajax = 0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
 if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
-}
-elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+} elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
@@ -986,9 +967,7 @@ if (empty($conf->browser->firefox))
 	define('ROWS_7', 7);
 	define('ROWS_8', 8);
 	define('ROWS_9', 9);
-}
-else
-{
+} else {
 	define('ROWS_1', 0);
 	define('ROWS_2', 1);
 	define('ROWS_3', 2);
@@ -1008,9 +987,8 @@ if (!defined('NOREQUIREMENU'))
 	if (empty($user->socid))    // If internal user or not defined
 	{
 		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
-	}
-	else                        // If external user
-	{
+	} else {
+		// If external user
 		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
@@ -1153,8 +1131,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
-	}
-	elseif (constant('FORCECSP'))
+	} elseif (constant('FORCECSP'))
 	{
 		header("Content-Security-Policy: ".constant('FORCECSP'));
 	}
@@ -1333,9 +1310,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			    if (preg_match('/^(http|\/\/)/i', $cssfile))
 			    {
 			        $urltofile = $cssfile;
-			    }
-			    else
-			    {
+			    } else {
 			        $urltofile = dol_buildpath($cssfile, 1);
 			    }
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;
@@ -1361,23 +1336,17 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
-			{
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Flot
-			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'jflot')
-			{
-				if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
-				{
-					if (constant('JS_JQUERY_FLOT'))
-					{
+			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'jflot') {
+				if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT')) {
+					if (constant('JS_JQUERY_FLOT')) {
 						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-					}
-					else
-					{
+					} else {
 						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1396,14 +1365,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				}
 			}
 			// Chart
-			if ($conf->global->MAIN_JS_GRAPH == 'chart')
-			{
+			if ($conf->global->MAIN_JS_GRAPH == 'chart') {
 				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/Chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 
 			// jQuery jeditable for Edit In Place features
-			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
-			{
+			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) {
 				print '<!-- JS to manage editInPlace feature -->'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1422,28 +1389,26 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
             // jQuery Timepicker
-            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
             	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
             	print '<script src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
             }
-            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
-            {
+            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+                // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
             }
 		}
 
-        if (!$disablejs && !empty($conf->use_javascript_ajax))
-        {
+        if (!$disablejs && !empty($conf->use_javascript_ajax)) {
             // CKEditor
         	if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
                 $jsckeditor = 'ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
-                {
+                if (constant('JS_CKEDITOR')) {
+                    // To use external ckeditor 4 js lib
                 	$pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script><!-- enable ckeditor by main.inc.php -->';
@@ -1457,9 +1422,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                 if (GETPOST('mode', 'aZ09') == 'Full_inline')
                 {
                 	print 'CKEDITOR.disableAutoInline = false;'."\n";
-                }
-                else
-                {
+                } else {
                 	print 'CKEDITOR.disableAutoInline = true;'."\n";
                 }
                 print '</script>'."\n";
@@ -1505,9 +1468,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                     if (preg_match('/^(http|\/\/)/i', $jsfile))
                     {
                         print '<script src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
-                    {
+                    } else {
                         print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
@@ -1588,10 +1549,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			if (preg_match('/\d\.\d/', $appli))
 			{
 				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-			}
-			else $appli .= " ".DOL_VERSION;
-		}
-		else $appli .= " ".DOL_VERSION;
+			} else $appli .= " ".DOL_VERSION;
+		} else $appli .= " ".DOL_VERSION;
 
 		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
@@ -1606,9 +1565,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin');
 				$logouttext .= '</a>';
-			}
-			else
-			{
+			} else {
 				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin opacitymedium');
 			}
@@ -1625,11 +1582,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		{
 			if ($result == 0)
 				$toprightmenu .= $hookmanager->resPrint; // add
-			else
+			else {
 				$toprightmenu = $hookmanager->resPrint; // replace
-		}
-		else
-		{
+			}
+		} else {
 			$toprightmenu .= $result; // For backward compatibility
 		}
 
@@ -1770,8 +1726,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     {
         $userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
         $userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
-    }
-    else {
+    } else {
         $nophoto = '/public/theme/common/user_anonymous.png';
         if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
         if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
@@ -1824,8 +1779,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     {
         if ($result == 0) {
             $dropdownBody .= $hookmanager->resPrint; // add
-        }
-        else {
+        } else {
             $dropdownBody = $hookmanager->resPrint; // replace
         }
     }
@@ -1851,10 +1805,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     	if (preg_match('/\d\.\d/', $appli))
     	{
     		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-    	}
-    	else $appli .= " ".DOL_VERSION;
-    }
-    else $appli .= " ".DOL_VERSION;
+    	} else $appli .= " ".DOL_VERSION;
+    } else $appli .= " ".DOL_VERSION;
 
     if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	    $btnUser = '<!-- div for user link -->
@@ -2088,7 +2040,7 @@ function top_menu_quickadd()
 
 	if (! empty($conf->service->enabled) && $user->rights->service->creer) {
 		$langs->load("products");
-		$dropDownQuickAddHtml.= '
+		$dropDownQuickAddHtml .= '
                 <!-- Service link -->
                 <div class="quickaddblock center">
                     <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">
@@ -2102,20 +2054,18 @@ function top_menu_quickadd()
 	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 	$parameters = array();
 	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks
-	if (is_numeric($result))
-	{
-		if ($result == 0)
+	if (is_numeric($result)) {
+		if ($result == 0) {
 			$dropDownQuickAddHtml.= $hookmanager->resPrint; // add
-		else
+		} else {
 			$dropDownQuickAddHtml = $hookmanager->resPrint; // replace
-	}
-	else
-	{
-		$dropDownQuickAddHtml.= $result; // For backward compatibility
+		}
+	} else {
+		$dropDownQuickAddHtml .= $result; // For backward compatibility
 	}
 
-	$dropDownQuickAddHtml.= '</div>';
-	$dropDownQuickAddHtml.= '</div>';
+	$dropDownQuickAddHtml .= '</div>';
+	$dropDownQuickAddHtml .= '</div>';
 
 	$html.= '<!-- div for quick add link -->
     <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
@@ -2465,10 +2415,8 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				if (preg_match('/\d\.\d/', $appli))
 				{
 					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-				}
-				else $appli .= " ".DOL_VERSION;
-			}
-			else $appli .= " ".DOL_VERSION;
+				} else $appli .= " ".DOL_VERSION;
+			} else $appli .= " ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
 			else print '<span class="help">';
@@ -2522,8 +2470,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			if (empty($reshook))
 			{
 				$bugbaseurl .= $hookmanager->resPrint;
-			}
-			else $bugbaseurl = $hookmanager->resPrint;
+			} else $bugbaseurl = $hookmanager->resPrint;
 
 			$bugbaseurl .= urlencode("\n");
 			$bugbaseurl .= urlencode("## Report\n");
@@ -2587,8 +2534,9 @@ function main_area($title = '')
             print '<table class="centpercent div-table-responsive">'."\n";
             print '<tbody>';
             print '<tr><td rowspan="0" class="width20p">';
-            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO))
+            if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) {
                 print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
+            }
             print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
             print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
             print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
@@ -2623,9 +2571,7 @@ function getHelpParamFor($helppagename, $langs)
 		$helpbaseurl = '%s';
 		$helppage = $helppagename;
 		$mode = 'local';
-	}
-	else
-	{
+	} else {
 		// If WIKI URL
 		$reg = array();
 		if (preg_match('/^es/i', $langs->defaultlang))
@@ -2763,10 +2709,8 @@ if (!function_exists("llxFooter"))
 			{
 				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
 				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
-			}
-			// html version
-			else
-			{
+			} else {
+				// html version
 				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');
 				print '<div class="error">'.$msg.'</div>';
 			}
@@ -2846,8 +2790,7 @@ if (!function_exists("llxFooter"))
 				// No ping done if we are into an alpha version
 				if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It is an alpha version -->\n";
-				}
-				elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
+				} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
 				{
 					// MAIN_LAST_PING_KO_DATE
 					// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent
@@ -2908,9 +2851,7 @@ if (!function_exists("llxFooter"))
 			    			</script>
 						<?php
 					}
-				}
-				else
-				{
+				} else {
 					$now = dol_now();
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It was disabled -->\n";
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 5b6cd01ba97..9efea04e415 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -47,9 +47,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -61,9 +59,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -73,9 +69,7 @@ if ($action == 'remises')
 	if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -85,9 +79,7 @@ if ($action == 'typemarges')
 	if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -97,9 +89,7 @@ if ($action == 'contact')
 	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -166,15 +156,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
-}
-else
-{
+} else {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -189,15 +175,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
-}
-else
-{
+} else {
 	if (empty($conf->global->DISPLAY_MARK_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -212,15 +194,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
-}
-else
-{
+} else {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index cf1d70db91a..6ff9cdc7274 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -48,8 +48,7 @@ if (!$sortfield)
 {
 	if ($agentid > 0)
 		$sortfield = "s.nom";
-	else
-	    $sortfield = "u.lastname";
+	else $sortfield = "u.lastname";
 }
 
 $startdate = $enddate = '';
@@ -156,16 +155,14 @@ $sql .= " AND sc.fk_soc = f.fk_soc";
 $sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (!empty($conf->global->AGENT_CONTACT_TYPE))
 	$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else
-	$sql .= " AND sc.fk_user = u.rowid";
+else $sql .= " AND sc.fk_user = u.rowid";
 $sql .= " AND f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")";
 $sql .= ' AND s.entity IN ('.getEntity('societe').')';
 $sql .= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
 	if (!empty($conf->global->AGENT_CONTACT_TYPE))
   		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
-	else
-	    $sql .= " AND sc.fk_user = ".$agentid;
+	else $sql .= " AND sc.fk_user = ".$agentid;
 }
 if (!empty($startdate))
   $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
@@ -205,7 +202,7 @@ if ($result)
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -217,8 +214,7 @@ if ($result)
 	print '<tr class="liste_titre">';
 	if ($agentid > 0)
 		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
-	else
-		print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
+	else print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
 
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -307,9 +303,7 @@ if ($result)
     }
 	print "</table>";
 	print '</div>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 337791238ce..83e743e0d68 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -222,7 +222,7 @@ if ($result) {
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 3cdd9c3c650..e1fd6876e0f 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -108,8 +108,7 @@ if ($socid > 0) {
 		if (!$sortorder) $sortorder = "DESC";
 		if (!$sortfield) $sortfield = "f.datef";
 	}
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_company(null, 'socid', '(client=1 OR client=3)', 1, 0, 0);
@@ -125,9 +124,7 @@ if (!$sortfield)
 	{
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
-	}
-	else
-	{
+	} else {
 	    $sortfield = "s.nom";
 	    $sortorder = "ASC";
 	}
@@ -255,7 +252,7 @@ if ($result)
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -268,9 +265,7 @@ if ($result)
 	if (!empty($client)) {
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$socid, 'align="center"', $sortfield, $sortorder);
-	}
-	else
-  		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
+	} else print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
@@ -297,9 +292,7 @@ if ($result)
 			{
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
-			}
-			else
-			{
+			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -313,8 +306,7 @@ if ($result)
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-		  	}
-		  	else {
+		  	} else {
 				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
 				$companystatic->client = $objp->client;
@@ -353,8 +345,7 @@ if ($result)
 	print '<tr class="liste_total">';
 	if ($client)
 	    print '<td colspan=2>';
-  	else
-    	print '<td>';
+  	else print '<td>';
   	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td class=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
@@ -367,9 +358,7 @@ if ($result)
 
 	print "</table>";
 	print '</div>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 1f1d6def849..fdfea1610bf 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -127,14 +127,10 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-		}
-		else
-		{
+		} else {
 			$paht_ret = $paht;
 		}
-	}
-	else
-	{
+	} else {
 		$paht_ret = $paht;
 	}
 
@@ -147,8 +143,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 	// calcul marge
 	if ($pu_ht_remise < 0)
 		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else
-		$marge = $pu_ht_remise - $paht_ret;
+	else $marge = $pu_ht_remise - $paht_ret;
 
 	// calcul taux marge
 	if ($paht_ret != 0)
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index d4df22475d4..cb67cb0d58f 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -61,9 +61,7 @@ if (!$sortfield)
 	{
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
-	}
-	else
-	{
+	} else {
 	    $sortfield = "p.ref";
 	    $sortorder = "ASC";
 	}
@@ -113,8 +111,7 @@ if ($id > 0) {
 
     if (!$sortorder) $sortorder = "DESC";
     if (!$sortfield) $sortfield = "f.datef";
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	$form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
@@ -226,7 +223,7 @@ if ($result)
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -239,9 +236,7 @@ if ($result)
 	if ($id > 0) {
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, 'align="center"', $sortfield, $sortorder);
-  	}
-  	else
-  	{
+  	} else {
   		print_liste_field_titre("ProductService", $_SERVER["PHP_SELF"], "p.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   	}
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
@@ -269,9 +264,7 @@ if ($result)
 			{
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
-			}
-			else
-			{
+			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -285,8 +278,7 @@ if ($result)
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-			}
-			else {
+			} else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
@@ -297,9 +289,7 @@ if ($result)
     				$product_static->entity = $objp->pentity;
     				$text = $product_static->getNomUrl(1);
     				print $text .= ' - '.$objp->label;
-				}
-				else
-				{
+				} else {
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
@@ -330,8 +320,7 @@ if ($result)
 	print '<tr class="liste_total">';
 	if ($id > 0)
 		print '<td colspan=2>';
-	else
-		print '<td>';
+	else print '<td>';
 	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
 	print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
@@ -344,9 +333,7 @@ if ($result)
 
 	print "</table>";
 	print '</div>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index e68a042ace2..70cbf6a9e42 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -229,9 +229,7 @@ if ($id > 0 || !empty($ref))
                 {
                     $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-                }
-                else
-                {
+                } else {
                     $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
                 }
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index ecb8a3ce764..c9711bd99ef 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -235,9 +235,7 @@ if ($socid > 0)
     	{
     		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-    	}
-    	else
-    	{
+    	} else {
     		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
     	}
@@ -254,9 +252,7 @@ if ($socid > 0)
     		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
     	print '<td class="right">&nbsp;</td>';
     	print "</tr>\n";
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
     print "</table>";
@@ -264,9 +260,7 @@ if ($socid > 0)
 
     print '<br>';
     $db->free($result);
-}
-else
-{
+} else {
 	dol_print_error('', 'Parameter socid not defined');
 }
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 4005e6a2ed5..e50539fd05b 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -60,14 +60,14 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type = constant('TEST_DB_FORCE_TYP
 
 // Set properties specific to conf file
 $conf->file->main_limit_users = $dolibarr_main_limit_users;
-$conf->file->mailing_limit_sendbyweb	= $dolibarr_mailing_limit_sendbyweb;
-$conf->file->mailing_limit_sendbycli	= $dolibarr_mailing_limit_sendbycli;
+$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb;
+$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli;
 $conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode
 $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
-$conf->file->strict_mode 				= empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
+$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
 $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
 $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')
-$conf->file->dol_url_root				= array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
+$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
 if (!empty($dolibarr_main_document_root_alt))
 {
 	// dolibarr_main_document_root_alt can contains several directories
@@ -132,9 +132,7 @@ if (!defined('NOREQUIREDB'))
 				$langs->setDefaultLang('auto');
 				$langs->load("website");
 				print $langs->trans("SorryWebsiteIsCurrentlyOffLine");
-			}
-			else
-			{
+			} else {
 				print "SorryWebsiteIsCurrentlyOffLine";
 			}
 			print '</div>';
@@ -162,20 +160,17 @@ if (!defined('NOREQUIREUSER')) {
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && !empty($_SESSION["dol_entity"]))			// Entity inside an opened session
-{
+if (session_id() && !empty($_SESSION["dol_entity"])) {
+	// Entity inside an opened session
 	$conf->entity = $_SESSION["dol_entity"];
-}
-elseif (!empty($_ENV["dol_entity"]))							// Entity inside a CLI script
-{
+} elseif (!empty($_ENV["dol_entity"])) {
+	// Entity inside a CLI script
 	$conf->entity = $_ENV["dol_entity"];
-}
-elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int'))	// Just after a login page
-{
+} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
+	// Just after a login page
 	$conf->entity = GETPOST("entity", 'int');
-}
-elseif (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
-{
+} elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+	// For public page with MultiCompany module
 	$conf->entity = DOLENTITY;
 }
 
@@ -225,9 +220,7 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/user/logout.php';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
-		{
+		} else {
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/';
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index db30c32607f..45f6dd91b66 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -48,9 +48,7 @@ if ($action == "update")
     if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d813c3b291b..7c867cdf17a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -128,9 +128,8 @@ if ($dirins && $action == 'initmodule' && $modulename)
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
-			}
-			else	// $result == 0
-			{
+			} else {
+				// $result == 0
 				setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
 			}
 		}
@@ -270,9 +269,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -307,15 +304,12 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initsqlextrafields' && !empty($module))
-{
+if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -353,9 +347,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
 
 		dolReplaceInFile($destfile1, $arrayreplacement);
 		dolReplaceInFile($destfile2, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
 	}
@@ -388,9 +380,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -422,9 +412,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -438,8 +426,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -456,9 +443,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -495,9 +480,7 @@ if ($dirins && $action == 'initcss' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -534,9 +517,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -573,15 +554,12 @@ if ($dirins && $action == 'initcli' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initdoc' && !empty($module))
-{
+if ($dirins && $action == 'initdoc' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/doc');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/doc/Documentation.asciidoc';
@@ -589,8 +567,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 		$modulelowercase = strtolower($module);
 
@@ -624,9 +601,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 
 		dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
 		dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -670,9 +645,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 	if (empty($_results))
 	{
 		setEventMessages($langs->trans("ErrorTableNotFound", $tablename), null, 'errors');
-	}
-	else
-	{
+	} else {
 		/**
 		 *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
 		 *  'label' the translation key.
@@ -881,9 +854,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
-				}
-				else	// $result == 0
-				{
+				} else {
+					// $result == 0
 					setEventMessages($langs->trans("FileAlreadyExists", $destfile), null, 'warnings');
 				}
 			}
@@ -1065,15 +1037,11 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 			{
 				$nb = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			if ($db->lasterrno() == 'DB_ERROR_NOSUCHTABLE')
 			{
 				setEventMessages($langs->trans("TableDoesNotExists", $tabletodrop), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1082,8 +1050,7 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 			$resql = $db->DDLDropTable($tabletodrop);
 			//var_dump($resql);
 			setEventMessages($langs->trans("TableDropped", $tabletodrop), null, 'mesgs');
-		}
-		elseif ($nb > 0)
+		} elseif ($nb > 0)
 		{
 			setEventMessages($langs->trans("TableNotEmptyDropCanceled", $tabletodrop), null, 'warnings');
 		}
@@ -1230,9 +1197,7 @@ if ($dirins && $action == 'confirm_deletemodule')
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null);
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings');
 		}
 	}
@@ -1290,9 +1255,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		if ($resultko == 0)
 		{
 			setEventMessages($langs->trans("FilesDeleted"), null);
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings');
 		}
 	}
@@ -1319,15 +1282,12 @@ if ($dirins && $action == 'generatepackage')
 	{
 		try {
 			$moduleobj = new $class($db);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$error++;
 			dol_print_error($e->getMessage());
 		}
-	}
-	else
-	{
+	} else {
 		$error++;
 		$langs->load("errors");
 		dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -1345,25 +1305,19 @@ if ($dirins && $action == 'generatepackage')
 		{
 			if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
 			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase);
-		}
-		else
-		{
+		} else {
 			$result = -1;
 		}
 
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfilezip), null);
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfilezip), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors');
@@ -1381,9 +1335,7 @@ if ($dirins && $action == 'generatedoc')
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
-	}
-	else
-	{
+	} else {
 		setEventMessages($util->error, $util->errors, 'errors');
 	}
 }
@@ -1420,14 +1372,10 @@ if ($action == 'savefile' && empty($cancel))
 				@chmod($pathoffile, octdec($newmask));
 
 				setEventMessages($langs->trans("FileSaved"), null);
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ContentCantBeEmpty"), null, 'errors');
 			//$action='editfile';
 			$error++;
@@ -1446,8 +1394,7 @@ if ($action == 'set' && $user->admin)
 	$value = GETPOST('value', 'alpha');
 	$resarray = activateModule($value);
 	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else
-	{
+	else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -1462,8 +1409,7 @@ if ($action == 'set' && $user->admin)
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?".$param);
@@ -1594,9 +1540,7 @@ if (!$dirins)
 {
 	$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 	$allowfromweb = -1;
-}
-else
-{
+} else {
 	if ($dirins_ok)
 	{
 		if (!is_writable(dol_osencode($dirins)))
@@ -1605,9 +1549,7 @@ else
 			$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins));
 			$allowfromweb = 0;
 		}
-	}
-	else
-	{
+	} else {
 		$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 		$allowfromweb = 0;
 	}
@@ -1638,15 +1580,12 @@ if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 	{
 		try {
 			$moduleobj = new $class($db);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$error++;
 			print $e->getMessage();
 		}
-	}
-	else
-	{
+	} else {
 		if (empty($forceddirread)) $error++;
 		$langs->load("errors");
 		print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
@@ -1702,29 +1641,21 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 				{
 					$linktoenabledisable .= ' <a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-				}
-				else
-				{
+				} else {
 					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 					{
 						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
-					}
-					else
-					{
+					} else {
 						$urltouse = $urlpage;
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 					}
 				}
 			}
-		}
-		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
-		{
+		} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
 			$linktoenabledisable .= ' &nbsp; <a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 		}
-	}
-	else
-	{
+	} else {
 		$linktoenabledisable .= '<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod'.$module.$param.'">';
 		$linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', '', false, 0, 0, '', 'classfortooltip', 1);
 		$linktoenabledisable .= "</a>\n";
@@ -1774,9 +1705,7 @@ if ($module == 'initmodule')
 
 	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-}
-elseif ($module == 'deletemodule')
-{
+} elseif ($module == 'deletemodule') {
 	print '<!-- Form to init a module -->'."\n";
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="delete">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1788,9 +1717,7 @@ elseif ($module == 'deletemodule')
 	print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
 	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-}
-elseif (!empty($module))
-{
+} elseif (!empty($module)) {
 	// Tabs for module
 	if (!$error)
 	{
@@ -1977,9 +1904,7 @@ elseif (!empty($module))
 					print '</td></tr>';
 
 					print '</table>';
-				}
-				else
-				{
+				} else {
 					print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
 				}
 
@@ -2005,9 +1930,7 @@ elseif (!empty($module))
 				}
 
 				dol_fiche_end();
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0, 1); // Description - level 2
 
 				if ($fullpathoffile)
@@ -2038,9 +1961,7 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_fiche_head($head2, $tab, '', -1, ''); // Level 2
 		}
 
@@ -2077,9 +1998,7 @@ elseif (!empty($module))
 					print '</td>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				// Edit text language file
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2207,9 +2126,7 @@ elseif (!empty($module))
 						print '</tr>';
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -2217,9 +2134,7 @@ elseif (!empty($module))
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -2323,9 +2238,7 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '</form>';
-			}
-			elseif ($tabobj == 'deleteobject')
-			{
+			} elseif ($tabobj == 'deleteobject') {
 				// Delete object tab
 				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2338,9 +2251,8 @@ elseif (!empty($module))
 				print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
 				print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '</form>';
-			}
-			else
-			{	// tabobj = module
+			} else {
+				// tabobj = module
 				if ($action == 'deleteproperty')
 				{
 					$formconfirm = $form->formconfirm(
@@ -2412,14 +2324,10 @@ elseif (!empty($module))
 		   					if (empty($conf->global->$const_name))	// If module is not activated
 		   					{
 		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled").'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
-		   					}
-		   					else
-		   					{
+		   					} else {
 		   						print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 		   					}
-						}
-						else
-						{
+						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2432,9 +2340,7 @@ elseif (!empty($module))
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
-						}
-						else
-						{
+						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&format=php&file='.urlencode($pathtophpunit).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2470,8 +2376,7 @@ elseif (!empty($module))
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 							print ' &nbsp; ';
 							print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptableextrafields">'.$langs->trans("DropTableIfEmpty").'</a>';
-						}
-						else {
+						} else {
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 						}
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
@@ -2541,17 +2446,14 @@ elseif (!empty($module))
 						if (empty($forceddirread))
 						{
 							$result = dol_include_once($pathtoclass);
-						}
-						else
-						{
+						} else {
 							$result = @include_once $dirread.'/'.$pathtoclass;
 						}
 						if (class_exists($tabobj))
 						{
 							try {
 								$tmpobjet = @new $tabobj($db);
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING);
 							}
@@ -2747,9 +2649,7 @@ elseif (!empty($module))
 
 									print '</tr>';
 								}
-							}
-							else
-							{
+							} else {
 								if ($tab == 'specifications')
 								{
 									if ($action != 'editfile' || empty($file))
@@ -2768,9 +2668,7 @@ elseif (!empty($module))
 											print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 											print '<br>';
 										}
-									}
-									else
-									{
+									} else {
 										// Use MD or asciidoc
 
 										//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2805,25 +2703,18 @@ elseif (!empty($module))
 							print '</div>';
 
 							print '</form>';
-						}
-						else
-						{
+						} else {
 							print '<tr><td><span class="warning">'.$langs->trans('Failed to init the object with the new.').'</warning></td></tr>';
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						print $e->getMessage();
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($forceddirread))
 					{
 						$fullpathoffile = dol_buildpath($file, 0);
-					}
-					else
-					{
+					} else {
 						$fullpathoffile = $dirread.'/'.$file;
 					}
 
@@ -2956,19 +2847,15 @@ elseif (!empty($module))
 
 						print '</tr>';
 					}
-				}
-				else
-				{
-				 	 print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+				} else {
+				 	print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
 				print '</table>';
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3056,19 +2943,15 @@ elseif (!empty($module))
 
 						print '</tr>';
 					}
-				}
-				else
-				{
-					 print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+				} else {
+					print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
 				}
 
 				print '</table>';
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3119,17 +3002,13 @@ elseif (!empty($module))
 					print '</td>';
 					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
 					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 					print '<td></td>';
 				}
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3188,9 +3067,7 @@ elseif (!empty($module))
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
@@ -3199,9 +3076,7 @@ elseif (!empty($module))
 				}
 
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3244,16 +3119,12 @@ elseif (!empty($module))
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3296,16 +3167,12 @@ elseif (!empty($module))
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3354,17 +3221,13 @@ elseif (!empty($module))
 						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoWidget");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3440,17 +3303,13 @@ elseif (!empty($module))
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoCLIFile");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3532,8 +3391,7 @@ elseif (!empty($module))
 							$texttoshow .= $langs->trans('CronMethod').': '.$cron['method'];
 							$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$cron['parameters'];
 							$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($cron['comment']);
-						}
-						elseif ($cron['jobtype'] == 'command')
+						} elseif ($cron['jobtype'] == 'command')
 						{
 							$text = $langs->trans('CronCommand');
 							$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($cron['command']);
@@ -3560,9 +3418,7 @@ elseif (!empty($module))
 
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -3570,9 +3426,7 @@ elseif (!empty($module))
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3621,18 +3475,14 @@ elseif (!empty($module))
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("FileNotYetGenerated");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php"><input type="button" class="button" value="'.$langs->trans("Generate").'"></a></td>';
 					print '</tr>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				// Use MD or asciidoc
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -3734,15 +3584,11 @@ elseif (!empty($module))
 			{
 				try {
 					$moduleobj = new $class($db);
-				}
-				catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$error++;
 					dol_print_error($e->getMessage());
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$langs->load("errors");
 				dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 05b2c56ffb8..dc48d60d3c6 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -115,9 +115,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	if (!empty($arrayofparameters))
 	{
 		print '<table class="noborder centpercent">';
@@ -136,9 +134,7 @@ else
 		print '<div class="tabsAction">';
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		print '<br>'.$langs->trans("NothingToSetup");
 	}
 }
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 10bca2e8b9a..13a2b8e895c 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -165,6 +165,7 @@ class ActionsMyModule
 		global $conf, $user, $langs;
 
 		$error = 0; // Error counter
+		$disabled = 1;
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
 		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
@@ -231,8 +232,8 @@ class ActionsMyModule
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
-		{
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		}
 
 		return $ret;
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index f84210b9198..65998ed4390 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -159,6 +159,7 @@ class MyModuleApi extends DolibarrApi
 		}
 
 		$result = $db->query($sql);
+		$i = 0;
 		if ($result)
 		{
 			$num = $db->num_rows($result);
@@ -171,8 +172,7 @@ class MyModuleApi extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieving myobject list: '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -239,12 +239,10 @@ class MyModuleApi extends DolibarrApi
 			$this->myobject->$field = $value;
 		}
 
-		if ($this->myobject->update($id, DolibarrApiAccess::$user) > 0)
+		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0)
 		{
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->myobject->error);
 		}
 	}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 12400ecb087..20a157d7c24 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -414,14 +414,11 @@ class MyObject extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -546,9 +543,7 @@ class MyObject extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef();
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -631,9 +626,7 @@ class MyObject extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -760,8 +753,7 @@ class MyObject extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -785,14 +777,12 @@ class MyObject extends CommonObject
 					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
 					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
 						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
-					}
-					else {
+					} else {
 						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
 					}
 
 					$result .= '</div>';
-				}
-				else {
+				} else {
 					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 				}
 			}
@@ -900,9 +890,7 @@ class MyObject extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -935,9 +923,7 @@ class MyObject extends CommonObject
 			$this->error = $this->error;
 			$this->errors = $this->errors;
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->lines = $result;
 			return $this->lines;
 		}
@@ -987,9 +973,7 @@ class MyObject extends CommonObject
 				if ($numref != '' && $numref != '-1')
 				{
 					return $numref;
-				}
-				else
-				{
+				} else {
 					$this->error = $obj->error;
 					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 					return "";
@@ -998,9 +982,7 @@ class MyObject extends CommonObject
 				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
 			return "";
 		}
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 39b325924fc..cb6e15695c1 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -146,9 +146,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 98c2c94bc7b..d19ced0d9dc 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -136,9 +136,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -274,9 +274,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
 					if ($format == '1') $format = '%Y%m%d%H%M%S';
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
-				}
-				else
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -308,19 +306,17 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
 				// Make substitution
 				$substitutionarray = array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				'__TOTAL_TTC__' => $object->total_ttc,
-				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+					'__FROM_NAME__' => $this->emetteur->name,
+					'__FROM_EMAIL__' => $this->emetteur->email,
+					'__TOTAL_TTC__' => $object->total_ttc,
+					'__TOTAL_HT__' => $object->total_ht,
+					'__TOTAL_VAT__' => $object->total_vat
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -347,8 +343,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -364,8 +359,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -392,29 +386,25 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
+						if (preg_match('/logo$/', $key)) {
+							// Image
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
+						} else {
+							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -433,15 +423,12 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -450,8 +437,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -464,8 +450,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -485,8 +470,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -507,9 +491,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
index 7c770acc88a..b5e7bccbd49 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -91,8 +91,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
-		}
-		elseif ($object->ismultientitymanaged == 2) {
+		} elseif ($object->ismultientitymanaged == 2) {
 			// TODO
 		}
 
@@ -129,8 +128,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
-		}
-		elseif ($object->ismultientitymanaged == 2) {
+		} elseif ($object->ismultientitymanaged == 2) {
 			// TODO
 		}
 
@@ -140,9 +138,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_myobject_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 9b71971b6cf..4da40f0eb9a 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -54,13 +54,10 @@ $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -226,9 +223,7 @@ if ($object->id > 0)
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
 		{
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
 		}
 	}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index e92c88f1364..d37cc7f5e05 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -478,9 +478,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($permissiontoadd)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
@@ -492,9 +490,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").'</a>';
-					}
-					else
-					{
+					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
@@ -536,9 +532,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 63b114ffc10..186edc11da1 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -199,9 +199,7 @@ if ($object->id)
 	$relativepathwithnofile = 'myobject/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index a0fcb744bb1..cf2ca41fe53 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -292,9 +292,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -430,8 +428,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 02024759058..684d58c1c03 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -163,9 +163,7 @@ if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 19fea01aa60..57f1089c2e2 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -49,8 +49,6 @@ if ($result > 0)
 	unset($object->fields);
 	unset($object->db);
 	echo json_encode($object);
-}
-else
-{
+} else {
    	echo 'Failed to load category with id='.$idbom;
 }
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 89e9b25abef..404a3329133 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -421,14 +421,11 @@ class Mo extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -582,8 +579,7 @@ class Mo extends CommonObject
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			setEventMessages($this->error, $this->errors, 'errors');
 			$this->db->rollback();
 			return -1;
@@ -655,8 +651,7 @@ class Mo extends CommonObject
 								$error++;
 								$this->error = "BadValueForquantityToConsume";
 								break;
-							}
-							else {
+							} else {
 								$moline->fk_product = $line->fk_product;
 								$moline->role = 'toconsume';
 								$moline->position = $line->position;
@@ -762,16 +757,12 @@ class Mo extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_MRP_MO_ADDON_NotDefined");
 			return "";
 		}
@@ -816,9 +807,7 @@ class Mo extends CommonObject
 		{
 			$this->fetch_product();
 			$num = $this->getNextNumRef($this->product);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -899,9 +888,7 @@ class Mo extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1028,8 +1015,7 @@ class Mo extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1145,9 +1131,7 @@ class Mo extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1180,9 +1164,7 @@ class Mo extends CommonObject
 	        $this->error = $this->error;
 	        $this->errors = $this->errors;
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1328,9 +1310,7 @@ class Mo extends CommonObject
 			$productstatic->fetch($line->fk_product);
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
-		}
-		else
-		{
+		} else {
 			// If origin MRP line is not a product, but another MRP
 			// TODO
 		}
@@ -1513,14 +1493,11 @@ class MoLine extends CommonObjectLine
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index f0bdc8ba62d..d4359dcae90 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -136,9 +136,7 @@ if ($conf->use_javascript_ajax)
     	print "</div>";
 
     	print "<br>";
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -195,9 +193,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -248,9 +244,7 @@ if ($resql)
     }
     print "</table></div>";
     print "<br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index eee839c8a83..6630688b64a 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -48,9 +48,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -216,9 +214,7 @@ if ($object->id > 0)
     	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
     	{
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	}
-    	else
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 0e2cc09e811..a4ab216156c 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -192,9 +192,7 @@ if (empty($reshook))
 
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -624,9 +622,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		if ($permissiontoadd)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		}
-	    		else
-	    		{
+	    		} else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 	    		}
     		}
@@ -639,9 +635,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    			if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 	    		    {
 	    		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    		    }
-	    		    else
-	    		    {
+	    		    } else {
 	    		    	$langs->load("errors");
 	    		        print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    		    }
@@ -675,9 +669,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 48031b6f372..86aefd8a5d5 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -183,9 +183,7 @@ if ($object->id)
 	$relativepathwithnofile = 'mo/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 4807c47fb53..64441a4fec9 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -279,9 +279,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -416,8 +414,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 2448d43bda7..2ec9f603b84 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -790,8 +790,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<td class="center nowraponall">';
 			if ($productlot->id > 0)
 				print $productlot->getNomUrl(1);
-			else
-				print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
+			else print $productlot->batch; // the id may not be defined if movement was entered when lot was not saved or if lot was removed after movement.
 			print '</td>';
 		}
 		if (!empty($arrayfields['pl.eatby']['checked'])) {
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 9f05283345a..b168371c0ea 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -352,8 +352,7 @@ if (empty($reshook))
 	    				}
 	    			}
 	    		}
-    		}
-    		else {
+    		} else {
     			$consumptioncomplete = false;
     			$productioncomplete = false;
     		}
@@ -406,9 +405,7 @@ if (empty($reshook))
 
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -592,9 +589,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-					}
-					else
-					{
+					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 513c4537358..27bf6dc1c8f 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -409,9 +409,7 @@ class MultiCurrency extends CommonObject
 		{
 			$this->rate = $currencyRate;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->rate = null;
 			$this->errors = $currencyRate->errors;
 			return -1;
@@ -533,8 +531,7 @@ class MultiCurrency extends CommonObject
 		$resql = $db->query($sql1.$sql2.$sql3);
 
 		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
-		else
-		{
+		else {
 			if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE))
 			{
 				$resql = $db->query($sql1.$sql3);
@@ -564,8 +561,7 @@ class MultiCurrency extends CommonObject
         {
             if ($way == 'dolibarr') return $amount * $multicurrency_tx;
             else return $amount / $multicurrency_tx;
-        }
-        else return $amount;
+        } else return $amount;
     }
 
 	/**
@@ -659,8 +655,7 @@ class MultiCurrency extends CommonObject
 					if ($obj->fetch(null, $code) > 0)
 					{
 						$obj->updateRate($rate);
-					}
-					elseif ($addifnotfound)
+					} elseif ($addifnotfound)
 					{
 						self::addRateFromDolibarr($code, $rate);
 					}
@@ -668,9 +663,7 @@ class MultiCurrency extends CommonObject
 			}
 
 			return 1;
-        }
-		else
-		{
+        } else {
 		    dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
 			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 32dde7ddb3e..7322c70780c 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -241,8 +241,7 @@ print $langs->trans("Title").'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="text" name="nouveautitre" style="width: 95%" value="'.dol_escape_htmltag(dol_htmlentities($object->titre)).'">';
-}
-else print dol_htmlentities($object->titre);
+} else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
 // Description
@@ -251,9 +250,7 @@ if ($action == 'edit')
 {
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
-}
-else
-{
+} else {
 	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
 }
 print '</td></tr>';
@@ -265,8 +262,7 @@ if (!$object->fk_user_creat) {
 	if ($action == 'edit')
 	{
 		print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
-	}
-	else print dol_print_email($object->mail_admin, 0, 0, 1);
+	} else print dol_print_email($object->mail_admin, 0, 0, 1);
 	print '</td></tr>';
 }
 
@@ -275,8 +271,7 @@ print '<tr><td>'.$langs->trans('ToReceiveEMailForEachVote').'</td><td colspan="2
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="mailsonde" '.($object->mailsonde ? 'checked="checked"' : '').'">';
-}
-else {
+} else {
 	print yn($object->mailsonde);
 
 	//If option is active and linked user does not have an email, we show a warning
@@ -293,8 +288,7 @@ print '<tr><td>'.$langs->trans('CanComment').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="cancomment" '.($object->allow_comments ? 'checked="checked"' : '').'">';
-}
-else print yn($object->allow_comments);
+} else print yn($object->allow_comments);
 print '</td></tr>';
 
 // Users can see others vote
@@ -302,15 +296,13 @@ print '<tr><td>'.$langs->trans('CanSeeOthersVote').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="canseeothersvote" '.($object->allow_spy ? 'checked="checked"' : '').'">';
-}
-else print yn($object->allow_spy);
+} else print yn($object->allow_spy);
 print '</td></tr>';
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
-else
-{
+else {
     print dol_print_date($object->date_fin, 'day');
     if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
 }
@@ -409,9 +401,7 @@ if ($comments) {
 
 		print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))." <br>";
 	}
-}
-else
-{
+} else {
 	print $langs->trans("NoCommentYet").'<br>';
 }
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index d9af22ed78e..19a29f5fa71 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -199,9 +199,7 @@ class Opensurveysondage extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -262,9 +260,7 @@ class Opensurveysondage extends CommonObject
 
                 $this->date_m = $this->db->jdate($obj->tls);
                 $ret = 1;
-            }
-            else
-            {
+            } else {
                 $sondage = ($id ? 'id='.$id : 'sondageid='.$numsurvey);
                 $this->error = 'Fetch no poll found for '.$sondage;
                 dol_syslog($this->error, LOG_ERR);
@@ -272,9 +268,7 @@ class Opensurveysondage extends CommonObject
             }
 
             $this->db->free($resql);
-        }
-        else
-        {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             $ret = -1;
         }
@@ -342,9 +336,7 @@ class Opensurveysondage extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -408,9 +400,7 @@ class Opensurveysondage extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -458,8 +448,7 @@ class Opensurveysondage extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -500,8 +489,7 @@ class Opensurveysondage extends CommonObject
                 $ret[] = $tmp;
                 $i++;
             }
-        }
-        else dol_print_error($this->db);
+        } else dol_print_error($this->db);
 
         $this->lines = $ret;
 
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 34e5b666710..6f9a699273b 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -108,14 +108,11 @@ if ($resql)
 			{
 				$input .= 'OK;';
 				$somme[$k]++;
-			}
-			elseif ($car == "2")
+			} elseif ($car == "2")
 			{
 				$input .= 'KO;';
 				$somme[$k]++;
-			}
-			else
-			{
+			} else {
 				$input .= ';';
 			}
 		}
@@ -123,8 +120,7 @@ if ($resql)
 		$input .= "\r\n";
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 $filesize = strlen($input);
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 2fa067ba9a3..635fc3ceb5c 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -103,8 +103,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 		$width = 150;
-	}
-	elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+	} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 	{
 		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 20609602ad2..50198e5202f 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -52,8 +52,7 @@ if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 	$nbsondages = $obj->nb;
-}
-else dol_print_error($db, '');
+} else dol_print_error($db, '');
 
 
 $title = $langs->trans("OpenSurveyArea");
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 442fc1b539b..4fcbb93a18c 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -190,9 +190,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
     $sql .= $db->plimit($limit + 1, $offset);
 
     $resql = $db->query($sql);
@@ -357,8 +355,7 @@ while ($i < min($num, $limit))
 	{
 		$obj2 = $db->fetch_object($resql2);
 		$nbuser = $obj2->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$opensurvey_static->id = $obj->rowid;
 	$opensurvey_static->ref = $obj->rowid;
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 337ccb3e435..59f605daf31 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -70,12 +70,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix .= "1";
-			}
-			elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix .= "2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix .= "0";
 			}
 		}
@@ -93,9 +91,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else
-		{
+		} else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -135,12 +131,10 @@ if ($testmodifier)
 		if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 		{
 			$nouveauchoix .= "1";
-		}
-		elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+		} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 		{
 			$nouveauchoix .= "2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix .= "0";
 		}
 	}
@@ -261,9 +255,7 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 		}
 
 		$adresseadmin = $object->mail_admin;
-	}
-	else
-	{
+	} else {
 		$erreur_ajout_date = "yes";
 	}
 }
@@ -451,8 +443,7 @@ print $langs->trans("Title").'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="text" name="nouveautitre" size="40" value="'.dol_escape_htmltag(dol_htmlentities($object->titre)).'">';
-}
-else print dol_htmlentities($object->titre);
+} else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
 // Expire date
@@ -535,9 +526,7 @@ if (GETPOST('ajoutsujet'))
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '<br><br>'."\n";
-	}
-	else
-	{
+	} else {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 		$formother = new FormOther($db);
@@ -752,9 +741,7 @@ if ($object->format == "D")
 
 		print '</tr>'."\n";
 	}
-}
-else
-{
+} else {
 	// Show titles
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -840,9 +827,7 @@ while ($compteur < $num)
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -868,9 +853,7 @@ while ($compteur < $num)
 				}
 				print '</td>'."\n";
 			}
-		}
-		else
-		{
+		} else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -1064,9 +1047,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 			} else {
 				$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').($toutsujet[$i] ? ' ('.dol_print_date($toutsujet[$i], '%A').')' : '');
 			}
-		}
-		else
-		{
+		} else {
 			$tmps = explode('@', $toutsujet[$i]);
 			$meilleursujet .= dol_htmlentities($tmps[0]);
 		}
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 17c5bdea251..17d60d4a406 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -209,8 +209,7 @@ llxHeader('', $langs->trans("OpenSurvey"), "", '', 0, 0, $arrayofjs, $arrayofcss
 if (!isset($_SESSION["nbrecaseshoraires"]))
 {
 	$_SESSION["nbrecaseshoraires"] = 5;
-}
-elseif (GETPOST('ajoutcases') && $_SESSION["nbrecaseshoraires"] == 5)
+} elseif (GETPOST('ajoutcases') && $_SESSION["nbrecaseshoraires"] == 5)
 {
 	$_SESSION["nbrecaseshoraires"] = 10;
 }
@@ -319,9 +318,7 @@ $premierjourmois = date("N", mktime(0, 0, 0, $_SESSION["mois"], 1, $_SESSION["an
 if (is_integer($_SESSION["mois"]) && $_SESSION["mois"] > 0 && $_SESSION["mois"] < 13)
 {
 	$motmois = dol_print_date(mktime(0, 0, 0, $_SESSION["mois"], 10), '%B');
-}
-else
-{
+} else {
 	$motmois = dol_print_date(dol_now(), '%B');
 }
 
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 7bb7861edbe..5d7363b4c9f 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -88,9 +88,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 		{
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
-		}
-		else
-		{
+		} else {
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
 			//$testdate = false;
@@ -192,9 +190,7 @@ if (GETPOST('choix_sondage'))
 	else print '<input type="hidden" name="creation_sondage_autre" value="autre">';
 	print '<input type="hidden" name="choix_sondage" value="'.GETPOST('choix_sondage').'">';
 	print '<br><input type="submit" class="button" name="submit" value="'.$langs->trans("CreatePoll").' ('.(GETPOST('choix_sondage') == 'date' ? $langs->trans("TypeDate") : $langs->trans("TypeClassic")).')">';
-}
-else
-{
+} else {
 	// Show image to selecte between date survey or other survey
 	print '<br><table>'."\n";
 	print '<tr><td>'.$langs->trans("CreateSurveyDate").'</td><td></td> '."\n";
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 13306deea32..cb1ad560158 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -79,9 +79,7 @@ if ($action == 'setvalue' && $user->admin)
   	{
   		$db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
-  	{
+  	} else {
   		$db->rollback();
 		dol_print_error($db);
     }
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 0af8262c54a..71f4b25829b 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -79,9 +79,7 @@ if ($action == 'setvalue' && $user->admin)
   	{
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
-  	{
+  	} else {
   		$db->rollback();
 		dol_print_error($db);
     }
@@ -95,9 +93,7 @@ if ($action == "setlive")
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -151,9 +147,7 @@ if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index ab9ba921e16..18ebce49479 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -112,8 +112,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -130,8 +129,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -148,8 +146,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -166,8 +163,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            else {
                 $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
                 if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
                 if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
@@ -263,9 +259,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         $payPalURL = $API_Url.$token;
         header("Location: ".$payPalURL);
         exit;
-    }
-    else
-    {
+    } else {
         //Display a user friendly Error on the page using any of the following error information returned by PayPal
         $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
         $ErrorShortMsg = urldecode($resArray["L_SHORTMESSAGE0"]);
@@ -275,9 +269,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         if ($ErrorCode == 10729)
         {
         	$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
-        }
-        else
-        {
+        } else {
         	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
         	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
         	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
@@ -351,9 +343,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
     {
     	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
-    }
-    else
-    {
+    } else {
     	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
     }
     $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
@@ -596,9 +586,7 @@ function hash_call($methodName, $nvpStr)
 	{
 	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-	}
-	else
-	{
+	} else {
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
@@ -676,9 +664,7 @@ function hash_call($methodName, $nvpStr)
         $_SESSION['curl_error_msg'] = curl_error($ch);
 
         //Execute the Error handling module to display errors.
-    }
-    else
-    {
+    } else {
         //closing the curl
         curl_close($ch);
     }
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 8b30e33704d..5fbe0f6e9cd 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -52,9 +52,7 @@ if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'
 {
 	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-}
-else
-{
+} else {
 	$API_Endpoint = "https://api-3t.paypal.com/nvp";
 	$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 }
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index ab655d790f6..02fd4545c84 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -73,9 +73,7 @@ if ($action == 'setconst' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -93,9 +91,7 @@ if ($action == 'setvalue' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -161,9 +157,7 @@ if ($mode == 'setup' && $user->admin)
                     if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
                     {
                         print $langs->trans("IsTokenGenerated");
-                    }
-                    else
-                    {
+                    } else {
                         print $langs->trans($key['varname']);
                     }
                     print '</td>';
@@ -197,11 +191,9 @@ if ($mode == 'setup' && $user->admin)
                 $tokenobj = null;
                 // Dolibarr storage
                 $storage = new DoliStorage($db, $conf);
-                try
-                {
+                try {
                     $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     // Return an error if token not found
                 }
@@ -267,15 +259,11 @@ if ($mode == 'config' && $user->admin)
         if (!empty($conf->use_javascript_ajax))
         {
             print ajax_constantonoff($printer->active);
-        }
-        else
-        {
+        } else {
             if (empty($conf->global->{$printer->conf}))
             {
                 print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            }
-            else
-            {
+            } else {
                 print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
             }
         }
@@ -309,8 +297,7 @@ if ($mode == 'test' && $user->admin)
             } else {
                 setEventMessages($printer->error, $printer->errors, 'errors');
             }
-        }
-        else {
+        } else {
             print $langs->trans('PleaseConfigureDriverfromList');
         }
     } else {
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index a50e22315d5..752ddecbea8 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -182,9 +182,7 @@ if ($action != 'create_updater' && $action != 'edit_updater')
 	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';
 	        print '</tr>';
 	    }
-    }
-    else
-    {
+    } else {
     	print '<tr colspan="7"><td class="opacitymedium">';
     	print $langs->trans("None");
     	print '</td></tr>';
@@ -275,9 +273,7 @@ if ($action != 'create_variable' && $action != 'edit_variable')
 	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';
 	        print '</tr>';
 	    }
-    }
-    else
-    {
+    } else {
     	print '<tr><td colspan="7" class="opacitymedium">';
     	print $langs->trans("None");
     	print '</td></tr>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index e1fe84600d1..23b1cb43f56 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -81,9 +81,7 @@ if ($action == 'setcodeproduct')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -111,17 +109,14 @@ if ($action == 'other')
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_BY_QTY', 0, 'chaine', 0, '', $conf->entity);
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES', 0, 'chaine', 0, '', $conf->entity);
 				dolibarr_set_const($db, 'PRODUCT_PRICE_UNIQ', 1, 'chaine', 0, '', $conf->entity);
-			}
-			else
-			{
+			} else {
 				$multirule = explode('&', $princingrules);
 				foreach ($multirule as $rulesselected)
 				{
 					$res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity);
 				}
 			}
-		}
-		else	// We clear this mode
+		} else // We clear this mode
 		{
 			if (strpos($rule, '&') === false) {
 				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
@@ -201,15 +196,11 @@ if ($action == 'specimen') // For products
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=product&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -270,9 +261,7 @@ if ($action)
     if (!$error)
     {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
 	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
     }
 }
@@ -289,8 +278,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$tab = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$tab = $langs->trans('Products');
@@ -338,8 +326,7 @@ foreach ($dirproduct as $dirroot)
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -361,9 +348,7 @@ foreach ($dirproduct as $dirroot)
     				print '<td class="center">'."\n";
     				print img_picto($langs->trans("Activated"), 'switch_on');
     				print "</td>\n";
-    			}
-    			else
-    			{
+    			} else {
     				$disabled = false;
     				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);
     				print '<td class="center">';
@@ -403,9 +388,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -475,9 +458,7 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	                                print "</td>";
@@ -488,9 +469,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
@@ -516,9 +495,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -571,9 +548,7 @@ print '<tr class="oddeven">';
 if (empty($conf->multicompany->enabled))
 {
 	print '<td>'.$langs->trans("PricingRule").'</td>';
-}
-else
-{
+} else {
 	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
 }
 print '<td width="60" class="right">';
@@ -616,9 +591,7 @@ if (empty($conf->use_javascript_ajax))
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 		'0'=>$langs->trans("No"),
@@ -742,9 +715,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     						print img_picto($langs->trans("Active"), 'tick');
     						print '</td><td class="right">';
     						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=0">'.$langs->trans("Disable").'</a>';
-    					}
-    					else
-    					{
+    					} else {
     						print '&nbsp;</td><td class="right">';
     						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=1">'.$langs->trans("Activate").'</a>';
     					}
@@ -755,9 +726,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     		}
 		    closedir($handle);
         }
-	}
-	else
-	{
+	} else {
 		setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
 	}
 }
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index 7814c3bcda8..1e67a1d469a 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -65,8 +65,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$textobject = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$textobject = $langs->trans('Products');
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index d35e6012e1f..b400843ab5c 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -66,8 +66,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$textobject = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$textobject = $langs->trans('Products');
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 4ce4a067e5c..ce7bcf733a5 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -120,9 +120,7 @@ if ($action == 'convert')
 							{
 								$newprice = price2num($objectstatic->multiprices_ttc[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min_ttc[$level];
-							}
-							else
-							{
+							} else {
 								$newprice = price2num($objectstatic->multiprices[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min[$level];
 							}
@@ -151,9 +149,7 @@ if ($action == 'convert')
 						{
 							$newprice = price2num($objectstatic->price_ttc, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min_ttc;
-						}
-						else
-						{
+						} else {
 							$newprice = price2num($objectstatic->price, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min;
 						}
@@ -176,8 +172,7 @@ if ($action == 'convert')
 
 					$i++;
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 
 		$fourn = new Fournisseur($db);
@@ -245,15 +240,12 @@ if ($action == 'convert')
 
 				$i++;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 
@@ -262,9 +254,7 @@ if ($action == 'convert')
 		{
 			if ($nbrecordsmodified > 0) setEventMessages($langs->trans("RecordsModified", $nbrecordsmodified), null, 'mesgs');
 			else setEventMessages($langs->trans("NoRecordFound"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -289,9 +279,7 @@ if (empty($mysoc->country_code))
 	$langs->load("errors");
 	$warnpicto = img_error($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
-}
-else
-{
+} else {
 	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'" />';
 	print '<input type="hidden" name="action" value="convert" />';
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 808ba9739ba..acd698d9f37 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -40,9 +40,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 918950179c7..f206d868347 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -162,9 +162,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	}
 
 	echo json_encode($outjson);
-}
-else
-{
+} else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->loadLangs(array("main", "products"));
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 1612448c1bb..c14bfaf5e74 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -287,9 +287,7 @@ class ActionsCardProduct
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -407,14 +405,12 @@ class ActionsCardProduct
 							$this->type 	= $obj->fk_product_type;
 							$this->entity = $obj->entity;
 							$datas[$alias] = $this->getNomUrl(1, '', 24);
-						}
-						elseif ($alias == 'stock')
+						} elseif ($alias == 'stock')
 						{
 							$this->load_stock();
 							if ($this->stock_reel < $obj->seuil_stock_alerte) $datas[$alias] = $this->stock_reel.' '.img_warning($langs->trans("StockTooLow"));
 							else $datas[$alias] = $this->stock_reel;
-						}
-						elseif ($alias == 'label')	$datas[$alias] = dol_trunc($obj->$alias, 40);
+						} elseif ($alias == 'label')	$datas[$alias] = dol_trunc($obj->$alias, 40);
 						elseif (preg_match('/price/i', $alias))	$datas[$alias] = price($obj->$alias);
 						elseif ($alias == 'datem') $datas[$alias] = dol_print_date($this->db->jdate($obj->$alias), 'day');
 						elseif ($alias == 'status') $datas[$alias] = $this->LibStatut($obj->$alias, 5);
@@ -427,9 +423,7 @@ class ActionsCardProduct
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 331cecb3071..0518cfed475 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -205,8 +205,7 @@ class ActionsCardService
 			if ($this->object->duration_value > 1)
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-			}
-			elseif ($this->object->duration_value > 0)
+			} elseif ($this->object->duration_value > 0)
 			{
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 			}
@@ -267,9 +266,7 @@ class ActionsCardService
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -360,9 +357,7 @@ class ActionsCardService
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			print $sql;
 		}
 	}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 87e86e8e0bc..1a7001f5864 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -174,9 +174,7 @@ if (empty($reshook))
 	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
 	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	    	exit;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
         	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
         	elseif ($result == -2) $errors[] = 'ErrorBarCodeRequired';
@@ -222,12 +220,10 @@ if (empty($reshook))
 
             if ($object->price_base_type == 'TTC')
             	$object->price_ttc = GETPOST('price');
-            else
-            	$object->price = GETPOST('price');
+            else $object->price = GETPOST('price');
             if ($object->price_base_type == 'TTC')
             	$object->price_min_ttc = GETPOST('price_min');
-            else
-            	$object->price_min = GETPOST('price_min');
+            else $object->price_min = GETPOST('price_min');
 
 	        $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
@@ -339,9 +335,7 @@ if (empty($reshook))
                     {
                         $object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');
                         $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
-                    }
-                    else
-                    {
+                    } else {
                         $object->multiprices["$i"] = "";
                     }
                 }
@@ -368,15 +362,11 @@ if (empty($reshook))
 					if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
+				} else {
                 	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
                 	exit;
 				}
-            }
-            else
-			{
+            } else {
             	if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
 				else setEventMessages($langs->trans($object->error), null, 'errors');
                 $action = "create";
@@ -390,9 +380,7 @@ if (empty($reshook))
     	if (GETPOST('cancel', 'alpha'))
         {
             $action = '';
-        }
-        else
-        {
+        } else {
             if ($object->id > 0)
             {
 				$object->oldcopy = clone $object;
@@ -488,16 +476,12 @@ if (empty($reshook))
 						$object->setCategories($categories);
 
                         $action = 'view';
-                    }
-                    else
-					{
+                    } else {
 						if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
                     	else setEventMessages($langs->trans($object->error), null, 'errors');
                         $action = 'edit';
                     }
-                }
-                else
-				{
+                } else {
 					if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
                 	else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
                     $action = 'edit';
@@ -513,9 +497,7 @@ if (empty($reshook))
         if (!GETPOST('clone_content') && !GETPOST('clone_prices'))
         {
         	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else
-        {
+        } else {
             $db->begin();
 
             $originalId = $id;
@@ -577,9 +559,7 @@ if (empty($reshook))
 
                         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
                         exit;
-                    }
-                    else
-                    {
+                    } else {
                         $id = $originalId;
 
                         if ($object->error == 'ErrorProductAlreadyExists')
@@ -593,17 +573,13 @@ if (empty($reshook))
                             $mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
                             setEventMessages($mesg, null, 'errors');
                             $object->fetch($id);
-                        }
-                        else
-                     	{
+                        } else {
                             $db->rollback();
                             if (count($object->errors))
                             {
                             	setEventMessages($object->error, $object->errors, 'errors');
                             	dol_print_error($db, $object->errors);
-                            }
-                            else
-                            {
+                            } else {
                             	setEventMessages($langs->trans($object->error), null, 'errors');
                             	dol_print_error($db, $object->error);
                             }
@@ -612,9 +588,7 @@ if (empty($reshook))
 
                     unset($object->context['createfromclone']);
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 dol_print_error($db, $object->error);
             }
@@ -631,9 +605,7 @@ if (empty($reshook))
         {
             header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
             exit;
-        }
-        else
-        {
+        } else {
         	setEventMessages($langs->trans($object->error), null, 'errors');
             $reload = 0;
             $action = '';
@@ -655,8 +627,7 @@ if (empty($reshook))
 	            exit;
 	        }
 	        $thirpdartyid = $propal->socid;
-        }
-        elseif (GETPOST('commandeid') > 0)
+        } elseif (GETPOST('commandeid') > 0)
         {
             $commande = new Commande($db);
 	        $result = $commande->fetch(GETPOST('commandeid'));
@@ -666,8 +637,7 @@ if (empty($reshook))
 	            exit;
 	        }
 	        $thirpdartyid = $commande->socid;
-        }
-        elseif (GETPOST('factureid') > 0)
+        } elseif (GETPOST('factureid') > 0)
         {
     	    $facture = new Facture($db);
 	        $result = $facture->fetch(GETPOST('factureid'));
@@ -742,9 +712,7 @@ if (empty($reshook))
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else
-                {
+                } else {
                     $buyprice = $result;
                 }
 
@@ -785,9 +753,7 @@ if (empty($reshook))
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else
-                {
+                } else {
                     $buyprice = $result;
                 }
 
@@ -828,9 +794,7 @@ if (empty($reshook))
                 {
                     dol_syslog($langs->trans('FailedToGetCostPrice'));
                     setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else
-                {
+                } else {
                     $buyprice = $result;
                 }
 
@@ -870,8 +834,7 @@ if (empty($reshook))
                     exit;
                 }
             }
-        }
-        else {
+        } else {
             $action = "";
             setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
         }
@@ -936,9 +899,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	}
 	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -974,8 +935,7 @@ else
 		if ($type == 1) {
 			$picto = 'service';
 			$title = $langs->trans("NewService");
-		}
-		else {
+		} else {
 			$picto = 'product';
 			$title = $langs->trans("NewProduct");
 		}
@@ -1029,9 +989,7 @@ else
  	        if (isset($_POST['fk_barcode_type']))
 	        {
 	         	$fk_barcode_type = GETPOST('fk_barcode_type');
-	        }
-	        else
-	        {
+	        } else {
 	        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 	        }
 	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
@@ -1079,9 +1037,7 @@ else
             print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
             print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
             print '</td></tr>';
-        }
-        else
-        {
+        } else {
             print '<input name="seuil_stock_alerte" type="hidden" value="0">';
             print '<input name="desiredstock" type="hidden" value="0">';
         }
@@ -1214,9 +1170,7 @@ else
             print '</table>';
 
             print '<br>';
-        }
-        else
-		{
+        } else {
             print '<table class="border centpercent">';
 
             // Price
@@ -1320,8 +1274,7 @@ else
 			}
 			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, '');
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			// Accountancy_code_sell
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1370,14 +1323,10 @@ else
 		print '</div>';
 
 		print '</form>';
-	}
-
-    /*
-     * Product card
-     */
-
-    elseif ($object->id > 0)
-    {
+    } elseif ($object->id > 0) {
+        /*
+         * Product card
+         */
         // Fiche en mode edition
 		if ($action == 'edit' && $usercancreate)
 		{
@@ -1415,9 +1364,7 @@ else
             {
                 print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
                 print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
-            }
-            else
-            {
+            } else {
                 print '<option value="1">'.$langs->trans("OnSell").'</option>';
                 print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
             }
@@ -1431,9 +1378,7 @@ else
             {
                 print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            else
-            {
+            } else {
                 print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
                 print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
             }
@@ -1462,9 +1407,7 @@ else
 		        if (isset($_POST['fk_barcode_type']))
 		        {
 		         	$fk_barcode_type = GETPOST('fk_barcode_type');
-		        }
-		        else
-		        {
+		        } else {
 	        		$fk_barcode_type = $object->barcode_type;
 		        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
 		        }
@@ -1525,9 +1468,7 @@ else
                 print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
                 print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
                 print '</td></tr>';
-            }
-            else
-            {
+            } else {
                 // Nature
                 print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
                 $statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
@@ -1682,9 +1623,8 @@ else
 				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1);
 				print '</td></tr>';
-			}
-			else // For external software
-			{
+			} else {
+                // For external software
 				// Accountancy_code_sell
 				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
@@ -1732,10 +1672,8 @@ else
 			print '</div>';
 
 			print '</form>';
-		}
-        // Fiche en mode visu
-        else
-		{
+		} else {
+            // Fiche en mode visu
             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
             if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
@@ -1790,9 +1728,7 @@ else
                 if ($action == 'editbarcodetype')
                 {
                     print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
-                }
-                else
-                {
+                } else {
                     $object->fetch_barcode();
                     print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
                 }
@@ -1818,9 +1754,7 @@ else
 					print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
 					print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 					print '</form>';
-                }
-                else
-                {
+                } else {
 					print $object->barcode;
                 }
                 print '</td></tr>'."\n";
@@ -2003,17 +1937,14 @@ else
                 if ($object->duration_value > 1)
                 {
                     $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-                }
-                elseif ($object->duration_value > 0)
+                } elseif ($object->duration_value > 0)
                 {
                     $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
                 }
                 print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 
                 print '</td></tr>';
-            }
-            else
-            {
+            } else {
                 // Nature
                 print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
@@ -2024,9 +1955,7 @@ else
                 if ($object->weight != '')
                 {
                 	print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-                }
-                else
-                {
+                } else {
                     print '&nbsp;';
                 }
                 print "</td></tr>\n";
@@ -2041,9 +1970,7 @@ else
                         if ($object->width) print " x ".$object->width;
                         if ($object->height) print " x ".$object->height;
                         print ' '.measuringUnitString(0, "size", $object->length_units);
-                    }
-                    else
-                    {
+                    } else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2055,9 +1982,7 @@ else
                     if ($object->surface != '')
                     {
                     	print $object->surface." ".measuringUnitString(0, "surface", $object->surface_units);
-                    }
-                    else
-                    {
+                    } else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2069,9 +1994,7 @@ else
                     if ($object->volume != '')
                     {
                     	print $object->volume." ".measuringUnitString(0, "volume", $object->volume_units);
-                    }
-                    else
-                    {
+                    } else {
                         print '&nbsp;';
                     }
                     print "</td></tr>\n";
@@ -2084,9 +2007,7 @@ else
                 	if ($object->net_measure != '')
                 	{
                 		print $object->net_measure." ".measuringUnitString($object->net_measure_units);
-                	}
-                	else
-                	{
+                	} else {
                 		print '&nbsp;';
                 	}
                 }
@@ -2140,8 +2061,7 @@ else
 
             dol_fiche_end();
         }
-    }
-    elseif ($action != 'create')
+    } elseif ($action != 'create')
     {
         exit;
     }
@@ -2214,9 +2134,7 @@ if ($action != 'create' && $action != 'edit')
                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
-                }
-                else
-    			{
+                } else {
                     print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
                 }
             }
@@ -2230,19 +2148,13 @@ if ($action != 'create' && $action != 'edit')
                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
                 {
                     print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-                }
-                else
-    			{
+                } else {
                     print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a>';
                 }
-            }
-            else
-    		{
+            } else {
                 print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
             }
-        }
-        else
-    	{
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a>';
         }
     }
@@ -2275,9 +2187,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
         	$html .= '</td></tr>';
-        }
-        else
-		{
+        } else {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
         	$html .= $langs->trans("NoDraftProposals");
@@ -2299,9 +2209,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
         	$html .= '</td></tr>';
-        }
-        else
-		{
+        } else {
         	$html .= '<tr><td style="width: 200px;">';
         	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
         	$html .= $langs->trans("NoDraftOrders");
@@ -2323,9 +2231,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
     		$html .= '</td></tr>';
-    	}
-    	else
-    	{
+    	} else {
     		$html .= '<tr><td style="width: 200px;">';
     		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
     		$html .= $langs->trans("NoDraftInvoices");
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index b04560dab32..e7fce1b480f 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -221,8 +221,7 @@ class Products extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -303,8 +302,7 @@ class Products extends DolibarrApi
             // We update price only if it was changed
             $pricemodified = false;
             if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
-            } else
-            {
+            } else {
                 if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
                 }
                 if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
@@ -317,9 +315,7 @@ class Products extends DolibarrApi
                     }
                     if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
                     }
-                }
-                else
-                {
+                } else {
                     if ($this->product->price != $oldproduct->price) { $pricemodified = true;
                     }
                     if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
@@ -805,7 +801,7 @@ class Products extends DolibarrApi
 
     			$product_fourn = new ProductFournisseur($this->db);
     			$product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
-    			foreach($product_fourn_list as $tmpobj) {
+    			foreach ($product_fourn_list as $tmpobj) {
     				$this->_cleanObjectDatas($tmpobj);
     			}
     				//var_dump($product_fourn_list->db);exit;
@@ -813,8 +809,7 @@ class Products extends DolibarrApi
 
     			$i++;
     		}
-    	}
-    	else {
+    	} else {
     		throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
     	}
     	if (!count($obj_ret)) {
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 0eeddd15c07..30445615413 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -101,13 +101,10 @@ class FormProduct
 			if (!empty($batch))
 			{
 				$sql .= ", pb.qty as stock";
-			}
-			else
-			{
+			} else {
 				$sql .= ", ps.reel as stock";
 			}
-		}
-		elseif ($sumStock)
+		} elseif ($sumStock)
 		{
 			$sql .= ", sum(ps.reel) as stock";
 		}
@@ -125,9 +122,7 @@ class FormProduct
 		if (count($warehouseStatus))
 		{
 			$sql .= " AND e.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND e.statut = 1";
 		}
 
@@ -178,9 +173,7 @@ class FormProduct
 			}
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -270,9 +263,7 @@ class FormProduct
 			{
 				if ($arraytypes['stock'] <= 0) {
 					$label .= ' <span class= \'text-warning\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
-				}
-				else
-				{
+				} else {
 					$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				}
 			}
@@ -436,9 +427,7 @@ class FormProduct
 		if (!is_array($objectLines) || !count($objectLines))
 		{
 			if (!empty($fk_product)) $productIdArray[] = $fk_product;
-		}
-		else
-		{
+		} else {
 			foreach ($objectLines as $line) {
 				if ($line->fk_product) $productIdArray[] = $line->fk_product;
 			}
@@ -458,9 +447,7 @@ class FormProduct
 		if (!empty($fk_product))
 		{
 			$productIdArray = array($fk_product); // only show lot stock for product
-		}
-		else
-		{
+		} else {
 			foreach ($this->cache_lot as $key => $value)
 			{
 				$productIdArray[] = $key;
@@ -477,8 +464,7 @@ class FormProduct
 					$label .= $arraytypes['batch'];
 					if ($arraytypes['qty'] <= 0) {
 						$label .= ' <span class=\'text-warning\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
-					}
-					else {
+					} else {
 						$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
 					}
 
@@ -526,9 +512,7 @@ class FormProduct
 		if ($cacheLoaded)
 		{
 			return count($this->cache_lot);
-		}
-		else
-		{
+		} else {
 			// clear cache
 			$this->cache_lot = array();
 			$productIdList = implode(',', $productIdArray);
@@ -560,9 +544,7 @@ class FormProduct
 				}
 
 				return $num;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e94065ded8d..8a069418c4a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -456,9 +456,7 @@ class Product extends CommonObject
 
         if ($err > 0) {
             return 0;
-        }
-        else
-        {
+        } else {
             return 1;
         }
     }
@@ -682,35 +680,25 @@ class Product extends CommonObject
                                 if ($this->update($id, $user, true, 'add') <= 0) {
                                     $error++;
                                 }
-                            }
-                            else
-                            {
+                            } else {
                                 $error++;
                                 $this->error = $this->db->lasterror();
                             }
-                        }
-                        else
-                        {
+                        } else {
                             $error++;
                             $this->error = 'ErrorFailedToGetInsertedId';
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         $this->error = $this->db->lasterror();
                     }
-                }
-                else
-                {
+                } else {
                     // Product already exists with this ref
                     $langs->load("products");
                     $error++;
                     $this->error = "ErrorProductAlreadyExists";
                 }
-            }
-            else
-            {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
             }
@@ -726,15 +714,11 @@ class Product extends CommonObject
             if (!$error) {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -$error;
             }
-        }
-        else
-          {
+        } else {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
@@ -764,11 +748,9 @@ class Product extends CommonObject
         if ($rescode) {
             if ($rescode == -1) {
                 $this->errors[] = 'ErrorBadBarCodeSyntax';
-            }
-            elseif ($rescode == -2) {
+            } elseif ($rescode == -2) {
                 $this->errors[] = 'ErrorBarCodeRequired';
-            }
-            elseif ($rescode == -3) {
+            } elseif ($rescode == -3) {
                 // Note: Common usage is to have barcode unique. For variants, we should have a different barcode.
                 $this->errors[] = 'ErrorBarCodeAlreadyUsed';
             }
@@ -810,9 +792,7 @@ class Product extends CommonObject
             dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
             $result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
             return $result;
-        }
-        else
-        {
+        } else {
             return 0;
         }
     }
@@ -1103,15 +1083,11 @@ class Product extends CommonObject
 
                     $this->db->commit();
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -$error;
                 }
-            }
-            else
-            {
+            } else {
                 if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                     $langs->load("errors");
                     if (empty($conf->barcode->enabled) || empty($this->barcode)) {
@@ -1122,18 +1098,14 @@ class Product extends CommonObject
                     $this->errors[] = $this->error;
                     $this->db->rollback();
                     return -1;
-                }
-                else
-                {
+                } else {
                     $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
                     $this->errors[] = $this->error;
                     $this->db->rollback();
                     return -2;
                 }
             }
-        }
-        else
-          {
+        } else {
             $this->db->rollback();
             dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
             return -3;
@@ -1280,9 +1252,7 @@ class Product extends CommonObject
             if (!$error) {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 foreach ($this->errors as $errmsg)
                 {
                     dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -1291,9 +1261,7 @@ class Product extends CommonObject
                 $this->db->rollback();
                 return -$error;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "ErrorRecordIsUsedCantDelete";
             return 0;
         }
@@ -1331,9 +1299,7 @@ class Product extends CommonObject
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note='".$this->db->escape($this->other)."'";
                     }
                     $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
                     }
@@ -1350,8 +1316,7 @@ class Product extends CommonObject
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
-            }
-            elseif (isset($this->multilangs[$key])) {
+            } elseif (isset($this->multilangs[$key])) {
                 $sql = "SELECT rowid";
                 $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
                 $sql .= " WHERE fk_product=".$this->id;
@@ -1369,9 +1334,7 @@ class Product extends CommonObject
                         $sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
                     }
                     $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
+                } else {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
                     }
@@ -1391,9 +1354,7 @@ class Product extends CommonObject
                         return -1;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 // language is not current language and we didn't provide a multilang description for this language
             }
         }
@@ -1434,9 +1395,7 @@ class Product extends CommonObject
             }
             // End call triggers
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
             return -1;
@@ -1497,9 +1456,7 @@ class Product extends CommonObject
 
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1537,9 +1494,7 @@ class Product extends CommonObject
                 $this->multilangs["$obj->lang"]["other"]        = $obj->other;
             }
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
             return -1;
         }
@@ -1580,9 +1535,7 @@ class Product extends CommonObject
             $this->error = $this->db->lasterror();
             dol_print_error($this->db);
             return -1;
-        }
-        else
-        {
+        } else {
             return 1;
         }
     }
@@ -1608,9 +1561,7 @@ class Product extends CommonObject
         $resql = $this->db->query($sql);
         if ($resql) {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -1652,9 +1603,8 @@ class Product extends CommonObject
 				if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) $tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
 				if (empty($tva_tx)) $tva_npr = 0;
 			}
-		}
-		// If price per customer
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			// If price per customer
 			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 			$prodcustprice = new Productcustomerprice($db);
@@ -1673,32 +1623,27 @@ class Product extends CommonObject
 					if (empty($tva_tx)) $tva_npr = 0;
 				}
 			}
-		}
-		// If price per quantity
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-			if ($this->prices_by_qty[0])	// yes, this product has some prices per quantity
-			{
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			// If price per quantity
+			if ($this->prices_by_qty[0]) {
+				// yes, this product has some prices per quantity
 				// Search price into product_price_by_qty from $this->id
-				foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray)
-				{
+				foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray) {
 					if ($priceforthequantityarray['rowid'] != $pqp) continue;
 					// We found the price
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
-					}
-					else
-					{
+					} else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
 				}
 			}
-		}
-		// If price per quantity and customer
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-			if ($this->prices_by_qty[$thirdparty_buyer->price_level]) // yes, this product has some prices per quantity
-			{
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			// If price per quantity and customer
+			if ($this->prices_by_qty[$thirdparty_buyer->price_level]) {
+				// yes, this product has some prices per quantity
 				// Search price into product_price_by_qty from $this->id
 				foreach ($this->prices_by_qty_list[$thirdparty_buyer->price_level] as $priceforthequantityarray)
 				{
@@ -1707,9 +1652,7 @@ class Product extends CommonObject
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
-					}
-					else
-					{
+					} else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
@@ -1791,8 +1734,7 @@ class Product extends CommonObject
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
                 $result = $obj->fk_product;
                 return $result;
-            }
-            else // If not found
+            } else // If not found
             {
                 // We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
                 $sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
@@ -1851,21 +1793,15 @@ class Product extends CommonObject
 						if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
 						$result = $obj->fk_product;
                         return $result;
-                    }
-                    else
-                    {
+                    } else {
                         return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
                     }
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     return -3;
                 }
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -2;
         }
@@ -1936,15 +1872,11 @@ class Product extends CommonObject
                     $price_min_ttc = price2num($newminprice, 'MU');
                     $price_min = price2num($newminprice) / (1 + ($newvat / 100));
                     $price_min = price2num($price_min, 'MU');
-                }
-                else
-                {
+                } else {
                     $price_min = 0;
                     $price_min_ttc = 0;
                 }
-            }
-            else
-            {
+            } else {
                 $price = price2num($newprice, 'MU');
                 $price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
                 $price_ttc = price2num($price_ttc, 'MU');
@@ -1954,9 +1886,7 @@ class Product extends CommonObject
                     $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
                     $price_min_ttc = price2num($price_min_ttc, 'MU');
                     //print 'X'.$newminprice.'-'.$price_min;
-                }
-                else
-                {
+                } else {
                     $price_min = 0;
                     $price_min_ttc = 0;
                 }
@@ -1968,8 +1898,7 @@ class Product extends CommonObject
                 $localtax1 = $localtaxes_array['1'];
                 $localtaxtype2 = $localtaxes_array['2'];
                 $localtax2 = $localtaxes_array['3'];
-            }
-            else     // old method. deprecated because ot can't retreive type
+            } else // old method. deprecated because ot can't retreive type
             {
                 $localtaxtype1 = '0';
                 $localtax1 = get_localtax($newvat, 1);
@@ -2044,9 +1973,7 @@ class Product extends CommonObject
                 // End call triggers
 
                 $this->db->commit();
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 dol_print_error($this->db);
             }
@@ -2280,19 +2207,15 @@ class Product extends CommonObject
                             return -1;
                             }
                             }*/
-                        }
-                        else
-                        {
+                        } else {
                             dol_print_error($this->db);
                             return -1;
                         }
                     }
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load))            // prices per customers
+                } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load))            // prices per customers
                 {
                     // Nothing loaded by default. List may be very long.
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load))    // prices per quantity
+                } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load))    // prices per quantity
                 {
                     $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
                     $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
@@ -2329,21 +2252,16 @@ class Product extends CommonObject
                                     $ii++;
                                 }
                                 $this->prices_by_qty_list[0] = $resultat;
-                            }
-                            else
-                            {
+                            } else {
                                     dol_print_error($this->db);
                                     return -1;
                             }
                         }
-                    }
-                    else
-                    {
+                    } else {
                         dol_print_error($this->db);
                         return -1;
                     }
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES) && empty($ignore_price_load))    // prices per customer and quantity
+                } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES) && empty($ignore_price_load))    // prices per customer and quantity
                 {
                     for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
                     {
@@ -2393,16 +2311,12 @@ class Product extends CommonObject
                                         $ii++;
                                     }
                                     $this->prices_by_qty_list[$i] = $resultat;
-                                }
-                                else
-                                         {
+                                } else {
                                     dol_print_error($this->db);
                                     return -1;
                                 }
                             }
-                        }
-                        else
-                        {
+                        } else {
                             dol_print_error($this->db);
                             return -1;
                         }
@@ -2426,14 +2340,10 @@ class Product extends CommonObject
                 $this->stock_warehouse = array();
 
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2506,9 +2416,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_propale = $hookmanager->resArray['stats_propale'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2557,9 +2465,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_proposal_supplier = $hookmanager->resArray['stats_proposal_supplier'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2660,9 +2566,7 @@ class Product extends CommonObject
             $reshook = $hookmanager->executeHooks('loadStatsCustomerOrder', $parameters, $this, $action);
             if ($reshook > 0) $this->stats_commande = $hookmanager->resArray['stats_commande'];
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2717,9 +2621,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_commande_fournisseur = $hookmanager->resArray['stats_commande_fournisseur'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -2801,9 +2703,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_expedition = $hookmanager->resArray['stats_expedition'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2854,9 +2754,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_reception = $hookmanager->resArray['stats_reception'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2945,9 +2843,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_mrptoproduce = $hookmanager->resArray['stats_mrptoproduce'];
 
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->error();
     		return -1;
     	}
@@ -3019,9 +2915,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_contrat = $hookmanager->resArray['stats_contrat'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -3093,9 +2987,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_facture = $hookmanager->resArray['stats_facture'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3146,9 +3038,7 @@ class Product extends CommonObject
             if ($reshook > 0) $this->stats_facture_fournisseur = $hookmanager->resArray['stats_facture_fournisseur'];
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -3181,9 +3071,7 @@ class Product extends CommonObject
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             return -1;
         }
@@ -3191,9 +3079,7 @@ class Product extends CommonObject
         if (empty($year)) {
             $year = strftime('%Y', time());
             $month = strftime('%m', time());
-        }
-        else
-        {
+        } else {
             $month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
         }
         $result = array();
@@ -3673,26 +3559,20 @@ class Product extends CommonObject
         if (!$this->db->query($sql)) {
             dol_print_error($this->db);
             return -1;
-        }
-        else
-        {
+        } else {
             $result = $this->db->query($sql);
             if ($result) {
                 $num = $this->db->num_rows($result);
                 if ($num > 0) {
                     $this->error = "isFatherOfThis";
                     return -1;
-                }
-                else
-                {
+                } else {
                     $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
                     $sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';
                     if (!$this->db->query($sql)) {
                          dol_print_error($this->db);
                          return -1;
-                    }
-                    else
-                    {
+                    } else {
                          return 1;
                     }
                 }
@@ -3735,9 +3615,7 @@ class Product extends CommonObject
         if (!$this->db->query($sql)) {
             dol_print_error($this->db);
             return -1;
-        }
-        else
-        {
+        } else {
             return 1;
         }
     }
@@ -3799,14 +3677,10 @@ class Product extends CommonObject
                 $this->is_sousproduit_incdec = $obj->incdec;
 
                 return true;
-            }
-            else
-            {
+            } else {
                 return false;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -3895,22 +3769,16 @@ class Product extends CommonObject
                 if ($this->db->query($sql)) {
                     $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     return -1;
                 }
-            }
-            // If the supplier price already exists for this product and quantity
-            else
-            {
+            } else {
+                 // If the supplier price already exists for this product and quantity
                 $this->product_fourn_price_id = $obj->rowid;
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -2;
         }
@@ -4105,9 +3973,7 @@ class Product extends CommonObject
         if (!$resql) {
             $this->db->rollback();
             return -1;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -4217,9 +4083,7 @@ class Product extends CommonObject
             $obj = $this->db->fetch_object($resql);
             if ($obj) { $nb = $obj->nb;
             }
-        }
-        else
-        {
+        } else {
             return -1;
         }
 
@@ -4303,9 +4167,7 @@ class Product extends CommonObject
                 $prods[$record['id']]['entity'] = $record['entity'];
             }
             return $prods;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -4368,9 +4230,7 @@ class Product extends CommonObject
             }
 
             return $prods;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -4497,9 +4357,7 @@ class Product extends CommonObject
 
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
             $linkclose .= ' class="nowraponall classfortooltip"';
-        }
-        else
-        {
+        } else {
         	$linkclose = ' class="nowraponall"';
         }
 
@@ -4573,9 +4431,7 @@ class Product extends CommonObject
         if (!dol_strlen($modele)) {
             if (!empty($conf->global->PRODUCT_ADDON_PDF)) {
                 $modele = $conf->global->PRODUCT_ADDON_PDF;
-            }
-            else
-            {
+            } else {
                 $modele = 'strato';
             }
         }
@@ -4657,27 +4513,22 @@ class Product extends CommonObject
             if ($type == 0) {
                 $labelStatus = $langs->trans('ProductStatusNotOnSellShort');
                 $labelStatusShort = $langs->trans('ProductStatusNotOnSell');
-            }
-            elseif ($type == 1) {
+            } elseif ($type == 1) {
                 $labelStatus = $langs->trans('ProductStatusNotOnBuyShort');
                 $labelStatusShort = $langs->trans('ProductStatusNotOnBuy');
-            }
-            elseif ($type == 2) {
+            } elseif ($type == 2) {
                 $labelStatus = $langs->trans('ProductStatusNotOnBatch');
                 $labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort');
             }
-        }
-        elseif ($status == 1) {
+        } elseif ($status == 1) {
             // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
             if ($type == 0) {
                 $labelStatus = $langs->trans('ProductStatusOnSellShort');
                 $labelStatusShort = $langs->trans('ProductStatusOnSell');
-            }
-            elseif ($type == 1) {
+            } elseif ($type == 1) {
                 $labelStatus = $langs->trans('ProductStatusOnBuyShort');
                 $labelStatusShort = $langs->trans('ProductStatusOnBuy');
-            }
-            elseif ($type == 2) {
+            } elseif ($type == 2) {
                 $labelStatus = $langs->trans('ProductStatusOnBatch');
                 $labelStatusShort = $langs->trans('ProductStatusOnBatchShort');
             }
@@ -4743,9 +4594,7 @@ class Product extends CommonObject
             if ($result >= 0) {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $movementstock->error;
                 $this->errors = $movementstock->errors;
 
@@ -4791,9 +4640,7 @@ class Product extends CommonObject
             if ($result >= 0) {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $movementstock->error;
                 $this->errors = $movementstock->errors;
 
@@ -4871,9 +4718,7 @@ class Product extends CommonObject
             }
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -4957,24 +4802,19 @@ class Product extends CommonObject
 		// Stock decrease mode
 		if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 			$this->stock_theorique -= ($stock_commande_client - $stock_sending_client);
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
 			$this->stock_theorique += 0;
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$this->stock_theorique -= $stock_commande_client;
 		}
 		// Stock Increase mode
         if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
             $this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-        }
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+        } elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
 			$this->stock_theorique -= $stock_reception_fournisseur;
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
 		}
 
@@ -5018,9 +4858,7 @@ class Product extends CommonObject
                 $i++;
             }
             return $result;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->db->rollback();
             return array();
@@ -5257,9 +5095,7 @@ class Product extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -5394,9 +5230,7 @@ class Product extends CommonObject
             $label = ($label_type == 'short' ? $res[$label_type] : 'unit'.$res['code']);
             $this->db->free($resql);
             return $label;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error().' sql='.$sql;
             dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
             return -1;
@@ -5628,9 +5462,7 @@ class Product extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 05cfd7523e0..db59efcdfb7 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -119,9 +119,7 @@ class Productbatch extends CommonObject
 		{
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -178,9 +176,7 @@ class Productbatch extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -232,9 +228,7 @@ class Productbatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -274,9 +268,7 @@ class Productbatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -330,9 +322,7 @@ class Productbatch extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -424,9 +414,7 @@ class Productbatch extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -494,9 +482,7 @@ class Productbatch extends CommonObject
             $db->free($resql);
 
             return $ret;
-        }
-        else
-        {
+        } else {
             $error = "Error ".$db->lasterror();
             return -1;
         }
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 9ca53d167cf..331708ff096 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -139,9 +139,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -198,9 +196,7 @@ class Propalmergepdfproduct extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
@@ -272,9 +268,7 @@ class Propalmergepdfproduct extends CommonObject
     		$this->db->free($resql);
 
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
     		return -1;
@@ -333,9 +327,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -376,9 +368,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -426,9 +416,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -469,9 +457,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -525,9 +511,7 @@ class Propalmergepdfproduct extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index dbdb6cb6f42..975dcfda831 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -80,28 +80,20 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 			{
 				//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
 				$action = 'edit';
-			}
-			else
-			{
+			} else {
 				$error++;
 				$action = 're-edit';
 				if ($object->error == "isFatherOfThis") {
 					setEventMessages($langs->trans("ErrorAssociationIsFatherOfThis"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($object->del_sousproduit($id, GETPOST("prod_id_".$i, 'int')) > 0)
 			{
 				$action = 'edit';
-			}
-			else
-			{
+			} else {
 				$error++;
 				$action = 're-edit';
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -114,8 +106,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-}
-elseif ($action === 'save_composed_product')
+} elseif ($action === 'save_composed_product')
 {
 	$TProduct = GETPOST('TProduct', 'array');
 	if (!empty($TProduct))
@@ -234,9 +225,7 @@ if ($id > 0 || !empty($ref))
     			if ($object->price_base_type == 'TTC')
     			{
     				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-    			}
-    			else
-    			{
+    			} else {
     				print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -246,9 +235,7 @@ if ($id > 0 || !empty($ref))
     			if ($object->price_base_type == 'TTC')
     			{
     				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-    			}
-    			else
-    			{
+    			} else {
     				print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -298,9 +285,7 @@ if ($id > 0 || !empty($ref))
 				print '<td>'.$value['qty'].'</td>';
 				print '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven">';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
@@ -377,9 +362,7 @@ if ($id > 0 || !empty($ref))
 					if (!empty($conf->global->PRODUIT_MULTIPRICES))
 					{
 						$pricesell = 'Variable';
-					}
-					else
-					{
+					} else {
 						$totallinesell = price2num($value['nb'] * ($pricesell), 'MT');
 						$totalsell += $totallinesell;
 					}
@@ -397,16 +380,13 @@ if ($id > 0 || !empty($ref))
 					{
 						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" size="4" /></td>';
 						print '<td class="center"><input type="checkbox" name="TProduct['.$productstatic->id.'][incdec]" value="1" '.($value['incdec'] == 1 ? 'checked' : '').' /></td>';
-					}
-					else {
+					} else {
 						print '<td>'.$nb_of_subproduct.'</td>';
 						print '<td>'.($value['incdec'] == 1 ? 'x' : '').'</td>';
 					}
 
 					print '</tr>'."\n";
-				}
-				else
-				{
+				} else {
 					$hide = '';
 					if (empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)) $hide = ' hideobject'; // By default, we do not show this. It makes screen very difficult to understand
 
@@ -468,9 +448,7 @@ if ($id > 0 || !empty($ref))
 			}
 			print '</td>';
 			print '</tr>'."\n";
-		}
-		else
-		{
+		} else {
 			$colspan = 8;
 			if (!empty($conf->stock->enabled)) $colspan++;
 
@@ -599,9 +577,7 @@ if ($id > 0 || !empty($ref))
 							//$addchecked = ' checked';
 							$qty = $object->is_sousproduit_qty;
 							$incdec = $object->is_sousproduit_incdec;
-						}
-						else
-						{
+						} else {
 							//$addchecked = '';
 							$qty = 0;
 							$incdec = 0;
@@ -615,8 +591,7 @@ if ($id > 0 || !empty($ref))
 						// Inc Dec
 						print '<td class="center">';
 						if ($qty) print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" '.($incdec ? 'checked' : '').'>';
-						else
-						{
+						else {
 							// TODO Hide field and show it when setting a qty
 							print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" checked>';
 							//print '<input type="checkbox" disabled name="prod_incdec_'.$i.'" value="1" checked>';
@@ -635,9 +610,7 @@ if ($id > 0 || !empty($ref))
 					print '<td></td>';
 					print '</tr>';
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			print '</table>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index e5702078dd2..4f505bff187 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -313,9 +313,7 @@ if ($object->id)
     						$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
     						$checked = ' checked ';
     					}
-    				}
-    				else
-    				{
+    				} else {
     					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
@@ -337,9 +335,7 @@ if ($object->id)
     		print  '</form>';
     	}
     }
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index 420d5aaddb2..cf498d6f998 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -123,9 +123,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -162,14 +160,10 @@ class PriceExpression
                 $this->title = $obj->title;
                 $this->expression = $obj->expression;
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -205,9 +199,7 @@ class PriceExpression
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -236,14 +228,10 @@ class PriceExpression
             if ($obj)
             {
                 return (int) $obj->rowid;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -301,9 +289,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -359,9 +345,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable.class.php b/htdocs/product/dynamic_price/class/price_global_variable.class.php
index acede724da5..f2ab8006b02 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -128,9 +128,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -162,14 +160,10 @@ class PriceGlobalVariable
                 $this->value		= $obj->value;
                 $this->checkParameters();
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -225,9 +219,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -282,9 +274,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -349,9 +339,7 @@ class PriceGlobalVariable
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
index 0c8e25e8751..6706dded094 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
@@ -144,9 +144,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -182,14 +180,10 @@ class PriceGlobalVariableUpdater
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -249,9 +243,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -305,9 +297,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -399,9 +389,7 @@ class PriceGlobalVariableUpdater
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -441,9 +429,7 @@ class PriceGlobalVariableUpdater
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -598,9 +584,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -644,9 +628,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 6659dc56054..7a7dd5aac56 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -103,20 +103,16 @@ class PriceParser
         if (in_array($code, array(9, 14, 19, 20))) //Errors which have 0 arg
         {
             return $langs->trans("ErrorPriceExpression".$code);
-        }
-        elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
+        } elseif (in_array($code, array(1, 2, 3, 4, 5, 8, 10, 11, 17, 21, 22))) //Errors which have 1 arg
         {
             return $langs->trans("ErrorPriceExpression".$code, $info);
-        }
-        elseif (in_array($code, array(6, 23))) //Errors which have 2 args
+        } elseif (in_array($code, array(6, 23))) //Errors which have 2 args
         {
             return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
-        }
-        elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
+        } elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
         {
             return $langs->trans("ErrorPriceExpressionInternal", $code);
-        }
-        else //Unknown errors
+        } else //Unknown errors
         {
             return $langs->trans("ErrorPriceExpressionUnknown", $code);
         }
@@ -276,7 +272,7 @@ class PriceParser
 		if ($res < 0) {
 			$this->error_parser = array(25, null);
 			return -1;
-		}  elseif ($res == 0) {
+		} elseif ($res == 0) {
 			$supplier_min_price = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index bf2f58f63f3..c8855b0665e 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -54,8 +54,7 @@ $price_globals = new PriceGlobalVariable($db);
 if (empty($eid)) //This also disables fetch when eid == 0
 {
 	$eid = 0;
-}
-elseif ($action != 'delete')
+} elseif ($action != 'delete')
 {
 	$price_expression->fetch($eid);
 }
@@ -77,9 +76,7 @@ if ($action == 'add')
 			$price_result = $priceparser->testExpression($id, $expression);
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
-			}
-			else
-			{
+			} else {
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
 				$result = $price_expression->create($user);
@@ -87,19 +84,14 @@ if ($action == 'add')
 				{
 					$eid = $price_expression->id;
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages("add: ".$price_expression->error, $price_expression->errors, 'errors');
 				}
 			}
-		}
-		elseif ($result < 0)
+		} elseif ($result < 0)
 		{
 			setEventMessages("add find: ".$price_expression->error, $price_expression->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -117,9 +109,7 @@ if ($action == 'update')
 			$price_result = $priceparser->testExpression($id, $expression);
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
-			}
-			else
-			{
+			} else {
 				$price_expression->id = $eid;
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
@@ -127,19 +117,14 @@ if ($action == 'update')
 				if ($result < 0)
 				{
 					setEventMessages("update: ".$price_expression->error, $price_expression->errors, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				}
 			}
-		}
-		elseif ($result < 0)
+		} elseif ($result < 0)
 		{
 			setEventMessages("update find: ".$price_expression->error, $price_expression->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -220,9 +205,7 @@ print '<span id="back" class="butAction">'.$langs->trans("Back").'</span>';
 if ($eid == 0)
 {
 	print '<div class="inline-block divButAction"><span id="action-delete" class="butActionRefused classfortooltip">'.$langs->trans('Delete').'</span></div>'."\n";
-}
-else
-{
+} else {
 	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
 }
 print '</div>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 7cc5d3966c1..efcf0b33553 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -127,9 +127,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 		        $action = '';
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -210,9 +208,7 @@ if (empty($reshook))
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), null, 'errors');
-			}
-			else
-			{
+			} else {
 				$_POST["price"] = 0;
 			}
 		}
@@ -255,8 +251,7 @@ if (empty($reshook))
 					$productLink = $object->getNomUrl(1, 'supplier');
 
 					setEventMessages($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", $productLink), null, 'errors');
-				}
-				elseif ($ret < 0)
+				} elseif ($ret < 0)
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -286,8 +281,8 @@ if (empty($reshook))
                             $sql .= '"'.$value.'", ';
                         }
                         $sql = substr($sql, 0, strlen($sql) - 2).')';
-                    } // else update the existing one
-                    else {
+                    } else {
+                        // update the existing one
                         $sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
                         foreach ($extrafield_values as $key => $value) {
                             $sql .= str_replace('options_', '', $key).' = "'.$value.'", ';
@@ -315,9 +310,7 @@ if (empty($reshook))
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
-				}
-				else
-				{
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
@@ -346,14 +339,10 @@ if (empty($reshook))
 			{
 				$db->commit();
 				$action = '';
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'add_price';
 		}
 	}
@@ -452,9 +441,7 @@ if ($id > 0 || $ref)
 				{
 					$object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
 					print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
-				}
-				else
-				{
+				} else {
 					print load_fiche_titre($langs->trans("AddSupplierPrice"));
 				}
 
@@ -477,9 +464,7 @@ if ($id > 0 || $ref)
 					print '<input type="hidden" name="ref_fourn_price_id" value="'.$rowid.'">';
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 					print '<input type="hidden" name="socid" value="'.$socid.'">';
-				}
-				else
-				{
+				} else {
 					$events = array();
 					$events[] = array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
@@ -502,9 +487,7 @@ if ($id > 0 || $ref)
 				{
                     print '<input type="hidden" name="ref_fourn_old" value="'.$object->ref_supplier.'">';
                     print '<input class="flat" name="ref_fourn" size="12" value="'.$object->ref_supplier.'">';
-				}
-				else
-				{
+				} else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
@@ -528,9 +511,7 @@ if ($id > 0 || $ref)
 				{
 					print '<input type="hidden" name="qty" value="'.$object->fourn_qty.'">';
 					print $object->fourn_qty;
-				}
-				else
-				{
+				} else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
                 // Units
@@ -563,9 +544,7 @@ if ($id > 0 || $ref)
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
-				}
-				else
-				{
+				} else {
                     if (empty($default_vat))
                     {
                         $default_vat = $object->tva_tx;
@@ -944,9 +923,7 @@ SCRIPT;
 						if ($usercancreate) // change required right here
 						{
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
-						}
-						else
-						{
+						} else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
 						}
 
@@ -1098,9 +1075,7 @@ SCRIPT;
 
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 				    dol_print_error($db);
 				}
 
@@ -1109,9 +1084,7 @@ SCRIPT;
 			}
 		}
 	}
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 3067cc63733..f2a9ea98b79 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -225,9 +225,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				if ($i < $nbmax)
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
-				}
-				else
-				{
+				} else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -247,9 +245,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->setHeight('200');
 			$dolgraph->draw('idstatscategproduct');
 			print $dolgraph->show($total ? 0 : 1);
-		}
-		else
-		{
+		} else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -385,9 +381,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 			print '</div>';
 			print '<br>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -457,8 +451,7 @@ function activitytrim($product_type)
 
 			if ($product_type == 0)
 				print '<tr class="liste_titre"><td class=left>'.$langs->trans("ProductSellByQuarterHT").'</td>';
-			else
-				print '<tr class="liste_titre"><td class=left>'.$langs->trans("ServiceSellByQuarterHT").'</td>';
+			else print '<tr class="liste_titre"><td class=left>'.$langs->trans("ServiceSellByQuarterHT").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter1").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter2").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter3").'</td>';
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index 1ea99480bd6..85dd488df6f 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -20,9 +20,7 @@ switch ($put)
 			$res = $det->update($user);
 
 			echo $det->qty_view;
-		}
-		else
-		{
+		} else {
 			echo -2;
 		}
 
@@ -40,9 +38,7 @@ switch ($put)
 			$det->update($user);
 
 			echo $det->new_pmp;
-		}
-		else
-		{
+		} else {
 			echo -2;
 		}
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 0e8ab8bda55..9f3afa55738 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -41,9 +41,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
-}
-else
-{
+} else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -80,9 +78,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
-}
-else
-{
+} else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
@@ -336,27 +332,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
         	if ($permissiontoadd)
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
     		if ($permissiontoadd)
     		{
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Validate").'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
     		}
 
     		if ($permissiontodelete)
     		{
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index e24fe4e0ad2..983a7a4acb9 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -371,8 +371,7 @@ class Inventory extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -465,9 +464,7 @@ class Inventory extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 3f0989251b5..5261b0432b8 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -41,9 +41,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
-}
-else
-{
+} else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -80,9 +78,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
-}
-else
-{
+} else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
@@ -268,8 +264,7 @@ if ($object->id > 0)
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
-	}
-	else {
+	} else {
     	print '<div class="tabsAction">'."\n";
     	$parameters = array();
     	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -282,9 +277,7 @@ if ($object->id > 0)
     			if ($permissiontoadd)
     			{
     				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>'."\n";
-    			}
-    			else
-    			{
+    			} else {
     				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Edit').'</a>'."\n";
     			}
     		}
@@ -294,9 +287,7 @@ if ($object->id > 0)
 	        	if ($permissiontoadd)
 	    		{
 	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans("Validate").'</a>'."\n";
-	    		}
-	    		else
-	    		{
+	    		} else {
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
 	    		}
     		}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index f3f7621b821..4d451fcbeec 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -76,9 +76,7 @@ if ($user->socid > 0)	// Protection if external user
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $objectid);
-}
-else
-{
+} else {
 	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
 }
 
@@ -255,9 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -378,8 +374,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index cd97972d382..d5eaa81d06f 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -311,14 +311,10 @@ if ($search_type != '' && $search_type != '-1')
 	if ($search_type == 1)
 	{
 		$texte = $langs->trans("Services");
-	}
-	else
-	{
+	} else {
 		$texte = $langs->trans("Products");
 	}
-}
-else
-{
+} else {
 	$texte = $langs->trans("ProductsAndServices");
 }
 
@@ -472,8 +468,7 @@ if ($resql)
 		if ($search_type == 0)
 		{
 			$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-		}
-		elseif ($search_type == 1)
+		} elseif ($search_type == 1)
 		{
 			$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 		}
@@ -1105,15 +1100,13 @@ if ($resql)
 				if ((float) $duration_value > 1)
 				{
 				    $dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-				}
-				elseif ((float) $duration_value > 0)
+				} elseif ((float) $duration_value > 0)
 				{
 				    $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 				}
 				print $duration_value;
 				print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
-			}
-			elseif (!preg_match('/^[a-z]$/i', $obj->duration))		// If duration is a simple char (like 's' of 'm'), we do not show value
+			} elseif (!preg_match('/^[a-z]$/i', $obj->duration))		// If duration is a simple char (like 's' of 'm'), we do not show value
 			{
 				print $obj->duration;
 			}
@@ -1294,8 +1287,7 @@ if ($resql)
 						{
 							$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
 							print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext);
-						}
-						else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
+						} else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
 					}
 				}
 			}
@@ -1489,9 +1481,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/popucom.php b/htdocs/product/popucom.php
index 2c28266ad15..a0ee53a5758 100644
--- a/htdocs/product/popucom.php
+++ b/htdocs/product/popucom.php
@@ -62,13 +62,10 @@ $helpurl = '';
 if ($type == '0')
 {
     $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-}
-elseif ($type == '1')
+} elseif ($type == '1')
 {
     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-else
-{
+} else {
     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -152,9 +149,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 //var_dump($infoprod);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index bf2ae9020ec..b48afc6d162 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -62,13 +62,10 @@ $helpurl = '';
 if ($type == '0')
 {
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-}
-elseif ($type == '1')
+} elseif ($type == '1')
 {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-else
-{
+} else {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -152,9 +149,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 //var_dump($infoprod);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index f2109b94795..2c1bc26d092 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -169,9 +169,7 @@ if (empty($reshook))
 	    if (!$error)
 	    {
 	        $db->commit();
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	    }
 
@@ -275,8 +273,7 @@ if (empty($reshook))
 					break;
 				}
 			}
-		}
-		elseif (!$error)
+		} elseif (!$error)
 		{
 			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
@@ -766,9 +763,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 			//print vatrate($object->multiprices_tva_tx[$soc->price_level], true);
 			print '</td></tr>';
-		}
-		else
-		{
+		} else {
         	// TVA
         	print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -786,18 +781,14 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
         	else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
         	print '</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
 			// We show only vat for level 1
 			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
             // TVA
 	        print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -845,9 +836,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			    print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
 			    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			    print '</form>';
-			}
-			else
-			{
+			} else {
 			    print $langs->trans("SellingPrice").' '.$i;
 			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			}
@@ -871,9 +860,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			if ($object->multiprices_base_type[$i] == 'TTC')
 			{
 				print price($object->multiprices_min_ttc[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
-			}
-			else
-			{
+			} else {
 				print price($object->multiprices_min[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
 			}
 			print '</td></tr>';
@@ -953,9 +940,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			}
 		}
 	}
-}
-else
-{
+} else {
 	// TVA
 	print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -997,9 +982,7 @@ else
 		print '<tr><td>'.$langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty[0] == 0) {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">('.$langs->trans("Activate").')';
-		}
-		else
-		{
+		} else {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable_price_by_qty&level=1">('.$langs->trans("DisablePriceByQty").')';
 		}
 		print '</td><td>';
@@ -1288,9 +1271,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '</div>';
 
 		print '<br></form>';
-	}
-	else
-	{
+	} else {
 	    print '<!-- Edit price per level -->'."\n";
 	    ?>
 		<script>
@@ -1550,9 +1531,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     				print '<td class="right"></td>';
     				print '<td class="right"></td>';
     				print '<td class="right">'.$title."</td>";
-    			}
-    			else
-    			{
+    			} else {
     				print '<td class="right">';
     				if (empty($objp->price_by_qty)) {
     					print price($objp->price);
@@ -1597,8 +1576,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     			    {
     			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
     			        else $candelete = 1;
-    			    }
-    			    elseif ($i > 0) $candelete = 1;
+    			    } elseif ($i > 0) $candelete = 1;
 
     				print '<td class="right">';
     				if ($candelete)
@@ -1606,8 +1584,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
     					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
     					print img_delete();
     					print '</a>';
-    				} else
-    					print '&nbsp;'; // Can not delete last price (it's current price)
+    				} else print '&nbsp;'; // Can not delete last price (it's current price)
     				print '</td>';
     			}
 
@@ -1734,8 +1711,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</div>';
 
 		print '</form>';
-	}
-	elseif ($action == 'edit_customer_price')
+	} elseif ($action == 'edit_customer_price')
 	{
 		// Edit mode
 		$maxpricesupplier = $object->min_recommended_price();
@@ -1828,8 +1804,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</div>';
 
 		print '<br></form>';
-	}
-	elseif ($action == 'showlog_customer_price')
+	} elseif ($action == 'showlog_customer_price')
 	{
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
@@ -1876,9 +1851,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
 				//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 				print '<td class="right">'.$langs->trans("INCT").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td class="right">'.$langs->trans("TTC").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
@@ -1899,9 +1872,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				if ($line->price_base_type == 'HT')
 				{
 				    $pu = $line->price;
-				}
-				else
-				{
+				} else {
 				    $pu = $line->price_ttc;
 				}
 
@@ -1939,9 +1910,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
@@ -1961,8 +1930,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		} else {
 			print $langs->trans('None');
 		}
-	}
-	elseif ($action != 'showlog_default_price' && $action != 'edit_price')
+	} elseif ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
         print '<!-- list of all prices per customer -->'."\n";
@@ -2013,9 +1981,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 			//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 			print '<td class="right">'.$langs->trans("INCT").'</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="right">'.$langs->trans("TTC").'</td>';
 		}
 
@@ -2029,9 +1995,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		if ($object->price_base_type == 'HT')
 		{
 		    $pu = $object->price;
-		}
-		else
-		{
+		} else {
 		    $pu = $object->price_ttc;
 		}
 
@@ -2070,9 +2034,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 			//print '<td class="right">' . price($object->price_ttc) . "</td>";
 			print '<td class="right">'.price($resultarray[2]).'</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="right">'.price($object->price_ttc)."</td>";
 		}
 
@@ -2110,9 +2072,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				if ($line->price_base_type == 'HT')
 				{
 				    $pu = $line->price;
-				}
-				else
-				{
+				} else {
 				    $pu = $line->price_ttc;
 				}
 
@@ -2149,9 +2109,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 94d2e80c303..a13c22ff4e7 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -136,9 +136,7 @@ if (dol_strlen($type))
     if ($type == 1)
     {
         $sql .= " AND p.fk_product_type = '1'";
-    }
-    else
-    {
+    } else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -188,8 +186,7 @@ if ($resql)
 
 	if (isset($type))
 	{
-		if ($type == 1) { $texte = $langs->trans("Services"); }
-		else { $texte = $langs->trans("Products"); }
+		if ($type == 1) { $texte = $langs->trans("Services"); } else { $texte = $langs->trans("Products"); }
 	} else {
 		$texte = $langs->trans("ProductsAndServices");
 	}
@@ -403,9 +400,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 0fec39d1708..de49a11fbc7 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -139,9 +139,7 @@ if (dol_strlen($type))
     if ($type == 1)
     {
         $sql .= " AND p.fk_product_type = '1'";
-    }
-    else
-    {
+    } else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -197,8 +195,7 @@ if ($resql)
 
 	if (isset($type))
 	{
-		if ($type == 1) { $texte = $langs->trans("Services"); }
-		else { $texte = $langs->trans("Products"); }
+		if ($type == 1) { $texte = $langs->trans("Services"); } else { $texte = $langs->trans("Products"); }
 	} else {
 		$texte = $langs->trans("ProductsAndServices");
 	}
@@ -422,9 +419,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 4600baa1597..d77c03f4d0d 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -90,15 +90,12 @@ if (!$id && empty($ref))
         $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
         //$title=$langs->trans("StatisticsOfProducts");
         $title = $langs->trans("Statistics");
-    }
-    elseif ($type == '1')
+    } elseif ($type == '1')
     {
         $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
         //$title=$langs->trans("StatisticsOfServices");
         $title = $langs->trans("Statistics");
-    }
-    else
-    {
+    } else {
         $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
         //$title=$langs->trans("StatisticsOfProductsOrServices");
         $title = $langs->trans("Statistics");
@@ -108,9 +105,7 @@ if (!$id && empty($ref))
     if ($type == 1) $picto = 'service';
 
     print load_fiche_titre($title, $mesg, $picto);
-}
-else
-{
+} else {
     $result = $object->fetch($id, $ref);
 
 	$title = $langs->trans('ProductServiceCard');
@@ -324,9 +319,7 @@ if ($result || empty($id))
 				if (dol_is_file($dir.'/'.$graphfiles[$key]['file']))
 				{
 					// TODO Load cachefile $graphfiles[$key]['file']
-				}
-				else
-				{
+				} else {
 				    $morefilters = '';
 				    if ($search_categ > 0)
 				    {
@@ -370,9 +363,7 @@ if ($result || empty($id))
 
 					$graphfiles[$key]['total'] = $px->total();
 					$graphfiles[$key]['output'] = $px->show();
-				}
-				else
-				{
+				} else {
 					dol_print_error($db, 'Error for calculating graph on key='.$key.' - '.$object->error);
 				}
 			}
@@ -401,9 +392,7 @@ if ($result || empty($id))
 			if ($i % 2 == 0)
 			{
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
-			}
-			else
-			{
+			} else {
 				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 			}
 
@@ -412,9 +401,7 @@ if ($result || empty($id))
 			{
 			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated = $langs->trans("GeneratedOn", dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']), "dayhour"));
 			    else $dategenerated = $langs->trans("GeneratedOn", dol_print_date(dol_now(), "dayhour"));
-			}
-			else
-			{
+			} else {
 			    $dategenerated = ($mesg ? '<font class="error">'.$mesg.'</font>' : $langs->trans("ChartNotGenerated"));
 			}
 			$linktoregenerate = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).((string) $type != '' ? '&type='.$type : '').'&action=recalcul&mode='.$mode.'&search_year='.$search_year.'&search_categ='.$search_categ.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh').'</a>';
@@ -436,9 +423,7 @@ if ($result || empty($id))
 			if ($i % 2 == 0)
 			{
 				print "\n".'</div>'."\n";
-			}
-			else
-			{
+			} else {
 				print "\n".'</div></div></div>';
 				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 			}
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8f88044d913..194de1c6ddf 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -220,16 +220,12 @@ if ($id > 0 || !empty($ref))
 			print '</table>';
 			print '</div>';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 342cd3058a2..731a3762728 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -143,8 +143,7 @@ if ($id > 0 || !empty($ref))
 		if ($showmessage && $nboflines > 1)
 		{
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
-		}
-        elseif ($user->rights->facture->lire)
+		} elseif ($user->rights->facture->lire)
         {
             $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
             $sql .= " f.ref, f.datef, f.paye, f.type, f.fk_statut as statut, f.rowid as facid,";
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 51e91aeaaac..d8dfa9053e8 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -213,16 +213,12 @@ if ($id > 0 || !empty($ref))
 			print '</table>';
 			print '</div>';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index d0e9228fbf5..a1818252023 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -135,9 +135,7 @@ if (empty($reshook))
 	                setEventMessages($object->error, $object->errors, 'errors');
 	            }
 	        }
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorWarehouseRefRequired"), null, 'errors');
 			$action = "create"; // Force retour sur page creation
 		}
@@ -153,9 +151,7 @@ if (empty($reshook))
 		    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -195,14 +191,11 @@ if (empty($reshook))
 				$object->setCategories($categories);
 	            $action = '';
 	        }
-		}
-		else
-		{
+		} else {
 			$action = 'edit';
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 	    $object->oldcopy = dol_clone($object);
 
 	    // Fill array 'array_options' with data from update form
@@ -314,9 +307,7 @@ if ($action == 'create')
 		if ($key == 1)
 		{
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
-		}
-		else
-		{
+		} else {
 			print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 		}
 	}
@@ -344,9 +335,7 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
     $id = GETPOST("id", 'int');
 	if ($id > 0 || $ref)
 	{
@@ -498,13 +487,11 @@ else
 				{
 					if ($user->rights->stock->creer)
 						print "<a class=\"butAction\" href=\"card.php?action=edit&id=".$object->id."\">".$langs->trans("Modify")."</a>";
-					else
-						print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Modify")."</a>";
+					else print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Modify")."</a>";
 
 					if ($user->rights->stock->supprimer)
 						print "<a class=\"butActionDelete\" href=\"card.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
-					else
-						print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Delete")."</a>";
+					else print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Delete")."</a>";
 				}
 			}
 
@@ -669,9 +656,7 @@ else
                 print '<td class="liste_total">&nbsp;</td>';
 				print '<td class="liste_total">&nbsp;</td>';
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			print "</table>\n";
@@ -749,9 +734,7 @@ else
 				if ($key == $object->statut)
 				{
 					print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
-				}
-				else
-				{
+				} else {
 					print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 				}
 			}
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 0c61ae605c0..a8e15f8f28e 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -144,8 +144,7 @@ class StockMovements extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve stock movement list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 0d244785479..e84b017ed93 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -151,8 +151,7 @@ class Warehouses extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve warehouse list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index bbe42d7718c..22414d69d05 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -169,9 +169,7 @@ class Entrepot extends CommonObject
 		{
 			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
-		}
-		else
-		{
+		} else {
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
 		}
 	}
@@ -238,22 +236,17 @@ class Entrepot extends CommonObject
 				{
 					$this->db->commit();
 					return $id;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::create return -3");
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error = "Failed to get insert id";
 				dol_syslog(get_class($this)."::create return -2");
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::create Error ".$this->db->error());
 			$this->db->rollback();
@@ -429,9 +422,7 @@ class Entrepot extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -464,9 +455,7 @@ class Entrepot extends CommonObject
 		if ($id)
 		{
 			$sql .= " WHERE rowid = '".$id."'";
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 			if ($ref) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 		}
@@ -503,15 +492,11 @@ class Entrepot extends CommonObject
 				$this->country_code = $tmp['code'];
 
 				return 1;
-			}
-			else
-			{
+			} else {
                 $this->error = "Record Not Found";
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -557,9 +542,7 @@ class Entrepot extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 	        dol_print_error($this->db);
 		}
 	}
@@ -622,9 +605,7 @@ class Entrepot extends CommonObject
 			$obj = $this->db->fetch_object($result);
 			$ret['nb'] = $obj->nb;
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -657,9 +638,7 @@ class Entrepot extends CommonObject
 			$ret['nb'] = $obj->nb;
 			$ret['value'] = $obj->value;
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -824,10 +803,8 @@ class Entrepot extends CommonObject
                 	$warehousetmp->fetch($parentid);
                 	$TArbo[] = $warehousetmp->label;
                  	$parentid = $objarbo->fk_parent;
-                }
-                else break;
-            }
-            else dol_print_error($this->db);
+                } else break;
+            } else dol_print_error($this->db);
 
             $i++;
         }
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 35626a4c1b3..1b966fd8c45 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -1125,20 +1125,16 @@ class MouvementStock extends CommonObject
 		if ($mode == 0 || $mode == 1)
 		{
 			return $langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			return $langs->trans('StatusNotApplicable').' '.img_picto($langs->trans('StatusNotApplicable'), 'statut9');
 		}
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f0a5c0a48ea..b495f64485a 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -571,8 +571,7 @@ class Productlot extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 2b7069c82b5..469cec4a9a2 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -532,28 +532,23 @@ class ProductStockEntrepot extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 807d9f36a4f..494f6042ff1 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -130,9 +130,7 @@ if ($_GET["id"])
 			$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$entrepot->id.'-'.($year - 1).'.png';
 			print '<br><img src="'.$url.'" alt="Valorisation du stock annee '.($year - 1).'">';
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		print $langs->trans("FeatureNotYetAvailable");
 	}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 92b68da7d10..fc43d5e8ce3 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -121,9 +121,7 @@ if ($result)
 
     print "</table>";
     print '</div>';
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index d73c5e9c907..b6ce237a2b5 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -141,9 +141,7 @@ function ordered($product_id)
 		} else {
 			return null; //img_picto('', 'stcomm-1');
 		}
-	}
-	else
-	{
+	} else {
 		$error = $db->lasterror();
 		dol_print_error($db);
 
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 78418f90db6..948398ce157 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -292,9 +292,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -420,8 +418,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -551,11 +548,9 @@ if ($num)
 				if ($key == 'statut') print $warehouse->getLibStatut(5);
 				if ($key == 'phone') {
 					print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
-				}
-				elseif ($key == 'fax') {
+				} elseif ($key == 'fax') {
 					print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
-				}
-				else {
+				} else {
 					print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
 				}
 				print '</td>';
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 890a45aad6d..3f000b523d6 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -128,9 +128,7 @@ if ($action == 'addline')
 		// Warning, don't forget lines already added into the $_SESSION['massstockmove']
 		if ($producttmp->hasbatch())
 		{
-		}
-		else
-		{
+		} else {
 		}
 	}
 
@@ -228,9 +226,7 @@ if ($action == 'createmovements')
 						$error++;
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
-				}
-				else
-				{
+				} else {
 					$arraybatchinfo = $product->loadBatchInfo($batch);
 					if (count($arraybatchinfo) > 0)
 					{
@@ -238,9 +234,7 @@ if ($action == 'createmovements')
 						$dlc = $firstrecord['eatby'];
 						$dluo = $firstrecord['sellby'];
 						//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
-					}
-					else
-					{
+					} else {
 						$dlc = '';
 						$dluo = '';
 					}
@@ -283,9 +277,7 @@ if ($action == 'createmovements')
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				// dol_print_error('',"Bad value saved into sessions");
 				$error++;
 			}
@@ -300,9 +292,7 @@ if ($action == 'createmovements')
 		setEventMessages($langs->trans("StockMovementRecorded"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT.'/product/stock/index.php'); // Redirect to avoid pb when using back
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -366,9 +356,7 @@ $filtertype = 0;
 if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype = '';
 if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
 	$limit = '';
-}
-else
-{
+} else {
 	$limit = $conf->global->PRODUIT_LIMIT_SIZE;
 }
 
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 477ba17e1c2..2000ab4cdec 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -207,9 +207,7 @@ if ($action == "correct_stock")
 	        	$origin_element,
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
-        }
-        else
-		{
+        } else {
 	        $result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -227,9 +225,7 @@ if ($action == "correct_stock")
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else
-        {
+        } else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -312,15 +308,11 @@ if ($action == "transfert_stock" && !$cancel)
                         $batch = $pdluo->batch;
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
-                    }
-                    else
-                    {
+                    } else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
-                }
-                else
-                {
+                } else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alpha');
                     $eatby = $d_eatby;
@@ -356,9 +348,7 @@ if ($action == "transfert_stock" && !$cancel)
                         GETPOST('inventorycode', 'alpha')
                     );
                 }
-            }
-            else
-            {
+            } else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -389,15 +379,11 @@ if ($action == "transfert_stock" && !$cancel)
                 {
                     header("Location: ".$backtopage);
                     exit;
-                }
-                else
-                {
+                } else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
-            }
-            else
-            {
+            } else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -532,8 +518,7 @@ if ($resql)
     $i = 0;
     $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-	else
-	{
+	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
@@ -609,9 +594,7 @@ if ($resql)
         {
             $obj = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($obj->datem);
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -619,9 +602,7 @@ if ($resql)
         if ($lastmovementdate)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
-        }
-        else
-        {
+        } else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -1136,9 +1117,7 @@ if ($resql)
     	print "<br>\n";
         //print '</td></tr>';
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index c46c2c16859..efebe9ed7a2 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -230,9 +230,7 @@ if ($action == "correct_stock")
 	        	$origin_element,
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
-        }
-        else
-		{
+        } else {
 			$result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -250,9 +248,7 @@ if ($action == "correct_stock")
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else
-        {
+        } else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -335,15 +331,11 @@ if ($action == "transfert_stock" && !$cancel)
                         $batch = $pdluo->batch;
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
-                    }
-                    else
-                    {
+                    } else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
-                }
-                else
-                {
+                } else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alphanohtml');
                     $eatby = $d_eatby;
@@ -375,9 +367,7 @@ if ($action == "transfert_stock" && !$cancel)
                     	GETPOST('inventorycode', 'alphanohtml')
                         );
                 }
-            }
-            else
-            {
+            } else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -408,15 +398,11 @@ if ($action == "transfert_stock" && !$cancel)
                 {
                     header("Location: ".$backtopage);
                     exit;
-                }
-                else
-                {
+                } else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
-            }
-            else
-            {
+            } else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -503,9 +489,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (empty($search_inventorycode))
 {
 	$sql .= $db->plimit($limit + 1, $offset);
-}
-else
-{
+} else {
 	$limit = 0;
 }
 
@@ -541,8 +525,7 @@ if ($resql)
     $i = 0;
     $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-	else
-	{
+	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
@@ -618,9 +601,7 @@ if ($resql)
         {
             $objbis = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($objbis->datem);
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -628,9 +609,7 @@ if ($resql)
         if ($lastmovementdate)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
-        }
-        else
-        {
+        } else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -1192,9 +1171,7 @@ if ($resql)
     	print "<br>\n";
     	//print '</td></tr>';
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 02ba2aaa129..b52162e08f3 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -255,9 +255,7 @@ if ($action == "correct_stock" && !$cancel)
 					$origin_element,
 					$origin_id
 				); // We do not change value of stock for a correction
-			}
-			else
-			{
+			} else {
 				$result = $object->correct_stock(
 		    		$user,
 		    		GETPOST("id_entrepot"),
@@ -277,15 +275,11 @@ if ($action == "correct_stock" && !$cancel)
 				{
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
+				} else {
 	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 			    setEventMessages($object->error, $object->errors, 'errors');
 			    $action = 'correction';
 			}
@@ -356,15 +350,11 @@ if ($action == "transfert_stock" && !$cancel)
 						$batch = $pdluo->batch;
 						$eatby = $pdluo->eatby;
 						$sellby = $pdluo->sellby;
-					}
-					else
-					{
+					} else {
 						setEventMessages($pdluo->error, $pdluo->errors, 'errors');
 						$error++;
 					}
-				}
-				else
-				{
+				} else {
 					$srcwarehouseid = GETPOST('id_entrepot', 'int');
 					$batch = $batchnumber;
 					$eatby = $d_eatby;
@@ -401,9 +391,7 @@ if ($action == "transfert_stock" && !$cancel)
 					);
 					if ($result2 < 0) $error++;
 				}
-			}
-			else
-			{
+			} else {
 				if (!$error)
 				{
     			    // Remove stock
@@ -443,15 +431,11 @@ if ($action == "transfert_stock" && !$cancel)
 				{
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
+				} else {
 					header("Location: product.php?id=".$object->id);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 				$action = 'transfert';
@@ -472,9 +456,7 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
         {
             if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
                 setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
-            }
-            else
-            {
+            } else {
                 $d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
                 $d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
                 $pdluo->batch = $batchnumber;
@@ -486,14 +468,10 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
                     setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                 }
             }
-        }
-        else
-        {
+        } else {
             setEventMessages($langs->trans('BatchInformationNotfound'), null, 'errors');
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($pdluo->error, null, 'errors');
     }
     header("Location: product.php?id=".$id);
@@ -753,9 +731,7 @@ if ($id > 0 || $ref)
 		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
 		print '<br><br>';
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
@@ -779,14 +755,10 @@ if (empty($reshook))
 		{
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("CorrectStock").'</a>';
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("CorrectStock").'</a>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -795,14 +767,10 @@ if (empty($reshook))
 		{
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("TransferStock").'</a>';
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("TransferStock").'</a>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -1091,9 +1059,7 @@ if (!$variants) {
 			print '<td class="right">'.$stock_total.'</td>';
 			print '<td></td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		?>
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 17004a39a71..0fd37e3f55b 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -180,12 +180,10 @@ if (empty($reshook))
 			{
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			else setEventMessages($object->error, null, 'errors');
 				$action = 'create';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'create';
 		}
 	}
@@ -217,17 +215,13 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				$action = 'view';
-			}
-			else
-			{
+			} else {
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, null, 'errors');
 				$action = 'edit';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'edit';
 		}
 	}
@@ -242,9 +236,7 @@ if (empty($reshook))
 			setEventMessages("RecordDeleted", null, 'mesgs');
 			header("Location: ".dol_buildpath('/stock/list.php', 1));
 			exit;
-		}
-		else
-		{
+		} else {
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else setEventMessages($object->error, null, 'errors');
 		}
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 1dbb8a900e6..6a28f595f86 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -154,9 +154,7 @@ if ($object->id)
     $permission = ($user->rights->produit->creer);
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 5977f1854f7..0fb3c4a0388 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -541,9 +541,7 @@ if ($resql)
 
 	print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 	*/
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db);
 }
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 97d3871c027..7ce22067c46 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -177,13 +177,10 @@ if ($action == 'order' && isset($_POST['valid']))
 						$line->fk_unit = $productsupplier->fk_unit;
 	                    $suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
                 	}
-                }
-				elseif ($idprod == -1)
+                } elseif ($idprod == -1)
 				{
 					$errorQty++;
-				}
-                else
-				{
+				} else {
                     $error = $db->lasterror();
                     dol_print_error($db);
                 }
@@ -272,9 +269,7 @@ if ($action == 'order' && isset($_POST['valid']))
             setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
             header('Location: replenishorders.php');
             exit;
-        }
-        else
-        {
+        } else {
         	$db->rollback();
         }
     }
@@ -420,8 +415,7 @@ if ($usevirtualstock)
 		$sqlProductionToProduce .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToProduce .= " AND mp5.role IN ('toproduce', 'produced')";
 		$sqlProductionToProduce .= " AND mm5.status IN (1,2))";
-	} else
-	{
+	} else {
 		$sqlProductionToConsume = '0';
 		$sqlProductionToProduce = '0';
 	}
@@ -672,9 +666,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		{
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
 			$stock = $prod->stock_theorique;
-		}
-		else
-		{
+		} else {
 			$stock = $prod->stock_reel;
 		}
 
@@ -714,8 +706,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			{
 				$picto = img_picto('', './img/yes', '', 1);
 				$disabled = 'disabled';
-			}
-			else {
+			} else {
 				$picto = img_picto('', './img/no', '', 1);
 			}
 		} else {
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 42469b4dd2a..b316d269c3a 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -314,9 +314,7 @@ if ($resql)
     $db->free($resql);
 
     dol_fiche_end();
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index dffd18e0176..097f1d2c84b 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -46,9 +46,7 @@ if ($pdluoid > 0)
 	if ($result > 0)
 	{
 		$pdluoid = $pdluo->id;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $pdluo->error, $pdluo->errors);
 	}
 }
@@ -104,9 +102,7 @@ if (!empty($conf->productbatch->enabled) &&
 		// If form was opened for a specific pdluoid, field is disabled
 		print '<input type="text" name="batch_number_bis" size="40" disabled="disabled" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 		print '<input type="hidden" name="batch_number" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
-	}
-	else
-	{
+	} else {
 		print '<input type="text" name="batch_number" size="40" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 	}
 	print '</td>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 816d97351b4..182d78e9cd1 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -149,9 +149,7 @@ if ($result)
         $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<br><img src="'.$url.'">';
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index c4b93b55969..4e5c7b13458 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -78,9 +78,7 @@ $cancel != $langs->trans("Cancel") &&
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
-	}
-	else
-	{
+	} else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
@@ -90,9 +88,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->setMultiLangs($user) > 0)
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -114,9 +110,7 @@ $cancel != $langs->trans("Cancel") &&
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
-		}
-		else
-		{
+		} else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -126,9 +120,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->setMultiLangs($user) > 0)
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -147,9 +139,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->delMultiLangs($langtodelete, $user) > 0)
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -276,8 +266,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
+} elseif ($action != 'add')
 {
 	if (!empty($object->multilangs))
 	{
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 107bcb4e4e3..da8a6dc9c0c 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -86,8 +86,7 @@ $morehtml .= '</SELECT>';
 $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
 
 if ($mine) $tooltiphelp = $langs->trans("MyTasksDesc");
-else
-{
+else {
 	if ($user->rights->projet->all->lire && !$socid) $tooltiphelp = $langs->trans("TasksDesc");
 	else $tooltiphelp = $langs->trans("TasksPublicDesc");
 }
@@ -170,9 +169,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -227,9 +224,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -339,9 +334,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
     		print "</tr>\n";
     	}
     	$db->free($resql);
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
     print '<tr class="liste_total">';
@@ -391,9 +384,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 			print "</tr>\n";
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
@@ -418,8 +409,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
         {
             $listofprojectcontacttype[$obj->rowid] = $obj->code;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
     // Get id of types of contacts for tasks (This list never contains a lot of elements)
     $listoftaskcontacttype = array();
@@ -433,8 +423,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
         {
             $listoftaskcontacttype[$obj->rowid] = $obj->code;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 
@@ -536,8 +525,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 				$tasktmp->ref = $obj->ref;
 				$tasktmp->label = $obj->label;
 				print $tasktmp->getNomUrl(1, 'withproject', 'task', 1, '<br>');
-			}
-			else print $langs->trans("NoTasks");
+			} else print $langs->trans("NoTasks");
 			print '</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->dateo), 'day').'</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datee), 'day');
@@ -580,9 +568,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 1e0c147c82a..41def74cf1d 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -93,15 +93,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else
-{
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -193,9 +190,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -231,9 +226,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -246,9 +239,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -305,9 +296,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			{
 				$object->timespent_datehour = dol_mktime(GETPOST($key."hour"), GETPOST($key."min"), 0, $monthofday, $dayofday, $yearofday);
 				$object->timespent_withhour = 1;
-			}
-			else
-			{
+			} else {
 				$object->timespent_datehour = dol_mktime(12, 0, 0, $monthofday, $dayofday, $yearofday);
 			}
 			$object->timespent_date = $object->timespent_datehour;
@@ -315,9 +304,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			if ($object->timespent_date > 0)
 			{
 				$result = $object->addTimeSpent($user);
-			}
-			else
-			{
+			} else {
 				setEventMessages("ErrorBadDate", null, 'errors');
 				$error++;
 				break;
@@ -339,9 +326,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid ? 'id='.$projectid : '').($search_usertoprocessid ? '&search_usertoprocessid='.$search_usertoprocessid : '').($mode ? '&mode='.$mode : '').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
 			exit;
 		}
-	}
-	else
-	{
+	} else {
    		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
 }
@@ -466,8 +451,7 @@ dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'task');
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -477,9 +461,7 @@ else
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else
-{
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -788,9 +770,7 @@ if (count($tasksarray) > 0)
                 <td class="liste_total"></td>
                 </tr>';
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="14"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index ae4eed48515..576f580db6a 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -96,15 +96,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else
-{
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -149,9 +146,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -188,9 +183,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -203,9 +196,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -225,9 +216,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	if (empty($timetoadd))
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -389,8 +378,7 @@ dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -400,9 +388,7 @@ else
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else
-{
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -609,9 +595,7 @@ if (count($tasksarray) > 0)
 		print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 3a5ae388f9f..f3a68dd979f 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -104,15 +104,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else
-{
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -205,9 +202,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -244,9 +239,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -259,9 +252,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -281,9 +272,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 	if (empty($timetoadd))
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -482,8 +471,7 @@ dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'task');
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -493,9 +481,7 @@ else
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else
-{
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -837,9 +823,7 @@ if (count($tasksarray) > 0)
                 print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index cfd10d2c1fa..bbc7441f8c8 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -63,9 +63,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -82,14 +80,10 @@ if ($action == 'updateMaskTask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -120,21 +114,15 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-elseif ($action == 'specimentask')
+} elseif ($action == 'specimentask')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -165,15 +153,11 @@ elseif ($action == 'specimentask')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -188,9 +172,7 @@ elseif ($action == 'set')
 elseif ($action == 'settask')
 {
 	$ret = addDocumentModel($value, 'project_task', $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -218,9 +200,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setdoctask')
+} elseif ($action == 'setdoctask')
 {
 	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -235,24 +215,19 @@ elseif ($action == 'setdoctask')
 	{
 		$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'setmodtask')
+} elseif ($action == 'setmodtask')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'updateoptions')
+} elseif ($action == 'updateoptions')
 {
 	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT'))
 	{
@@ -384,9 +359,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
@@ -404,9 +377,7 @@ foreach ($dirmodels as $reldir)
 							if ($nextval)
 							{
 								$htmltooltip .= $nextval.'<br>';
-							}
-							else
-							{
+							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
 							}
 						}
@@ -485,9 +456,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
-							}
-							else
-							{
+							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
@@ -505,9 +474,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 								if ($nextval)
 								{
 									$htmltooltip .= $nextval.'<br>';
-								}
-								else
-								{
+								} else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
 								}
 							}
@@ -555,9 +522,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -624,9 +589,7 @@ foreach ($dirmodels as $reldir)
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print "</td>";
-								}
-								else
-								{
+								} else {
 									print "<td class=\"center\">\n";
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
@@ -637,9 +600,7 @@ foreach ($dirmodels as $reldir)
 								if ($conf->global->PROJECT_ADDON_PDF == "$name")
 								{
 									print img_picto($langs->trans("Default"), 'on');
-								}
-								else
-								{
+								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
@@ -663,9 +624,7 @@ foreach ($dirmodels as $reldir)
 								if ($module->type == 'pdf')
 								{
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-								}
-								else
-								{
+								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
 								print '</td>';
@@ -712,9 +671,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			array_push($def, $array[0]);
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -781,9 +738,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 										print img_picto($langs->trans("Enabled"), 'switch_on');
 										print '</a>';
 										print "</td>";
-									}
-									else
-									{
+									} else {
 										print "<td class=\"center\">\n";
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 										print "</td>";
@@ -794,9 +749,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
 									{
 										print img_picto($langs->trans("Default"), 'on');
-									}
-									else
-									{
+									} else {
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 									}
 									print '</td>';
@@ -820,9 +773,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									if ($module->type == 'pdf')
 									{
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-									}
-									else
-									{
+									} else {
 										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 									}
 									print '</td>';
@@ -862,9 +813,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index c9007dc6d8a..596cd152faa 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -102,9 +102,7 @@ if (empty($reshook))
 			{
 				header("Location: index.php");
 				exit;
-			}
-			else
-			{
+			} else {
 				dol_syslog($object->error, LOG_DEBUG);
 				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
@@ -183,9 +181,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans($object->error), null, 'errors');
 					$error++;
 				}
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
@@ -212,22 +208,16 @@ if (empty($reshook))
 					$backtopage = $backtopage.'&projectid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
+				} else {
 					header("Location:card.php?id=".$object->id);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				$action = 'create';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'create';
 		}
 	}
@@ -334,9 +324,7 @@ if (empty($reshook))
 		{
 			$db->rollback();
 			$action = 'edit';
-		}
-		else
-		{
+		} else {
 			$db->commit();
 
 			if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
@@ -377,8 +365,7 @@ if (empty($reshook))
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret)
 				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else
-				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 			$action = '';
 		}
 	}
@@ -420,9 +407,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: list.php?restore_lastsearch_values=1");
 			exit;
-		}
-		else
-		{
+		} else {
 			dol_syslog($object->error, LOG_DEBUG);
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -442,9 +427,7 @@ if (empty($reshook))
 		if ($result <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			// Load new object
 			$newobject = new Project($db);
 			$newobject->fetch($result);
@@ -609,8 +592,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		{
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
-		}
-		else print $text;
+		} else print $text;
 		if (!GETPOSTISSET('backtopage')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -703,9 +685,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	{
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	}
-	else
-	{
+	} else {
 		print ' &nbsp; &nbsp; ';
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	}
@@ -743,8 +723,7 @@ if ($action == 'create' && $user->rights->projet->creer)
         	});
         });
         </script>';
-}
-elseif ($object->id > 0)
+} elseif ($object->id > 0)
 {
 	/*
      * Show or edit
@@ -895,8 +874,7 @@ elseif ($object->id > 0)
 			{
 				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
-			}
-			else print $text;
+			} else print $text;
 			print '</td></tr>';
 		}
 
@@ -984,9 +962,7 @@ elseif ($object->id > 0)
 		}
 
 		print '</table>';
-	}
-	else
-	{
+	} else {
 		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 		// Project card
@@ -1239,9 +1215,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
 				}
 			}
@@ -1252,9 +1226,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
 				}
 			}
@@ -1265,9 +1237,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
 				}
 			}
@@ -1278,9 +1248,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
 				}
 			}
@@ -1346,9 +1314,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
 				}
 			}
@@ -1359,9 +1325,7 @@ elseif ($object->id > 0)
 				if ($userDelete > 0 || ($object->statut == 0 && $user->rights->projet->creer))
 				{
 					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -1418,9 +1382,7 @@ elseif ($object->id > 0)
 	// Hook to add more things on page
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('mainCardTabAddMore', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-}
-else
-{
+} else {
 	print $langs->trans("RecordNotFound");
 }
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index f8a076c89ee..5ef21879c7f 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -171,8 +171,7 @@ class Projects extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve project list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -452,9 +451,7 @@ class Projects extends DolibarrApi
         if ($this->project->update(DolibarrApiAccess::$user) >= 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->project->error);
         }
     }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 65060f4d8ff..084292d0727 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -173,8 +173,7 @@ class Tasks extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve task list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
@@ -450,9 +449,7 @@ class Tasks extends DolibarrApi
         if ($this->task->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->task->error);
         }
     }
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 03aac96db68..7389af9083c 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -306,9 +306,7 @@ class Project extends CommonObject
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$error++;
@@ -333,9 +331,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -441,31 +437,23 @@ class Project extends CommonObject
 				{
 					$this->db->commit();
 					$result = 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$result = -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->error;
 				$this->db->rollback();
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$result = -4;
-				}
-				else
-				{
+				} else {
 					$result = -2;
 				}
 				dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::update ref null");
 			$result = -1;
 		}
@@ -493,8 +481,7 @@ class Project extends CommonObject
 		if (!empty($id))
 		{
 			$sql .= " WHERE rowid=".$id;
-		}
-		elseif (!empty($ref))
+		} elseif (!empty($ref))
 		{
 			$sql .= " WHERE ref='".$this->db->escape($ref)."'";
 			$sql .= " AND entity IN (".getEntity('project').")";
@@ -553,9 +540,7 @@ class Project extends CommonObject
 			$this->db->free($resql);
 
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -585,46 +570,37 @@ class Project extends CommonObject
 		if ($type == 'agenda')
 		{
 			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$ids.") AND entity IN (".getEntity('agenda').")";
-		}
-		elseif ($type == 'expensereport')
+		} elseif ($type == 'expensereport')
 		{
 			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'project_task')
+		} elseif ($type == 'project_task')
 		{
 			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
+		} elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
 		{
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'stock_mouvement')
+		} elseif ($type == 'stock_mouvement')
 		{
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$ids.") AND ms.type_mouvement = 1";
-		}
-		elseif ($type == 'loan')
+		} elseif ($type == 'loan')
 		{
 			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
 		}
 
-		if($dates > 0 && $type == 'loan'){
+		if ($dates > 0 && $type == 'loan'){
 			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
-		}
-		elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		} elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
 			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
 
-		if($datee > 0 && $type == 'loan'){
+		if ($datee > 0 && $type == 'loan'){
 			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
-		}
-		elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		} elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
@@ -654,9 +630,7 @@ class Project extends CommonObject
 
 			/* Return array even if empty*/
 			return $elements;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -806,9 +780,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -900,17 +872,13 @@ class Project extends CommonObject
 					$this->statut = 1;
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -960,17 +928,13 @@ class Project extends CommonObject
 					$this->statut = 2;
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -1068,17 +1032,13 @@ class Project extends CommonObject
 		{
 			if (preg_match('/\.php$/', $option)) {
 				$url = dol_buildpath($option, 1).'?id='.$this->id;
-			}
-			elseif ($option == 'task')
+			} elseif ($option == 'task')
 			{
 				$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
-			}
-			elseif ($option == 'preview')
+			} elseif ($option == 'preview')
 			{
 				$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
-			}
-			else
-			{
+			} else {
 				$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
 			}
 			// Add param to save lastsearch_values or not
@@ -1194,13 +1154,10 @@ class Project extends CommonObject
 		if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
 		{
 			$userAccess = 1;
-		}
-		elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
+		} elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
 		{
 			$userAccess = 1;
-		}
-		else
-		{
+		} else {
 			foreach (array('internal', 'external') as $source)
 			{
 				$userRole = $this->liste_contact(4, $source);
@@ -1250,12 +1207,10 @@ class Project extends CommonObject
 		if ($mode == 0)
 		{
 			$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			// No filter. Use this if user has permission to see all project
 		}
@@ -1272,12 +1227,11 @@ class Project extends CommonObject
 		$resql = $this->db->query($sql2);
 		if ($resql)
 		{
-			while($obj = $this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
 				$listofprojectcontacttype[$obj->rowid]=$obj->code;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
 
 		if ($mode == 0)
@@ -1286,16 +1240,14 @@ class Project extends CommonObject
 			$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
 			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
 			$sql.= " )";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$sql.= " AND ec.element_id = p.rowid";
 			$sql.= " AND (";
 			$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
 			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
 			$sql.= " )";
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			// No filter. Use this if user has permission to see all project
 		}
@@ -1324,9 +1276,7 @@ class Project extends CommonObject
 				$result = implode(',', $temp);
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1433,9 +1383,7 @@ class Project extends CommonObject
 			{
 				$clone_project->note_private = '';
 				$clone_project->note_public = '';
-			}
-			else
-			{
+			} else {
 				$this->db->begin();
 				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1443,9 +1391,7 @@ class Project extends CommonObject
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 
@@ -1456,9 +1402,7 @@ class Project extends CommonObject
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 			}
@@ -1481,9 +1425,7 @@ class Project extends CommonObject
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else
-						{
+						} else {
 							if ($clone_project->error != '')
 							{
 								$this->error .= $clone_project->error;
@@ -1514,9 +1456,7 @@ class Project extends CommonObject
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 					$error++;
 				}
@@ -1545,9 +1485,7 @@ class Project extends CommonObject
 					{
 						$this->error .= $result_clone->error;
 						$error++;
-					}
-					else
-					{
+					} else {
 						$new_task_id = $result_clone;
 						$taskstatic->fetch($tasktoclone->id);
 
@@ -1585,9 +1523,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return $clone_project_id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1680,9 +1616,7 @@ class Project extends CommonObject
 		{
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".$elementSelectId;
-		}
-		else
-		{
+		} else {
 			$sql .= " SET fk_projet=".$this->id;
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1716,8 +1650,7 @@ class Project extends CommonObject
 		{
 			$sql .= " SET fk_project=NULL";
 			$sql .= " WHERE id=".$elementSelectId;
-		} else
-		{
+		} else {
 			$sql .= " SET ".$projectfield."=NULL";
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1808,9 +1741,7 @@ class Project extends CommonObject
 				{
 					$this->weekWorkLoad[$day] = $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
-				}
-				else
-				{
+				} else {
 					$this->weekWorkLoad[$day] += $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1819,9 +1750,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1875,9 +1804,7 @@ class Project extends CommonObject
 				{
 					$this->monthWorkLoad[$week_number] = $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] = $obj->task_duration;
-				}
-				else
-				{
+				} else {
 					$this->monthWorkLoad[$week_number] += $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1886,9 +1813,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1957,9 +1882,7 @@ class Project extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2016,9 +1939,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2084,9 +2005,7 @@ class Project extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 22868e96899..cb6150b6dc7 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -92,9 +92,7 @@ class ProjectStats extends Stats
 					$label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')',
 					$row[0]
 					);
-				}
-				else
-					$other += $row[1];
+				} else $other += $row[1];
 					$i++;
 			}
 			if ($num > $limit)
@@ -281,9 +279,7 @@ class ProjectStats extends Stats
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -293,9 +289,7 @@ class ProjectStats extends Stats
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else
-		{
+		} else {
 			$year = $startyear;
 			while ($year <= $endyear)
 			{
@@ -329,8 +323,7 @@ class ProjectStats extends Stats
 				fclose($fp);
 				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 41f6a76afb2..10f5a36d67f 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -225,9 +225,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -328,9 +326,7 @@ class Task extends CommonObject
 			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -439,9 +435,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -543,9 +537,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			//Delete associated link file
 			if ($conf->projet->dir_output)
 			{
@@ -589,9 +581,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else
-		{
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -600,9 +590,7 @@ class Task extends CommonObject
 		if (!$error)
 		{
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -623,9 +611,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else
-		{
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -634,9 +620,7 @@ class Task extends CommonObject
 		if (!$error)
 		{
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -799,8 +783,7 @@ class Task extends CommonObject
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
             $sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND t.fk_projet = p.rowid";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($filteronprojuser > 0)
 			{
@@ -816,9 +799,7 @@ class Task extends CommonObject
 				}
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
-			}
-			else
-			{
+			} else {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 				if ($includebilltime)
 				{
@@ -827,8 +808,7 @@ class Task extends CommonObject
 			}
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
             $sql .= " WHERE p.entity IN (".getEntity('project').")";
-		}
-		else return 'BadValueForParameterMode';
+		} else return 'BadValueForParameterMode';
 
 		if ($filteronprojuser > 0)
 		{
@@ -974,9 +954,7 @@ class Task extends CommonObject
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1054,9 +1032,7 @@ class Task extends CommonObject
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1080,7 +1056,7 @@ class Task extends CommonObject
 		while ($i < $num)
 		{
 			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			else $contactAlreadySelected[$i] = $tab[$i]['id'];
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1147,9 +1123,7 @@ class Task extends CommonObject
 				if ($result < 0) { $ret = -1; }
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$ret = -1;
 		}
@@ -1184,9 +1158,7 @@ class Task extends CommonObject
 		if ($ret > 0)
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 		}
 		return $ret;
@@ -1246,9 +1218,7 @@ class Task extends CommonObject
 			$this->timespent_nblines = ($obj->nblines ? $obj->nblines : 0);
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -1303,9 +1273,7 @@ class Task extends CommonObject
 
 			$this->db->free($resql);
 			return $result;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return $result;
 		}
@@ -1356,9 +1324,7 @@ class Task extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -1443,9 +1409,7 @@ class Task extends CommonObject
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -1505,14 +1469,10 @@ class Task extends CommonObject
 				{
 					$this->db->rollback();
 					$ret = -1;
-				}
-				else $ret = 1;
+				} else $ret = 1;
 				// End call triggers
-			}
-			else $ret = 1;
-		}
-		else
-		{
+			} else $ret = 1;
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			$ret = -1;
@@ -1582,9 +1542,7 @@ class Task extends CommonObject
 			if ($this->db->query($sql))
 			{
 				$result = 0;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$result = -2;
 			}
@@ -1600,9 +1558,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1714,9 +1670,7 @@ class Task extends CommonObject
 	   		{
 				$clone_task->note_private = '';
 				$clone_task->note_public = '';
-			}
-			else
-			{
+			} else {
 				$this->db->begin();
 				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1724,9 +1678,7 @@ class Task extends CommonObject
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 
@@ -1737,9 +1689,7 @@ class Task extends CommonObject
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 			}
@@ -1758,9 +1708,7 @@ class Task extends CommonObject
 				{
 					$projectstatic->fetch($project_id);
 					$clone_project_ref = $projectstatic->ref;
-				}
-				else
-				{
+				} else {
 					$clone_project_ref = $ori_project_ref;
 				}
 
@@ -1807,9 +1755,7 @@ class Task extends CommonObject
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else
-						{
+						} else {
 							if ($clone_task->error != '')
 							{
 								$this->error .= $clone_task->error;
@@ -1833,9 +1779,7 @@ class Task extends CommonObject
 		{
 			$this->db->commit();
 			return $clone_task_id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1882,12 +1826,10 @@ class Task extends CommonObject
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts_short[$status]);
@@ -1895,8 +1837,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1');
@@ -1904,8 +1845,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]);
@@ -1913,8 +1853,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			/*if ($status==0) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
@@ -1925,8 +1864,7 @@ class Task extends CommonObject
 			*/
 			//else return $this->progress.' %';
 			return '&nbsp;';
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			/*if ($status==0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
@@ -2038,9 +1976,7 @@ class Task extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2087,9 +2023,7 @@ class Task extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 12d6395af66..722736fe9b8 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -82,9 +82,7 @@ class TaskStats extends Stats
 						$row[1],
 						$row[0]
 					);
-				}
-				else
-					$other += $row[1];
+				} else $other += $row[1];
 				$i++;
 			}
 			if ($num > $limit)
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index d16dca5ceb1..04e306f9dfb 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -123,8 +123,7 @@ print '<table class="border centpercent">';
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 if ($object->public) print $langs->trans('SharedProject');
-else
-	print $langs->trans('PrivateProject');
+else print $langs->trans('PrivateProject');
 print '</td></tr>';
 
 // Date start - end
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 93ced9392c4..b8f1a24013d 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -73,16 +73,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -94,9 +90,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -111,9 +105,7 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
 	{
 		header("Location: contact.php?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9b4c852100d..9015ef0d4d4 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -157,9 +157,7 @@ if ($object->id > 0)
 	$permission = ($userWrite > 0);
 	$permtoedit = ($userWrite > 0);
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	dol_print_error('', 'NoRecordFound');
 }
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 23fa6551656..84612ef76ce 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -528,24 +528,24 @@ $listofreferent = array(
 
 // Change rules for benefit calculation
 if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
-	foreach($listofreferent as $key => $element) {
+	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
-	foreach($newelementforplusmargin as $value) {
+	foreach ($newelementforplusmargin as $value) {
 		$listofreferent[$value]['margin']='add';
 	}
 }
 if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
-	foreach($listofreferent as $key => $element) {
+	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
-	foreach($newelementforplusmargin as $value) {
+	foreach ($newelementforplusmargin as $value) {
 		$listofreferent[$value]['margin']='minus';
 	}
 }
@@ -568,8 +568,7 @@ if ($action == "addelement")
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
-elseif ($action == "unlink")
+} elseif ($action == "unlink")
 {
 	$tablename = GETPOST("tablename", "aZ09");
     $projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
@@ -685,19 +684,15 @@ foreach ($listofreferent as $key => $value)
 					{
 						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
-					}
-					else
-					{
+					} else {
 						$tmp = $element->getSumOfAmount('', $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                     if ((empty($dates) && empty($datee)) || (intval($dates) <= $element->datestart && intval($datee) >= $element->dateend)) {
                         // Get total loan
                         $total_ht_by_line = -$element->capital;
-                    }
-				    else {
+                    } else {
                         // Get loan schedule according to date filter
                         $total_ht_by_line = 0;
                         $loanScheduleStatic = new LoanSchedule($element->db);
@@ -716,8 +711,7 @@ foreach ($listofreferent as $key => $value)
                             }
                         }
                     }
-                }
-				else $total_ht_by_line = $element->total_ht;
+                } else $total_ht_by_line = $element->total_ht;
 
 				// Define $total_ttc_by_line
 				if ($tablename == 'don' || $tablename == 'chargesociales' || $tablename == 'payment_various' || $tablename == 'payment_salary') $total_ttc_by_line = $element->amount;
@@ -727,11 +721,9 @@ foreach ($listofreferent as $key => $value)
 				{
 					$defaultvat = get_default_tva($mysoc, $mysoc);
 					$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                         $total_ttc_by_line = $total_ht_by_line; // For loan there is actually no taxe managed in Dolibarr
-                }
-				else $total_ttc_by_line = $element->total_ttc;
+                } else $total_ttc_by_line = $element->total_ttc;
 
 				// Change sign of $total_ht_by_line and $total_ttc_by_line for some cases
 				if ($tablename == 'payment_various')
@@ -845,8 +837,7 @@ foreach ($listofreferent as $key => $value)
 			if ($selectList < 0)
 			{
 				setEventMessages($formproject->error, $formproject->errors, 'errors');
-			}
-			elseif ($selectList)
+			} elseif ($selectList)
 			{
 				// Define form with the combo list of elements to link
 			    $addform .= '<div class="inline-block valignmiddle">';
@@ -952,9 +943,7 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename != 'expensereport_det')
 				{
 					if (method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
-				}
-				else
-				{
+				} else {
 					$expensereport = new ExpenseReport($db);
 					$expensereport->fetch($element->fk_expensereport);
 				}
@@ -999,20 +988,16 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					// Show ref with link
 					if ($element instanceof Task)
 					{
 						print $element->getNomUrl(1, 'withproject', 'time');
 						print ' - '.dol_trunc($element->label, 48);
-					}
-					elseif ($key == 'loan') {
+					} elseif ($key == 'loan') {
                         print $element->getNomUrl(1);
                         print ' - '.dol_trunc($element->label, 48);
-                    }
-					else print $element->getNomUrl(1);
+                    } else print $element->getNomUrl(1);
 
 					$element_doc = $element->element;
 					$filename = dol_sanitizeFileName($element->ref);
@@ -1021,8 +1006,7 @@ foreach ($listofreferent as $key => $value)
 					if ($element_doc === 'order_supplier') {
 						$element_doc = 'commande_fournisseur';
 						$filedir = $conf->fournisseur->commande->multidir_output[$element->entity].'/'.dol_sanitizeFileName($element->ref);
-					}
-					elseif ($element_doc === 'invoice_supplier') {
+					} elseif ($element_doc === 'invoice_supplier') {
 						$element_doc = 'facture_fournisseur';
 						$filename = get_exdir($element->id, 2, 0, 0, $element, 'product').dol_sanitizeFileName($element->ref);
 						$filedir = $conf->fournisseur->facture->multidir_output[$element->entity].'/'.get_exdir($element->id, 2, 0, 0, $element, 'invoice_supplier').dol_sanitizeFileName($element->ref);
@@ -1050,12 +1034,10 @@ foreach ($listofreferent as $key => $value)
 				    if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
     				{
     				    $date = ($element->date_commande ? $element->date_commande : $element->date_valid);
-    				}
-    				elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
+    				} elseif ($tablename == 'supplier_proposal') $date = $element->date_validation; // There is no other date for this
     				elseif ($tablename == 'fichinter') $date = $element->datev; // There is no other date for this
     				elseif ($tablename == 'projet_task') $date = ''; // We show no date. Showing date of beginning of task make user think it is date of time consumed
-					else
-					{
+					else {
     					$date = $element->date; // invoice, ...
     					if (empty($date)) $date = $element->date_contrat;
     					if (empty($date)) $date = $element->datev;
@@ -1063,8 +1045,7 @@ foreach ($listofreferent as $key => $value)
     						$date = $element->$datefieldname;
     					}
     				}
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                     $date = $element->datestart;
                 }
 
@@ -1073,16 +1054,14 @@ foreach ($listofreferent as $key => $value)
 				{
 				    print dol_print_date($element->datep, 'dayhour');
 				    if ($element->datef && $element->datef > $element->datep) print " - ".dol_print_date($element->datef, 'dayhour');
-				}
-				elseif (in_array($tablename, array('projet_task')))
+				} elseif (in_array($tablename, array('projet_task')))
 				{
 				    $tmpprojtime = $element->getSumOfAmount($elementuser, $dates, $datee); // $element is a task. $elementuser may be empty
                     print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$idofelement.'&withproject=1">';
 				    print convertSecondToTime($tmpprojtime['nbseconds'], 'allhourmin');
                 	print '</a>';
 				    $total_time_by_line = $tmpprojtime['nbseconds'];
-				}
-				else print dol_print_date($date, 'day');
+				} else print dol_print_date($date, 'day');
 				print '</td>';
 
 				// Third party or user
@@ -1093,14 +1072,12 @@ foreach ($listofreferent as $key => $value)
                 	$tmpuser = new User($db);
                 	$tmpuser->fetch($expensereport->fk_user_author);
                 	print $tmpuser->getNomUrl(1, '', 48);
-                }
-				elseif ($tablename == 'payment_salary')
+                } elseif ($tablename == 'payment_salary')
 				{
 					$tmpuser = new User($db);
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
-				}
-				elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
+				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
                 {
                 	if ($element->fk_user_author > 0)
                 	{
@@ -1108,8 +1085,7 @@ foreach ($listofreferent as $key => $value)
 	                	$tmpuser2->fetch($element->fk_user_author);
 	                	print $tmpuser2->getNomUrl(1, '', 48);
                 	}
-                }
-                elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
+                } elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
                 {
                     print $elementuser->getNomUrl(1);
                 }
@@ -1144,15 +1120,11 @@ foreach ($listofreferent as $key => $value)
     							$langs->load("errors");
     							$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
     						}
-					    }
-					    else
-					    {
+					    } else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
-					}
-                    elseif ($key == 'loan') $total_ht_by_line = $element->capital;
-					else
-					{
+					} elseif ($key == 'loan') $total_ht_by_line = $element->capital;
+					else {
 						$total_ht_by_line = $element->total_ht;
 					}
 
@@ -1175,8 +1147,7 @@ foreach ($listofreferent as $key => $value)
 					}
 					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				}
-				else print '<td></td>';
+				} else print '<td></td>';
 
                 // Amount inc tax
 				if (empty($value['disableamount']))
@@ -1192,15 +1163,11 @@ foreach ($listofreferent as $key => $value)
 					        // TODO Permission to read daily rate
     						$defaultvat = get_default_tva($mysoc, $mysoc);
     						$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)), 'MT');
-					    }
-					    else
-					    {
+					    } else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
-					}
-                    elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
-					else
-					{
+					} elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
+					else {
 						$total_ttc_by_line = $element->total_ttc;
 					}
 
@@ -1223,33 +1190,27 @@ foreach ($listofreferent as $key => $value)
 					}
 					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				}
-				else print '<td></td>';
+				} else print '<td></td>';
 
 				// Status
 				print '<td class="right">';
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getLibStatut(5);
-				}
-				elseif ($element instanceof CommonInvoice)
+				} elseif ($element instanceof CommonInvoice)
 				{
 					//This applies for Facture and FactureFournisseur
 					print $element->getLibStatut(5, $element->getSommePaiement());
-				}
-				elseif ($element instanceof Task)
+				} elseif ($element instanceof Task)
 				{
 					if ($element->progress != '')
 					{
 						print $element->progress.' %';
 					}
-				}
-				elseif ($tablename == 'stock_mouvement')
+				} elseif ($tablename == 'stock_mouvement')
 				{
 					print $element->getLibStatut(3);
-				}
-				else
-				{
+				} else {
 					print $element->getLibStatut(5);
 				}
 				print '</td>';
@@ -1323,9 +1284,7 @@ foreach ($listofreferent as $key => $value)
 			print '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			if (!is_array($elementarray))	// error
 			{
 				print $elementarray;
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index babacbd27bf..457345d2fe3 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -195,9 +195,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	if ($project_id && $level < 0)
 	{
 		$parent = '-'.$project_id;
-	}
-	else
-	{
+	} else {
 		$parent = $task["task_parent_alternate_id"];
 		//$parent = $task["task_parent"];
 	}
@@ -208,9 +206,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	{
 		//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
 		$link = '';
-	}
-	else
-	{
+	} else {
 		$link = DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
 	}
 
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 314f945e604..d578f372777 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -281,8 +281,7 @@ if (count($tasksarray) > 0)
             $tasks[$taskcursor]['task_is_group'] = 1;
         	$tasks[$taskcursor]['task_css'] = 'ggroupblack';
             //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
-        elseif ($task->hasChildren() > 0) {
+        } elseif ($task->hasChildren() > 0) {
             $tasks[$taskcursor]['task_is_group'] = 1;
         	//$tasks[$taskcursor]['task_is_group'] = 0;
             $tasks[$taskcursor]['task_css'] = 'ggroupblack';
@@ -379,15 +378,11 @@ if (count($tasksarray) > 0)
 		print '</div>'."\n";
 
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		$langs->load("admin");
 		print $langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled");
 	}
-}
-else
-{
+} else {
 	print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
 }
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 8d0e7bb1e02..a18b2dc54a5 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -98,9 +98,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	    print "</div>";
 
 	    print "<br>";
-	}
-	else
-	{
+	} else {
 	    dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index f9cab81f43c..f4edfdea548 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -89,8 +89,7 @@ $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs
 $morehtml .= '</form>';
 
 if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
-else
-{
+else {
 	if (!empty($user->rights->projet->all->lire) && !$socid) $tooltiphelp = $langs->trans("ProjectsDesc");
 	else $tooltiphelp = $langs->trans("ProjectsPublicDesc");
 }
@@ -141,8 +140,7 @@ if ($resql)
 		}
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 //var_dump($listofoppcode);
 
 
@@ -273,8 +271,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set.
@@ -327,9 +324,7 @@ if ($resql)
 			$companystatic->status = $obj->status;
 
 			print $companystatic->getNomUrl(1);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("OthersNotLinkedToThirdParty");
 		}
 		print '</td>';
@@ -353,9 +348,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 0058a5a94dd..6c73d2cfc8b 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -52,9 +52,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 43d0e0b7f7f..70ad0f61e96 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -233,9 +233,7 @@ if (empty($reshook))
                 } else {
                     setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
                 }
-            }
-            else
-            {
+            } else {
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
@@ -247,9 +245,7 @@ if (empty($reshook))
             if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
             else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
     }
@@ -284,8 +280,7 @@ if ($resql)
 	{
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
@@ -459,8 +454,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 // Show description of content
 $texthelp = '';
 if ($search_project_user == $user->id) $texthelp .= $langs->trans("MyProjectsDesc");
-else
-{
+else {
     if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
     else $texthelp .= $langs->trans("ProjectsPublicDesc");
 }
@@ -752,9 +746,7 @@ while ($i < min($num, $limit))
 			if ($obj->socid)
 			{
 				print $socstatic->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -773,8 +765,7 @@ while ($i < min($num, $limit))
 				if ($nbofsalesrepresentative > 3)   // We print only number
 				{
 					print $nbofsalesrepresentative;
-				}
-				elseif ($nbofsalesrepresentative > 0)
+				} elseif ($nbofsalesrepresentative > 0)
 				{
 					$userstatic = new User($db);
 					$j = 0;
@@ -794,9 +785,7 @@ while ($i < min($num, $limit))
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
-			}
-			else
-			{
+			} else {
 				print '&nbsp';
 			}
 			print '</td>';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 38d12081b4f..6d56b2088e9 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -350,8 +350,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ebc6a7dc556..f395a4ee27a 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -236,8 +236,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 			$error++;
-		}
-		elseif (empty($_POST['task_parent']))
+		} elseif (empty($_POST['task_parent']))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
 			$action = 'create';
@@ -273,17 +272,13 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			if ($taskid > 0)
 			{
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
-			}
-			else
-			{
+			} else {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("projects");
 					setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
 					$duplicate_code_error = true;
-				}
-				else
-				{
+				} else {
 					setEventMessages($task->error, $task->errors, 'errors');
 				}
 				$action = 'create';
@@ -297,23 +292,19 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			{
 				header("Location: ".$backtopage);
 				exit;
-			}
-			elseif (empty($projectid))
+			} elseif (empty($projectid))
 			{
 				header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 				exit;
 			}
 			$id = $projectid;
 		}
-	}
-	else
-	{
+	} else {
 		if (!empty($backtopage))
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		elseif (empty($id))
+		} elseif (empty($id))
 		{
 			// We go back on task list
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
@@ -507,9 +498,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		$langs->load("errors");
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="createtask">';
@@ -536,9 +525,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		if (empty($duplicate_code_error))
 		{
 			print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
-		}
-		else
-		{
+		} else {
 			print $defaultref;
 		}
 		print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
@@ -558,9 +545,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		if (is_array($contactsofproject) && count($contactsofproject))
 		{
 			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
-		}
-		else
-		{
+		} else {
 			print $langs->trans("NoUserAssignedToTheProject");
 		}
 		print '</td></tr>';
@@ -613,8 +598,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 		print '</form>';
 	}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
@@ -811,9 +795,7 @@ elseif ($id > 0 || !empty($ref))
 		// Show all lines in taskarray (recursive function to go down on tree)
 		$j = 0; $level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
-	}
-	else
-	{
+	} else {
 		$colspan = 10;
 		if ($object->usage_bill_time) $colspan += 2;
 		print '<tr class="oddeven nobottom"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoTasks").'</span></td></tr>';
@@ -836,9 +818,7 @@ elseif ($id > 0 || !empty($ref))
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
-		}
-		else
-		{
+		} else {
 			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int'))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 82b4d8fdc10..e8a4ae93168 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -74,9 +74,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($objectsarray) > 0)
 		{
 			$id = $objectsarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -280,8 +278,7 @@ if ($id > 0 || !empty($ref))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 415859127db..2c3737c6788 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -68,18 +68,14 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
     		if ($result <= 0)
     		{
     			dol_print_error($db, $projectstatic->error, $projectstatic->errors);
-    		}
-    		else
-    		{
+    		} else {
     			$contactsofproject = $projectstatic->getListContactId('internal');
     			foreach ($contactsofproject as $key => $val)
     			{
     				$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
     			}
     		}
-    	}
-    	else
-    	{
+    	} else {
   			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
     	}
     }
@@ -88,16 +84,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -109,9 +101,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	if ($object->fetch($id, $ref))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -126,9 +116,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -142,9 +130,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -325,8 +311,7 @@ if ($id > 0 || !empty($ref))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
@@ -545,9 +530,7 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 		print "</table>";
-	}
-	else
-	{
+	} else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index bd4335f747f..1493542c5ed 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -79,9 +79,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -103,9 +101,7 @@ if ($id > 0 || !empty($ref))
 		$object->project = clone $projectstatic;
 
 		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -271,8 +267,7 @@ if ($object->id > 0)
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
 
@@ -318,9 +313,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->projet->creer;
 	$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 0aefa412571..8930220f6ec 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -245,8 +245,7 @@ if ($resql)
 	{
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 // Get id of types of contacts for tasks (This list never contains a lot of elements)
 $listoftaskcontacttype = array();
@@ -260,8 +259,7 @@ if ($resql)
 	{
 		$listoftaskcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is assigned only once.
@@ -437,8 +435,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 // Show description of content
 $texthelp = '';
 if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
-else
-{
+else {
     if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
     else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
 }
@@ -753,9 +750,7 @@ while ($i < min($num, $limit))
 				$socstatic->id = $obj->socid;
 				$socstatic->name = $obj->name;
 				print $socstatic->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -856,9 +851,7 @@ while ($i < min($num, $limit))
 		        print convertSecondToTime($obj->tobill, 'allhourmin');
 		        $totalarray['val']['t.tobill'] += $obj->tobill;
 		        $totalarray['totaltobill'] += $obj->tobill;
-		    }
-		    else
-		    {
+		    } else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -875,9 +868,7 @@ while ($i < min($num, $limit))
 		        print convertSecondToTime($obj->billed, 'allhourmin');
 		        $totalarray['val']['t.billed'] += $obj->billed;
 		        $totalarray['totalbilled'] += $obj->billed;
-		    }
-		    else
-		    {
+		    } else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -942,8 +933,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 		{
 			if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 			else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-		}
-		elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
+		} elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
 		elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).'</td>';
 		elseif ($totalarray['totalprogress_calculatedfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
 		elseif ($totalarray['totalprogress_declaredfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 4967257570e..7af9bbbacef 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -57,9 +57,7 @@ if ($id > 0 || !empty($ref))
 		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
 		$object->project = clone $projectstatic;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -75,9 +73,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -243,8 +239,7 @@ if ($object->id > 0)
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
 
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index bbb275ef5df..a0bf33b34ba 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -199,8 +199,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 }
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index da15a73f66f..7a109eb1f50 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -113,9 +113,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 			    setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 	}
 }
@@ -131,9 +129,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 		{
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 		    setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -149,9 +145,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -462,9 +456,7 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			/*
 			 * Fiche tache en mode visu
 			 */
@@ -482,8 +474,7 @@ if ($id > 0 || !empty($ref))
 			{
 			    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-			}
-			else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+			} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 			$morehtmlref = '';
 
@@ -567,8 +558,7 @@ if ($id > 0 || !empty($ref))
 				$tmparray = $object->getSummaryOfTimeSpent();
 				if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 				else print '0 %';
-			}
-			else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+			} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 			print '</td></tr>';
 
 			// Other attributes
@@ -605,9 +595,7 @@ if ($id > 0 || !empty($ref))
 				if ($user->rights->projet->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
 
@@ -617,14 +605,10 @@ if ($id > 0 || !empty($ref))
 				    if (!$object->hasChildren() && !$object->hasTimeSpent())
 				    {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
-				    }
-				    else
-				    {
+				    } else {
 				        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
 				    }
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 78f5039fe8a..6c482264bbf 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -154,17 +154,13 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 		if ($id || $ref)
 		{
 			$object->fetch($id, $ref);
-		}
-		else
-		{
+		} else {
 			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
 				$action = 'createtime';
 				$error++;
-			}
-			else
-			{
+			} else {
 				$object->fetch(GETPOST('taskid', 'int'));
 			}
 		}
@@ -178,9 +174,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
 				$action = 'createtime';
 				$error++;
-			}
-			else
-			{
+			} else {
 				$object->timespent_note = $_POST["timespent_note"];
 				if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
 				$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
@@ -189,9 +183,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				{
 					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 					$object->timespent_withhour = 1;
-				}
-				else
-				{
+				} else {
 					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 				}
 				$object->timespent_fk_user = $_POST["userid"];
@@ -199,17 +191,13 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				if ($result >= 0)
 				{
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans($object->error), null, 'errors');
 					$error++;
 				}
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if (empty($id)) $action = 'createtime';
 		else $action = 'createtime';
 	}
@@ -244,9 +232,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			{
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
-			}
-			else
-			{
+			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -254,15 +240,11 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$object->fetch($id, $ref);
 			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 
@@ -275,9 +257,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			{
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
-			}
-			else
-			{
+			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -286,16 +266,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$action = '';
 	}
 }
@@ -312,9 +288,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 		setEventMessages($langs->trans($object->error), null, 'errors');
 		$error++;
 		$action = '';
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
 }
@@ -328,9 +302,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -346,14 +318,12 @@ if (GETPOST('projectid', 'int') > 0)
 	$result = $projectstatic->fetch($projectidforalltimes);
 	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 	$res = $projectstatic->fetch_optionals();
-}
-elseif (GETPOST('project_ref', 'alpha'))
+} elseif (GETPOST('project_ref', 'alpha'))
 {
 	$projectstatic->fetch(0, GETPOST('project_ref', 'alpha'));
 	$projectidforalltimes = $projectstatic->id;
 	$withproject = 1;
-}
-elseif ($id > 0)
+} elseif ($id > 0)
 {
 	$object->fetch($id);
 	$result = $projectstatic->fetch($object->fk_project);
@@ -367,9 +337,7 @@ if ($action == 'confirm_generateinvoice')
 	if (!($projectstatic->thirdparty->id > 0))
 	{
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -407,9 +375,7 @@ if ($action == 'confirm_generateinvoice')
 			$txtva = $dataforprice['tva_tx'];
 			$localtax1 = $dataforprice['localtax1'];
 			$localtax2 = $dataforprice['localtax2'];
-		}
-		else
-		{
+		} else {
 			$pu_ht = 0;
 			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
 			$localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
@@ -422,8 +388,7 @@ if ($action == 'confirm_generateinvoice')
 
         if ($invoiceToUse) {
             $tmpinvoice->fetch($invoiceToUse);
-        }
-        else {
+        } else {
 		    $result = $tmpinvoice->create($user);
 		    if ($result <= 0)
 		    {
@@ -474,8 +439,7 @@ if ($action == 'confirm_generateinvoice')
 						break;
 					}
 				}
-			}
-			elseif ($generateinvoicemode == 'onelineperperiod') {
+			} elseif ($generateinvoicemode == 'onelineperperiod') {
 					$arrayoftasks = array();
 				foreach ($toselect as $key => $value)
 					{
@@ -518,8 +482,7 @@ if ($action == 'confirm_generateinvoice')
 						break;
 					}
 				}
-			}
-			elseif ($generateinvoicemode == 'onelinepertask') {
+			} elseif ($generateinvoicemode == 'onelinepertask') {
 					$arrayoftasks = array();
 				foreach ($toselect as $key => $value)
 					{
@@ -569,9 +532,7 @@ if ($action == 'confirm_generateinvoice')
 			//var_dump($tmpinvoice);
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -601,8 +562,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$result = $projectstatic->fetch($projectidforalltimes);
 		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 		$res = $projectstatic->fetch_optionals();
-	}
-	elseif ($object->fetch($id, $ref) >= 0)
+	} elseif ($object->fetch($id, $ref) >= 0)
 	{
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
 		$result = $projectstatic->fetch($object->fk_project);
@@ -759,15 +719,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
-				}
-				else									// We are on tab 'Time Spent' of task
+				} else // We are on tab 'Time Spent' of task
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
 				}
-			}
-			else
-			{
+			} else {
 				$linktocreatetimeBtnStatus = -2;
 				$linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
 			}
@@ -806,8 +763,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		{
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
@@ -873,8 +829,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$tmparray = $object->getSummaryOfTimeSpent();
 			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 			else print '0 %';
-		}
-		else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+		} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 		print '</td>';
 
 		print '</tr>';
@@ -1069,9 +1024,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 		{
 			$num = $nbtotalofrecords;
-		}
-		else
-		{
+		} else {
 			$sql .= $db->plimit($limit + 1, $offset);
 
 			$resql = $db->query($sql);
@@ -1093,9 +1046,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				$title = $langs->trans("ListTaskTimeUserProject");
 
 				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
-			}
-			else
-			{
+			} else {
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title = $langs->trans("ListTaskTimeForTask");
@@ -1111,9 +1062,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1171,9 +1120,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 				if ($projectstatic->public) $contactsofproject = array();
 				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
-			}
-			else
-			{
+			} else {
 				if ($nboftasks) {
 					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).' '.$langs->trans('FirstAddRessourceToAllocateTime');
 				}
@@ -1332,11 +1279,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if (empty($task_time->task_date_withhour))
 					{
 						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-					}
-					else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-				}
-				else
-				{
+					} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+				} else {
 					print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 				}
 				print '</td>';
@@ -1352,9 +1296,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ?GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
-					}
-					else
-					{
+					} else {
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
 						$tasktmp->label = $task_time->label;
@@ -1394,9 +1336,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					} else {
 						print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 					}
-				}
-				else
-				{
+				} else {
 					$userstatic->id = $task_time->fk_user;
 					$userstatic->lastname = $task_time->lastname;
 					$userstatic->firstname = $task_time->firstname;
@@ -1415,15 +1355,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-				}
-				else
-				{
+				} else {
 					print dol_nl2br($task_time->note);
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
-			}
-			elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+			} elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
 				print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 			}
@@ -1436,9 +1373,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-				}
-				else
-				{
+				} else {
 					print convertSecondToTime($task_time->task_duration, 'allhourmin');
 				}
 				print '</td>';
@@ -1478,14 +1413,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 							{
 								print $tmpinvoice->getNomUrl(1);
 							}
-						}
-						else
-						{
+						} else {
 							print $langs->trans("No");
 						}
-					}
-					else
-					{
+					} else {
 						print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 					}
 				}
@@ -1513,8 +1444,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="save" value="'.$langs->trans("Save").'">';
 				print '<br>';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="cancel" value="'.$langs->trans('Cancel').'">';
-			}
-			elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
+			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
 			{
 				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer)
 				{
@@ -1566,11 +1496,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						if (empty($task_time->task_date_withhour))
 						{
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-						}
-						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-					}
-					else
-					{
+						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1618,9 +1545,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						} else {
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
-					}
-					else
-					{
+					} else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1638,14 +1563,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-					}
-					else
-					{
+					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				}
-				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 				}
@@ -1658,9 +1580,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-					}
-					else
-					{
+					} else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1714,11 +1634,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						if (empty($task_time->task_date_withhour))
 						{
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
-						}
-						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
-					}
-					else
-					{
+						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1766,9 +1683,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						} else {
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
-					}
-					else
-					{
+					} else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1786,14 +1701,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-					}
-					else
-					{
+					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				}
-				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
 				}
@@ -1806,9 +1718,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
-					}
-					else
-					{
+					} else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1865,8 +1775,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 					else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-				}
-				elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
+				} elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
 				elseif ($totalarray['totalvaluefield'] == $i) print '<td class="right">'.price($totalarray['totalvalue']).'</td>';
 				//elseif ($totalarray['totalvaluebilledfield'] == $i) print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
 				else print '<td></td>';
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index a7eef6c2ede..9530757b283 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -109,8 +109,7 @@ if ($reshook < 0) {
 		print '<div class="error">'.$hookmanager->error.'</div>';
 	}
 	llxFooterVierge();
-}
-elseif (empty($reshook)) {
+} elseif (empty($reshook)) {
 	// Check exportkey
 	if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"]) {
 		$user->getrights();
@@ -188,9 +187,7 @@ if ($format == 'ical' || $format == 'vcal')
 
 		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
-	{
+	} else {
 		print 'Error '.$agenda->error;
 
 		exit;
@@ -226,9 +223,7 @@ if ($format == 'rss')
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
-	{
+	} else {
 		print 'Error '.$agenda->error;
 
 		exit;
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 1cfe1d4b0b3..9eb0579680a 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -90,9 +90,7 @@ if ($result < 0)
 	echo "User Error:".$user->error;
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 	exit;
-}
-else
-{
+} else {
 	if (empty($user->id))
 	{
 		echo " User login:".$userlogin." do not exists";
@@ -167,9 +165,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 		            echo "\nUser Error: ".$user->error."\n";
 		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 		            exit(-1);
-		        }
-		        else
-		        {
+		        } else {
 		            if ($result == 0)
 		            {
 		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -206,9 +202,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			    echo "You can also enable module Log if not yet enabled, run again and take a look into dolibarr.log file\n";
 			    dol_syslog("cron_run_jobs.php::run_jobs Error".$cronjob->error, LOG_ERR);
 				$nbofjobslaunchedko++;
-			}
-			else
-			{
+			} else {
 				$nbofjobslaunchedok++;
 			}
 
@@ -225,9 +219,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			}
 
 			echo " - reprogrammed\n";
-		}
-		else
-		{
+		} else {
 		    echo " - not qualified\n";
 
 		    dol_syslog("cron_run_jobs.php job not qualified line->datenextrun:".dol_print_date($line->datenextrun, 'dayhourrfc')." line->datestart:".dol_print_date($line->datestart, 'dayhourrfc')." line->dateend:".dol_print_date($line->dateend, 'dayhourrfc')." now:".dol_print_date($now, 'dayhourrfc'));
@@ -237,9 +229,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 	$conf = $savconf;
 
 	echo "Result: ".($nbofjobs)." jobs - ".($nbofjobslaunchedok + $nbofjobslaunchedko)." launched = ".$nbofjobslaunchedok." OK + ".$nbofjobslaunchedko." KO";
-}
-else
-{
+} else {
 	echo "Result: No active jobs found.";
 }
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index f0caf948770..768b7d42392 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -144,17 +144,14 @@ foreach ($modulesdir as $dir)
 
                 if ($modName)
                 {
-		            try
-		            {
+		            try {
                         include_once $dir.$file;
                         $objMod = new $modName($db);
 
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else
-                        {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -175,8 +172,7 @@ foreach ($modulesdir as $dir)
                             $j++;
                             $i++;
                         }
-		            }
-                    catch (Exception $e)
+		            } catch (Exception $e)
                     {
                         dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
                     }
@@ -380,9 +376,7 @@ foreach ($demoprofiles as $profilearray)
                 {
                     print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
                     print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
-                }
-                else
-                {
+                } else {
                     $modulo = ($j % $nbcolsmod);
         		    //if ($modulo == 0) print '<tr>';
                     print '<!-- id='.$val->numero.' -->';
@@ -434,9 +428,7 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIEN
 		print 'src="http://pagead2.googlesyndication.com/pagead/show_ads.js">'."\n";
 		print '</script>'."\n";
 		print '</div>'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- google js advert tag disabled with jmobile -->'."\n";
 	}
 }
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index c92108d7723..49114b89f46 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -87,9 +87,7 @@ if ($resql)
 			if ($objp->public)
 			{
 				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
-			}
-			else
-			{
+			} else {
 				print "<td>Anonyme Anonyme</td>\n";
 			}
 			print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
@@ -98,14 +96,10 @@ if ($resql)
 			$i++;
 		}
 		print "</table>";
-	}
-	else
-	{
+	} else {
 		print "Aucun don publique";
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 7f788a84671..7eb45f008e6 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -107,13 +107,11 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     {
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
         $width = 150;
-    }
-    elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+    } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
     {
         $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
         $width = 150;
-    }
-    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+    } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
     {
         $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
         $width = 150;
@@ -343,10 +341,8 @@ if ($action == 'add')
             		if (preg_match('/\d\.\d/', $appli))
             		{
             			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-            		}
-            		else $appli .= " ".DOL_VERSION;
-            	}
-            	else $appli .= " ".DOL_VERSION;
+            		} else $appli .= " ".DOL_VERSION;
+            	} else $appli .= " ".DOL_VERSION;
 
             	$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
             	$from = $conf->global->ADHERENT_MAIL_FROM;
@@ -375,8 +371,7 @@ if ($action == 'add')
             {
                 $urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
                 // TODO Make replacement of __AMOUNT__, etc...
-            }
-            else $urlback = $_SERVER["PHP_SELF"]."?action=added";
+            } else $urlback = $_SERVER["PHP_SELF"]."?action=added";
 
             if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1')
             {
@@ -390,14 +385,11 @@ if ($action == 'add')
                         if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                     	    $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else
-                        {
+                        } else {
                             $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-            	elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
+                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
                 {
                     $urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
                     if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -407,14 +399,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                     	{
                     		$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                    	}
-                    	else
-                    	{
+                    	} else {
                     		$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                     	}
                     }
-                }
-                elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
+                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
                 {
                     $urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=membernewform&source=membersubscription&ref='.urlencode($adh->ref);
                     if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -424,14 +413,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else
-                        {
+                        } else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-				elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
+                } elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
                 {
                     $urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=membernewform&source=membersubscription&ref='.$adh->ref;
                     if (price2num(GETPOST('amount', 'alpha'))) $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@@ -441,15 +427,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else
-                        {
+                        } else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-                else
-                {
+                } else {
                     dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
                     exit;
                 }
@@ -457,9 +439,7 @@ if ($action == 'add')
 
             if (!empty($entity)) $urlback .= '&entity='.$entity;
             dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-        }
-        else
-        {
+        } else {
         	$error++;
             $errmsg .= join('<br>', $adh->errors);
         }
@@ -471,9 +451,7 @@ if ($action == 'add')
 
     	Header("Location: ".$urlback);
     	exit;
-    }
-    else
-    {
+    } else {
     	$db->rollback();
     }
 }
@@ -574,9 +552,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
     print $form->selectarray("type", $adht->liste_array(), GETPOST('type') ?GETPOST('type') : $defaulttype, $isempty);
     print '</td></tr>'."\n";
-}
-else
-{
+} else {
     $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
     print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
@@ -588,9 +564,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
     print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
     print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
     print '</td></tr>'."\n";
-}
-else
-{
+} else {
     print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
     print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
@@ -732,9 +706,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)
     if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT))
     {
         print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    }
-    else
-    {
+    } else {
         print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled size="6" value="'.$amount.'">';
         print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
     }
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 04fe1f75fca..c1677b2902b 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -84,9 +84,7 @@ if ($id > 0)
 	if (empty($object->public))
 	{
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
-	}
-	else
-	{
+	} else {
 		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
 
 		print '<tr><td width="15%">'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 459926707b8..cb5b9308ed4 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -152,18 +152,14 @@ if ($result)
 			print '<td>';
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
-		}
-		else
-		{
+		} else {
 			print "<td>&nbsp;</td>\n";
 		}
 		print "</tr>";
 		$i++;
 	}
 	print "</table>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index 626aba2cd32..a86b8c68e42 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -38,9 +38,7 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
 {
 	print 'Sorry, it seems your internet connexion is off.<br>';
 	print 'You need to be connected to network to use this software.<br>';
-}
-else
-{
+} else {
 	$langs->load("error");
 	$langs->load("other");
 
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 2378728a8d3..2031c11a3ad 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -174,8 +174,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -235,9 +234,7 @@ if ($source == 'proposal')
 	{
 		$mesg = $proposal->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$result = $proposal->fetch_thirdparty($proposal->socid);
 	}
 
@@ -276,14 +273,10 @@ if ($action != 'dosign')
 {
     if ($found && !$error)	// We are in a management option and no error
     {
-    }
-    else
-    {
+    } else {
     	dol_print_error_email('ERRORNEWONLINESIGN');
     }
-}
-else
-{
+} else {
     // Print
 }
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index d0ce716bb7d..4f437c07740 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -108,12 +108,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix .= "1";
-			}
-			elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix .= "2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix .= "0";
 			}
 		}
@@ -132,9 +130,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else
-		{
+		} else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -169,12 +165,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 						$result = $cmailfile->sendfile();
 					}
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 	}
 }
@@ -210,12 +203,10 @@ if ($testmodifier)
 		if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1')
 		{
 			$nouveauchoix .= "1";
-		}
-		elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
+		} elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
 		{
 			$nouveauchoix .= "2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix .= "0";
 		}
 	}
@@ -391,9 +382,7 @@ if ($object->format == "D")
 
 		print '</tr>'."\n";
 	}
-}
-else
-{
+} else {
 	//display of survey topics
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -480,9 +469,7 @@ while ($compteur < $num)
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -508,9 +495,7 @@ while ($compteur < $num)
 				}
 				print '</td>'."\n";
 			}
-		}
-		else
-		{
+		} else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -694,9 +679,7 @@ if ($object->allow_spy) {
 				} else {
 					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
 				}
-			}
-			else
-			{
+			} else {
 				$tmps = explode('@', $toutsujet[$i]);
 				$meilleursujet .= dol_htmlentities($tmps[0]);
 			}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index ea7fd71c9e6..746fcffcfa4 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -210,9 +210,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 	{
 		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
 		else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-	}
-	else
-	{
+	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
 	if ($SECUREKEY != $token)
@@ -371,8 +369,7 @@ if ($action == 'dopayment')
 	if ($paymentmethod == 'stripe')
 	{
 		if (GETPOST('newamount', 'alpha')) $amount = price2num(GETPOST('newamount', 'alpha'), 'MT');
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$action = '';
 		}
@@ -468,9 +465,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
 	    				setEventMessages('Failed to create card record', null, 'errors');
 	    				$action = '';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				if (!empty($FULLTAG))       $metadata["FULLTAG"] = $FULLTAG;
 	    				if (!empty($dol_id))        $metadata["dol_id"] = $dol_id;
 	    				if (!empty($dol_type))      $metadata["dol_type"] = $dol_type;
@@ -496,9 +491,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				}
 	    			}
     			}
-    		}
-    		else
-    		{
+    		} else {
     			$vatcleaned = $vatnumber ? $vatnumber : null;
 
     			/*$taxinfo = array('type'=>'vat');
@@ -652,8 +645,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             } else {
                 $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $error++;
             $errormessage = "CantRetreivePaymentIntent ".$e->getMessage();
@@ -669,9 +661,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
             setEventMessages($paymentintent->status, null, 'errors');
             $action = '';
-        }
-        else
-        {
+        } else {
         	// TODO We can alse record the payment mode into llx_societe_rib with stripe $paymentintent->payment_method
         	// Note that with other old Stripe architecture (using Charge API), the payment mode was not recorded, so it is not mandatory to do it here.
         	//dol_syslog("Create payment_method for ".$paymentintent->payment_method, LOG_DEBUG, 0, '_stripe');
@@ -700,9 +690,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	{
 		header("Location: ".$urlko);
 		exit;
-	}
-	else
-	{
+	} else {
 		header("Location: ".$urlok);
 		exit;
 	}
@@ -775,8 +763,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -876,8 +863,7 @@ if (!$source)
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -913,9 +899,7 @@ if ($source == 'order')
 	{
 		$mesg = $order->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$result = $order->fetch_thirdparty($order->socid);
 	}
 	$object = $order;
@@ -971,8 +955,7 @@ if ($source == 'order')
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -1008,9 +991,7 @@ if ($source == 'order')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($order->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
@@ -1036,9 +1017,7 @@ if ($source == 'invoice')
 	{
 		$mesg = $invoice->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$result = $invoice->fetch_thirdparty($invoice->socid);
 	}
 	$object = $invoice;
@@ -1096,15 +1075,12 @@ if ($source == 'invoice')
 		{
 			print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-		}
-		else {
+		} else {
 			print '<b>'.price($amount).'</b>';
 			print '<input type="hidden" name="amount" value="'.$amount.'">';
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
 		}
-	}
-	else
-	{
+	} else {
 		print '<b>'.price($object->total_ttc, 1, $langs).'</b>';
 	}
 	// Currency
@@ -1138,9 +1114,7 @@ if ($source == 'invoice')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($invoice->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
@@ -1167,24 +1141,18 @@ if ($source == 'contractline')
 	{
 		$mesg = $contractline->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		if ($contractline->fk_contrat > 0)
 		{
 			$result = $contract->fetch($contractline->fk_contrat);
 			if ($result > 0)
 			{
 				$result = $contract->fetch_thirdparty($contract->socid);
-			}
-			else
-			{
+			} else {
 				$mesg = $contract->error;
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$mesg = 'ErrorRecordNotFound';
 			$error++;
 		}
@@ -1206,9 +1174,7 @@ if ($source == 'contractline')
 				$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
 				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
 				$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-			}
-			else
-			{
+			} else {
 				$pu_ht = $product->price;
 				$pu_ttc = $product->price_ttc;
 				$price_base_type = $product->price_base_type;
@@ -1293,9 +1259,7 @@ if ($source == 'contractline')
 			if ($contractline->product->duration_value > 1)
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
-			}
-			else
-			{
+			} else {
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
 			}
 			$duration = $contractline->product->duration_value.' '.$dur[$contractline->product->duration_unit];
@@ -1314,8 +1278,7 @@ if ($source == 'contractline')
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -1351,9 +1314,7 @@ if ($source == 'contractline')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($contract->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
@@ -1379,9 +1340,7 @@ if ($source == 'membersubscription')
 	{
 		$mesg = $member->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$member->fetch_thirdparty();
 		$subscription = new Subscription($db);
 	}
@@ -1468,8 +1427,7 @@ if ($source == 'membersubscription')
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1482,8 +1440,7 @@ if ($source == 'membersubscription')
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow = $amount;
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
@@ -1522,9 +1479,7 @@ if ($source == 'membersubscription')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($member->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
@@ -1548,9 +1503,7 @@ if ($source == 'donation')
 	{
 		$mesg = $don->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$don->fetch_thirdparty();
 	}
 	$object = $don;
@@ -1613,8 +1566,7 @@ if ($source == 'donation')
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1627,8 +1579,7 @@ if ($source == 'donation')
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow = $amount;
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
@@ -1667,9 +1618,7 @@ if ($source == 'donation')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($don->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$don->thirdparty->id.'">'."\n";
@@ -1696,17 +1645,13 @@ if ($action != 'dopayment')
 		if ($source == 'order' && $object->billed)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("OrderBilled").'</span>';
-		}
-		elseif ($source == 'invoice' && $object->paye)
+		} elseif ($source == 'invoice' && $object->paye)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("InvoicePaid").'</span>';
-		}
-		elseif ($source == 'donation' && $object->paid)
+		} elseif ($source == 'donation' && $object->paid)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
-		}
-		else
-		{
+		} else {
 		    // Membership can be paid and we still allow to make renewal
 		    if ($source == 'membersubscription' && $object->datefin > dol_now())
 		    {
@@ -1795,14 +1740,10 @@ if ($action != 'dopayment')
 				';
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error_email('ERRORNEWPAYMENT');
 	}
-}
-else
-{
+} else {
 	// Print
 }
 
@@ -1939,9 +1880,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		    if (empty($paymentintent))
 		    {
                 print '<center>'.$langs->trans("Error").'</center>';
-		    }
-		    else
-		    {
+		    } else {
 		        print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
 		        //$_SESSION["paymentintent_id"] = $paymentintent->id;
 		    }
@@ -1955,9 +1894,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		{
 			$langs->load("errors");
 			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
-		}
-		else
-		{
+		} else {
 			print '<!-- JS Code for Stripe components -->';
     		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
     		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
@@ -2019,8 +1956,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
     				$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
     				$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     				print $e->getMessage();
     			}
@@ -2068,8 +2004,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 
     			<?php
-    		}
-    		elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
+    		} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
     		{
             	?>
     		// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
@@ -2172,8 +2107,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
             });
 
     			<?php
-    		}
-    		else		// Old method (not SCA ready)
+    		} else // Old method (not SCA ready)
     		{
     			?>
     		// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
@@ -2240,8 +2174,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     			        }
     				});
     				<?php
-    			}
-    			else											// Ask credit card with 3DS test
+    			} else // Ask credit card with 3DS test
     			{
     				?>
     				/* Use 3DS source */
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index a3f6d733fcb..c42677d8b21 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -77,9 +77,7 @@ if (empty($paymentmethod))
 {
     dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
     exit;
-}
-else
-{
+} else {
     dol_syslog("paymentmethod=".$paymentmethod);
 }
 
@@ -159,10 +157,8 @@ if (!empty($_SESSION['ipaddress']))      // To avoid to make action twice
     	    if (preg_match('/\d\.\d/', $appli))
     	    {
     	        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-    	    }
-    	    else $appli .= " ".DOL_VERSION;
-    	}
-    	else $appli .= " ".DOL_VERSION;
+    	    } else $appli .= " ".DOL_VERSION;
+    	} else $appli .= " ".DOL_VERSION;
 
     	$urlback = $_SERVER["REQUEST_URI"];
     	$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
@@ -186,9 +182,7 @@ if (!empty($_SESSION['ipaddress']))      // To avoid to make action twice
     	if ($result)
     	{
     		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-    	}
-    	else
-    	{
+    	} else {
     		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
     	}
     }
@@ -227,8 +221,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index b1d6c149a51..4bb899b930e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -163,8 +163,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
 	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
@@ -221,9 +220,7 @@ if (!empty($conf->paypal->enabled))
 		        {
 		        	// Nothing to do
 		        	dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
-		        }
-		        else
-		        {
+		        } else {
 		        	dol_syslog("Call to GetExpressCheckoutDetails return error: ".json_encode($resArray), LOG_WARNING, '_payment');
 		        }
 
@@ -250,9 +247,7 @@ if (!empty($conf->paypal->enabled))
 		            $NOTE = urldecode($resArray2["NOTE"]);
 
 		            $ispaymentok = true;
-		        }
-		        else
-		        {
+		        } else {
 		        	dol_syslog("Call to DoExpressCheckoutPayment return error: ".json_encode($resArray2), LOG_WARNING, 0, '_payment');
 
 		            //Display a user friendly Error on the page using any of the following error information returned by PayPal
@@ -261,14 +256,10 @@ if (!empty($conf->paypal->enabled))
 		            $ErrorLongMsg = urldecode($resArray2["L_LONGMESSAGE0"]);
 		            $ErrorSeverityCode = urldecode($resArray2["L_SEVERITYCODE0"]);
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error('', 'Session expired');
 		    }
-		}
-		else
-		{
+		} else {
 		    dol_print_error('', '$PAYPALTOKEN not defined');
 		}
 	}
@@ -419,9 +410,7 @@ if ($ispaymentok)
 						$errmsg = $object->error;
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
-					}
-					else
-					{
+					} else {
 						$postactionmessages[] = 'Subscription created';
 						$ispostactionok = 1;
 					}
@@ -442,9 +431,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $object->error;
 						$postactionmessages = array_merge($postactionmessages, $object->errors);
 						$ispostactionok = -1;
-					}
-					else
-					{
+					} else {
 						if ($option == 'bankviainvoice')
 						{
 							$postactionmessages[] = 'Invoice, payment and bank record created';
@@ -508,8 +495,7 @@ if ($ispaymentok)
 									$postactionmessages[] = $errmsg;
 									$ispostactionok = -1;
 								}
-							}
-							catch (Exception $e) {
+							} catch (Exception $e) {
 								$error++;
 								$errmsg = 'Failed to save customer stripe id in database ; '.$e->getMessage();
 								$postactionmessages[] = $errmsg;
@@ -522,9 +508,7 @@ if ($ispaymentok)
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 				}
 
@@ -589,9 +573,7 @@ if ($ispaymentok)
 							$errmsg = $object->error;
 							$postactionmessages[] = $errmsg;
 							$ispostactionok = -1;
-						}
-						else
-						{
+						} else {
 							if ($file) $postactionmessages[] = 'Email sent to member (with invoice document attached)';
 							else $postactionmessages[] = 'Email sent to member (without any attached document)';
 
@@ -599,20 +581,15 @@ if ($ispaymentok)
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" or "payment type" to record the payment of subscription for member '.$tmptag['MEM'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-		}
-		else
-		{
+		} else {
 			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
 			$ispostactionok = -1;
 		}
-	}
-	elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
+	} elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
 	{
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -647,9 +624,7 @@ if ($ispaymentok)
 				if ($currencyCodeType == $conf->currency)
 				{
 					$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-				}
-				else
-				{
+				} else {
 					$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
 
 					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
@@ -671,9 +646,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 						$ispostactionok = -1;
 						$error++;
-					}
-					else
-					{
+					} else {
 						$postactionmessages[] = 'Payment created';
 						$ispostactionok = 1;
 					}
@@ -696,15 +669,11 @@ if ($ispaymentok)
 							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
-						}
-						else
-						{
+						} else {
 							$postactionmessages[] = 'Bank transaction of payment created';
 							$ispostactionok = 1;
 						}
-					}
-					else
-					{
+					} else {
 						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
@@ -714,26 +683,18 @@ if ($ispaymentok)
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 				}
-			}
-			else
-			{
+			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-		}
-		else
-		{
+		} else {
 			$postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-	}
-	else
-	{
+	} else {
 		// Nothing done
 	}
 }
@@ -788,10 +749,8 @@ if ($ispaymentok)
 		    if (preg_match('/\d\.\d/', $appli))
 		    {
 		        if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-		    }
-		    else $appli .= " ".DOL_VERSION;
-		}
-		else $appli .= " ".DOL_VERSION;
+		    } else $appli .= " ".DOL_VERSION;
+		} else $appli .= " ".DOL_VERSION;
 
 		$urlback = $_SERVER["REQUEST_URI"];
 		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived");
@@ -802,17 +761,14 @@ if ($ispaymentok)
 			$content .= '<strong>'.$companylangs->trans("PaymentSubscription")."</strong><br><br>\n";
 			$content .= $companylangs->trans("MemberId").': <strong>'.$tmptag['MEM']."</strong><br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		elseif (array_key_exists('INV', $tmptag))
+		} elseif (array_key_exists('INV', $tmptag))
 		{
 			$url = $urlwithroot."/compta/facture/card.php?id=".$tmptag['INV'];
 			$content .= '<strong>'.$companylangs->trans("Payment")."</strong><br><br>\n";
 			$content .= $companylangs->trans("InvoiceId").': <strong>'.$tmptag['INV']."</strong><br>\n";
 			//$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		else
-		{
+		} else {
 			$content .= $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
 		$content .= $companylangs->transnoentities("PostActionAfterPayment").' : ';
@@ -820,13 +776,10 @@ if ($ispaymentok)
 		{
 			//$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')';
 			$content .= '<font color="green">'.$companylangs->transnoentitiesnoconv("OK").'</font>';
-		}
-		elseif ($ispostactionok == 0)
+		} elseif ($ispostactionok == 0)
 		{
 			$content .= $companylangs->transnoentitiesnoconv("None");
-		}
-		else
-		{
+		} else {
 			$topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
 			$content .= '<font color="red">'.$companylangs->transnoentitiesnoconv("Error").'</font>';
 		}
@@ -864,16 +817,12 @@ if ($ispaymentok)
 		{
 			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 			//dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0);
-		}
-		else
-		{
+		} else {
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			//dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0);
 		}
 	}
-}
-else
-{
+} else {
     // Get on url call
 	$onlinetoken = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
     $payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
@@ -924,10 +873,8 @@ else
             if (preg_match('/\d\.\d/', $appli))
             {
                 if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-            }
-            else $appli .= " ".DOL_VERSION;
-        }
-        else $appli .= " ".DOL_VERSION;
+            } else $appli .= " ".DOL_VERSION;
+        } else $appli .= " ".DOL_VERSION;
 
         $urlback = $_SERVER["REQUEST_URI"];
         $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed");
@@ -951,9 +898,7 @@ else
         if ($result)
         {
             dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-        }
-        else
-        {
+        } else {
             dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
         }
     }
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 9a45a2cbeec..683a537fe69 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -48,23 +48,18 @@ if (isset($_GET['connect']))
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
 	}
-}
-else {
+} else {
 	if (isset($_GET['test']))
 	{
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 4291cb6f834..d3a9521bf25 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -48,23 +48,18 @@ if (isset($_GET['connect']))
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
 	}
-}
-else {
+} else {
 	if (isset($_GET['test']))
 	{
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
@@ -91,8 +86,7 @@ $error = 0;
 
 try {
 	$event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret);
-}
-catch (\UnexpectedValueException $e) {
+} catch (\UnexpectedValueException $e) {
 	// Invalid payload
 	http_response_code(400); // PHP 5.4 or greater
 	exit();
@@ -125,12 +119,10 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled
 		{
 			$obj = $db->fetch_object($result);
 			$key = $obj->entity;
-		}
-		else {
+		} else {
 			$key = 1;
 		}
-	}
-	else {
+	} else {
 		$key = 1;
 	}
 	$ret = $mc->switchEntity($key);
@@ -188,15 +180,12 @@ if ($event->type == 'payout.created') {
 
         http_response_code(200); // PHP 5.4 or greater
         return 1;
-	}
-	else
-	{
+	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
 	}
-}
-elseif ($event->type == 'payout.paid') {
+} elseif ($event->type == 'payout.paid') {
 	global $conf;
 	$error = 0;
 	$result = dolibarr_set_const($db, $service."_NEXTPAYOUT", null, 'chaine', 0, '', $conf->entity);
@@ -269,42 +258,32 @@ elseif ($event->type == 'payout.paid') {
 
 		http_response_code(200); // PHP 5.4 or greater
 		return 1;
-	}
-	else
-	{
+	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
 	}
-}
-elseif ($event->type == 'customer.source.created') {
+} elseif ($event->type == 'customer.source.created') {
 	//TODO: save customer's source
-}
-elseif ($event->type == 'customer.source.updated') {
+} elseif ($event->type == 'customer.source.updated') {
 	//TODO: update customer's source
-}
-elseif ($event->type == 'customer.source.delete') {
+} elseif ($event->type == 'customer.source.delete') {
 	//TODO: delete customer's source
-}
-elseif ($event->type == 'customer.deleted') {
+} elseif ($event->type == 'customer.deleted') {
     $db->begin();
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE key_account = '".$db->escape($event->data->object->id)."' and site='stripe'";
     $db->query($sql);
     $db->commit();
-}
-elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
+} elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'payment_intent.payment_failed') {
+} elseif ($event->type == 'payment_intent.payment_failed') {
     // TODO: Redirect to paymentko.php
-}
-elseif ($event->type == 'checkout.session.completed')		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
+} elseif ($event->type == 'checkout.session.completed')		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 {
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'payment_method.attached') {
+} elseif ($event->type == 'payment_method.attached') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 	$societeaccount = new SocieteAccount($db);
@@ -343,14 +322,11 @@ elseif ($event->type == 'payment_method.attached') {
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
-}
-elseif ($event->type == 'payment_method.updated') {
+} elseif ($event->type == 'payment_method.updated') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
 	$companypaymentmode = new CompanyPaymentMode($db);
 	$companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'");
@@ -380,26 +356,20 @@ elseif ($event->type == 'payment_method.updated') {
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
-}
-elseif ($event->type == 'payment_method.detached') {
+} elseif ($event->type == 'payment_method.detached') {
 	$db->begin();
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE ref = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus;
 	$db->query($sql);
 	$db->commit();
-}
-elseif ($event->type == 'charge.succeeded') {
+} elseif ($event->type == 'charge.succeeded') {
     // TODO: create fees
     // TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'charge.failed') {
+} elseif ($event->type == 'charge.failed') {
     // TODO: Redirect to paymentko.php
-}
-elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
+} elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
 	// This event is deprecated.
 }
 
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index c326b4a6bd2..ffa4b24fc59 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -45,9 +45,7 @@ if (empty($usedolheader))
 
 
 	<?php
-}
-else
-{
+} else {
 	$arraycss = array();
 	$arrayjs = array();
 	/*
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 29ec7983930..131be53c756 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -370,8 +370,7 @@ if ($action != "infos_success") {
 		print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>';
 		print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket"));
 		print '<div>';
-	}
-	else {
+	} else {
 		print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
 		$formticket->showForm();
 	}
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index af656e69ab0..2b9ab94c5b1 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -187,9 +187,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($action == "add_message")
 		{
 			$action = 'presend';
-		}
-		else
-		{
+		} else {
 			$action = '';
 		}
 	}
@@ -372,9 +370,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		// Message list
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
-	}
-	else
-	{
+	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 95f2efa492a..d09b8e10012 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -95,8 +95,7 @@ if (empty($pageid))
 		if ($result > 0)
 		{
 			$pageid = $objectpage->id;
-		}
-		elseif ($result == 0)
+		} elseif ($result == 0)
 		{
 			// Page not found from ref=pageurl, we try using alternative alias
 			$result = $objectpage->fetch(0, $object->id, null, $pageref);
@@ -105,9 +104,7 @@ if (empty($pageid))
 				$pageid = $objectpage->id;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($object->fk_default_home > 0)
 		{
 			$result = $objectpage->fetch($object->fk_default_home);
@@ -164,9 +161,7 @@ if ($pageid == 'css')   // No more used ?
 	//else
 	header('Cache-Control: no-cache');
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
-}
-else
-{
+} else {
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
 }
 
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index ce416bdd7b6..8854c13ea52 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -77,9 +77,7 @@ if (empty($pageid))
     {
         $object->fetch($websiteid);
         $website = $object->ref;
-    }
-    else
-    {
+    } else {
         $object->fetch(0, $website);
     }
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3d8547f9322..7bc99977943 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -79,7 +79,7 @@ else {
 	$result = restrictedArea($user, 'reception');
 	if ($origin == 'supplierorder') {
 		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
-	}elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
 $action		= GETPOST('action', 'alpha');
@@ -233,8 +233,7 @@ if (empty($reshook))
 
 		if ($object->origin == "supplierorder")
 			$classname = 'CommandeFournisseur';
-		else
-			$classname = ucfirst($object->origin);
+		else $classname = ucfirst($object->origin);
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($object->origin_id);
 
@@ -353,9 +352,7 @@ if (empty($reshook))
 	                $error++;
 	            }
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -365,16 +362,12 @@ if (empty($reshook))
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
 	    }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
         ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
        	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 	)
@@ -387,9 +380,7 @@ if (empty($reshook))
 	    {
 			$langs->load("errors");
 	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else
-	    {
+	    } else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -408,18 +399,14 @@ if (empty($reshook))
 	    		if ($result < 0) dol_print_error($db, $result);
 	    	}
 	    }
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
 	{
 	    $result = $object->delete($user);
 	    if ($result > 0)
 	    {
 	        header("Location: ".DOL_URL_ROOT.'/reception/index.php');
 	        exit;
-	    }
-	    else
-		{
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -517,9 +504,7 @@ if (empty($reshook))
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-
-	elseif ($action == 'classifybilled')
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -527,9 +512,7 @@ if (empty($reshook))
 	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -566,9 +549,7 @@ if (empty($reshook))
 		if (!$error) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
-		}
-		else
-		{
+		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -630,8 +611,7 @@ if (empty($reshook))
 						setEventMessages($line->error, $line->errors, 'errors');
 						$error++;
 					}
-				}
-				else // Product no predefined
+				} else // Product no predefined
 				{
 					$qty = "qtyl".$line_id;
 					$line->id = $line_id;
@@ -666,9 +646,7 @@ if (empty($reshook))
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
@@ -1048,9 +1026,7 @@ if ($action == 'create')
                     }
 
                     print '</td>';
-                }
-                else
-				{
+                } else {
 				    print "<td>";
                     if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
                     else $text = img_object($langs->trans('Product'), 'product');
@@ -1088,9 +1064,7 @@ if ($action == 'create')
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
 					$quantityToBeDelivered = 0;
-				}
-				else
-				{
+				} else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
                 $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
@@ -1111,8 +1085,7 @@ if ($action == 'create')
                         if (GETPOST('qtyl'.$indiceAsked, 'int')) $defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
                         print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 						print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-					}
-					else print $langs->trans("NA");
+					} else print $langs->trans("NA");
 					print '</td>';
 
 					// Stock
@@ -1130,9 +1103,7 @@ if ($action == 'create')
 								print '<!-- Show warehouse selection -->';
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
 							}
-						}
-						else
-						{
+						} else {
 							print $langs->trans("Service");
 						}
 						print '</td>';
@@ -1149,8 +1120,7 @@ if ($action == 'create')
 							print '<td>';
 							print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
 							print '</td>';
-						}
-						else {
+						} else {
 							print '<td colspan="3"></td>';
 						}
 					}
@@ -1194,14 +1164,11 @@ if ($action == 'create')
             print '</form>';
 
             print '<br>';
-        }
-        else
-		{
+        } else {
             dol_print_error($db);
         }
     }
-}
-elseif ($id || $ref)
+} elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
@@ -1246,9 +1213,7 @@ elseif ($id || $ref)
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -1412,9 +1377,7 @@ elseif ($id || $ref)
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1436,9 +1399,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1471,9 +1432,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1504,8 +1463,7 @@ elseif ($id || $ref)
 			if ($volumeUnit < 50)
 			{
 			    print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-			}
-			else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
 		{
@@ -1550,9 +1508,7 @@ elseif ($id || $ref)
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -1584,9 +1540,7 @@ elseif ($id || $ref)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
 			}
 	        print '</td></tr>';
@@ -1639,9 +1593,7 @@ elseif ($id || $ref)
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToReceive").' - ';
-			}
-			else
-			{
+			} else {
 				print $langs->trans("QtyReceived").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1653,15 +1605,11 @@ elseif ($id || $ref)
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center">'.$langs->trans("QtyToReceive").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1768,9 +1716,7 @@ elseif ($id || $ref)
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
-				}
-				else
-					$label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
+				} else $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
 
 				print '<td>';
 
@@ -1784,9 +1730,7 @@ elseif ($id || $ref)
 					print (!empty($lines[$i]->product->description) && $lines[$i]->description != $lines[$i]->product->description) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 				}
 				print "</td>\n";
-			}
-			else
-			{
+			} else {
 				print "<td>";
 				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 				else $text = img_object($langs->trans('Product'), 'product');
@@ -1805,9 +1749,7 @@ elseif ($id || $ref)
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
-			}
-			else
-			{
+			} else {
 				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
 			}
 
@@ -1872,9 +1814,7 @@ elseif ($id || $ref)
 							print '</td>';
 						}
 						print '</tr>';
-					}
-					else
-					{
+					} else {
 						print '<!-- case edit 2 -->';
 						print '<tr>';
 						// Qty to receive or received
@@ -1887,9 +1827,7 @@ elseif ($id || $ref)
 					}
 				}
 				print '</table></td>';
-			}
-			else
-			{
+			} else {
 				// Qty to receive or received
 				print '<td class="center">'.$lines[$i]->qty.'</td>';
 
@@ -1925,9 +1863,7 @@ elseif ($id || $ref)
 								$detail .= '<br>';
 
 							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-						}
-						else
-						{
+						} else {
 							print $langs->trans("NA");
 						}
 						print '</td>';
@@ -1955,8 +1891,7 @@ elseif ($id || $ref)
 				print '<td class="center" colspan="2" valign="middle">';
 				print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
-			}
-			elseif ($object->statut == Reception::STATUS_DRAFT)
+			} elseif ($object->statut == Reception::STATUS_DRAFT)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit center">';
@@ -1987,9 +1922,7 @@ elseif ($id || $ref)
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
-				}
-				else
-				{
+				} else {
 					print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 				}
 			}
@@ -2026,9 +1959,7 @@ elseif ($id || $ref)
 	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2044,9 +1975,7 @@ elseif ($id || $ref)
 				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else
-				{
+				} else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
@@ -2058,8 +1987,7 @@ elseif ($id || $ref)
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
-					}
-					else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+					} else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 				}
 			}
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index a95d6217c1c..f4cbb08ee9e 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -178,15 +178,11 @@ class Reception extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        }
-	    else
-	    {
+        } else {
 		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
 		    return "";
 	    }
@@ -324,9 +320,7 @@ class Reception extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					foreach ($this->errors as $errmsg)
 					{
 						dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -335,17 +329,13 @@ class Reception extends CommonObject
 					$this->db->rollback();
 					return -1 * $error;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -472,16 +462,12 @@ class Reception extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -530,8 +516,7 @@ class Reception extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
-		}
-		else {
+		} else {
 			$numref = $this->ref;
 		}
 
@@ -601,9 +586,7 @@ class Reception extends CommonObject
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -617,9 +600,7 @@ class Reception extends CommonObject
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -693,9 +674,7 @@ class Reception extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
@@ -866,9 +845,7 @@ class Reception extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -921,9 +898,7 @@ class Reception extends CommonObject
 
 					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref), '', $obj->eatby, $obj->sellby, $obj->batch); // Price is set to 0, because we don't want to see WAP changed
 				}
-			}
-			else
-			{
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -999,36 +974,26 @@ class Reception extends CommonObject
 							}
 
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1086,8 +1051,7 @@ class Reception extends CommonObject
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1273,15 +1237,11 @@ class Reception extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -1364,9 +1324,7 @@ class Reception extends CommonObject
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
             $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
-        }
-        else
-        {
+        } else {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
             $sql .= " code='".$this->db->escape($this->update['code'])."'";
             $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
@@ -1441,9 +1399,7 @@ class Reception extends CommonObject
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
-		}
-		else
-		{
+		} else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -1544,9 +1500,7 @@ class Reception extends CommonObject
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1559,9 +1513,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1575,9 +1527,7 @@ class Reception extends CommonObject
     			    $error++;
     			}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
             $error++;
 		}
@@ -1586,9 +1536,7 @@ class Reception extends CommonObject
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
-		{
+		} else {
 		    $this->db->rollback();
 		    return -1;
 		}
@@ -1632,9 +1580,7 @@ class Reception extends CommonObject
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1709,9 +1655,7 @@ class Reception extends CommonObject
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1723,9 +1667,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1754,9 +1696,7 @@ class Reception extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1845,9 +1785,7 @@ class Reception extends CommonObject
 								$error++;
 								break;
 							}
-						}
-						else
-						{
+						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -1859,9 +1797,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1911,9 +1847,7 @@ class Reception extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index b2d30bf7c7f..4e8605ac74a 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -90,9 +90,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -120,8 +118,7 @@ elseif ($action == 'deletecontact' && $user->rights->reception->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index b9786229468..e3951458e40 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -120,8 +120,7 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-	}
-	else {
+	} else {
 		print '<tr><td><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 	}
 
@@ -182,16 +181,14 @@ if ($resql)
 				$orderstatic->id = $obj->commande_fournisseur_id;
 				$orderstatic->ref = $obj->commande_fournisseur_ref;
 				print $orderstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td></tr>';
 			$i++;
 		}
 		print "</table></div><br>";
 	}
 	$db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index c6cfcd5264c..93aba12eb00 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -192,8 +192,7 @@ if (empty($reshook))
 							$object->add_object_linked('reception', $value); // add supplier order linked object
 					}
 				}
-			}
-    		else {
+			} else {
     			$object->socid = $rcp->socid;
     			$object->type = FactureFournisseur::TYPE_STANDARD;
     			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
@@ -278,16 +277,12 @@ if (empty($reshook))
 	    					{
 	    						$result = $object->insert_discount($discountid);
 	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					}
-	    					else
-	    					{
+	    					} else {
 	    						setEventMessages($discount->error, $discount->errors, 'errors');
 	    						$error++;
 	    						break;
 	    					}
-	    				}
-	    				else
-	    				{
+	    				} else {
 	    					// Positive line
 	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 	    					// Date start
@@ -334,9 +329,7 @@ if (empty($reshook))
 	    					if ($result > 0)
 	    					{
 	    						$lineid = $result;
-	    					}
-	    					else
-	    					{
+	    					} else {
 	    						$lineid = 0;
 	    						$error++;
 	    						break;
@@ -390,9 +383,7 @@ if (empty($reshook))
     	{
     		$db->commit();
     		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	}
-    	else
-    	{
+    	} else {
     		$db->rollback();
     		$action = 'create';
     		$_GET["origin"] = $_POST["origin"];
@@ -584,9 +575,7 @@ if ($resql)
 		{
 		    print $form->selectyesno('validate_invoices', 0, 1, 1);
 		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else
-		{
+		} else {
             print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		print '</td>';
@@ -936,9 +925,7 @@ if ($resql)
 	print "</div>";
 	print '</form>';
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index e7e8ef7e090..5079671dafd 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -77,9 +77,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
 }
 
@@ -290,8 +288,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr valign="top"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 1035d17d5f9..72d055da41d 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -48,9 +48,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index b403c0516f9..8d965c69c2c 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -99,9 +99,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 				$action = 'create';
-			}
-			else
-			{
+			} else {
 				$object->ref                    = $ref;
 				$object->description            = $description;
 				$object->fk_code_type_resource  = $fk_code_type_resource;
@@ -118,17 +116,13 @@ if (empty($reshook))
 					setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs');
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					// Creation KO
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'create';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			Header("Location: list.php");
 			exit;
 		}
@@ -165,15 +159,11 @@ if (empty($reshook))
 				{
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
@@ -197,14 +187,10 @@ if (empty($reshook))
 				setEventMessages($langs->trans('RessourceSuccessfullyDeleted'), null, 'mesgs');
 				Header('Location: '.DOL_URL_ROOT.'/resource/list.php');
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -227,9 +213,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 	{
 		print load_fiche_titre($title, '', 'object_resource');
 		dol_fiche_head('');
-	}
-	else
-	{
+	} else {
 		$head = resource_prepare_head($object);
 		dol_fiche_head($head, 'resource', $title, -1, 'resource');
 	}
@@ -291,9 +275,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		$formconfirm = '';
 
 		// Confirm deleting resource line
@@ -393,8 +375,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		}
 	}
 	print '</div>';
-}
-else {
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 1b4223e1fff..294f36e5589 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -164,9 +164,7 @@ class Dolresource extends CommonObject
     		}
     		$this->db->rollback();
     		return -1 * $error;
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->commit();
     		return $this->id;
     	}
@@ -223,9 +221,7 @@ class Dolresource extends CommonObject
     		$this->db->free($resql);
 
     		return $this->id;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
     		return -1;
@@ -329,9 +325,7 @@ class Dolresource extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -388,9 +382,7 @@ class Dolresource extends CommonObject
     		$this->db->free($resql);
 
     		return $this->id;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -427,9 +419,7 @@ class Dolresource extends CommonObject
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -475,9 +465,7 @@ class Dolresource extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -522,11 +510,9 @@ class Dolresource extends CommonObject
     		foreach ($filter as $key => $value) {
     			if (strpos($key, 'date')) {
     				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			elseif (strpos($key, 'ef.') !== false) {
+    			} elseif (strpos($key, 'ef.') !== false) {
     				$sql .= $value;
-    			}
-    			else {
+    			} else {
     				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -567,9 +553,7 @@ class Dolresource extends CommonObject
     			$this->db->free($resql);
     		}
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -608,8 +592,7 @@ class Dolresource extends CommonObject
    			foreach ($filter as $key => $value) {
    				if (strpos($key, 'date')) {
    					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-   				}
-   				else {
+   				} else {
    					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
    				}
    			}
@@ -645,9 +628,7 @@ class Dolresource extends CommonObject
    				$this->db->free($resql);
    			}
    			return $num;
-   		}
-   		else
-   		{
+   		} else {
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
@@ -690,8 +671,7 @@ class Dolresource extends CommonObject
     		foreach ($filter as $key => $value) {
     			if (strpos($key, 'date')) {
     				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			else {
+    			} else {
     				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -724,9 +704,7 @@ class Dolresource extends CommonObject
     			$this->db->free($resql);
     		}
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -816,9 +794,7 @@ class Dolresource extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -924,9 +900,7 @@ class Dolresource extends CommonObject
     			$i++;
     		}
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($this->db);
     		return -1;
     	}
@@ -978,8 +952,7 @@ class Dolresource extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.$get_params.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 4836ed1a0f1..451ca9922b1 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -126,9 +126,7 @@ class FormResource
     				if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
     				{
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
-    				}
-    				else
-    				{
+    				} else {
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
     				}
 
@@ -146,9 +144,7 @@ class FormResource
 
         		$out .= '</form>';
     		}
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($this->db);
     	}
 
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index cbc94c2e843..ee20d918648 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -62,9 +62,7 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -91,8 +89,7 @@ elseif ($action == 'deletecontact' && $user->rights->resource->write)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index d0d4e2300d8..077430cf4bb 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -136,9 +136,7 @@ if ($object->id > 0)
     $permission = $user->rights->resource->write;
 
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 1ce3957071a..dd3a02e18e3 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -97,9 +97,7 @@ if (empty($reshook))
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Resource")), null, 'errors');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$objstat = fetchObjectByElement($element_id, $element, $element_ref);
 			$objstat->element = $element; // For externals module, we need to keep @xx
 
@@ -169,8 +167,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ResourceLinkedWithSuccess'), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF'].'?element='.$element.'&element_id='.$objstat->id);
 			exit;
-		}
-		elseif ($objstat)
+		} elseif ($objstat)
 		{
 			setEventMessages($objstat->error, $objstat->errors, 'errors');
 		}
@@ -265,9 +262,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('RessourceLineSuccessfullyDeleted'), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -297,9 +292,7 @@ if ($ret == -1) {
 }
 if (!$ret) {
     print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
-}
-else
-{
+} else {
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
 	{
@@ -411,9 +404,7 @@ else
 					}
 				}
 				$_SESSION['assignedtouser'] = json_encode($listofuserid);
-			}
-			else
-			{
+			} else {
 				if (!empty($_SESSION['assignedtouser']))
 				{
 					$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -600,9 +591,7 @@ else
 				if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php')))
 				{
 					$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_add.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -620,9 +609,7 @@ else
 					if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php')))
 					{
 						$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php');
-					}
-					else
-					{
+					} else {
 						$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_view.tpl.php';
 					}
 					if (empty($conf->file->strict_mode)) {
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 033d49ae8c8..4dca64b47a6 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -281,9 +281,7 @@ if ($ret)
 
         print '</tr>';
     }
-}
-else
-{
+} else {
     $colspan = 1;
     foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
     print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 29e3c325ee0..a824a7d8eee 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -62,9 +62,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -114,9 +112,7 @@ foreach ($list as $key)
 	if (!empty($conf->accounting->enabled))
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-	}
-	else
-	{
+	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index ade8924b0d0..94add08291c 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -158,9 +158,7 @@ if ($action == 'add' && empty($cancel))
 				header("Location: list.php");
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -193,22 +191,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/salaries/list.php');
 				exit;
-			}
-			else
-			{
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 	}
 }
@@ -493,14 +485,10 @@ if ($id)
 		if (!empty($user->rights->salaries->delete))
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 82cdf3c80ce..34b58a5c0e4 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -182,9 +182,7 @@ class PaymentSalary extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -263,9 +261,7 @@ class PaymentSalary extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -480,9 +476,7 @@ class PaymentSalary extends CommonObject
                     if ($bank_line_id > 0)
                     {
                         $this->update_fk_bank($bank_line_id);
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $acc->error;
                         $error++;
                     }
@@ -524,22 +518,17 @@ class PaymentSalary extends CommonObject
                 $result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
-            }
-            else $error++;
+            } else $error++;
 
             if (!$error)
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -562,9 +551,7 @@ class PaymentSalary extends CommonObject
         if ($result)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -622,8 +609,7 @@ class PaymentSalary extends CommonObject
              $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
              if ($reshook > 0) $linkclose = $hookmanager->resPrint;
              */
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -675,9 +661,7 @@ class PaymentSalary extends CommonObject
                 $this->date_creation     = $this->db->jdate($obj->datec);
             }
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index ff709816d18..69680df6a2a 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -128,9 +128,7 @@ if ($object->id)
 	$permission = $user->rights->salaries->write;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index fd6e7a3ec95..6c4ee37a979 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -67,9 +67,7 @@ if (!GETPOST('typeid', 'int'))
 		$part = explode(':', $val);
 		if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$typeid = GETPOST('typeid', 'int');
 }
 
@@ -288,8 +286,7 @@ if ($result)
 				}
 	            $accountstatic->label = $obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
-	        }
-	        else print '&nbsp;';
+	        } else print '&nbsp;';
 	        print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 	    }
@@ -317,9 +314,7 @@ if ($result)
 	print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index b0023de8b64..06beda8ce41 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -256,8 +256,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index fb6663be951..21ee679292a 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -53,9 +53,7 @@ if ($action == 'setcodeclient')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -66,9 +64,7 @@ if ($action == 'setcodecompta')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -83,9 +79,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else
-	    {
+	    } else {
 		    setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -98,9 +92,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -113,9 +105,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -177,9 +167,7 @@ if ($action == 'setdoc')
 	if ($result1 && $result2)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 	    $db->rollback();
 	}
 }
@@ -192,9 +180,7 @@ if ($action == "setaddrefinlist") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -207,9 +193,7 @@ if ($action == "setaddadressinlist") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -222,9 +206,7 @@ if ($action == "setaskforshippingmet") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -237,9 +219,7 @@ if ($action == "setdisableprospectcustomer") {
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -254,9 +234,7 @@ if ($action == 'setprofid')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -271,9 +249,7 @@ if ($action == 'setprofidmandatory')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -288,9 +264,7 @@ if ($action == 'setprofidinvoicemandatory')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -304,9 +278,7 @@ if ($action == 'sethideinactivethirdparty')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -317,9 +289,7 @@ if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -378,8 +348,7 @@ foreach ($dirsociete as $dirroot)
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -411,9 +380,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers)
 		print '<td class="center">'."\n";
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print "</td>\n";
-	}
-	else
-	{
+	} else {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
 		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
@@ -466,8 +433,7 @@ foreach ($dirsociete as $dirroot)
 
     		    try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -497,9 +463,7 @@ foreach ($arrayofmodules as $file => $modCodeCompta)
     	print '<td class="center">';
     	print img_picto($langs->trans("Activated"), 'switch_on');
     	print '</td>';
-    }
-    else
-    {
+    } else {
     	print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodecompta&value='.$file.'">';
     	print img_picto($langs->trans("Disabled"), 'switch_off');
     	print '</a></td>';
@@ -537,9 +501,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -569,8 +531,7 @@ foreach ($dirsociete as $dirroot)
 
 			    try {
         			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -607,17 +568,13 @@ foreach ($dirsociete as $dirroot)
 						//	print img_picto($langs->trans("Enabled"),'on');
 						//}
 						print "</td>";
-					}
-					else
-					{
+					} else {
 						if (versioncompare($module->phpmin, versionphparray()) > 0)
 						{
 							print "<td class=\"center\">\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
-						}
-						else
-						{
+						} else {
 							print "<td class=\"center\">\n";
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
@@ -643,9 +600,7 @@ foreach ($dirsociete as $dirroot)
 					if ($module->type == 'pdf')
 					{
 						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-					}
-					else
-					{
+					} else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
 					print $linkspec;
@@ -714,9 +669,7 @@ foreach ($profid as $key => $val)
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -727,9 +680,7 @@ foreach ($profid as $key => $val)
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -740,9 +691,7 @@ foreach ($profid as $key => $val)
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
@@ -783,9 +732,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -807,9 +754,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -833,9 +778,7 @@ if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -850,9 +793,7 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -869,9 +810,7 @@ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
@@ -887,9 +826,7 @@ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
     print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&value=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
 }
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dba483c52eb..61d473f5c43 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -38,9 +38,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 4fe737ca31c..dc2d60df5e6 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -67,9 +67,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	}
 
 	echo json_encode($outjson);
-}
-else
-{
+} else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->load("companies");
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index dcf0b1a4483..b98a5f75d5b 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -71,9 +71,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
             $sql .= "nom LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
-        }
-        else
-        {
+        } else {
     		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
@@ -100,13 +98,9 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else
-	{
+	} else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
-}
-else
-{
+} else {
     echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 70ac0577cb9..fa650a4e1fd 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -244,23 +244,19 @@ abstract class ActionsCardCommon
                     $this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
                     $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
                     $this->tpl['localtax'] .= '</td></tr>';
-                }
-                elseif ($mysoc->localtax1_assuj == "1")
+                } elseif ($mysoc->localtax1_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
                     $this->tpl['localtax'] .= '</td><tr>';
-                }
-                elseif ($mysoc->localtax2_assuj == "1")
+                } elseif ($mysoc->localtax2_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
                     $this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
                     $this->tpl['localtax'] .= '</td><tr>';
                 }
             }
-        }
-        else
-        {
+        } else {
             $head = societe_prepare_head($this->object);
 
             $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
@@ -307,8 +303,7 @@ abstract class ActionsCardCommon
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
             	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
-            }
-            elseif ($nbofsalesrepresentative > 0)
+            } elseif ($nbofsalesrepresentative > 0)
             {
             	$userstatic = new User($this->db);
             	$i = 0;
@@ -321,8 +316,7 @@ abstract class ActionsCardCommon
             		$i++;
             		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
             	}
-            }
-            else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+            } else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
             if (!empty($conf->adherent->enabled))
@@ -334,9 +328,7 @@ abstract class ActionsCardCommon
                 {
                     $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                }
-                else
-                {
+                } else {
                     $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
                 }
             }
@@ -353,13 +345,11 @@ abstract class ActionsCardCommon
                     $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
                     $this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-                }
-                elseif ($mysoc->localtax1_assuj == "1")
+                } elseif ($mysoc->localtax1_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
                     $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-                }
-                elseif ($mysoc->localtax2_assuj == "1")
+                } elseif ($mysoc->localtax2_assuj == "1")
                 {
                     $this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
                     $this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 0601760e34a..73453aff62e 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -134,19 +134,13 @@ class ActionsCardCompany extends ActionsCardCommon
 				{
 					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-				}
-				else
-				{
+				} else {
 					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
-			}
-			else
-			{
+			} else {
 				$this->tpl['tva_intra'] = $s;
 			}
-		}
-		else
-		{
+		} else {
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
@@ -173,19 +167,13 @@ class ActionsCardCompany extends ActionsCardCommon
 					{
 						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-					}
-					else
-					{
+					} else {
 						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					$this->tpl['tva_intra'] = $s;
 				}
-			}
-			else
-			{
+			} else {
 				$this->tpl['tva_intra'] = '&nbsp;';
 			}
 
@@ -196,9 +184,7 @@ class ActionsCardCompany extends ActionsCardCommon
 				$socm->fetch($this->object->parent);
 				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
 				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
-			}
-			else
-			{
+			} else {
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}
 		}
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 9f236c8015e..3abb9e9b6f7 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -110,9 +110,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 		if ($action == 'create' || $action == 'edit')
 		{
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else
-		{
+		} else {
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)
 			{
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 681d4a37fc9..f468f4f63ce 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -136,9 +136,7 @@ if (empty($reshook))
 		{
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
 				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
@@ -301,9 +299,7 @@ if (empty($reshook))
 				{
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
-				}
-				else
-				{
+				} else {
 				    $langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
@@ -391,8 +387,7 @@ if (empty($reshook))
 	        {
 	        	$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas = $canvas;
+	        } else $object->canvas = $canvas;
 
 	        if (GETPOST("private", 'int') == 1)	// Ask to create a contact
 	        {
@@ -403,9 +398,7 @@ if (empty($reshook))
 	            // Add non official properties
 	            $object->name_bis = GETPOST('name', 'alpha');
 	            $object->firstname = GETPOST('firstname', 'alpha');
-	        }
-	        else
-	        {
+	        } else {
 	            $object->name = GETPOST('name', 'alpha');
 	        }
 	        $object->entity					= (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
@@ -608,17 +601,13 @@ if (empty($reshook))
                                 if (!$result > 0)
                                 {
                                     $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else
-                                {
+                                } else {
                                     // Create thumbs
                                     $object->addThumbs($newfile);
                                 }
                             }
                         }
-                    }
-                    else
-					{
+                    } else {
 						switch ($_FILES['photo']['error'])
 						{
 						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -631,9 +620,7 @@ if (empty($reshook))
 						}
 	                }
                     // Gestion du logo de la société
-                }
-                else
-				{
+                } else {
 				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
@@ -655,9 +642,7 @@ if (empty($reshook))
                 		if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
-                	{
+                	} else {
                 		$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
                     	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
                     	elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
@@ -665,9 +650,7 @@ if (empty($reshook))
                 		header("Location: ".$url);
                     	exit;
                 	}
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                     $action = 'create';
                 }
@@ -683,9 +666,7 @@ if (empty($reshook))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
-                	{
+                	} else {
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
@@ -759,9 +740,7 @@ if (empty($reshook))
                             if (!$result > 0)
                             {
                                 $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else
-                            {
+                            } else {
                             	// Create thumbs
                             	$object->addThumbs($newfile);
 
@@ -776,14 +755,10 @@ if (empty($reshook))
                                 }
                             }
                         }
-                    }
-                    else
-					{
+                    } else {
                         $errors[] = "ErrorBadImageFormat";
                     }
-                }
-                else
-                {
+                } else {
 					switch ($_FILES['photo']['error'])
 					{
 					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -817,22 +792,16 @@ if (empty($reshook))
                 	{
                		    header("Location: ".$backtopage);
                     	exit;
-                	}
-                	else
-                	{
+                	} else {
                		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
                     	exit;
                 	}
-                }
-                else
-                {
+                } else {
                     $object->id = $socid;
                     $action = "edit";
                 }
             }
-        }
-        else
-        {
+        } else {
         	$action = ($action == 'add' ? 'create' : 'edit');
         }
     }
@@ -848,9 +817,7 @@ if (empty($reshook))
         {
             header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
             exit;
-        }
-        else
-        {
+        } else {
             $langs->load("errors");
            	setEventMessages($object->error, $object->errors, 'errors');
            	$error++;
@@ -919,9 +886,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
     // -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -989,8 +954,7 @@ else
 	        $object->code_client		= GETPOST('customer_code', 'alpha');
 	        $object->fournisseur		= GETPOST('fournisseur') ?GETPOST('fournisseur') : $object->fournisseur;
             $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-        }
-		else {
+        } else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), '', 'warnings');
 		}
 
@@ -1061,9 +1025,7 @@ else
                     if (!$result > 0)
                     {
                         $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else
-                    {
+                    } else {
                         // Create thumbs
                         $object->addThumbs($newfile);
                     }
@@ -1204,9 +1166,7 @@ else
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
-        }
-        else
-		{
+        } else {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
@@ -1341,9 +1301,7 @@ else
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
             {
                 print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
-            }
-            else
-            {
+            } else {
                 print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
@@ -1431,9 +1389,7 @@ else
                 print "\n";
                 $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                 $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-            }
-            else
-            {
+            } else {
                 $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
@@ -1452,14 +1408,12 @@ else
             print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
             print '</td></tr>';
-        }
-        elseif ($mysoc->localtax1_assuj == "1")
+        } elseif ($mysoc->localtax1_assuj == "1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
             print '</td></tr>';
-        }
-        elseif ($mysoc->localtax2_assuj == "1")
+        } elseif ($mysoc->localtax2_assuj == "1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
@@ -1484,9 +1438,7 @@ else
         if ($object->country_id)
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else
-        {
+        } else {
             print $countrynotdefined;
         }
         print '</td></tr>';
@@ -1578,17 +1530,14 @@ else
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else
-        {
+        } else {
             print ' &nbsp; &nbsp; ';
             print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
         }
         print '</div>'."\n";
 
         print '</form>'."\n";
-    }
-    elseif ($action == 'edit')
+    } elseif ($action == 'edit')
     {
         //print load_fiche_titre($langs->trans("EditCompany"));
 
@@ -1836,9 +1785,7 @@ else
                 {
                     print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
-                }
-                else
-                {
+                } else {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
                 print '</td>';
@@ -1859,13 +1806,10 @@ else
                 if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
                 if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
                 print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-            }
-            elseif ($object->codeclient_modifiable())
+            } elseif ($object->codeclient_modifiable())
             {
             	print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
-            }
-            else
-            {
+            } else {
                 print $object->code_client;
                 print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
             }
@@ -1900,13 +1844,10 @@ else
                     if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
                     if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
                     print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-                }
-                elseif ($object->codefournisseur_modifiable())
+                } elseif ($object->codefournisseur_modifiable())
                 {
                     print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
-                }
-                else
-                {
+                } else {
                     print $object->code_fournisseur;
                     print '<input type="hidden" name="supplier_code" value="'.$object->code_fournisseur.'">';
                 }
@@ -1961,9 +1902,7 @@ else
                 if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
                 {
                     print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
-                else
-                {
+                } else {
                     print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
 
@@ -2049,8 +1988,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+            } elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
             {
                 print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
                 print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
@@ -2061,8 +1999,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+            } elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
             {
                 print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
@@ -2098,9 +2035,7 @@ else
                     print "\n";
                     $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                }
-                else
-                {
+                } else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
@@ -2242,9 +2177,7 @@ else
 
             print '</form>';
         }
-    }
-    else
-    {
+    } else {
     	/*
          * View
          */
@@ -2405,9 +2338,7 @@ else
 			            print '<td class="left">';
 			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }
-			        else
-			        {
+			        } else {
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
 			        print '</tr></form>';
@@ -2427,8 +2358,7 @@ else
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
 			{
 			    print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax1_assuj);
@@ -2448,8 +2378,7 @@ else
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
 			{
 			    print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 			    print yn($object->localtax2_assuj);
@@ -2499,16 +2428,12 @@ else
                     print "\n";
                     $s .= '<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-                }
-                else
-                {
+                } else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
-        }
-        else
-        {
+        } else {
             print '&nbsp;';
         }
         print '</td>';
@@ -2585,9 +2510,7 @@ else
         	if ($action != 'editincoterm')
         	{
         		print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-        	}
-        	else
-        	{
+        	} else {
         		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
         	}
         	print '</td></tr>';
@@ -2620,9 +2543,7 @@ else
         	if ($action == 'editparentcompany')
         	{
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
-        	}
-        	else
-        	{
+        	} else {
         		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
         	}
         	print '</td>';
@@ -2644,9 +2565,7 @@ else
             {
                 $adh->ref = $adh->getFullName($langs);
                 print $adh->getNomUrl(1);
-            }
-            else
-            {
+            } else {
                 print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
             }
             print '</td>';
@@ -2695,9 +2614,7 @@ else
 			        {
 			        	$langs->load("mails");
 			        	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-			        }
-			        else
-					{
+			        } else {
 			        	$langs->load("mails");
 			       		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
 			        }
@@ -2728,9 +2645,7 @@ else
 		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
 		            {
 		                print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-		            }
-		            else
-					{
+		            } else {
 		                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
 		            }
 		        }
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 91d0fe9bb1a..725cab96065 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -49,9 +49,7 @@ if (!$vatNumber)
 {
 	print '<br>';
 	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</font><br>';
-}
-else
-{
+} else {
 	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
 	$vatNumber = str_replace(array(' ', '.'), '', $vatNumber);
 	$countryCode = substr($vatNumber, 0, 2);
@@ -102,18 +100,15 @@ else
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
+	} elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
+	} elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif ($result['faultstring'])
+	} elseif ($result['faultstring'])
 	{
 		print '<font class="error">'.$langs->trans("Error").'</font><br>';
 		$messagetoshow = $result['faultstring'];
@@ -126,9 +121,7 @@ else
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
-	}
-	else
-	{
+	} else {
 		// Syntaxe ok
 		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
@@ -136,18 +129,14 @@ else
 		if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring']))
 		{
 			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</font><br>';
-		}
-		else
-		{
+		} else {
 			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true'))
 			{
 				print '<font class="ok">'.$langs->trans("Yes").'</font>';
 				print '<br>';
 				print $langs->trans("Name").': '.$result['name'].'<br>';
 				print $langs->trans("Address").': '.$result['address'].'<br>';
-			}
-			else
-			{
+			} else {
 				print '<font class="error">'.$langs->trans("No").'</font>';
 				print '<br>'."\n";
 			}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index bfaed41f21b..37d9239265f 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -208,8 +208,7 @@ class Contacts extends DolibarrApi
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
 		if (!count($obj_ret))
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index c50a746c444..ca3e4385837 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -143,9 +143,7 @@ class Thirdparties extends DolibarrApi
 
     	// Select thirdparties of given category
     	if ($category > 0) {
-			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid"; }
-			elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid"; }
-			else { $sql .= " AND ((c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid))"; }
+			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid"; } elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid"; } else { $sql .= " AND ((c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid))"; }
     	}
 
 		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
@@ -195,8 +193,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -466,9 +463,7 @@ class Thirdparties extends DolibarrApi
 			$db->rollback();
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else
-		{
+		} else {
 			$db->commit();
 		}
 
@@ -1105,8 +1100,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1312,9 +1306,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			throw new RestException(404, 'Bank account not found');
 		}
 
@@ -1330,9 +1322,7 @@ class Thirdparties extends DolibarrApi
 		if ($result > 0)
 		{
 			return array("success" => $result);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500);
 		}
     }
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 06c56b027cd..3b289547f8d 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -83,9 +83,7 @@ class Client extends Societe
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 7211802721e..283c32573e0 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -111,20 +111,14 @@ class CompanyBankAccount extends Account
 					if (!$error)
 					{
 						return 1;
-					}
-					else
-					{
+					} else {
 						return 0;
 					}
-				}
-				else
-				{
+				} else {
 					return 1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 			return 0;
 		}
@@ -167,8 +161,7 @@ class CompanyBankAccount extends Account
 		}
 		if (trim($this->label) != '')
 			$sql .= ",label = '".$this->db->escape($this->label)."'";
-		else
-			$sql .= ",label = NULL";
+		else $sql .= ",label = NULL";
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
@@ -183,19 +176,13 @@ class CompanyBankAccount extends Account
 				if (!$error)
 				{
 					return 1;
-				}
-				else
-				{
+				} else {
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				return 1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -258,9 +245,7 @@ class CompanyBankAccount extends Account
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -307,9 +292,7 @@ class CompanyBankAccount extends Account
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -354,9 +337,7 @@ class CompanyBankAccount extends Account
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$this->db->begin();
@@ -376,16 +357,12 @@ class CompanyBankAccount extends Account
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 5ba268f6687..93f0d13b498 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -404,8 +404,7 @@ class CompanyPaymentMode extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -439,9 +438,7 @@ class CompanyPaymentMode extends CommonObject
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
@@ -466,16 +463,12 @@ class CompanyPaymentMode extends CommonObject
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -565,9 +558,7 @@ class CompanyPaymentMode extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index de65e05d41e..03290f1581d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -818,40 +818,31 @@ class Societe extends CommonObject
 					$result = $this->call_trigger('COMPANY_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
-				}
-				else $error++;
+				} else $error++;
 
 				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else
-			{
+			} else {
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
 					$result = -1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -929,16 +920,13 @@ class Societe extends CommonObject
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
+				} elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -954,16 +942,13 @@ class Societe extends CommonObject
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
+				} elseif ($rescode == -5)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
 				}
@@ -1006,9 +991,7 @@ class Societe extends CommonObject
 						$this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
@@ -1253,20 +1236,16 @@ class Societe extends CommonObject
 				if ($this->localtax1_value != '')
 				{
 					$sql .= ",localtax1_value =".$this->localtax1_value;
-				}
-				else $sql .= ",localtax1_value =0.000";
-			}
-			else $sql .= ",localtax1_value =0.000";
+				} else $sql .= ",localtax1_value =0.000";
+			} else $sql .= ",localtax1_value =0.000";
 
 			if ($this->localtax2_assuj == 1)
 			{
 				if ($this->localtax2_value != '')
 				{
 					$sql .= ",localtax2_value =".$this->localtax2_value;
-				}
-				else $sql .= ",localtax2_value =0.000";
-			}
-			else $sql .= ",localtax2_value =0.000";
+				} else $sql .= ",localtax2_value =0.000";
+			} else $sql .= ",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1336,9 +1315,7 @@ class Societe extends CommonObject
 						unset($this->state_code);
 						unset($this->state);
 					}
-				}
-				else
-				{
+				} else {
 					unset($this->country_code); // We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
 					unset($this->state_code);
@@ -1381,8 +1358,7 @@ class Societe extends CommonObject
 								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
-						}
-						elseif ($result < 0)
+						} elseif ($result < 0)
 						{
 							$this->error = $lmember->error;
 							$error++;
@@ -1424,32 +1400,24 @@ class Societe extends CommonObject
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-	    {
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -1541,8 +1509,7 @@ class Societe extends CommonObject
 				$this->error = 'Fetch found several records. Rename one of thirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 
@@ -1674,16 +1641,12 @@ class Societe extends CommonObject
 
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else
-			{
+			} else {
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
@@ -1821,15 +1784,12 @@ class Societe extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		} else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1855,8 +1815,7 @@ class Societe extends CommonObject
 			{
 				$this->client = $newclient;
 				return 1;
-			}
-			else return -1;
+			} else return -1;
 		}
 		return 0;
 	}
@@ -2050,14 +2009,11 @@ class Societe extends CommonObject
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $discount->error;
 				return -3;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -2078,9 +2034,7 @@ class Societe extends CommonObject
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->error = $discountstatic->error;
 			return -1;
 		}
@@ -2107,9 +2061,7 @@ class Societe extends CommonObject
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";
 			$sql .= " OR u.admin = 1)";
-		}
-		else
-			$sql .= " WHERE entity in (0, ".$conf->entity.")";
+		} else $sql .= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
 
@@ -2135,16 +2087,13 @@ class Societe extends CommonObject
 					$reparray[$i]['entity'] = $obj->entity;
 					$reparray[$i]['login'] = $obj->login;
 					$reparray[$i]['photo'] = $obj->photo;
-				}
-				else
-				{
+				} else {
 					$reparray[] = $obj->rowid;
 				}
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2248,9 +2197,7 @@ class Societe extends CommonObject
 			{
                 $this->db->commit();
                 return 1;
-			}
-			else
-			{
+			} else {
 			    $this->db->rollback();
 			    return -1;
 			}
@@ -2334,9 +2281,7 @@ class Societe extends CommonObject
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
 				$name = $code.' '.$name;
-			}
-			else
-			{
+			} else {
 				$name = $code;
 			}
 		}
@@ -2351,8 +2296,7 @@ class Societe extends CommonObject
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label .= '</div><div style="clear: both;"></div>';
-		}
-		elseif (!empty($this->logo_squarred) && class_exists('Form'))
+		} elseif (!empty($this->logo_squarred) && class_exists('Form'))
 		{
 			/*$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
@@ -2365,38 +2309,31 @@ class Societe extends CommonObject
 		{
 		    $label .= '<u>'.$langs->trans("ShowCustomer").'</u>';
 		    $linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
 			$label .= '<u>'.$langs->trans("ShowProspect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier')
+		} elseif ($option == 'supplier')
 		{
 			$label .= '<u>'.$langs->trans("ShowSupplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
+		} elseif ($option == 'agenda')
 		{
 			$label .= '<u>'.$langs->trans("ShowAgenda").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
+		} elseif ($option == 'project')
 		{
 			$label .= '<u>'.$langs->trans("ShowProject").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
+		} elseif ($option == 'margin')
 		{
 			$label .= '<u>'.$langs->trans("ShowMargin").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
+		} elseif ($option == 'contact')
 		{
 			$label .= '<u>'.$langs->trans("ShowContacts").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
+		} elseif ($option == 'ban')
 		{
 			$label .= '<u>'.$langs->trans("ShowBan").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
@@ -2628,18 +2565,14 @@ class Societe extends CommonObject
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
-						}
-						else
-						{
+						} else {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contact_property;
@@ -2672,9 +2605,7 @@ class Societe extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2709,9 +2640,7 @@ class Societe extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2749,9 +2678,7 @@ class Societe extends CommonObject
 				elseif ($mode == 'mobile') $contact_property = $obj->phone_mobile;
 			}
 			return $contact_property;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2775,8 +2702,7 @@ class Societe extends CommonObject
 		if ($mode == 'label')
 		{
 			return $bac->getRibLabel(true);
-		}
-		elseif ($mode == 'rum')
+		} elseif ($mode == 'rum')
 		{
 			if (empty($bac->rum))
 			{
@@ -2786,8 +2712,7 @@ class Societe extends CommonObject
 				$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 			}
 			return $bac->rum;
-		}
-		elseif ($mode == 'format')
+		} elseif ($mode == 'format')
 		{
 			return $bac->frstrecur;
 		}
@@ -2917,9 +2842,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -2953,9 +2876,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -2991,9 +2912,7 @@ class Societe extends CommonObject
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
 			return $result;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -3028,9 +2947,7 @@ class Societe extends CommonObject
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
 			return $result;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -3071,15 +2988,11 @@ class Societe extends CommonObject
 				elseif ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
 
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			if ($type == 'customer') $this->code_compta = '';
 			elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
 
@@ -3108,13 +3021,10 @@ class Societe extends CommonObject
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else return -1;
+		} else return -1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3204,9 +3114,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else
-		{
+		} else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3306,8 +3214,7 @@ class Societe extends CommonObject
 			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
 				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 					return 1;
-			else
-				return -1;
+			else return -1;
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
@@ -3319,29 +3226,25 @@ class Societe extends CommonObject
 			if (preg_match('/^[KLM]{1}/', $string))
 				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 					return 1;
-			else
-				return -1;
+			else return -1;
 
 			//Check CIF
 			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
 				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 					return 2;
-			else
-				return -2;
+			else return -2;
 
 			//Check NIE T
 			if (preg_match('/^[T]{1}/', $string))
 				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 					return 3;
-			else
-				return -3;
+			else return -3;
 
 			//Check NIE XYZ
 			if (preg_match('/^[XYZ]{1}/', $string))
 				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
 					return 3;
-			else
-				return -3;
+			else return -3;
 
 			//Can not be verified
 			return -4;
@@ -3361,8 +3264,7 @@ class Societe extends CommonObject
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
 		}
@@ -3416,8 +3318,7 @@ class Societe extends CommonObject
 			if ($url) {
 				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
 			}
-		}
-		else {
+		} else {
 			return $hookmanager->resPrint;
 		}
 
@@ -3439,9 +3340,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else
-		{
+		} else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3490,9 +3389,7 @@ class Societe extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3510,11 +3407,9 @@ class Societe extends CommonObject
 		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
 		if (!empty($this->tva_intra)) {
 			$isacompany = 1;
-		}
-		elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
+		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
 			$isacompany = 1;
-		}
-		elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
 			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
@@ -3557,9 +3452,7 @@ class Societe extends CommonObject
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -3580,9 +3473,7 @@ class Societe extends CommonObject
 			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
 			if ($resql = $this->db->query($sql)) return 0;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 		return -1;
@@ -3644,17 +3535,13 @@ class Societe extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
@@ -3695,8 +3582,7 @@ class Societe extends CommonObject
 			{
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
-			}
-			else                    // For backward compatibility
+			} else // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3720,8 +3606,7 @@ class Societe extends CommonObject
 			{
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
-			}
-			else                    // For backward compatibility
+			} else // For backward compatibility
 			{
 				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3859,8 +3744,7 @@ class Societe extends CommonObject
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -3880,8 +3764,7 @@ class Societe extends CommonObject
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -3903,9 +3786,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
    			return (($obj->nb > 0) ?true:false);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return false;
 		}
@@ -3991,8 +3872,7 @@ class Societe extends CommonObject
 			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
 			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
 			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
+			else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
@@ -4003,8 +3883,7 @@ class Societe extends CommonObject
 			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
 			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
 			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
-			{
+			else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0);
 			}
 		}
@@ -4015,8 +3894,7 @@ class Societe extends CommonObject
 			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
 			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
 			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
+			else {
 				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
@@ -4073,9 +3951,7 @@ class Societe extends CommonObject
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else
-			return array();
+		} else return array();
 	}
 
 	/**
@@ -4113,9 +3989,7 @@ class Societe extends CommonObject
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else
-			return array();
+		} else return array();
 	}
 
 	/**
@@ -4156,9 +4030,7 @@ class Societe extends CommonObject
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
-			}
-			else
-			{
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject = new Facture($this->db);
 			}
@@ -4193,9 +4065,7 @@ class Societe extends CommonObject
                 }
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else
-		{
+		} else {
 			return array();
 		}
 	}
@@ -4254,18 +4124,14 @@ class Societe extends CommonObject
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
 			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
-		{
+		} else {
 			// Positionne le modele sur le nom du modele a utiliser
 			if (!dol_strlen($modele))
 			{
 				if (!empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
-				{
+				} else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;
 				}
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 98bdeffa637..ba32086cc4d 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -433,8 +433,7 @@ class SocieteAccount extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -477,33 +476,27 @@ class SocieteAccount extends CommonObject
 			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -556,9 +549,7 @@ class SocieteAccount extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index ad7383d81af..312835e1a80 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -427,9 +427,7 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else
-		{
+		} else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -471,9 +469,7 @@ if ($sql_select)
 				}
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
-			{
+			} else {
 				$label = $objp->product_label;
 			}
 
@@ -507,29 +503,23 @@ if ($sql_select)
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
-				{
+				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
@@ -607,8 +597,7 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-}
-elseif (empty($type_element) || $type_element == -1)
+} elseif (empty($type_element) || $type_element == -1)
 {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
@@ -625,8 +614,7 @@ elseif (empty($type_element) || $type_element == -1)
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
-}
-else {
+} else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste centpercent">'."\n";
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d082ae6baa5..ba0241a90f7 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -166,9 +166,7 @@ if ($object->id)
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 0);
 }
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 0000494a3fe..85c27a29b7e 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -95,8 +95,7 @@ if ($result)
         if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) { $found = 1; $third['other']++; }
         if ($found) $total++;
     }
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover centpercent">'."\n";
@@ -119,9 +118,7 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$dolgraph->draw('idgraphthirdparties');
 	print $dolgraph->show();
     print '</td></tr>'."\n";
-}
-else
-{
+} else {
     if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
     {
         $statstring = "<tr>";
@@ -185,9 +182,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				if ($i < $nbmax)
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
-				}
-				else
-				{
+				} else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -206,9 +201,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->setHeight('200');
 			$dolgraph->draw('idgraphcateg');
 			print $dolgraph->show();
-		}
-		else
-		{
+		} else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -334,9 +327,7 @@ if ($result)
         print '</div>';
         print "<!-- End last thirdparties modified -->\n";
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1df7c38d6c5..4ead540eb8b 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -386,8 +386,7 @@ if ($resql)
 		if ($level == $obj->code) $level = $langs->trans($obj->label);
 		$tab_level[$obj->code] = $level;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
@@ -1049,9 +1048,7 @@ while ($i < min($num, $limit))
 		if ($contextpage == 'poslist')
 		{
 		    print $obj->name;
-		}
-		else
-		{
+		} else {
 		    print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 2e3e3ec4532..866a0e0964f 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -122,9 +122,7 @@ if ($object->id > 0)
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
     dol_fiche_end();
-}
-else
-{
+} else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 191f9c4bb2c..2a0d2603e5b 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -104,18 +104,14 @@ if (empty($reshook))
                     $error++;
                     dol_print_error($db);
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
             }
 
             if (!$error)
             {
                 $db->commit();
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -263,9 +259,7 @@ if ($result > 0)
         print '</td>';
         print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
         print '</td></tr>';
@@ -293,9 +287,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -333,9 +325,7 @@ if ($result > 0)
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
-                {
+                } else {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
@@ -443,9 +433,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -493,9 +481,7 @@ if ($result > 0)
 	            $contactstatic->firstname = $obj->firstname;
 	            print $contactstatic->getNomUrl(1);
 	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            }
-            else
-			{
+            } else {
 				print $obj->email;
             }
             print '</td>';
@@ -529,8 +515,7 @@ if ($result > 0)
     print '</table>';
 
     print '</form>';
-}
-else dol_print_error('', 'RecordNotFound');
+} else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 6385346ce5d..fa01e2db095 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -175,9 +175,7 @@ if (empty($reshook))
 			if (!$result)
 			{
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				// If this account is the default bank account, we disable others
 				if ($companybankaccount->default_rib)
 				{
@@ -230,9 +228,7 @@ if (empty($reshook))
 			if (!$result)
 			{
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				// If this account is the default bank account, we disable others
 				if ($companypaymentmode->default_rib)
 				{
@@ -338,9 +334,7 @@ if (empty($reshook))
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -407,9 +401,7 @@ if (empty($reshook))
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -424,9 +416,7 @@ if (empty($reshook))
 			$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -451,14 +441,10 @@ if (empty($reshook))
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 		}
 	}
@@ -473,14 +459,10 @@ if (empty($reshook))
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 		}
 	}
@@ -515,18 +497,14 @@ if (empty($reshook))
 			{
 				$error++;
 				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
-			}
-			else
-			{
+			} else {
 				// Creation of Stripe customer + update of societe_account
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
 				if (!$cu)
 				{
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
-				}
-				else
-				{
+				} else {
 					$stripecu = $cu->id;
 				}
 			}
@@ -540,9 +518,7 @@ if (empty($reshook))
 			{
 				$error++;
 				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
-			}
-			else
-			{
+			} else {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (!$cu)
@@ -612,9 +588,7 @@ if (empty($reshook))
 			{
 				$stripecu = $newcu;
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -669,9 +643,7 @@ if (empty($reshook))
 			{
 				$stripesupplieracc = $newsup;
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -684,23 +656,19 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
+		} elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
 		{
 			try {
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (preg_match('/pm_/', $source))
 				{
 					$cu->invoice_settings->default_payment_method = (string) $source; // New
-				}
-				else
-				{
+				} else {
 					$cu->default_source = (string) $source; // Old
 				}
 				$result = $cu->save();
@@ -708,14 +676,12 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'deletecard' && $source)
+		} elseif ($action == 'deletecard' && $source)
 		{
 			try {
 				if (preg_match('/pm_/', $source))
@@ -725,9 +691,7 @@ if (empty($reshook))
 			        {
 					    $payment_method->detach();
 				    }
-				}
-				else
-				{
+				} else {
 				    $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				    $card = $cu->sources->retrieve("$source");
 				    if ($card) {
@@ -743,8 +707,7 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
@@ -782,9 +745,7 @@ if (!$id)
 {
 	$companybankaccount->fetch(0, $object->id);
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
-}
-else
-{
+} else {
 	$companybankaccount->fetch($id);
 	$companypaymentmode->fetch($id);
 }
@@ -975,9 +936,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 					{
 						$listofsources = $customerstripe->sources->data;
-					}
-					else
-					{
+					} else {
 						$service = 'StripeTest';
 						$servicestatus = 0;
 						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
@@ -998,16 +957,14 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							}
 
 							$listofsources = $paymentmethodobjs->data;
-						}
-						catch (Exception $e)
+						} catch (Exception $e)
 						{
 							$error++;
 							setEventMessages($e->getMessage(), null, 'errors');
 						}
 					}
 				}
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
 			}
@@ -1104,8 +1061,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								$img = picto_from_langcode($companypaymentmodetemp->country_code);
 								print $img ? $img.' ' : '';
 								print getCountry($companypaymentmodetemp->country_code, 1);
-							}
-							else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+							} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 							print '</td>';
 							// Default
 							print '<td class="center">';
@@ -1152,8 +1108,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$i++;
 					}
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 
 		// Show remote sources (not already shown as local source)
@@ -1193,20 +1148,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				if ($src->object == 'card')
 				{
 					print img_credit_card($src->brand);
-				}
-				elseif ($src->object == 'source' && $src->type == 'card')
+				} elseif ($src->object == 'source' && $src->type == 'card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object == 'source' && $src->type == 'sepa_debit')
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'card')
+				} elseif ($src->object == 'payment_method' && $src->type == 'card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
 				}
@@ -1222,10 +1173,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'source' && $src->type == 'card')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'source' && $src->type == 'card')
 				{
 					print '<span class="opacitymedium">'.$src->owner->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1235,10 +1184,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'source' && $src->type == 'sepa_debit')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
 				{
 					print 'SEPA debit';
 					print '</td><td>';
@@ -1247,10 +1194,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							$img = picto_from_langcode($src->sepa_debit->country);
 							print $img ? $img.' ' : '';
 							print getCountry($src->sepa_debit->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'card')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'payment_method' && $src->type == 'card')
 				{
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1260,10 +1205,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
 				{
 					print 'SEPA debit';
 					print '</td><td>';
@@ -1272,10 +1215,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->sepa_debit->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->sepa_debit->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				else {
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} else {
 					print '</td><td>';
 				}
 				print '</td>';
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 6d69e692a96..278a85fa7f5 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -466,18 +466,14 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print '</td>';
 			}
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			print $langs->trans('None');
 		}
 
 		print "\n".'<div class="tabsAction">'."\n";
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'">'.$langs->trans("Ok").'</a></div>';
 		print "\n</div><br>\n";
-	}
-	else
-	{
+	} else {
         // View mode
 
 		/* ************************************************************************** */
@@ -590,9 +586,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
                 print "</tr>\n";
             }
-        }
-        else
-        {
+        } else {
             $colspan = 9;
             if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
             print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 5ff86ff0064..1369f29a185 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -78,16 +78,12 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -99,9 +95,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -116,8 +110,7 @@ elseif ($action == 'deletecontact' && $user->rights->societe->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -327,17 +320,13 @@ if ($id > 0 || !empty($ref))
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}
 							print '</td>';
-						}
-						else
-						{
+						} else {
 							print '<td class="left nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
 								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
-							{
+							} else {
 								print '&nbsp;';
 							}
 							print '</td>';
@@ -350,9 +339,7 @@ if ($id > 0 || !empty($ref))
 				}
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Contrat non trouve
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 11b2d033b69..8ee338fba44 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -48,6 +48,5 @@ if ($nbofsalesrepresentative > 0)
 		print $userstatic->getNomUrl(-1);
 		print ' ';
 	}
-}
-else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
+} else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 print '</td></tr>';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index a8bca51dda3..728c076d1c8 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -136,9 +136,7 @@ if ($action == "setlive")
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -237,16 +235,12 @@ if (empty($conf->stripeconnect->enabled))
             {
             	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
             	print img_picto($langs->trans("Activated"), 'switch_on');
-            }
-            else
-            {
+            } else {
             	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
             	print img_picto($langs->trans("Disabled"), 'switch_off');
             }
             //print $endpoint;
-        }
-        else
-        {
+        } else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
@@ -310,23 +304,17 @@ if (empty($conf->stripeconnect->enabled))
             {
                 print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
                 print img_picto($langs->trans("Activated"), 'switch_on');
-            }
-            else
-            {
+            } else {
                 print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=1">';
                 print img_picto($langs->trans("Disabled"), 'switch_off');
             }
             //print $endpoint;
-        }
-        else
-        {
+        } else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
     print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td><td></td></tr>';
 }
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 44c7db306a2..5672176168a 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -65,9 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -85,9 +83,7 @@ if (!$rowid)
 	if ($stripeacc)
 	{
 		$list = \Stripe\Charge::all($option, array("stripe_account" => $stripeacc));
-	}
-	else
-	{
+	} else {
 		$list = \Stripe\Charge::all($option);
 	}
 
@@ -179,21 +175,16 @@ if (!$rowid)
 		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
 		{
 			$societestatic->fetch($tmparray['CUS']);
-		}
-		elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
+		} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
 		{
 			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
-		}
-		else
-		{
+		} else {
 			$societestatic->id = 0;
 		}
 		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
 		{
 			$memberstatic->fetch($tmparray['MEM']);
-		}
-		else
-		{
+		} else {
 			$memberstatic->id = 0;
 		}
 
@@ -231,8 +222,7 @@ if (!$rowid)
 		if ($societestatic->id > 0)
 		{
 			print $societestatic->getNomUrl(1);
-		}
-		elseif ($memberstatic->id > 0)
+		} elseif ($memberstatic->id > 0)
 		{
 			print $memberstatic->getNomUrl(1);
 		}
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 33b19384085..2fafe09a693 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -75,9 +75,7 @@ class ActionsStripeconnect
 		{
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-		}
-		else
-		{
+		} else {
 			$service = 'StripeLive';
 		}
 
@@ -104,13 +102,11 @@ class ActionsStripeconnect
 			if ($stripe->getStripeAccount($service) && $object->client != 0) {
 				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
 				$this->resprints .= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints .= $langs->trans("NoStripe");
 			}
 			$this->resprints .= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'member') {
+		} elseif (is_object($object) && $object->element == 'member') {
 			$this->resprints .= '<tr><td>';
 			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints .= $langs->trans('StripeCustomer');
@@ -208,25 +204,19 @@ class ActionsStripeconnect
 					{
 						$langs->load("withdrawals");
 						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-				}
-				elseif ($resteapayer == 0)
+				} elseif ($resteapayer == 0)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 				}
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 			}
-		}
-		elseif (is_object($object) && $object->element == 'invoice_supplier') {
+		} elseif (is_object($object) && $object->element == 'invoice_supplier') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-		}
-		elseif (is_object($object) && $object->element == 'member') {
+		} elseif (is_object($object) && $object->element == 'member') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
 		}
 		return 0;
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index a72e5291f58..f3bb30d7efb 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -95,8 +95,7 @@ class Stripe extends CommonObject
 		$sql .= " AND service = '".$mode."'";
 		if ($fk_soc > 0) {
 			$sql .= " AND fk_soc = ".$fk_soc;
-		}
-		else {
+		} else {
 			$sql .= " AND fk_soc IS NULL";
 		}
 		$sql .= " AND fk_user IS NULL AND fk_adherent IS NULL";
@@ -113,8 +112,7 @@ class Stripe extends CommonObject
     		} else {
     			$tokenstring = '';
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
 
@@ -189,14 +187,12 @@ class Stripe extends CommonObject
 					} else {
 						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
 					$this->error = $e->getMessage();
 				}
-			}
-			elseif ($createifnotlinkedtostripe)
+			} elseif ($createifnotlinkedtostripe)
 			{
 			    $ipaddress = getUserRemoteIP();
 
@@ -254,15 +250,12 @@ class Stripe extends CommonObject
 					{
 						$this->error = $this->db->lasterror();
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -290,8 +283,7 @@ class Stripe extends CommonObject
 			} else {
 				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'', array("stripe_account" => $key));
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->error = $e->getMessage();
 		}
@@ -481,8 +473,7 @@ class Stripe extends CommonObject
     						$obj = $this->db->fetch_object($resql);
     						if ($obj) $paymentintentalreadyexists++;
     					}
-    				}
-    				else dol_print_error($this->db);
+    				} else dol_print_error($this->db);
 
     				// If not, we create it.
     				if (!$paymentintentalreadyexists)
@@ -498,20 +489,16 @@ class Stripe extends CommonObject
 	                        dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
 	    				}
     				}
-    			}
-    			else
-    			{
+    			} else {
     			    $_SESSION["stripe_payment_intent"] = $paymentintent;
     			}
-    		}
-    		catch (Stripe\Error\Card $e)
+    		} catch (Stripe\Error\Card $e)
     		{
     			$error++;
     			$this->error = $e->getMessage();
     			$this->code = $e->getStripeCode();
     			$this->declinecode = $e->getDeclineCode();
-    		}
-    		catch (Exception $e)
+    		} catch (Exception $e)
     		{
     		    /*var_dump($dataforintent);
     		    var_dump($description);
@@ -531,9 +518,7 @@ class Stripe extends CommonObject
 		if (!$error)
 		{
 			return $paymentintent;
-		}
-		else
-		{
+		} else {
 			return null;
 		}
 	}
@@ -657,8 +642,7 @@ class Stripe extends CommonObject
 				{
 					$_SESSION["stripe_setup_intent"] = $setupintent;
 				}*/
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				/*var_dump($dataforintent);
 				 var_dump($description);
@@ -674,9 +658,7 @@ class Stripe extends CommonObject
 		{
 			dol_syslog("getSetupIntent ".(is_object($setupintent) ? $setupintent->id : ''), LOG_INFO, -1);
 			return $setupintent;
-		}
-		else
-		{
+		} else {
 			dol_syslog("getSetupIntent return error=".$error, LOG_INFO, -1);
 			return null;
 		}
@@ -720,9 +702,7 @@ class Stripe extends CommonObject
 							if (!preg_match('/^pm_/', $cardref))
 							{
 								$card = $cu->sources->retrieve($cardref);
-							}
-							else
-							{
+							} else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
@@ -730,20 +710,17 @@ class Stripe extends CommonObject
 							{
 								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 								$card = $cu->sources->retrieve($cardref);
-							}
-							else {
+							} else {
 								//$card = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
-				}
-				elseif ($createifnotlinkedtostripe)
+				} elseif ($createifnotlinkedtostripe)
 				{
 					$exp_date_month = $obj->exp_date_month;
 					$exp_date_year = $obj->exp_date_year;
@@ -768,9 +745,7 @@ class Stripe extends CommonObject
 								{
 									$this->error = 'Creation of card on Stripe has failed';
 								}
-							}
-							else
-							{
+							} else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -792,9 +767,7 @@ class Stripe extends CommonObject
 								{
 									$this->error = 'Creation of card on Stripe has failed';
 								}
-							}
-							else
-							{
+							} else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -823,17 +796,14 @@ class Stripe extends CommonObject
 								$this->error = $this->db->lasterror();
 							}
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -943,9 +913,7 @@ class Stripe extends CommonObject
 					if ($paymentintent->status == 'succeeded')
 					{
 						$charge->status = 'ok';
-					}
-					else
-					{
+					} else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
@@ -954,8 +922,7 @@ class Stripe extends CommonObject
 						$stripefailuremessage = $stripe->error;
 						$stripefailuredeclinecode = $stripe->declinecode;
 					}
-				}
-				elseif (preg_match('/acct_/i', $source))
+				} elseif (preg_match('/acct_/i', $source))
 				{
                     $charge = \Stripe\Charge::create(array(
 						"amount" => "$stripeamount",
@@ -1038,17 +1005,13 @@ class Stripe extends CommonObject
 					{
 						$charge->status = 'ok';
 						$charge->id = $paymentintent->id;
-					}
-					else
-					{
+					} else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
 						$charge->failure_declinecode = $stripe->declinecode;
 					}
-				}
-				else
-				{
+				} else {
 					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description", "stripe_account" => "$account"));
 				}
 			}
@@ -1060,9 +1023,7 @@ class Stripe extends CommonObject
 			if (preg_match('/pm_/i', $source))
 			{
 				$return->message = 'Payment retreived by card status = '.$charge->status;
-			}
-			else
-			{
+			} else {
 				if ($charge->source->type == 'card') {
 					$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
 				} elseif ($charge->source->type == 'three_d_secure') {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 730203245f4..e6dc75c04ec 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -47,9 +47,7 @@ $stripearrayofkeys = array();
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
-}
-else
-{
+} else {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
 }
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 17f2423327f..6823c32c0b7 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -64,9 +64,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -114,9 +112,7 @@ if (!$rowid) {
 	if ($stripeacc)
 	{
 		$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else
-	{
+	} else {
 		$payout = \Stripe\Payout::all(array("limit" => $limit));
 	}
 
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 3829eba4d0d..6f74d1a48c0 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -65,9 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -113,9 +111,7 @@ if (!$rowid) {
 	if ($stripeacc)
 	{
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else
-	{
+	} else {
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 	}
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 08479b95871..dc696dcea90 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -133,17 +133,13 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = '';
 				}
@@ -221,9 +217,7 @@ if (empty($reshook))
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
+	} elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
 	{
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
 		if ($result < 0)
@@ -411,8 +405,7 @@ if (empty($reshook))
 						$error++;
 					}
 				} 			// Standard creation
-				else
-				{
+				else {
 					$id = $object->create($user);
 				}
 
@@ -442,15 +435,11 @@ if (empty($reshook))
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
-					}
-					else
-					{
+					} else {
 						$db->rollback();
 						$action = 'create';
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
@@ -520,9 +509,7 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-
-	elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
+	} elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -551,9 +538,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = '';
 			$tva_tx = '';
@@ -621,14 +606,11 @@ if (empty($reshook))
 						{
 							$productsupplier->ref_supplier = '';
 						}
-					}
-					else
-					{
+					} else {
 						$fksoctosearch = $object->thirdparty->id;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					}
-				}
-				elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+				} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 				{
 					//$qtytosearch=$qty; 	   // Just to see if a price exists for the quantity. Not used to found vat.
 					$qtytosearch = -1; // We force qty to -1 to be sure to find if the supplier price that exists
@@ -715,8 +697,7 @@ if (empty($reshook))
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 				}
-			}
-			elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
+			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
 			{
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -737,9 +718,7 @@ if (empty($reshook))
 				if ($price_ht !== '')
 				{
 					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-				}
-				else
-				{
+				} else {
 					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 					$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 				}
@@ -834,9 +813,7 @@ if (empty($reshook))
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1011,9 +988,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
@@ -1031,13 +1006,9 @@ if (empty($reshook))
 	// Terms of payments
 	elseif ($action == 'setconditions' && $user->rights->supplier_proposal->creer) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
+	} elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
 		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
+	} elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
 		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
 	}
 
@@ -1054,9 +1025,7 @@ if (empty($reshook))
 	// Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
@@ -1138,9 +1107,7 @@ if ($action == 'create')
 			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
 			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 		}
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
@@ -1895,8 +1862,7 @@ if ($action == 'create')
 					if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 3fbe3afa021..3eea10bdf13 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -160,8 +160,7 @@ class Supplierproposals extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieving supplier proposal list : '.$db->lasterror());
         }
         if (!count($obj_ret)) {
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 97c0ee27e4e..907a741c288 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -273,9 +273,7 @@ class SupplierProposal extends CommonObject
             if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else
-            {
+            } else {
                 $price = $prod->price;
             }
 
@@ -346,22 +344,16 @@ class SupplierProposal extends CommonObject
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $supplier_proposalligne->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -2;
         }
@@ -430,9 +422,7 @@ class SupplierProposal extends CommonObject
         if ($price_base_type == 'HT')
         {
             $pu = $pu_ht;
-        }
-        else
-        {
+        } else {
             $pu = $pu_ttc;
         }
 
@@ -492,17 +482,13 @@ class SupplierProposal extends CommonObject
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $product_type = $type;
             }
 
@@ -622,23 +608,17 @@ class SupplierProposal extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
         	$this->error = 'BadStatusOfObjectToAddLine';
         	return -5;
         }
@@ -808,16 +788,12 @@ class SupplierProposal extends CommonObject
 
                 $this->db->commit();
                 return $result;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
             return -2;
         }
@@ -844,14 +820,10 @@ class SupplierProposal extends CommonObject
                 $this->update_price(1);
 
                 return 1;
-            }
-            else
-            {
+            } else {
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             return -2;
         }
     }
@@ -1079,16 +1051,12 @@ class SupplierProposal extends CommonObject
                             if ($result < 0) { $error++; }
                             // End call triggers
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $this->db->lasterror();
                         $error++;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $error++;
             }
@@ -1098,15 +1066,11 @@ class SupplierProposal extends CommonObject
                 $this->db->commit();
                 dol_syslog(get_class($this)."::create done id=".$this->id);
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -1167,9 +1131,7 @@ class SupplierProposal extends CommonObject
             }
 
             // TODO Change product price if multi-prices
-        }
-        else
-        {
+        } else {
             $objsoc->fetch($this->socid);
         }
 
@@ -1217,9 +1179,7 @@ class SupplierProposal extends CommonObject
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -1410,9 +1370,7 @@ class SupplierProposal extends CommonObject
                         $i++;
                     }
                     $this->db->free($result);
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->error();
                     return -1;
                 }
@@ -1426,9 +1384,7 @@ class SupplierProposal extends CommonObject
 
             $this->error = "Record Not Found";
             return 0;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -1463,9 +1419,7 @@ class SupplierProposal extends CommonObject
             if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
-            }
-            else
-            {
+            } else {
                 $num = $this->ref;
             }
             $this->newref = dol_sanitizeFileName($num);
@@ -1538,15 +1492,11 @@ class SupplierProposal extends CommonObject
 
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING);
             return -2;
         }
@@ -1573,9 +1523,7 @@ class SupplierProposal extends CommonObject
             {
                 $this->date_livraison = $date_livraison;
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
                 return -1;
@@ -1608,9 +1556,7 @@ class SupplierProposal extends CommonObject
                 $this->remise_percent = $remise;
                 $this->update_price(1);
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
@@ -1644,9 +1590,7 @@ class SupplierProposal extends CommonObject
                 $this->remise_absolue = $remise;
                 $this->update_price(1);
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
@@ -1708,9 +1652,7 @@ class SupplierProposal extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -1782,15 +1724,11 @@ class SupplierProposal extends CommonObject
             {
                 $this->db->commit();
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->db->lasterror();
             $this->db->rollback();
@@ -1892,8 +1830,7 @@ class SupplierProposal extends CommonObject
                     $values[] = $product->multicurrency_subprice;
                     $values[] = $product->multicurrency_total_ht;
                     $values[] = $multicurrency->rate->rate;
-                }
-                else {
+                } else {
                     for ($i = 0; $i < 5; $i++) $values[] = 'NULL';
                 }
             }
@@ -1957,9 +1894,7 @@ class SupplierProposal extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -2019,13 +1954,10 @@ class SupplierProposal extends CommonObject
                     if ($shortlist == 1)
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref;
-                    }
-                    elseif ($shortlist == 2)
+                    } elseif ($shortlist == 2)
                     {
                         $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
-                    {
+                    } else {
                         $ga[$i]['id'] = $obj->supplier_proposalid;
                         $ga[$i]['ref'] 	= $obj->ref;
                         $ga[$i]['name'] = $obj->name;
@@ -2035,9 +1967,7 @@ class SupplierProposal extends CommonObject
                 }
             }
             return $ga;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2133,30 +2063,22 @@ class SupplierProposal extends CommonObject
                         dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
                         $this->db->commit();
                         return 1;
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return 0;
                     }
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -3;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -2209,9 +2131,7 @@ class SupplierProposal extends CommonObject
                 }
             }
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -2340,9 +2260,7 @@ class SupplierProposal extends CommonObject
                 // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
             }
             return $response;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -2409,9 +2327,7 @@ class SupplierProposal extends CommonObject
                 $line->total_ttc = 59.8;
                 $line->total_tva = 9.8;
                 $line->remise_percent = 50;
-            }
-            else
-            {
+            } else {
                 $line->total_ht = 100;
                 $line->total_ttc = 119.6;
                 $line->total_tva = 19.6;
@@ -2469,9 +2385,7 @@ class SupplierProposal extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
@@ -2520,15 +2434,11 @@ class SupplierProposal extends CommonObject
             if ($numref != "")
             {
                 return $numref;
-            }
-            else
-            {
+            } else {
                 $this->error = $obj->error;
                 return "";
             }
-        }
-        else
-        {
+        } else {
             $langs->load("errors");
             print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal"));
             return "";
@@ -2698,9 +2608,7 @@ class SupplierProposal extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -2994,9 +2902,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->fk_unit = $objp->fk_unit;
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -3041,9 +2947,7 @@ class SupplierProposalLine extends CommonObjectLine
             if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
             {
                 return $result;
-            }
-            else
-            {
+            } else {
                 $this->pa_ht = $result;
             }
         }
@@ -3129,9 +3033,7 @@ class SupplierProposalLine extends CommonObjectLine
 
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -3177,9 +3079,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->db->commit();
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -3224,9 +3124,7 @@ class SupplierProposalLine extends CommonObjectLine
             if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
             {
                 return $result;
-            }
-            else
-            {
+            } else {
                 $this->pa_ht = $result;
             }
         }
@@ -3300,9 +3198,7 @@ class SupplierProposalLine extends CommonObjectLine
 
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
@@ -3335,9 +3231,7 @@ class SupplierProposalLine extends CommonObjectLine
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 43c9b91f563..4bd027299fa 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $permissiontoedit)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $permissiontoedit)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -194,9 +187,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else
-	{
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 3f471e28b3f..5b58c7de461 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -166,9 +166,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->supplier_proposal->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index e8432ad8fe4..6ba425f323a 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -162,9 +162,7 @@ if ($resql)
 
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -294,8 +292,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -376,16 +373,13 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table></div><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index ded5d9ca2bf..d0ea3a2b625 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -358,9 +358,7 @@ if ($resql)
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfSupplierProposals');
 	}
 
@@ -950,9 +948,7 @@ if ($resql)
 	$delallowed = $user->rights->supplier_proposal->creer;
 
 	print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 7e5b6aaf531..43077495238 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -110,14 +110,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 					$includeconferror = 'ErrorBadValueForDolibarrMainDBType';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
 		}
-	}
-	else
-	{
+	} else {
 		$includeconferror = 'ErrorBadFormatForConfFile';
 	}
 }
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 2508ab56040..81eaf319295 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -52,9 +52,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 566f18ac1a4..79a16d77861 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -72,17 +72,39 @@ if ($action == "SavePrinter2") {
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; }
-elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; }
-elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; }
-elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; }
-else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
+if ($type == Categorie::TYPE_PRODUCT) {
+	$title = $langs->trans("ProductsCategoriesArea");
+	$typetext = 'product';
+} elseif ($type == Categorie::TYPE_SUPPLIER) {
+	$title = $langs->trans("SuppliersCategoriesArea");
+	$typetext = 'supplier';
+} elseif ($type == Categorie::TYPE_CUSTOMER) {
+	$title = $langs->trans("CustomersCategoriesArea");
+	$typetext = 'customer';
+} elseif ($type == Categorie::TYPE_MEMBER) {
+	$title = $langs->trans("MembersCategoriesArea");
+	$typetext = 'member';
+} elseif ($type == Categorie::TYPE_CONTACT) {
+	$title = $langs->trans("ContactsCategoriesArea");
+	$typetext = 'contact';
+} elseif ($type == Categorie::TYPE_ACCOUNT) {
+	$title = $langs->trans("AccountsCategoriesArea");
+	$typetext = 'bank_account';
+} elseif ($type == Categorie::TYPE_PROJECT) {
+	$title = $langs->trans("ProjectsCategoriesArea");
+	$typetext = 'project';
+} elseif ($type == Categorie::TYPE_USER) {
+	$title = $langs->trans("UsersCategoriesArea");
+	$typetext = 'user';
+} else {
+	$title = $langs->trans("CategoriesArea");
+	$typetext = 'unknown';
+}
 
-$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofjs = array(
+	'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
+	'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
+);
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
 llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss);
@@ -146,9 +168,7 @@ if ($nbofentries > 0)
 		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
@@ -176,9 +196,7 @@ if ($nbofentries > 0)
 		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 2f54d79d603..567c8ca5aff 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -57,14 +57,11 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif (GETPOST('action', 'alpha') == 'setmethod')
+} elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
     dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
@@ -104,9 +101,7 @@ print '</td><td class="center">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
     print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
@@ -121,9 +116,7 @@ if ($conf->receiptprinter->enabled) {
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter")
 	{
 		print img_picto($langs->trans("Activated"), 'switch_on');
-	}
-	else
-	{
+	} else {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	}
 	print "</td></tr>\n";
@@ -138,9 +131,7 @@ print '</td><td class="center">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
+} else {
     print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 }
 print "</td></tr>\n";
@@ -175,9 +166,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
@@ -191,9 +180,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 03607409ea7..541c34e4e12 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -96,9 +96,7 @@ if ($action == 'set')
  	if (!$error)
     {
         $db->commit();
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 } elseif ($action == 'updateMask') {
@@ -195,9 +193,7 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->TAKEPOS_REF_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
+						} else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;value='.$file.'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index ec3908361fc..6f042d7f10e 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -102,9 +102,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -187,9 +185,7 @@ if (!empty($conf->stock->enabled))
 	print '<td>';
 	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
-	}
-	else
-	{
+	} else {
 	    if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -207,9 +203,7 @@ if (!empty($conf->stock->enabled))
 	{
 		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index d1f59325c1f..7c4471b0ec8 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -64,13 +64,10 @@ if ($action == 'getProducts') {
 	    	}
 	    }
     	echo json_encode($prods);
-    }
-    else
-    {
+    } else {
     	echo 'Failed to load category with id='.$category;
     }
-}
-elseif ($action == 'search' && $term != '') {
+} elseif ($action == 'search' && $term != '') {
 	// Define $filteroncategids, the filter on category ID if there is a Root category defined.
 	$filteroncategids = '';
 	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {	// A root category is defined, we must filter on products inside this category tree
@@ -109,8 +106,7 @@ elseif ($action == 'search' && $term != '') {
 	    	);
 	    }
 	    echo json_encode($rows);
-	}
-	else {
+	} else {
 		echo 'Failed to search product : '.$db->lasterror();
 	}
 } elseif ($action == "opendrawer" && $term != '') {
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index 2700bad3a17..9ec730bfad8 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -55,9 +55,7 @@ if ($query == "cat")
 		if ($obj['photo_vignette'])
 		{
 			$filename = $obj['photo_vignette'];
-		}
-		else
-		{
+		} else {
 			$filename = $obj['photo'];
 		}
 		$file = DOL_URL_ROOT.'/viewimage.php?cache=1&publictakepos=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
@@ -65,8 +63,7 @@ if ($query == "cat")
 		exit;
 	}
 	header('Location: ../../public/theme/common/nophoto.png');
-}
-elseif ($query == "pro")
+} elseif ($query == "pro")
 {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
@@ -76,14 +73,16 @@ elseif ($query == "pro")
 
 	preg_match('@src="([^"]+)"@', $image, $match);
 	$file = array_pop($match);
-	if ($file == "") header('Location: ../../public/theme/common/nophoto.png');
-	else{
-		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) header('Location: '.$file.'&cache=1');
-		else header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
+	if ($file == "") {
+		header('Location: ../../public/theme/common/nophoto.png');
+	} else {
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			header('Location: '.$file.'&cache=1');
+		} else {
+			header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
+		}
 	}
-}
-else
-{
+} else {
     // TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
 
 	// The file
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index dbc68afeaf4..4091e5fff90 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -134,9 +134,7 @@ foreach ($categories as $key => $categorycursor)
     if ($categorycursor['level'] == $levelofmaincategories)
     {
         $maincategories[$key] = $categorycursor;
-    }
-    else
-    {
+    } else {
         $subcategories[$key] = $categorycursor;
     }
 }
@@ -857,9 +855,7 @@ $r = 0;
 if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
 {
     $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
-}
-else
-{
+} else {
     // BAR RESTAURANT specific menu
     $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
@@ -953,8 +949,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
         	{
         		echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
         		echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-        	}
-            elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+        	} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
             else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
         }
 
@@ -983,13 +978,10 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				if ($count == ($MAXCATEG - 2)) {
 				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
 				    echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
-				}
-				elseif ($count == ($MAXCATEG - 1)) {
+				} elseif ($count == ($MAXCATEG - 1)) {
 				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
 				    echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
-				}
-				else
-				{
+				} else {
 				    echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 				}
 				?>
@@ -1018,13 +1010,10 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
     				if ($count == ($MAXPRODUCT - 2)) {
     				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
     					print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
-    				}
-    				elseif ($count == ($MAXPRODUCT - 1)) {
+    				} elseif ($count == ($MAXPRODUCT - 1)) {
     				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
     					print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
-    				}
-    				else
-    				{
+    				} else {
     					print '<div class="" id="proprice'.$count.'"></div>';
     					print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
     				}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 859859fbc93..f0e1e96a969 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -57,8 +57,7 @@ if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout ==
 	if ($_SESSION["takeposterminal"] == "")
 	{
 		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT."/takepos/index.php");
 			exit;
 		}
@@ -119,9 +118,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $ret = $invoice->fetch($invoiceid);
-}
-else
-{
+} else {
     $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 }
 if ($ret > 0)
@@ -145,8 +142,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
     if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
     elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
     elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
-    else
-    {
+    else {
         $accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
     	$bankaccount = $conf->global->$accountname;
     }
@@ -191,13 +187,11 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			dol_syslog("Sale already validated");
 			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
 		}
-	}
-	elseif (count($invoice->lines) == 0)
+	} elseif (count($invoice->lines) == 0)
 	{
 		dol_syslog("Sale without lines");
 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
-	}
-	elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
+	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
 	{
 		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
 		$conf->global->STOCK_CALCULATE_ON_BILL = 1;
@@ -212,9 +206,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		$res = $invoice->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
 
 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
-	}
-	else
-	{
+	} else {
 	    $res = $invoice->validate($user);
 	}
 
@@ -276,9 +268,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 	{
 		$langs->load('errors');
 		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
-	}
-	else
-	{
+	} else {
 		$placeid = $invoice->create($user);
 		if ($placeid < 0)
 		{
@@ -382,8 +372,7 @@ if ($action == "deleteline") {
     if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.
         $invoice->deleteline($idline);
         $invoice->fetch($placeid);
-    }
-    elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
+    } elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture='".$placeid."' order by rowid DESC";
         $resql = $db->query($sql);
         $row = $db->fetch_array($resql);
@@ -422,9 +411,7 @@ if ($action == "delete") {
             if ($resql1 && $resql2 && $resql3)
             {
             	$db->commit();
-            }
-            else
-            {
+            } else {
             	$db->rollback();
             }
 
@@ -464,8 +451,7 @@ if ($action == "updateprice")
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min))))
 			{
 				echo $langs->trans("CantBeLessThanMinPrice");
-			}
-			else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			} else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
         }
     }
     $invoice->fetch($placeid);
@@ -489,8 +475,7 @@ if ($action == "updatereduction")
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min))))
 			{
 				echo $langs->trans("CantBeLessThanMinPrice");
-			}
-			else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			} else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 		}
     }
 	$invoice->fetch($placeid);
@@ -582,9 +567,7 @@ if ($action == "valid" || $action == "history")
     if ($remaintopay > 0)
     {
         $sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-    }
-    else
-    {
+    } else {
         if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
         else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
     }
@@ -815,15 +798,11 @@ $( document ).ready(function() {
 				if ($adh->hasDelay()) {
 					$s .= " ".img_warning($langs->trans("Late"));
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");
 				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
-		}
-		else
-		{
+		} else {
 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");
 		}
 		$s .= '</span>';
@@ -983,9 +962,7 @@ if ($placeid > 0)
 					if ($firstline != $line->desc)
 					{
 						$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
-					}
-					else
-					{
+					} else {
 						$htmlsupplements[$line->fk_parent_line] .= $line->desc;
 					}
 				}
@@ -1033,9 +1010,7 @@ if ($placeid > 0)
 	                if ($firstline != $line->desc)
 	                {
 	                    $htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
-	                }
-	                else
-	                {
+	                } else {
 	                    $htmlforlines .= $line->desc;
 	                }
 	            }
@@ -1063,13 +1038,10 @@ if ($placeid > 0)
 
             print $htmlforlines;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
     }
-}
-else {      // No invoice generated yet
+} else {      // No invoice generated yet
     print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
 }
 
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index b2534272ae2..95bb9118b48 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -51,9 +51,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
-}
-else
-{
+} else {
     $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
     $obj = $db->fetch_object($resql);
@@ -64,9 +62,7 @@ else
     if (!$invoiceid)
     {
         $invoiceid = 0; // Invoice does not exist yet
-    }
-    else
-    {
+    } else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 2276317a198..2fd2beec15d 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -39,10 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
 if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// Decode place if it is an order from customer phone
-	if (GETPOSTISSET("key")) $place = dol_decode(GETPOST('key'));
-	else $place = GETPOST('place', 'aZ09');
+	$place = GETPOSTISSET("key") ? dol_decode(GETPOST('key')) : GETPOST('place', 'aZ09');
+} else {
+	$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 }
-else $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 $action = GETPOST('action', 'alpha');
 $setterminal = GETPOST('setterminal', 'int');
 $idproduct = GETPOST('idproduct', 'int');
@@ -71,23 +71,21 @@ if ($action == "productinfo") {
 	print "<br>".$prod->description;
 	print "<br><b>".price($prod->price_ttc, 1, $langs, 1, -1, -1, $conf->currency)."</b>";
 	print '<br>';
-}
-elseif ($action == "publicpreorder") {
+} elseif ($action == "publicpreorder") {
 	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="TakeposPrintingOrder();">'.$langs->trans('Confirm').'</button>';
 	print "<br><br>";
-	print 	'<div class="comment">
+	print '<div class="comment">
             <textarea class="textinput" placeholder="'.$langs->trans('Note').'"></textarea>
 			</div>';
 	print '<br>';
-}
-elseif ($action == "publicpayment") {
+} elseif ($action == "publicpayment") {
 	$langs->loadLangs(array("orders"));
 	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
 	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
 	print '<br>';
 }
 elseif ($action == "checkplease") {
-	if (GETPOSTISSET("payment")){
+	if (GETPOSTISSET("payment")) {
 		print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -106,14 +104,12 @@ elseif ($action == "checkplease") {
 		$printer->printer->feed();
 		$printer->printer->feed();
 		$printer->close();
-	}
-	else{
+	}	else {
 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';
 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';
 		print '<br>';
 	}
-}
-elseif ($action == "editline") {
+} elseif ($action == "editline") {
 	$placeid = GETPOST('placeid', 'int');
 	$selectedline = GETPOST('selectedline', 'int');
 	$invoice = new Facture($db);
@@ -134,8 +130,7 @@ elseif ($action == "editline") {
 			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';
         }
     }
-}
-else {
+} else {
 	// Title
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
 	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
@@ -174,9 +169,7 @@ else {
     	if ($categorycursor['level'] == $levelofmaincategories)
     	{
         	$maincategories[$key] = $categorycursor;
-    	}
-    	else
-    	{
+    	} else {
         	$subcategories[$key] = $categorycursor;
     	}
 	}
@@ -303,7 +296,7 @@ function LoadCats(){
 }
 
 function LoadProducts(idcat){
-    
+
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 7be5ee85938..e882957ad14 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -51,9 +51,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
-}
-else
-{
+} else {
     $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
     $obj = $db->fetch_object($resql);
@@ -64,9 +62,7 @@ else
     if (!$invoiceid)
     {
         $invoiceid = 0; // Invoice does not exist yet
-    }
-    else
-    {
+    } else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 861a389fb91..fa423f676f2 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2121,9 +2121,7 @@ a.tmenuimage:hover{
                 print 'div.mainmenu.'.$val.'::before {
                     content: "\f249";
                 }'."\n";
-            }
-            else
-            {
+            } else {
                 print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
                 $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
                 print "div.mainmenu.".$val." {\n";
@@ -2131,9 +2129,7 @@ a.tmenuimage:hover{
                 print "}\n";
             }
             $generic++;
-        }
-        else
-        {
+        } else {
             print "div.mainmenu.".$val." {\n";
             print "	background-image: url(".$url.");\n";
             print "}\n";
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 30a7c8635ac..fa6ce2caa08 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -154,24 +154,20 @@ else $colortextbackhmenu = '000000';
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
-else { $colortextbackvmenu = '000000'; }
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; }
 
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
     $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
-    else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
-}
-else $colorshadowtitle = '888888';
+    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
+} else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
-else { $colortextbacktab = '000000'; }
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '000000'; }
 
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 0677c8e4918..5d7cc0faa18 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -40,9 +40,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-		}
-		else
-		{
+		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f1e2c9257e6..c58700dc007 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -157,24 +157,20 @@ else $colortextbackhmenu = '000000';
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
-else { $colortextbackvmenu = '000000'; }
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; }
 
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
 	$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
-	else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
-}
-else $colorshadowtitle = '888888';
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
+} else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
-else { $colortextbacktab = '111111'; }
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '111111'; }
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
@@ -2147,9 +2143,7 @@ div.mainmenu.website {
 		        print 'div.mainmenu.'.$val.'::before {
 	                    content: "\f249";
 	                }';
-		    }
-		    else
-		    {
+		    } else {
 		    	print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
 		    	print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
 		        $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
@@ -2158,9 +2152,7 @@ div.mainmenu.website {
 		        print "}\n";
 	    	}
 	    	$generic++;
-		}
-		else
-		{
+		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
 			print "}\n";
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index ffad2cc66b5..fdf62ffb1bf 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -36,9 +36,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-		}
-		else
-		{
+		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 2c473a9de54..3d1b89e6c65 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -56,9 +56,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 6e400b3eeaa..132280d6d40 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -986,8 +986,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		print '<td>';
 		if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) {
 			print '<input class="button" type="submit" name="btn_update_ticket_prop" value="'.$langs->trans("Modify").'" />';
-		}
-		else {
+		} else {
 			//    Button to edit Properties
 			if ($object->fk_statut < 5 && $user->rights->ticket->write) {
 				print '<a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
@@ -1206,9 +1205,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 				}
 			}
 			print '</div>'."\n";
-		}
-		else
-		{
+		} else {
 			print '<br>';
 		}
 
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 0fb5835cb4c..043eed1d142 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -396,9 +396,7 @@ class ActionsTicket
 				if ($status == 1)
 				{
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=mark_ticket_read'; // To set as read, we use a dedicated action
-				}
-				else
-				{
+				} else {
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&new_status='.$status;
 				}
 
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 94b94b33339..f06ec59aa5d 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -114,8 +114,7 @@ class Tickets extends DolibarrApi
     {
         try {
             return $this->getCommon(0, '', $ref);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
                throw $e;
         }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 4545497be62..0396779f214 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -541,9 +541,7 @@ class Ticket extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
 		} else {
@@ -1182,29 +1180,21 @@ class Ticket extends CommonObject
 
 		if ($status == self::STATUS_NOT_READ) {
 			$statusType = 'status0';
-		}
-		elseif ($status == self::STATUS_READ) {
+		} elseif ($status == self::STATUS_READ) {
 			$statusType = 'status1';
-		}
-		elseif ($status == self::STATUS_ASSIGNED) {
+		} elseif ($status == self::STATUS_ASSIGNED) {
 			$statusType = 'status3';
-		}
-		elseif ($status == self::STATUS_IN_PROGRESS) {
+		} elseif ($status == self::STATUS_IN_PROGRESS) {
 			$statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_WAITING) {
+		} elseif ($status == self::STATUS_WAITING) {
 			$statusType = 'status3';
-		}
-		elseif ($status == self::STATUS_NEED_MORE_INFO) {
+		} elseif ($status == self::STATUS_NEED_MORE_INFO) {
 			$statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_CANCELED) {
+		} elseif ($status == self::STATUS_CANCELED) {
 			$statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_CLOSED) {
+		} elseif ($status == self::STATUS_CLOSED) {
 			$statusType = 'status6';
-		}
-		else {
+		} else {
 			$labelStatus = $langs->trans('Unknown');
 			$labelStatusShort = $langs->trans('Unknown');
 			$statusType = 'status0';
@@ -1262,8 +1252,7 @@ class Ticket extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1353,9 +1342,7 @@ class Ticket extends CommonObject
 		if ($id_assign_user > 0)
 		{
 			$sql .= " SET fk_user_assign=".$id_assign_user.", fk_statut = ".Ticket::STATUS_ASSIGNED;
-		}
-		else
-		{
+		} else {
 			$sql .= " SET fk_user_assign=null, fk_statut = ".Ticket::STATUS_READ;
 		}
 		$sql .= " WHERE rowid = ".$this->id;
@@ -2766,9 +2753,7 @@ class Ticket extends CommonObject
 				}
 			}
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2809,9 +2794,7 @@ class Ticket extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index d48001a680e..e37db95c23d 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -195,9 +195,7 @@ if ($object->id)
   	$param = '&id='.$object->id;
 
   	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 1331e2be12e..b920d10aed5 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -285,9 +285,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -558,12 +556,10 @@ foreach ($object->fields as $key => $val)
 		    if ($search[$key]) $selectedarray = array_values($search[$key]);
 			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth150', 1, 0, '', '', '');
 			print '</td>';
-		}
-		elseif ($key == "fk_soc")
+		} elseif ($key == "fk_soc")
 		{
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
-		}
-		else {
+		} else {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 		}
 	}
@@ -664,8 +660,7 @@ while ($i < min($num, $limit))
 					$user_create->fetch($object->fk_user_create);
 					print $user_create->getNomUrl(-1);
 				}
-			}
-			elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
 			else print $object->showOutputField($val, $key, $obj->$key, '');
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 0a6c8067db5..b7d4c3d7b21 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -56,9 +56,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index b39ba0fd366..da921577596 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -84,9 +84,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
 }
@@ -125,9 +123,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
 }
@@ -164,9 +160,7 @@ if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
 }
@@ -309,8 +303,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     //print $px2->show();
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 3bdc6b5390c..5363ec728c2 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -71,9 +71,7 @@ $account = new UserBankAccount($db);
 if (!$bankid)
 {
 	$account->fetch(0, '', $id);
-}
-else
-{
+} else {
 	$account->fetch($bankid);
 }
 if (empty($account->userid)) $account->userid = $object->id;
@@ -106,9 +104,7 @@ if ($action == 'add' && !$cancel)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
 	}
@@ -137,9 +133,7 @@ if ($action == 'update' && !$cancel)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
     }
@@ -283,9 +277,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -339,9 +331,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -394,9 +384,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cd115dbe292..b3a3739b2c1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -294,9 +294,7 @@ if (empty($reshook)) {
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -325,9 +323,7 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -424,18 +420,13 @@ if (empty($reshook)) {
 					if (!empty($_POST["superadmin"]))
 					{
 						$object->entity = 0;
-					}
-					elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+					} elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 					{
 						$object->entity = 1; // all users in master entity
-					}
-					else
-					{
+					} else {
 						$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 					}
-				}
-				else
-				{
+				} else {
 					$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 				}
 
@@ -454,9 +445,7 @@ if (empty($reshook)) {
 				    if ($isimage > 0)
 				    {
     					$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
-				    }
-				    else
-				    {
+				    } else {
 				        $error++;
 				        $langs->load("errors");
 				        setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -471,9 +460,7 @@ if (empty($reshook)) {
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 							$langs->load("errors");
 							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
-						}
-						else
-						{
+						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
 					}
@@ -559,14 +546,11 @@ if (empty($reshook)) {
 						$langs->load("errors");
 						setEventMessages($langs->transnoentitiesnoconv("WarningYourLoginWasModifiedPleaseLogin"), null, 'warnings');
 					}
-				}
-				else {
+				} else {
 					$db->rollback();
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($caneditpassword)    // Case we can edit only password
 			{
 				dol_syslog("Not allowed to change fields, only password");
@@ -602,14 +586,10 @@ if (empty($reshook)) {
 				if ($object->send_password($user, $newpassword) > 0)
 				{
 					setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("PasswordChangedTo", $newpassword), null, 'warnings');
 			}
 		}
@@ -665,9 +645,7 @@ if (empty($reshook)) {
 					$ldap_sid = $attribute[$conf->global->LDAP_FIELD_SID];
 				}
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -764,14 +742,10 @@ if ($action == 'create' || $action == 'adduserldap')
 					}
 					$liste[$key] = $label;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 
@@ -821,9 +795,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" id="lastname" name="lastname" value="'.dol_escape_htmltag($ldap_lastname).'">';
 		print $ldap_lastname;
-	}
-	else
-	{
+	} else {
 		print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.dol_escape_htmltag(GETPOST('lastname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -835,9 +807,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="firstname" value="'.dol_escape_htmltag($ldap_firstname).'">';
 		print $ldap_firstname;
-	}
-	else
-	{
+	} else {
 		print '<input class="minwidth100" type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST('firstname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -849,14 +819,11 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_login).'">';
 		print $ldap_login;
-	}
-	elseif (!empty($ldap_loginsmb))
+	} elseif (!empty($ldap_loginsmb))
 	{
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_loginsmb).'">';
 		print $ldap_loginsmb;
-	}
-	else
-	{
+	} else {
 		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -886,9 +853,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		{
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
-		}
-		else
-		{
+		} else {
 			// We do not use a field password but a field text to show new password to use.
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
 		}
@@ -913,9 +878,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		if (!empty($conf->use_javascript_ajax))
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		print '</td></tr>';
-	}
-	else
-	{
+	} else {
 		// PARTIAL WORKAROUND
 		$generated_fake_api_key = getRandomPassword(false);
 		print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
@@ -1059,9 +1022,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="office_phone" value="'.dol_escape_htmltag($ldap_phone).'">';
 		print $ldap_phone;
-	}
-	else
-	{
+	} else {
 		print '<input size="20" type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1073,9 +1034,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="user_mobile" value="'.dol_escape_htmltag($ldap_mobile).'">';
 		print $ldap_mobile;
-	}
-	else
-	{
+	} else {
 		print '<input size="20" type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1087,9 +1046,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="office_fax" value="'.dol_escape_htmltag($ldap_fax).'">';
 		print $ldap_fax;
-	}
-	else
-	{
+	} else {
 		print '<input size="20" type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1101,9 +1058,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="email" value="'.dol_escape_htmltag($ldap_mail).'">';
 		print $ldap_mail;
-	}
-	else
-	{
+	} else {
 		print '<input size="40" type="text" name="email" value="'.dol_escape_htmltag(GETPOST('email', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1236,9 +1191,7 @@ if ($action == 'create' || $action == 'adduserldap')
 				 print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
 				 print "<td>".$mc->select_entities($conf->entity);
 				 print "</td></tr>\n";
-			}
-			else
-			{
+			} else {
 				 print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 			}
 		}
@@ -1357,9 +1310,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	print '</div>';
 
 	print "</form>";
-}
-else
-{
+} else {
 	/* ************************************************************************** */
 	/*                                                                            */
 	/* View and edition                                                            */
@@ -1410,9 +1361,7 @@ else
 							$statutUACF = $statut;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$userDisabled = 1;
 					$statutUACF = "ACCOUNTDISABLE";
 				}
@@ -1429,9 +1378,7 @@ else
 		{
 			$title = $langs->trans("Employee");
 			$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/employee/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-		}
-		else
-		{
+		} else {
 			$title = $langs->trans("User");
 			$linkback = '';
 
@@ -1502,9 +1449,7 @@ else
 			if (!empty($object->ldap_sid) && $object->statut == 0)
 			{
 				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>'.$object->login.'</td>';
 			}
 			print '</tr>'."\n";
@@ -1521,22 +1466,16 @@ else
 					if ($passDoNotExpire)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("LdapUacf_".$statutUACF);
-					}
-					elseif ($userChangePassNextLogon)
+					} elseif ($userChangePassNextLogon)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN).'</span>';
-					}
-					elseif ($userDisabled)
+					} elseif ($userDisabled)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
-					}
-					else
-					{
+					} else {
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 					}
-				}
-				else
-				{
+				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 				}
 			}
@@ -1547,8 +1486,7 @@ else
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication))
 			{
 				if ($object->pass) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
-				else
-				{
+				else {
 					if ($user->admin) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
 					else $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
 				}
@@ -1577,13 +1515,10 @@ else
 			if (!empty($conf->multicompany->enabled) && $object->admin && !$object->entity)
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("SuperAdministratorDesc"), 1, "superadmin");
-			}
-			elseif ($object->admin)
+			} elseif ($object->admin)
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("AdministratorDesc"), 1, "admin");
-			}
-			else
-			{
+			} else {
 				print yn($object->admin);
 			}
 			print '</td></tr>'."\n";
@@ -1625,8 +1560,7 @@ else
 			print '<td>';
 			if (empty($object->fk_user)) {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
-			}
-			else {
+			} else {
 				$huser = new User($db);
 				$huser->fetch($object->fk_user);
 				print $huser->getNomUrl(1);
@@ -1825,9 +1759,7 @@ else
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
 					print $societe->getNomUrl(1, '');
-				}
-				else
-				{
+				} else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				if (!empty($object->contactid))
@@ -1854,9 +1786,7 @@ else
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->getFullname($langs); // Force to show login instead of id
 					print $adh->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -1893,9 +1823,7 @@ else
 					{
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-					}
-					else
-					{
+					} else {
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 					}
@@ -1906,13 +1834,10 @@ else
 					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 					}
-				}
-				elseif ($caneditpassword && !$object->ldap_sid &&
+				} elseif ($caneditpassword && !$object->ldap_sid &&
 				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
@@ -1924,8 +1849,7 @@ else
 					if ($object->statut == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
-					}
-					elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
@@ -1934,8 +1858,7 @@ else
 					if ($object->statut == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-					}
-					elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 					{
 						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
@@ -1954,9 +1877,7 @@ else
 				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
-				}
-				else
-				{
+				} else {
 				    if ($user->id == $id)
 				    {
 				        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
@@ -1969,9 +1890,7 @@ else
 					if ($user->admin || !$object->admin) // If user edited is admin, delete is possible on for an admin
 					{
 						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
 					}
 				}
@@ -2054,9 +1973,7 @@ else
 								if ($caneditgroup)
 								{
 									print $group->getNomUrl(1);
-								}
-								else
-								{
+								} else {
 									print img_object($langs->trans("ShowGroup"), "group").' '.$group->name;
 								}
 								print '</td>';
@@ -2066,16 +1983,12 @@ else
 									print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
 									print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 									print '</a>';
-								}
-								else
-								{
+								} else {
 									print "&nbsp;";
 								}
 								print "</td></tr>\n";
 							}
-						}
-						else
-						{
+						} else {
 							print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 						}
 
@@ -2122,9 +2035,7 @@ else
 			if ($caneditfield && !$object->ldap_sid)
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
 				print $object->lastname;
 			}
@@ -2137,9 +2048,7 @@ else
 			if ($caneditfield && !$object->ldap_sid)
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
 				print $object->firstname;
 			}
@@ -2151,9 +2060,7 @@ else
 			if ($user->admin && !$object->ldap_sid)
 			{
 				print '<input maxlength="50" type="text" class="flat" name="login" value="'.$object->login.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="login" value="'.$object->login.'">';
 				print $object->login;
 			}
@@ -2177,9 +2084,7 @@ else
 				if ($caneditpassword)
 				{
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
-				}
-				else
-				{
+				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
 			}
@@ -2213,9 +2118,7 @@ else
 				print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
 				print ' ('.$langs->trans("ExternalUser").')';
 				print '</td></tr>';
-			}
-			else
-			{
+			} else {
 				print '<td>';
 				$nbAdmin = $user->getNbOfUsers('active', '', 1);
 				$nbSuperAdmin = $user->getNbOfUsers('active', 'superadmin', 1);
@@ -2275,9 +2178,7 @@ else
 						$checked = (($object->admin && !$object->entity) ? ' checked' : '');
 						print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
 					}
-				}
-				else
-				{
+				} else {
 					$yn = yn($object->admin);
 					print '<input type="hidden" name="admin" value="'.$object->admin.'">';
 					print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
@@ -2297,9 +2198,7 @@ else
 			   	if ($object->socid) $type = $langs->trans("External");
 			   	print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
 			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-		   	}
-		   	else
-			{
+		   	} else {
 				// Select mode
 				$type = 0;
 				if ($object->contactid) $type = $object->contactid;
@@ -2350,9 +2249,7 @@ else
 		   	if ($caneditfield)
 		   	{
 		   		print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-		   	}
-		   	else
-		   	{
+		   	} else {
 		   		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
 		   		$huser = new User($db);
 		   		$huser->fetch($object->fk_user);
@@ -2370,9 +2267,7 @@ else
 			if ($caneditfield)
 			{
 				print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
 				$evuser = new User($db);
 				$evuser->fetch($object->fk_user_expense_validator);
@@ -2390,9 +2285,7 @@ else
 			if ($caneditfield)
 			{
 				print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
 				$hvuser = new User($db);
 				$hvuser->fetch($object->fk_user_holiday_validator);
@@ -2460,9 +2353,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
 				print $object->office_phone;
 			}
@@ -2474,9 +2365,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
 				print $object->user_mobile;
 			}
@@ -2488,9 +2377,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
 				print $object->office_fax;
 			}
@@ -2502,9 +2389,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="email" value="'.$object->email.'">';
 				print $object->email;
 			}
@@ -2537,9 +2422,7 @@ else
 				if ($caneditfield)
 				{
 					print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="openid" value="'.$object->openid.'">';
 					print $object->openid;
 				}
@@ -2557,9 +2440,7 @@ else
 				if ($caneditfield)
 				{
 					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
 					print $object->accountancy_code;
 				}
@@ -2631,9 +2512,7 @@ else
 						$contact->fetch($object->contactid);
 						print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				print ' ('.$langs->trans("UseTypeFieldToChange").')';
@@ -2653,9 +2532,7 @@ else
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->login; // Force to show login instead of id
 					print $adh->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -2674,9 +2551,7 @@ else
 	            		print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
 	            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1, false, false, 1); // last parameter 1 means, show also a choice 0=>'all entities'
 	            		print "</td></tr>\n";
-	            	}
-	            	else
-	            	{
+	            	} else {
 	            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 	            	}
 	            }
@@ -2704,9 +2579,7 @@ else
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 				print $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				print dol_htmlentitiesbr($object->signature);
 			}
 			print '</td></tr>';
@@ -2732,9 +2605,7 @@ else
             if ($caneditfield)
             {
             	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-            }
-            else
-            {
+            } else {
             	print '<input type="hidden" name="job" value="'.$object->job.'">';
             	print $object->job;
             }
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 46022d066f3..d477e37c160 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -132,8 +132,7 @@ class Users extends DolibarrApi
 	            }
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        throw new RestException(503, 'Error when retrieve User list : '.$db->lasterror());
 	    }
 	    if (!count($obj_ret)) {
@@ -288,9 +287,7 @@ class Users extends DolibarrApi
 		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0)
 		{
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->useraccount->error);
 		}
     }
@@ -363,9 +360,7 @@ class Users extends DolibarrApi
 		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity))
 		{
 			$entity = (!empty($entity) ? $entity : $conf->entity);
-		}
-		else
-		{
+		} else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
 			// hack the security by giving himself permissions on another entity.
 			$entity = (DolibarrApiAccess::$user->entity > 0 ? DolibarrApiAccess::$user->entity : $conf->entity);
@@ -450,8 +445,7 @@ class Users extends DolibarrApi
 	            }
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        throw new RestException(503, 'Error when retrieve Group list : '.$db->lasterror());
 	    }
 	    if (!count($obj_ret)) {
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 11d0cec3654..8b62c501294 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -294,34 +294,26 @@ class User extends CommonObject
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity)))
 			{
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
-		}
-		else  // The fetch was forced on an entity
+		} else // The fetch was forced on an entity
 		{
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
-			else
-				$sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
+			else $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
 		}
 
 		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
 		{
 			$sql .= " AND (u.ldap_sid = '".$this->db->escape($sid)."' OR u.login = '".$this->db->escape($login)."') LIMIT 1";
-		}
-		elseif ($login)
+		} elseif ($login)
 		{
 			$sql .= " AND u.login = '".$this->db->escape($login)."'";
-		}
-		elseif ($email)
+		} elseif ($email)
 		{
 			$sql .= " AND u.email = '".$this->db->escape($email)."'";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND u.rowid = ".$id;
 		}
 		$sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
@@ -419,18 +411,14 @@ class User extends CommonObject
 				$this->fetch_optionals();
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
 				$this->error = "USERNOTFOUND";
 				dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
 
 				$this->db->free($result);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -456,9 +444,7 @@ class User extends CommonObject
 					$i++;
 				}
 				$this->db->free($resql);
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return -2;
 			}
@@ -524,9 +510,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -570,8 +554,7 @@ class User extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -581,8 +564,7 @@ class User extends CommonObject
 			// Ajout des droits induits
 			if (!empty($subperms))   $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
 			elseif (!empty($perms)) $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
-		}
-		else {
+		} else {
 			// On a pas demande un droit en particulier mais une liste de droits
 			// sur la base d'un nom de module de de perms
 			// Where pour la liste des droits a ajouter
@@ -591,9 +573,7 @@ class User extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$whereforadd = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -628,9 +608,7 @@ class User extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -650,8 +628,7 @@ class User extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -693,8 +670,7 @@ class User extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -712,9 +688,7 @@ class User extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$wherefordel = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -749,9 +723,7 @@ class User extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -771,8 +743,7 @@ class User extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -832,9 +803,7 @@ class User extends CommonObject
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
 		{
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND ur.entity = ".$conf->entity;
 		}
 		$sql .= " AND ur.fk_user= ".$this->id;
@@ -865,9 +834,7 @@ class User extends CommonObject
 							if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 							if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 							$this->rights->$module->$perms->$subperms = 1;
-						}
-						else
-						{
+						} else {
 							if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 							$this->rights->$module->$perms = 1;
 						}
@@ -891,9 +858,7 @@ class User extends CommonObject
 			} else {
 				$sql .= " AND r.entity = ".$conf->entity;
 			}
-		}
-		else
-		{
+		} else {
 			$sql .= " AND gr.entity = ".$conf->entity;
 			$sql .= " AND gu.entity = ".$conf->entity;
 			$sql .= " AND r.entity = ".$conf->entity;
@@ -925,9 +890,7 @@ class User extends CommonObject
 						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
-					}
-					else
-					{
+					} else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
 						if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
@@ -947,9 +910,7 @@ class User extends CommonObject
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de user
 			$this->all_permissions_are_loaded = 1;
-		}
-		else
-		{
+		} else {
 			// If module defined, we flag it as loaded into cache
 			$this->_tab_loaded[$moduletag] = 1;
 		}
@@ -992,9 +953,7 @@ class User extends CommonObject
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1132,9 +1091,7 @@ class User extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1199,9 +1156,7 @@ class User extends CommonObject
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
 				return -6;
-			}
-			else
-			{
+			} else {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
 				$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
 				$result = $this->db->query($sql);
@@ -1252,25 +1207,19 @@ class User extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						//$this->error=$interface->error;
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -2;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1338,17 +1287,13 @@ class User extends CommonObject
 
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_contact - 0");
 
@@ -1423,9 +1368,7 @@ class User extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 
 					$this->db->rollback();
@@ -1438,9 +1381,7 @@ class User extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			// $this->error deja positionne
 			$this->db->rollback();
 			return -2;
@@ -1694,8 +1635,7 @@ class User extends CommonObject
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->error = $adh->error;
 						$this->errors = $adh->errors;
@@ -1751,9 +1691,7 @@ class User extends CommonObject
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $tmpobj->error;
 						$this->errors = $tmpobj->errors;
 						$error++;
@@ -1785,16 +1723,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return $nbrowsaffected;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -1826,9 +1760,7 @@ class User extends CommonObject
 			$this->datepreviouslogin = $this->datelastlogin;
 			$this->datelastlogin = $now;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
 			return -1;
 		}
@@ -1876,9 +1808,7 @@ class User extends CommonObject
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 			{
 				$sql .= ", pass = null";
-			}
-			else
-			{
+			} else {
 				$sql .= ", pass = '".$this->db->escape($password)."'";
 			}
 			$sql .= " WHERE rowid = ".$this->id;
@@ -1911,9 +1841,7 @@ class User extends CommonObject
 								dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
 								$error++;
 							}
-						}
-						else
-						{
+						} else {
 							$this->error = $adh->error;
 							$error++;
 						}
@@ -1931,22 +1859,16 @@ class User extends CommonObject
 
 					$this->db->commit();
 					return $this->pass;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			// We store clear password in password temporary field.
 			// After receiving confirmation link, we will crypt it and store it in pass_crypted
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -1958,9 +1880,7 @@ class User extends CommonObject
 			if ($result)
 			{
 				return $password;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -3;
 			}
@@ -2000,9 +1920,7 @@ class User extends CommonObject
 
 		if ($this->conf->MAIN_LANG_DEFAULT) {
             $outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
-        }
-		else
-		{	// If user has not defined its own language, we used current language
+        } else {	// If user has not defined its own language, we used current language
 			$outputlangs = $langs;
 		}
 
@@ -2032,9 +1950,7 @@ class User extends CommonObject
 			$mesg .= $user->getFullName($outputlangs); // Username that send the email (not the user for who we want to reset password)
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
-		}
-		else
-		{
+		} else {
 			$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.urlencode($this->login)."&passwordhash=".dol_hash($password);
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";
@@ -2071,9 +1987,7 @@ class User extends CommonObject
 		if ($mailfile->sendfile())
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$langs->trans("errors");
 			$this->error = $langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;
 			return -1;
@@ -2121,9 +2035,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2160,9 +2072,7 @@ class User extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2216,16 +2126,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2273,16 +2179,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2773,9 +2675,7 @@ class User extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2801,9 +2701,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2827,9 +2725,7 @@ class User extends CommonObject
 		{
 			$sql .= " WHERE entity = 0";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE entity IN (".getEntity('user', 0).")";
 			if ($limitTo == 'active') $sql .= " AND statut = 1";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
@@ -2843,9 +2739,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2916,9 +2810,7 @@ class User extends CommonObject
 				$users[] = $user;
 			}
 			return $users;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2951,9 +2843,7 @@ class User extends CommonObject
 				$this->parentof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3022,9 +2912,7 @@ class User extends CommonObject
 				$this->users[$obj->rowid]['photo'] = $obj->photo;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3082,9 +2970,7 @@ class User extends CommonObject
 		if (isset($this->cache_childids[$this->id]))
 		{
 			$childids = $this->cache_childids[$this->id];
-		}
-		else
-		{
+		} else {
 			// Init this->users
 			$this->get_full_tree();
 
@@ -3195,9 +3081,7 @@ class User extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3227,9 +3111,7 @@ class User extends CommonObject
 			if (!empty($conf->global->USER_ADDON_PDF))
 			{
 				$modele = $conf->global->USER_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = 'bluesky';
 			}
 		}
@@ -3271,9 +3153,7 @@ class User extends CommonObject
 				elseif ($mode == 'mobile') $user_property = $obj->user_mobile;
 			}
 			return $user_property;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3309,14 +3189,10 @@ class User extends CommonObject
 					$sql .= " AND ug.entity IN (".getEntity('user')."))";
 					$sql .= " OR t.entity = 0)"; // Show always superadmin
 				}
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE t.entity IN (".getEntity('user').")";
 			}
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE 1";
 		}
 
@@ -3326,14 +3202,11 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -3364,9 +3237,7 @@ class User extends CommonObject
 				$this->db->free($resql);
 			}
 			return $num;
-		}
-		else
-		{
+		} else {
             $this->errors[] = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 79df9d287ec..325753fc773 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -104,9 +104,7 @@ class UserBankAccount extends Account
 
                 return $this->update($user);
             }
-        }
-        else
-        {
+        } else {
             print $this->db->error();
             return 0;
         }
@@ -142,17 +140,14 @@ class UserBankAccount extends Account
 
         if (trim($this->label) != '')
             $sql .= ",label = '".$this->db->escape($this->label)."'";
-        else
-            $sql .= ",label = NULL";
+        else $sql .= ",label = NULL";
         $sql .= " WHERE rowid = ".$this->id;
 
         $result = $this->db->query($sql);
         if ($result)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return 0;
         }
@@ -203,9 +198,7 @@ class UserBankAccount extends Account
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index bc5396e9f51..f9a5243407f 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -154,9 +154,7 @@ class UserGroup extends CommonObject
 		if (!empty($groupname))
 		{
 			$result = $this->fetchCommon(0, '', ' AND nom = \''.$this->db->escape($groupname).'\'');
-		}
-		else
-		{
+		} else {
 			$result = $this->fetchCommon($id);
 		}
 
@@ -170,9 +168,7 @@ class UserGroup extends CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -200,9 +196,7 @@ class UserGroup extends CommonObject
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " AND g.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " ORDER BY g.nom";
@@ -226,9 +220,7 @@ class UserGroup extends CommonObject
 			$this->db->free($result);
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -257,9 +249,7 @@ class UserGroup extends CommonObject
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " AND u.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		}
 		if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
@@ -277,8 +267,7 @@ class UserGroup extends CommonObject
 						$newuser = new User($this->db);
 						$newuser->fetch($obj->rowid);
 						$ret[$obj->rowid] = $newuser;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 				if ($mode != 1 && !empty($obj->usergroup_entity))
 				{
@@ -289,9 +278,7 @@ class UserGroup extends CommonObject
 			$this->db->free($resql);
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -333,8 +320,7 @@ class UserGroup extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -348,17 +334,14 @@ class UserGroup extends CommonObject
 			// Pour compatibilite, si lowid = 0, on est en mode ajout de tout
 			// TODO A virer quand sera gere par l'appelant
 			//if (substr($rid,-1,1) == 0) $whereforadd="module='$module'";
-		}
-		else {
+		} else {
 			// Where pour la liste des droits a ajouter
 			if (!empty($allmodule))
 			{
 				if ($allmodule == 'allmodules')
 				{
 					$whereforadd = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -393,9 +376,7 @@ class UserGroup extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -415,8 +396,7 @@ class UserGroup extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -458,8 +438,7 @@ class UserGroup extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -480,9 +459,7 @@ class UserGroup extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$wherefordel = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -517,9 +494,7 @@ class UserGroup extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -539,8 +514,7 @@ class UserGroup extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -604,9 +578,7 @@ class UserGroup extends CommonObject
 						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
-					}
-					else
-					{
+					} else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						$this->rights->$module->$perms = 1;
 					}
@@ -622,9 +594,7 @@ class UserGroup extends CommonObject
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de group
 			$this->all_permissions_are_loaded = 1;
-		}
-		else
-		{
+		} else {
 			// If module defined, we flag it as loaded into cache
 		    $this->_tab_loaded[$moduletag] = 1;
 		}
@@ -901,9 +871,7 @@ class UserGroup extends CommonObject
 			if (!empty($conf->global->USERGROUP_ADDON_PDF))
 			{
 				$modele = $conf->global->USERGROUP_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = 'grass';
 			}
 		}
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index c81e4068558..20c51a28ba4 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -121,9 +121,7 @@ if ($id > 0)
             {
                 $langs->load("errors");
                 print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-            }
-            else
-            {
+            } else {
                 print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
             }
             print '</td>';
@@ -146,8 +144,7 @@ if ($id > 0)
         print "</tr>\n";
 
         print '</table>';
-    }
-    else	// View mode
+    } else // View mode
     {
         print '<table class="border centpercent tableforfield">';
 
@@ -161,9 +158,7 @@ if ($id > 0)
         	{
         	    $langs->load("errors");
         	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-        	}
-        	else
-        	{
+        	} else {
         		print $form->textwithpicto((empty($object->clicktodial_url) ? $langs->trans("DefaultLink").': ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
         	}
         	print '</td>';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 2b8c67d7ae6..83b525d03de 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -171,9 +171,7 @@ if ($object->id)
 	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 1cd3b3edc37..e4e8913c3af 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -114,9 +114,7 @@ if (empty($reshook)) {
 			$object->delete($user);
 			header("Location: ".DOL_URL_ROOT."/user/group/list.php?restore_lastsearch_values=1");
 			exit;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -152,9 +150,7 @@ if (empty($reshook)) {
 
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 
 					$langs->load("errors");
@@ -162,9 +158,7 @@ if (empty($reshook)) {
 					$action = "create"; // Go back to create page
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -189,15 +183,11 @@ if (empty($reshook)) {
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($edituser->error, $edituser->errors, 'errors');
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -231,15 +221,11 @@ if (empty($reshook)) {
 			{
 				setEventMessages($langs->trans("GroupModified"), null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
 		}
@@ -286,9 +272,7 @@ if ($action == 'create')
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
 			print "</td></tr>\n";
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 		}
 	}
@@ -318,8 +302,7 @@ if ($action == 'create')
 /* Visu et edition                                                            */
 /*                                                                            */
 /* ************************************************************************** */
-else
-{
+else {
     if ($id)
     {
 		$res = $object->fetch_optionals();
@@ -487,16 +470,12 @@ else
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
 							print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 							print '</a>';
-						}
-						else
-						{
+						} else {
 							print "-";
 						}
 						print "</td></tr>\n";
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 				}
 				print "</table>";
@@ -556,9 +535,7 @@ else
 					print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 					print "<td>".$mc->select_entities($object->entity);
 					print "</td></tr>\n";
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 				}
 			}
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 5462167b4af..8e69101b44d 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -83,9 +83,7 @@ if ($action == 'dolibarr2ldap')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
@@ -195,21 +193,15 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else
-		{
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 1701d2ae9c1..ace4e863c01 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -116,9 +116,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergrou
 if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 {
 	$sql .= " WHERE g.entity IS NOT NULL";
-}
-else
-{
+} else {
 	$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 }
 if (!empty($search_group)) natural_search(array("g.nom", "g.note"), $search_group);
@@ -221,9 +219,7 @@ if ($resql)
     print "</form>\n";
 
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 70030dbf1af..71f8f5b0ebd 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -188,9 +188,7 @@ if ($object->id > 0)
     			$i++;
     	}
     	$db->free($result);
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
@@ -324,9 +322,7 @@ if ($object->id > 0)
             		print '<td class="center nowrap">';
             		print img_picto($langs->trans("Active"), 'tick');
             		print '</td>';
-            	}
-            	else
-            	{
+            	} else {
             		// Do not own permission
             		if ($caneditperms)
             		{
@@ -334,9 +330,7 @@ if ($object->id > 0)
             		}
             		print '<td>&nbsp</td>';
             	}
-            }
-            else
-            {
+            } else {
             	// Do not own permission
             	if ($caneditperms)
             	{
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3a05bb3d640..5278835be3c 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -79,9 +79,7 @@ $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_stat
 if (!is_array($user_arbo) && $user_arbo < 0)
 {
     setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
-}
-else
-{
+} else {
     // Define fulltree array
     $fulltree = $user_arbo;
     //var_dump($fulltree);
@@ -112,9 +110,7 @@ else
     		if (empty($entity))
     		{
     			$entitystring = $langs->trans("AllEntities");
-    		}
-    		else
-    		{
+    		} else {
     			$mc->getInfo($entity);
     			$entitystring = $mc->label;
     		}
@@ -124,8 +120,7 @@ else
     	if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
     	{
     		$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
-    	}
-    	elseif ($userstatic->admin)
+    	} elseif ($userstatic->admin)
     	{
     		$li .= img_picto($langs->trans("Administrator"), 'star');
     	}
@@ -196,9 +191,7 @@ else
     	print '</td>';
     	print '<td></td>';
     	print '</tr>';
-    }
-    else
-    {
+    } else {
     	print '<tr '.$bc[true].'>';
     	print '<td colspan="3">';
     	print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4c46c502acc..2fa6ec1e7ae 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -158,8 +158,7 @@ if ($resql)
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"), 'redstar');
-		}
-		elseif ($obj->admin)
+		} elseif ($obj->admin)
 		{
 			print img_picto($langs->trans("Administrator"), 'star');
 		}
@@ -169,9 +168,7 @@ if ($resql)
 		if ($obj->fk_soc)
 		{
             print $companystatic->getNomUrl(1);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("InternalUser");
 		}
 		if ($obj->ldap_sid)
@@ -187,9 +184,7 @@ if ($resql)
 			if (empty($entity))
 			{
 				$entitystring = $langs->trans("AllEntities");
-			}
-			else
-			{
+			} else {
 				$mc->getInfo($entity);
 				$entitystring = $mc->label;
 			}
@@ -209,9 +204,7 @@ if ($resql)
 	print "</div><br>";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -228,9 +221,7 @@ if ($canreadperms)
 	if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 	{
 		$sql .= " WHERE g.entity IS NOT NULL";
-	}
-	else
-	{
+	} else {
 		$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 	}
 	$sql .= $db->order("g.datec", "DESC");
@@ -283,9 +274,7 @@ if ($canreadperms)
 		print "</div><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 71410eb223a..eaa3de2c55d 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -75,8 +75,7 @@ if (empty($reshook))
 
 		if ($result >= 0) {
 			setEventMessages($langs->trans("UserSynchronized"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -113,9 +112,7 @@ print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
 if ($object->ldap_sid)
 {
 	print '<td class="warning">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-}
-else
-{
+} else {
 	print '<td>'.$object->login.'</td>';
 }
 print '</tr>';
@@ -198,22 +195,16 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else
-		{
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ef6e205fd0d..84447ea9781 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -521,8 +521,7 @@ while ($i < min($num, $limit))
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 		  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-		}
-		elseif ($obj->admin)
+		} elseif ($obj->admin)
 		{
 			print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 		}
@@ -575,13 +574,10 @@ while ($i < min($num, $limit))
 			$companystatic->name = $obj->name;
 			$companystatic->canvas = $obj->canvas;
 			print $companystatic->getNomUrl(1);
-		}
-		elseif ($obj->ldap_sid)
+		} elseif ($obj->ldap_sid)
 		{
 			print $langs->trans("DomainUser");
-		}
-		else
-	    {
+		} else {
 			print $langs->trans("InternalUser");
 		}
 		print '</td>';
@@ -596,9 +592,7 @@ while ($i < min($num, $limit))
 			if (!$obj->entity)
 			{
 				print $langs->trans("AllEntities");
-			}
-			else
-			{
+			} else {
 				$mc->getInfo($obj->entity);
 				print $mc->label;
 			}
@@ -627,8 +621,7 @@ while ($i < min($num, $limit))
 			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
 			{
 			  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-			}
-			elseif ($obj->admin2)
+			} elseif ($obj->admin2)
 			{
 				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 			}
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ab4df07e193..beece592a3b 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -120,9 +120,7 @@ if ($id)
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
 		$doleditor->Create();
-	}
-	else
-	{
+	} else {
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 	}
 	print "</td></tr>";
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 84fbf2793e3..bc07dc0270d 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -87,18 +87,14 @@ if ($action == 'add')
                 $error++;
                 dol_print_error($db);
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
         if (!$error)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
     }
@@ -151,9 +147,7 @@ if ($result > 0)
     if (!empty($object->ldap_sid) && $object->statut == 0)
     {
         print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-    }
-    else
-    {
+    } else {
         print '<td>'.$object->login.'</td>';
     }
     print '</tr>'."\n";
@@ -227,9 +221,7 @@ if ($result > 0)
         if (isValidEmail($object->email))
         {
             print ' &lt;'.$object->email.'&gt;';
-        }
-        else
-        {
+        } else {
             $langs->load("errors");
             print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
         }
@@ -243,9 +235,7 @@ if ($result > 0)
         print '</td>';
         print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="4">';
         print $langs->trans("YouMustAssignUserMailFirst");
         print '</td></tr>';
@@ -271,9 +261,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -311,9 +299,7 @@ if ($result > 0)
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
-                {
+                } else {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
@@ -420,9 +406,7 @@ if ($result > 0)
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -470,9 +454,7 @@ if ($result > 0)
 	            $userstatic->firstname = $obj->firstname;
 	            print $userstatic->getNomUrl(1);
 	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            }
-            else
-			{
+            } else {
 				print $obj->email;
             }
             print '</td>';
@@ -499,16 +481,14 @@ if ($result > 0)
             $i++;
         }
         $db->free($resql);
-    }
-    else {
+    } else {
     	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
     }
 
     print '</table>';
 
     print '</form>';
-}
-else dol_print_error('', 'RecordNotFound');
+} else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index f9ebd310cfa..1f0880b0fb3 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -324,9 +324,7 @@ if ($action == 'edit')
     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
     print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
     print '</div>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -348,8 +346,7 @@ else
     if (!empty($tmparray[$object->conf->MAIN_LANDING_PAGE]))
     {
         print $langs->trans($tmparray[$object->conf->MAIN_LANDING_PAGE]);
-    }
-    else print $object->conf->MAIN_LANDING_PAGE;
+    } else print $object->conf->MAIN_LANDING_PAGE;
     //print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
     print '</td></tr>';
 
@@ -396,15 +393,11 @@ else
     if (empty($user->admin) && !empty($dolibarr_main_demo))
     {
         print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify")."</a>";
-    }
-    else
-    {
+    } else {
         if ($caneditfield || !empty($user->admin))       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
         {
             print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
-        }
-        else
-        {
+        } else {
             print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify")."</a>";
         }
     }
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 83289521538..8baae98e6ef 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -72,9 +72,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     if ($result < 0)
     {
         $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
-    }
-    else
-    {
+    } else {
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
         	// Clear session
@@ -85,9 +83,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
             header("Location: ".DOL_URL_ROOT.'/');
             exit;
-        }
-        else
-        {
+        } else {
         	$langs->load("errors");
             $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
         }
@@ -103,9 +99,7 @@ if ($action == 'buildnewpassword' && $username)
     if (!$ok)
     {
         $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-    }
-    else
-    {
+    } else {
         $edituser = new User($db);
         $result = $edituser->fetch('', $username, '', 1);
         if ($result == 0 && preg_match('/@/', $username))
@@ -117,31 +111,23 @@ if ($action == 'buildnewpassword' && $username)
         {
             $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
             $username = '';
-        }
-        else
-        {
+        } else {
             if (!$edituser->email)
             {
                 $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-            }
-            else
-            {
+            } else {
                 $newpassword = $edituser->setPassword($user, '', 1);
                 if ($newpassword < 0)
                 {
                     // Failed
                     $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
-                }
-                else
-                {
+                } else {
                     // Success
                     if ($edituser->send_password($user, $newpassword, 1) > 0)
                     {
                     	$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
                         $username = '';
-                    }
-                    else
-                    {
+                    } else {
                         $message .= '<div class="error">'.$edituser->error.'</div>';
                     }
                 }
@@ -165,9 +151,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_
 if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/passwordforgotten.tpl.php"))
 {
     $template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
-}
-else
-{
+} else {
     $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 }
 
@@ -186,17 +170,14 @@ $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-}
-elseif (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+} elseif (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 	$width = 128;
-}
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
 {
 	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg';
-}
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 {
 	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 }
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 5d06973abf6..606380acd7c 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -208,9 +208,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -239,9 +237,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -386,8 +382,7 @@ if ($result)
         	print '<td class="center nowrap">';
         	print img_picto($langs->trans("Active"), 'tick');
         	print '</td>';
-        }
-        elseif (in_array($obj->id, $permsuser))					// Permission granted by user
+        } elseif (in_array($obj->id, $permsuser))					// Permission granted by user
         {
         	if ($caneditperms)
         	{
@@ -396,8 +391,7 @@ if ($result)
         	print '<td class="center nowrap">';
         	print img_picto($langs->trans("Active"), 'tick');
         	print '</td>';
-        }
-        elseif (is_array($permsgroupbyentity[$entity]))
+        } elseif (is_array($permsgroupbyentity[$entity]))
         {
         	if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission granted by group
 	        {
@@ -410,9 +404,7 @@ if ($result)
 	        	print '<td class="center nowrap">';
 	        	print img_picto($langs->trans("Active"), 'tick');
 	        	print '</td>';
-	        }
-	        else
-	        {
+	        } else {
 	        	// Do not own permission
 	        	if ($caneditperms)
 	        	{
@@ -420,9 +412,7 @@ if ($result)
 	        	}
 	        	print '<td>&nbsp</td>';
 	        }
-        }
-        else
-        {
+        } else {
         	// Do not own permission
         	if ($caneditperms)
         	{
@@ -439,8 +429,7 @@ if ($result)
 
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 399be5de0ee..744f8ea900e 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -102,8 +102,7 @@ if ($confirm == 'yes') {
 			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
 		exit();
-	}
-	elseif ($action == 'confirm_deletevalue')
+	} elseif ($action == 'confirm_deletevalue')
 	{
 		if ($objectval->fetch($valueid) > 0) {
 			if ($objectval->delete() < 1) {
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 160504b518b..36b4823b51b 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -119,8 +119,7 @@ class ProductAttribute
 
     			$return[] = $tmp;
     		}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $return;
 	}
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 15e019dd311..3886a8fcdce 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -105,9 +105,7 @@ if ($_POST) {
 
 		if (!$features) {
 			setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-		}
-		else
-		{
+		} else {
 			$reference = trim($reference);
 		    if (empty($reference)) {
 		        $reference = false;
@@ -166,8 +164,7 @@ if ($_POST) {
 
 			$db->rollback();
 		}
-	}
-	elseif (!empty($massaction))
+	} elseif (!empty($massaction))
 	{
 		$bulkaction = $massaction;
 		$error = 0;
@@ -220,8 +217,7 @@ if ($_POST) {
 			$db->commit();
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
-	}
-	elseif ($valueid > 0) {
+	} elseif ($valueid > 0) {
 		if ($prodcomb->fetch($valueid) < 0) {
 			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 			exit();
@@ -360,9 +356,7 @@ if (!empty($id) || !empty($ref))
 	if ($object->weight != '')
 	{
 		print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print "</td></tr>\n";
@@ -627,9 +621,7 @@ if (!empty($id) || !empty($ref))
 		<?php
 
         print '</form>';
-	}
-	else
-	{
+	} else {
 		if ($action === 'delete') {
 			if ($prodcomb->fetch($valueid) > 0) {
 				$prodstatic->fetch($prodcomb->fk_product_child);
@@ -800,9 +792,7 @@ if (!empty($id) || !empty($ref))
     			print '</td>';
     			print '</tr>';
 		    }
-		}
-		else
-		{
+		} else {
 		     print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print '</table>';
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 55bf1c81f34..c11f6b5f485 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -42,9 +42,7 @@ if ($_POST) {
 			if ($backtopage)
 			{
 				header('Location: '.$backtopage);
-			}
-			else
-			{
+			} else {
 				header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$resid.'&backtopage='.urlencode($backtopage));
 			}
 			exit;
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index b2534ee92dd..c2856848dc5 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -127,8 +127,7 @@ if (GETPOST("cache", 'alpha'))
     {
         header('Cache-Control: max-age=3600, public, must-revalidate');
         header('Pragma: cache'); // This is to avoid having Pragma: no-cache
-    }
-    else header('Cache-Control: no-cache');
+    } else header('Cache-Control: no-cache');
     //print $dolibarr_nocache; exit;
 }
 
@@ -155,20 +154,14 @@ if (!empty($hashp))
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else
-			{
+			} else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
-		}
-		else
-		{
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -198,19 +191,14 @@ $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
 
-if (!empty($hashp))
-{
+if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-}
-elseif (isset($_GET["publictakepos"]))
-{
+} elseif (isset($_GET["publictakepos"])) {
 	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
 		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
 	}
-}
-else
-{
+} else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
@@ -290,9 +278,8 @@ if ($modulepart == 'barcode')
     {
         $result = $module->buildBarCode($code, $encoding, $readable);
     }
-}
-else					// Open and return file
-{
+} else {
+    // Open and return file
     clearstatcache();
 
     $filename = basename($fullpath_original_file);
@@ -314,9 +301,7 @@ else					// Open and return file
     {
         top_httphead($type);
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    }
-    else
-    {
+    } else {
         top_httphead('image/png');
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
     }
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 819694f5041..cb0940bb61c 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -48,8 +48,7 @@ if ($actionsave)
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
-    else
-    {
+    else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 39ed3b3cdf5..092624c1501 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -328,14 +328,12 @@ function getActionComm($authentication, $id)
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncomm'=>$actioncomm_result_fields);
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -388,15 +386,11 @@ function getListActionCommType($authentication)
 				 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncommtypes'=>$resultarray);
-			}
-			else
-			{
+			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -482,8 +476,7 @@ function createActionComm($authentication, $actioncomm)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index de1fb73d3c0..d7382447749 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -262,14 +262,12 @@ function getCategory($authentication, $id)
 					'categorie'=> $cat
 			    );
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 804cb3f7db1..023cdc1c4ac 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -333,14 +333,12 @@ function getContact($authentication, $id, $ref_ext)
 			        'contact'=>$contact_result_fields
                 );
 	        }
-	        else
-	        {
+	        else {
 	            $error++;
 	            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 	        }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
         }
@@ -451,8 +449,7 @@ function createContact($authentication, $contact)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -584,8 +581,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 46590688f88..8b15ade0a6a 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -370,14 +370,12 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 			        	'lines' => $linesresp
 			        ));
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -511,8 +509,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
@@ -627,8 +624,7 @@ function createInvoice($authentication, $invoice)
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
             		'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -707,14 +703,12 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -724,8 +718,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
-	else
-	{
+	else {
 		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref, 'ref_ext'=>$newobject->ref_ext);
 	}
 
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 0b22ea9aab6..7018f5fb5c8 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -473,15 +473,13 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 					));
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
                 $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED';
             $errorlabel = 'User does not have permission for this request';
@@ -640,8 +638,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
@@ -786,8 +783,7 @@ function createOrder($authentication, $order)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
 		}
-		else
-		{
+		else {
 			dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
 			$db->rollback();
 			$error++;
@@ -848,24 +844,21 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 					$outputlangs = $langs;
 					$order->generateDocument($order->modelpdf, $outputlangs);
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					$error++;
 					$errorcode = 'KO';
 					$errorlabel = $order->error;
 				}
 			}
-			else
-			{
+			else {
 				$db->rollback();
 				$error++;
 				$errorcode = 'KO';
 				$errorlabel = $order->error;
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -877,8 +870,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
-	else
-	{
+	else {
 		$db->commit();
 		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
 	}
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 4ae702ade15..71ee78d3c4d 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -304,8 +304,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 					'document'=>$objectret
 				);
 			}
-			else
-			{
+			else {
 				dol_syslog("File doesn't exist ".$original_file);
 				$errorcode = 'NOT_FOUND';
 				$errorlabel = '';
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 38dab505bac..5145c4a3b7b 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -197,8 +197,7 @@ function createPayment($authentication, $payment)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index a98d8b2a6cd..fa5eab60fa8 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -450,14 +450,12 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 			        'product'=>$productorservice_result_fields
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -613,8 +611,7 @@ function createProductOrService($authentication, $product)
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -627,8 +624,7 @@ function createProductOrService($authentication, $product)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -754,8 +750,7 @@ function updateProductOrService($authentication, $product)
         {
             $error++;
         }
-        else
-		{
+        else {
         	// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && !empty($conf->global->stock->enabled))
 			{
@@ -785,8 +780,7 @@ function updateProductOrService($authentication, $product)
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -819,8 +813,7 @@ function updateProductOrService($authentication, $product)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-		{
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -890,8 +883,7 @@ function deleteProductOrService($authentication, $listofidstring)
 		        $firsterror = 'Product or service with id '.$id.' not found';
 		        break;
 	        }
-	        else
-			{
+	        else {
 		        $result = $newobject->delete($user);
 		        if ($result <= 0)
 		        {
@@ -910,8 +902,7 @@ function deleteProductOrService($authentication, $listofidstring)
             //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 	    }
-	    else
-	    {
+	    else {
 	    	$db->rollback();
 	        $error++;
 	        $errorcode = 'KO';
@@ -983,8 +974,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
          		$i++;
          	}
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = $db->lasterrno();
             $errorlabel = $db->lasterror();
@@ -997,9 +987,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
         	'products'=>$arrayproducts
         );
-    }
-    else
-    {
+    } else {
         $objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
         	'products'=>$arrayproducts
@@ -1139,21 +1127,18 @@ function getProductsForCategory($authentication, $id, $lang = '')
 					'products'=> $products
 					);
 				}
-				else
-				{
+				else {
 					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$errorcode, LOG_DEBUG);
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 5bbaaaf035a..dc8fc81db2c 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -298,8 +298,7 @@ function createProject($authentication, $project)
                     $error++;
                 }
             }
-            else
-            {
+            else {
                 $error++;
             }
 
@@ -308,16 +307,14 @@ function createProject($authentication, $project)
                 $db->commit();
                 $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
             }
-            else
-            {
+            else {
                 $db->rollback();
                 $error++;
                 $errorcode = 'KO';
                 $errorlabel = $newobject->error;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -424,14 +421,12 @@ function getProject($authentication, $id = '', $ref = '')
                     'project'=>$project_result_fields
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 78a00ced40e..ecf2c51fd1f 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -303,14 +303,12 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 			    ));
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -441,8 +439,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index d69b481323e..1e9f8355d52 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -378,14 +378,12 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'thirdparty'=>$thirdparty_result_fields);
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -515,8 +513,7 @@ function createThirdParty($authentication, $thirdparty)
 
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -750,8 +747,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
                 $i++;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = $db->lasterrno();
             $errorlabel = $db->lasterror();
@@ -765,8 +761,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
             'thirdparties'=>$arraythirdparties
         );
     }
-    else
-    {
+    else {
         $objectresp = array(
             'result'=>array('result_code' => 'OK', 'result_label' => ''),
             'thirdparties'=>$arraythirdparties
@@ -828,8 +823,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 					$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					$error++;
 					$errorcode = 'KO';
@@ -837,14 +831,12 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 					dol_syslog("Function: deleteThirdParty cant delete");
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 8793d2f02fa..bc43c4ab6d4 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -372,14 +372,12 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
                     )
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -426,8 +424,7 @@ function getListOfGroups($authentication)
 		{
 			$sql .= " WHERE g.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
@@ -444,8 +441,7 @@ function getListOfGroups($authentication)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno();
 			$errorlabel = $db->lasterror();
@@ -459,8 +455,7 @@ function getListOfGroups($authentication)
 		'groups'=>$arraygroups
 		);
 	}
-	else
-	{
+	else {
 		$objectresp = array(
 		'result'=>array('result_code' => 'OK', 'result_label' => ''),
 		'groups'=>$arraygroups
@@ -526,8 +521,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 					$error++;
 					$errorcode = 'ALREADY_EXIST'; $errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
 				}
-				else
-				{
+				else {
 					$db->begin();
 					/*
 					 * Company creation
@@ -633,14 +627,12 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 								if ($thirdpartywithuser['group_id'] > 0)
 									$edituser->SetInGroup($thirdpartywithuser['group_id'], $conf->entity);
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$edituser->error;
 							}
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$contact->error;
 						}
@@ -650,23 +642,17 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 							$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'), 'id'=>$socid_return);
 							$error = 0;
 						}
-					}
-					else
-					{
+					} else {
 						$error++;
 						$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				// retour creation KO
 				$error++;
 				$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -732,20 +718,17 @@ function setUserPassword($authentication, $shortuser)
 						'groups'=>$arraygroups
 					);
 				}
-				else
-				{
+				else {
 					$error++;
 					$errorcode = 'NOT_MODIFIED'; $errorlabel = 'Error when changing password';
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'User not found';
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d579a8b3153..51008beffd7 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -728,8 +728,7 @@ class Website extends CommonObject
 						$newidforhome = $objectpagenew->id;
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages($objectpageold->error, $objectpageold->errors, 'errors');
 					$error++;
 				}
@@ -1089,8 +1088,7 @@ class Website extends CommonObject
 		{
 			return $filename;
 		}
-		else
-		{
+		else {
 			global $errormsg;
 			$this->error = $errormsg;
 			return '';
@@ -1263,8 +1261,7 @@ class Website extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $object->id;
 		}
@@ -1342,8 +1339,7 @@ class Website extends CommonObject
 		{
 			return -1;
 		}
-		else
-		{
+		else {
 			return 1;
 		}
 	}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 2a72a222265..dcc7b0508fa 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -238,8 +238,7 @@ class WebsitePage extends CommonObject
 		{
 			$sql .= ' AND t.rowid = '.$id;
 		}
-		else
-		{
+		else {
 			if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
 			if (null !== $website_id) {
 			    $sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
@@ -359,7 +358,7 @@ class WebsitePage extends CommonObject
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
 					$foundnull = 0;
-					foreach(explode(',', $value) as $tmpvalue) {
+					foreach (explode(',', $value) as $tmpvalue) {
 						if ($tmpvalue == 'null') {
 							$foundnull++;
 							continue;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index a6f4f0250fb..4198ef8e1eb 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -145,20 +145,19 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 				$res = $objectpage->fetch($object->fk_default_home, $object->id, ''); // We search first page of web site
 				if ($res > 0) $pageid = $object->fk_default_home;
 			}
-			else
-			{
+			else {
 				$res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
 				if ($res == 0)	// Page was not found, we reset it
 				{
 					$objectpage = new WebsitePage($db);
 				}
-				else			// We found a page, we set pageid to it.
+				else // We found a page, we set pageid to it.
 				{
 					$pageid = $objectpage->id;
 				}
 			}
 		}
-		else	// We have a valid page. We force pageid for the case we got the page with a fetch on ref.
+		else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
 		{
 			$pageid = $objectpage->id;
 		}
@@ -516,8 +515,7 @@ if ($action == 'addsite')
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		$action = 'createsite';
 	}
@@ -611,8 +609,7 @@ if ($action == 'addcontainer')
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
 				$action = 'createcontainer';
 			}
-			else
-			{
+			else {
 				// Remove comments
 				$tmp['content'] = removeHtmlComment($tmp['content']);
 
@@ -700,8 +697,7 @@ if ($action == 'addcontainer')
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
-					else
-					{
+					else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
@@ -769,8 +765,7 @@ if ($action == 'addcontainer')
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
-					else
-					{
+					else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
@@ -805,8 +800,7 @@ if ($action == 'addcontainer')
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action = 'createcontainer';
 					}
-					else
-					{
+					else {
 						// Clean some comment
 						//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
 						//$tmpgeturl['content'] = utf8_encode(utf8_decode($tmpgeturl['content']));
@@ -874,8 +868,7 @@ if ($action == 'addcontainer')
 			}
 		}
 	}
-	else
-	{
+	else {
 		$objectpage->title = GETPOST('WEBSITE_TITLE', 'alphanohtml');
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'aZ09');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
@@ -974,8 +967,7 @@ if ($action == 'addcontainer')
 			{
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
 			}
-			else
-			{
+			else {
 				setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 				$action = 'createcontainer';
 			}
@@ -987,8 +979,7 @@ if ($action == 'addcontainer')
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -1099,8 +1090,7 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes')
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1136,8 +1126,7 @@ if ($action == 'delete')
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1151,8 +1140,7 @@ if ($action == 'updatecss')
 	{
 		$action = 'editcss';
 	}
-	else
-	{
+	else {
 		$res = $object->fetch(0, $websitekey);
 		$website = $object;
 
@@ -1403,8 +1391,7 @@ if ($action == 'updatecss')
 	    			exit;
 	    		}
     		}
-    		else
-    		{
+    		else {
     			$action = 'editcss';
     		}
 		}
@@ -1440,8 +1427,7 @@ if ($action == 'setashome')
 
 		$action = 'preview';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -1549,8 +1535,7 @@ if ($action == 'updatemeta')
 				setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
 				$action = 'editmeta';
 			}
-			else
-			{
+			else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
@@ -1574,8 +1559,7 @@ if ($action == 'updatemeta')
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -1646,13 +1630,11 @@ if ($action == 'updatemeta')
 				//exit;
 				$action = 'preview';
 			}
-			else
-			{
+			else {
 				$action = 'editmeta';
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
    			//exit;
@@ -1682,8 +1664,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 			$db->rollback();
 		}
-		else
-		{
+		else {
 			$object = $objectnew;
 			$id = $object->id;
 			$pageid = $object->fk_default_home;
@@ -1725,8 +1706,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				$tmpwebsite->fetch($newwebsiteid);
 				$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
 			}
-			else
-			{
+			else {
 				$tmpwebsite = $object;
 			}
 
@@ -1739,9 +1719,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				$action = 'createpagefromclone';
 
 				$db->rollback();
-			}
-			else
-			{
+			} else {
 				$filetpl = $pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
 				$fileindex = $pathofwebsitenew.'/index.php';
 				$filewrapper = $pathofwebsitenew.'/wrapper.php';
@@ -1789,8 +1767,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 		{
 			$res = $objectpage->fetch($pageid);
 		}
-		else
-		{
+		else {
 			$res = 0;
 			if ($object->fk_default_home > 0)
 			{
@@ -1900,41 +1877,29 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 							header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 							exit;
 						}
-					}
-					else
-					{
+					} else {
 						if ($action == 'updatesource') $action = 'editsource';
 						if ($action == 'updatecontent') $action = 'editcontent';
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 	   				exit;
 				}
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		if (!$error)
 		{
 			if (empty($websitekey) || $websitekey == '-1')
 			{
 				setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
 				setEventMessages($langs->trans("YouCanCreatePageOrImportTemplate"), null, 'warnings');
 			}
@@ -1958,8 +1923,7 @@ if ($action == 'exportsite')
 		readfile($fileofzip);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
@@ -1973,9 +1937,7 @@ if ($action == 'regeneratesite')
 	{
 		setEventMessages($langs->trans("PagesRegenerated"), null, 'mesgs');
 		$action = 'preview';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
@@ -1989,8 +1951,7 @@ if ($action == 'importsiteconfirm')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
 	}
-	else
-	{
+	else {
 		if (!empty($_FILES) || GETPOSTISSET('templateuserfile'))
 		{
 			// Check symlink to medias and restore it if ko
@@ -2059,8 +2020,7 @@ if ($action == 'importsiteconfirm')
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'importsite';
 				}
-				else
-				{
+				else {
 					// Force mode dynamic on
 					dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
 
@@ -2251,8 +2211,7 @@ if (!GETPOST('hide_websitemenu'))
 		{
 			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 		}
-		else
-		{
+		else {
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 		}
 
@@ -2320,16 +2279,14 @@ if (!GETPOST('hide_websitemenu'))
 		{
 		    //$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
-		else
-		{
+		else {
 		    $htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
 		    $htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
-		else
-		{
+		else {
     		$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
     		$htmltext .= '<br>';
     		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
@@ -2400,8 +2357,7 @@ if (!GETPOST('hide_websitemenu'))
 		{
 			print '<span class="websiteselection">'.$formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone').'</span>';
 		}
-		else
-		{
+		else {
 			print $langs->trans("New");
 		}
 
@@ -2576,15 +2532,13 @@ if (!GETPOST('hide_websitemenu'))
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
-				else
-				{
+				else {
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					if (empty($conf->global->WEBSITE_EDITINLINE))
 					{
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
-					else
-					{
+					else {
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 				}
@@ -2596,8 +2550,7 @@ if (!GETPOST('hide_websitemenu'))
 				{
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
-				else
-				{
+				else {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				/*}*/
@@ -2612,8 +2565,7 @@ if (!GETPOST('hide_websitemenu'))
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
 				}
-				else
-				{
+				else {
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
@@ -2682,8 +2634,7 @@ if (!GETPOST('hide_websitemenu'))
             {
                 print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
             }
-            else
-            {
+            else {
             	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
             	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
             }
@@ -2767,8 +2718,7 @@ if ($action == 'editcss')
 		// Clean the php css file to remove php code and get only css part
 		$csscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $csscontent);
 	}
-	else
-	{
+	else {
 		$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
 	}
 	if (!trim($csscontent)) {
@@ -2781,8 +2731,7 @@ if ($action == 'editcss')
 		// Clean the php js file to remove php code and get only js part
 		$jscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $jscontent);
 	}
-	else
-	{
+	else {
 		$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
 	}
 	if (!trim($jscontent)) $jscontent = '/* JS content (all pages) */'."\n";
@@ -2793,8 +2742,7 @@ if ($action == 'editcss')
 		// Clean the php htmlheader file to remove php code and get only html part
 		$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htmlheadercontent);
 	}
-	else
-	{
+	else {
 		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
 	}
 	if (!trim($htmlheadercontent))
@@ -2803,8 +2751,7 @@ if ($action == 'editcss')
 		$htmlheadercontent .= $htmlheadercontentdefault;
 		$htmlheadercontent .= "</html>";
 	}
-	else
-	{
+	else {
 		$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
 		$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
 		$htmlheadercontent = '<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
@@ -2816,8 +2763,7 @@ if ($action == 'editcss')
 		// Clean the php htmlheader file to remove php code and get only html part
 		$robotcontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $robotcontent);
 	}
-	else
-	{
+	else {
 		$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
 	}
 	if (!trim($robotcontent))
@@ -2834,8 +2780,7 @@ if ($action == 'editcss')
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
 	}
-	else
-	{
+	else {
 		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
 	}
 	if (!trim($htaccesscontent))
@@ -2851,8 +2796,7 @@ if ($action == 'editcss')
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
 	}
-	else
-	{
+	else {
 		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'none');
 	}
 	if (!trim($manifestjsoncontent))
@@ -2866,8 +2810,7 @@ if ($action == 'editcss')
 		// Clean the readme file to remove php code and get only html part
 		$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
 	}
-	else
-	{
+	else {
 		$readmecontent = GETPOST('WEBSITE_README', 'none');
 	}
 	if (!trim($readmecontent))
@@ -3229,8 +3172,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pageauthoralias = $objectpage->author_alias;
  		$pagestatus = $objectpage->status;
 	}
-	else
-	{
+	else {
 		$type_container = 'page';
 		$pagedatecreation = dol_now();
 		$pageauthorid = $user->id;
@@ -3749,8 +3691,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 					print '</tr>';
 				}
-				else
-				{
+				else {
 					print '<tr>';
 
 					print '<td>';
@@ -3789,8 +3730,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			print '</div></div>';
 			print '<br>';
 		}
-		else
-		{
+		else {
 			print $listofpages['message'];
 		}
 	}
@@ -3912,8 +3852,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		    // Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		}
-		else
-		{
+		else {
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
 		$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
@@ -3954,15 +3893,13 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
         print '</iframe>';*/
 	}
-	else
-	{
+	else {
 		if (empty($websitekey) || $websitekey == '-1')
 		{
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
-		else
-		{
+		else {
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index abb2bea0179..a04ff14882c 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -43,19 +43,16 @@ if (!empty($hashp))
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
 			}
-			else
-			{
+			else {
 				print 'Bad link. File is from another module part.';
 			}
 		}
-		else
-		{
+		else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
 	}
-	else
-	{
+	else {
 		print "ErrorFileNotFoundWithSharedLink";
 		exit;
 	}
@@ -161,8 +158,7 @@ if ($rss) {
 		if ($result >= 0)
 		{
 			if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-			else
-			{
+			else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
@@ -170,8 +166,7 @@ if ($rss) {
 				exit(-1);
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
 			dol_delete_file($outputfiletmp, 0, 1);
 			$langs->load("errors");
@@ -213,8 +208,7 @@ elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file
 {
 	readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
 }
-else
-{
+else {
 	// Find the subdirectory name as the reference
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index e608ece5bb7..8a74b525c2b 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -110,8 +110,7 @@ if ($action == 'edit') {
         print '<div class="tabsAction">';
         print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
         print '</div>';
-    } else
-    {
+    } else {
         print '<br>'.$langs->trans("NothingToSetup");
     }
 }
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index b985c77434e..0a6f39c777b 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -398,7 +398,7 @@ class Hook extends CommonObject
     {
         $result = $this->fetchCommon($id, $ref);
         if ($result > 0 && !empty($this->table_element_line)) {
-            $this->fetchLines();
+            //$this->fetchLines();
         }
         return $result;
     }
@@ -635,8 +635,7 @@ class Hook extends CommonObject
         // phpcs:enable
     	global $langs;
 
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
     		global $langs;
     		//$langs->load("mymodule");
     		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index ca046392cec..a9b44fbd089 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -41,13 +41,10 @@ $action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} else {
     $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -91,19 +88,16 @@ $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
+    if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
         header("Location: ".$backtopage);
         exit;
     }
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $actioncode = '';
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
         $search_agenda_label = '';
     }
 }
@@ -118,8 +112,7 @@ $contactstatic = new Contact($db);
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
@@ -199,8 +192,7 @@ if ($object->id > 0)
 
     $out = '';
     $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
+    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
         //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
         if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
         $out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
@@ -212,22 +204,17 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
+    if (!empty($conf->agenda->enabled)) {
+    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
         	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-    	}
-    	else
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
 
     print '</div>';
 
-    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-    {
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
         $param = '&socid='.$socid;
         if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index c2755892716..c6cfda9f539 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -55,8 +55,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
@@ -82,8 +81,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
     $error = 0;
 
     $permissiontoadd = $user->rights->mymodule->write;
@@ -142,8 +140,7 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -175,8 +172,7 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -207,8 +203,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
     $res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
@@ -217,8 +212,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
 	}
 
@@ -230,8 +224,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
+	if ($action == 'xxx') {
 		$formquestion = array();
 	    /*
 		$forcecombo=0;
@@ -332,21 +325,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
+    	if (empty($reshook)) {
             // Modify
-    		if ($user->rights->mymodule->write)
-    		{
+    		if ($user->rights->mymodule->write) {
     			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
     		}
 
     		// Clone
-    		if ($user->rights->mymodule->write)
-    		{
+    		if ($user->rights->mymodule->write) {
     			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
     		}
 
@@ -364,12 +352,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->mymodule->delete)
-    		{
+    		if ($user->rights->mymodule->delete) {
     			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
     		}
     	}
@@ -382,8 +367,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 	    print '<div class="fichecenter"><div class="fichehalfleft">';
 	    print '<a name="builddoc"></a>'; // ancre
 
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index cdc5f8c7ddf..9b43ded60c8 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -92,8 +92,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -105,8 +104,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -132,9 +130,7 @@ if ($object->id)
 	print '</div>';
 
 	dol_fiche_end();
-}
-else
-{
+} else {
 	accessforbidden('', 0, 0);
 }
 
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 8be913c5a8c..228d26232e8 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -509,8 +509,7 @@ while ($i < min($num, $limit)) {
             else print $object->showOutputField($val, $key, $obj->$key, '');
             print '</td>';
             if (!$i) $totalarray['nbfield']++;
-            if (!empty($val['isameasure']))
-            {
+            if (!empty($val['isameasure'])) {
                 if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
                 $totalarray['val']['t.'.$key] += $obj->$key;
             }
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index af96dfce98c..151c762be56 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -77,8 +77,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('MyObject'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);
diff --git a/htdocs/zapier/lib/zapier_hook.lib.php b/htdocs/zapier/lib/zapier_hook.lib.php
index 9416936e261..114e7753512 100644
--- a/htdocs/zapier/lib/zapier_hook.lib.php
+++ b/htdocs/zapier/lib/zapier_hook.lib.php
@@ -41,8 +41,7 @@ function myobjectPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
diff --git a/htdocs/zapier/zapierindex.php b/htdocs/zapier/zapierindex.php
index 6986bc8588d..760bd85322a 100644
--- a/htdocs/zapier/zapierindex.php
+++ b/htdocs/zapier/zapierindex.php
@@ -37,8 +37,7 @@ $action = GETPOST('action', 'alpha');
 // Securite acces client
 if (!$user->rights->zapier->read) accessforbidden();
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index e24a460f61e..ba4fe922ab9 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -65,10 +65,8 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1)
 				$month_end = 12;
-			else
-				$year_end++;
-		} else
-			$month_end = $month_start;
+			else $year_end++;
+		} else $month_end = $month_start;
 		$date_start = dol_get_first_day($year_start, $month_start, false);
 		$date_end = dol_get_last_day($year_end, $month_end, false);
 	}
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 7ddc41752dd..4f2a256275a 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -241,8 +241,7 @@ if ($resql) {
 		preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
 		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1]) != $reg[1])
 			$description = $langs->transnoentitiesnoconv($reg[1]);
-		else
-			$description = $objp->label;
+		else $description = $objp->label;
 
 		/*
 		 * Ajout les liens (societe, company...)
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 8bd3d4a4824..ae449484e7b 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -137,8 +137,7 @@ if ($resql) {
 					if ($oldemail != 'none') {
 						if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 							print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-						else
-							print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+						else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 					}
 				}
 				$oldemail = $newemail;
@@ -168,8 +167,7 @@ if ($resql) {
 			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -189,8 +187,7 @@ if ($resql) {
 				if ($oldemail != 'none') {
 					if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 						print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-					else
-						print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+					else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 				}
 			}
 		}
@@ -233,10 +230,8 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget, $
 	if ($duration_value) {
 		if ($duration_value > 0)
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else
-			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else
-		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
 	$sendto = $oldemail;
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index dcc21de083b..06cb67c99e9 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -133,8 +133,7 @@ if ($resql) {
 			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
 			if (dol_strlen($obj->email))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -192,10 +191,8 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 	if ($duration_value) {
 		if ($duration_value > 0)
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else
-			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else
-		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 40421c3853e..9058577aa21 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -106,8 +106,7 @@ if ($userlogin == 'firstadmin') {
 			$userlogin = $obj->login;
 			echo "First admin user found is login '".$userlogin."', entity ".$obj->entity."\n";
 		}
-	} else
-		dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 // Check user login
@@ -192,9 +191,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
     		        echo "\nUser Error: ".$user->error."\n";
     		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
     		        exit(-1);
-    		    }
-    		    else
-    		    {
+    		    } else {
     		        if ($result == 0)
     		        {
     		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -259,9 +256,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 	}
 
 	$conf = $savconf;
-}
-else
-{
+} else {
 	echo "cron_run_jobs.php no qualified job found\n";
 }
 
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index bc7efec7dba..7cde66db687 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -42,8 +42,7 @@ if (!isset($argv[1]) || !$argv[1]) {
 $id = $argv[1];
 if (isset($argv[2]) || !empty($argv[2]))
 	$login = $argv[2];
-else
-	$login = '';
+else $login = '';
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
@@ -206,23 +205,19 @@ if ($resql) {
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 						}
 
 						complete_substitutions_array($substitutionarray, $langs);
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 19e3e20e156..5617751b58b 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -135,8 +135,7 @@ if ($resql) {
 					if ($oldemail != 'none') {
 						if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 							print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-						else
-							print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+						else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 					}
 				}
 				$oldemail = $newemail;
@@ -166,8 +165,7 @@ if ($resql) {
 			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -187,8 +185,7 @@ if ($resql) {
 				if ($oldemail != 'none') {
 					if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 						print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-					else
-						print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+					else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 				}
 			}
 		}
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 8ca40581d2a..9bdd37ca599 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -137,8 +137,7 @@ if ($resql) {
 			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
 			if (dol_strlen($obj->email))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 984305c2727..4166772cb10 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -114,8 +114,7 @@ print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
 if (!empty($conf->global->LDAP_MEMBER_FILTER))
 	print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n"; // Note: filter is defined into function getRecords
-else
-	print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -278,8 +277,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index b3c22bf65a8..547b2664070 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -162,8 +162,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index e98097f061e..28c580dce63 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -211,8 +211,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 022cf9a9ed7..c8502cd1f14 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -93,8 +93,7 @@ print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
 if (!empty($conf->global->LDAP_FILTER_CONNECTION))
 	print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n"; // Note: filter is defined into function getRecords
-else
-	print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -254,8 +253,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 5c3c6d7d54e..c28021a6957 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -154,7 +154,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
-        foreach($filesarray as $key => $file)
+        foreach ($filesarray as $key => $file)
         {
             if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
@@ -170,7 +170,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
            		$ok=false;
            		break;
@@ -183,7 +183,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[1] != '\'"' && $val[1] != '\'\'')
                 {
@@ -201,7 +201,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(=|sql.+)\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[2] != 'db->' && $val[2] != 'esca')
                 {
@@ -220,7 +220,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
                 {
@@ -236,7 +236,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                    $ok=false;
                    break;
@@ -249,7 +249,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($file['name'] != 'functions.lib.php')
                 {
@@ -265,7 +265,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 $ok=false;
                 break;
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index f56d00b5bcd..56b0d001a81 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -158,7 +158,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
 
-            foreach($filesarray as $key => $file)
+            foreach ($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/', $file))
                     continue;
@@ -201,19 +201,14 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
-                }
-                elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
+                } elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
                 {
                     // Test for data files only
-                }
-                else
-                {
+                } else {
                     if (preg_match('/\.key\.sql$/', $file))
                     {
                         // Test for key files only
-                    }
-                    else
-                    {
+                    } else {
                         // Test for non key files only
                         $result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
                         print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
@@ -244,7 +239,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
         $db=$this->savdb;
 
         $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdemo');
-        foreach($filesarray as $key => $file) {
+        foreach ($filesarray as $key => $file) {
             if (! preg_match('/\.sql$/', $file))
                 continue;
 
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 590accccbed..cf1cafe74b1 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -342,7 +342,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         $result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
 
         // Loop on each dataset
-        foreach($objexport->array_export_code as $key => $datatoexport)
+        foreach ($objexport->array_export_code as $key => $datatoexport)
         {
         	$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
 	        print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
@@ -351,7 +351,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	        // Generate $array_selected
 	        $i=0;
 	        $array_selected=array();
-			foreach($objexport->array_export_fields[$key] as $key => $val)
+			foreach ($objexport->array_export_fields[$key] as $key => $val)
 			{
 				$array_selected[$key]=$i++;
 			}
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index f89ab4b1f13..3778989945a 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -186,13 +186,11 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
-        {
+        } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            foreach ($aKeys as $sKey)
             {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 47f3a639b29..dc34b061806 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -365,13 +365,11 @@ class FactureTest extends PHPUnit\Framework\TestCase
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
-        {
+        } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            foreach ($aKeys as $sKey)
             {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 7802bc57659..73e826cf75a 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -154,7 +154,7 @@ class LangTest extends PHPUnit\Framework\TestCase
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach($filesarray as $key => $code)
+		foreach ($filesarray as $key => $code)
 		{
 			if (! preg_match('/^[a-z]+_[A-Z]+$/', $code)) continue;
 
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index f8feaa8f829..32652200c2c 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -144,7 +144,7 @@ class ModulesTest extends PHPUnit\Framework\TestCase
 		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
 		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
 		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog','TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
-		foreach($modulelist as $modlabel)
+		foreach ($modulelist as $modlabel)
 		{
     		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
             $class='mod'.$modlabel;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 10b0bd7b0b7..08338de949b 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -339,7 +339,7 @@ class UserTest extends PHPUnit\Framework\TestCase
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey) {
+            foreach ($aKeys as $sKey) {
                 if (in_array($sKey, $fieldstoignorearray))
                     continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 8aada2fc03a..428db9e8ef5 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -255,8 +255,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch(SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -313,8 +312,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch(SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -413,8 +411,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch(SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -433,7 +430,6 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 
-
     	return $result;
     }
 }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 33d842f6d39..803247e2598 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -169,7 +169,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 34686cbec92..10c74bb1821 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -170,7 +170,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -198,7 +198,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 70a8c12a498..90911b289bc 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -188,7 +188,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -251,7 +251,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -314,7 +314,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 1106164b4ee..285fc6d5ddb 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -214,7 +214,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
@@ -268,7 +268,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -330,7 +330,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
@@ -390,7 +390,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index bb68f413741..f78386fc5bf 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -170,7 +170,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__."Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -197,7 +197,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__."Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }