diff --git a/.travis.yml b/.travis.yml
index 6dd9dd7dac3..11da1e2d048 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -216,7 +216,7 @@ before_script:
   - |
     export CONF_FILE=htdocs/conf/conf.php
     echo "Setting up Dolibarr $CONF_FILE"
-    echo '<?php ' > $CONF_FILE
+    echo '<?php' > $CONF_FILE
     echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
     echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
     echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
diff --git a/build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js b/build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js
index d6386c93792..10056e95fd4 100644
--- a/build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js	
+++ b/build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js	
@@ -15,14 +15,14 @@ else return 0;
 
 
 function highlightTOC(str) {
-    
-	
-		
-		 
-	
+
+
+
+
+
     if (StopProcess()) return;
     try {
-		
+
     str = str || parent.BODY.document.location.href;
     uri = last(str);
     list = parent.TOC.document.getElementsByTagName("a");
@@ -33,7 +33,7 @@ function highlightTOC(str) {
         list[i].style.backgroundColor = "#6697cc";
         list[i].style.padding = "2px";
         list[i].style.color = "#ffffff";
-		
+
 	} else {
 		list[i].style.backgroundColor = "#ffffff";
         list[i].style.color = "#003380";
diff --git a/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css b/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css
index ee31b50285a..ab64ac4bb6b 100644
--- a/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css	
+++ b/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css	
@@ -12,7 +12,7 @@
 .atn { color: #606; }
 .atv { color: #080; }
 .dec { color: #606; }
-pre.preformatted { 
+pre.preformatted {
 
 	    display: block;
         font-family: "Courier New", verdana, arial, helvetica, sans-serif;
diff --git a/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js b/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js
index 11234738656..fab5c8e6f2a 100644
--- a/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js	
+++ b/build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js	
@@ -1116,7 +1116,7 @@ window['_pr_isIE6'] = function () {
       for (var i = 0; i < 10; ++i) {
         lineBreaks[i] = lineBreakHtml + '</li><li class="L' + i + '">';
       }
-      var lineNum = numberLines[1] && numberLines[1].length 
+      var lineNum = numberLines[1] && numberLines[1].length
           ? numberLines[1] - 1 : 0;  // Lines are 1-indexed
       html.push('<ol class="linenums"><li class="L', (lineNum) % 10, '"');
       if (lineNum) {
diff --git a/build/aps/Limitations of APS Support in the Panel_fichiers/stylesheet.css b/build/aps/Limitations of APS Support in the Panel_fichiers/stylesheet.css
index f791ddf4ea8..b7ce63f17b3 100644
--- a/build/aps/Limitations of APS Support in the Panel_fichiers/stylesheet.css	
+++ b/build/aps/Limitations of APS Support in the Panel_fichiers/stylesheet.css	
@@ -1,5 +1,5 @@
 body
-{ 
+{
 background: #FFFFFF
 }
 
@@ -100,7 +100,7 @@ li.listalpha3 {
         width: auto;
         height: auto;
         white-space: normal;
-       }	   
+       }
 
 /*li.listalpha2, li.listalpha, li.listalpha3
 {
@@ -207,7 +207,7 @@ p.listcontinue3 {
         height: auto;
 }
 
-.prcontinuous 
+.prcontinuous
 {font-family: "Courier New", verdana, arial, helvetica, sans-serif;
         font-style: normal;
         font-variant: normal;
@@ -237,7 +237,7 @@ p.listcontinue3 {
         height: auto;
        }
 
-.prefblue 
+.prefblue
 {display: inline;
         font-family: "Courier New", verdana, arial, helvetica, sans-serif;
         font-size: 10pt;
@@ -253,7 +253,7 @@ p.listcontinue3 {
         padding-left: 0pt;
         padding-right: 0pt;
        }
-.prefred 
+.prefred
 {display: inline;
         font-family: "Courier New", verdana, arial, helvetica, sans-serif;
         font-size: 10pt;
@@ -269,7 +269,7 @@ p.listcontinue3 {
         padding-left: 0pt;
         padding-right: 0pt;
        }
-.prefdarkblue 
+.prefdarkblue
 {display: inline;
         font-family: "Courier New", verdana, arial, helvetica, sans-serif;
         font-weight: bold;
@@ -286,7 +286,7 @@ p.listcontinue3 {
         padding-left: 0pt;
         padding-right: 0pt;
        }
-.prefgrey 
+.prefgrey
 {display: inline;
         font-family: "Courier New", verdana, arial, helvetica, sans-serif;
         font-size: 10pt;
@@ -303,7 +303,7 @@ p.listcontinue3 {
         padding-right: 0pt;
        }
 
-.expandingblock 
+.expandingblock
 {font-family: "Tahoma", verdana, arial, helvetica, sans-serif;
         border-color: #AFAFAF;
         border-top-style: dotted;
@@ -363,7 +363,7 @@ p.listcontinue3 {
 
 .pagenavigation a, .pagenavigation a:link, .pagenavigation a:visited {
 	color: #000000;
-	text-decoration: none;	
+	text-decoration: none;
 }
 .pagenavigation a:hover {
 	text-decoration: none;
@@ -387,7 +387,7 @@ p.listcontinue3 {
 }
 .nav a, .nav a:link, .nav a:visited {
 	color: #000000;
-	text-decoration: none;	
+	text-decoration: none;
 }
 .nav a:hover {
 	text-decoration: none;
@@ -400,9 +400,9 @@ td.navTabActive {
 	vertical-align: middle;
 	font-family: tahoma, verdana, arial, helvetica, sans-serif;
 	font-size: 8pt;
-	padding-top: 4px;  
-	padding-bottom: 0px; 
-	padding-left: 8px; 
+	padding-top: 4px;
+	padding-bottom: 0px;
+	padding-left: 8px;
 	padding-right: 8px;
 	font-weight: bold;
 	background-image: url('nav_bg_active.gif');
@@ -567,7 +567,7 @@ a:visited,
         border-right-color: #FFFFFF;
 	     border-bottom-style: solid;
         border-bottom-width: 2px;
-        border-bottom-color: #ffffff; 
+        border-bottom-color: #ffffff;
 }
 .bodytext {
         font-family: verdana, tahoma, arial, helvetica, sans-serif;
@@ -582,7 +582,7 @@ a:visited,
 		  font-weight: bold;
         font-size: 8pt;
 		  line-height: 12px;
-        color: #2f739b; 
+        color: #2f739b;
 		  line-height: 11px;
         margin: 0px;
         padding: 3px;
@@ -1303,7 +1303,7 @@ li.listnumber2 {
         font-style: normal;
         font-variant: normal;
 		  font-size: 12pt;
-        color: #5c5b64; 
+        color: #5c5b64;
         background-color: inherit;
         word-spacing: normal;
         letter-spacing: normal;
@@ -1512,7 +1512,7 @@ li.listnumber2 {
 span.toc {
 	line-height: 19px;
 }
-		 
+
 .searchDetails {
         font-family: tahoma, verdana, arial, helvetica, sans-serif;
         font-size: 11px;
@@ -1561,11 +1561,11 @@ form {
 	font-weight: bold;
 }
 .searchFoundWord {
-	background-color: #fffdce; 
+	background-color: #fffdce;
 }
 .searchToTop {
 	text-align: left;
 	border-top: 1px solid #cfcfcf;
 	padding: 7px 0px 15px 0px;
 	margin: 0px;
-}
\ No newline at end of file
+}
diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index 942e6f8f5d7..0f4856aefb2 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -21,7 +21,7 @@
 
 /**
  *      \file       dev/initdata/import-product.php
- *		\brief      Script example to insert products from a csv file. 
+ *		\brief      Script example to insert products from a csv file.
  *                  To purge data, you can have a look at purge-data.php
  */
 
@@ -118,22 +118,22 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
     $errorrecord=0;
-    
+
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
-    
+
     $nboflines++;
-    
+
     $produit = new Product($db);
     $produit->type = 0;
     $produit->status = 1;
     $produit->ref = trim($fields[0]);
-    
+
     print "Process line nb ".$i.", ref ".$produit->ref;
     $produit->label = trim($fields[2]);
     $produit->description = trim($fields[4]."\n".($fields[5] ? $fields[5].' x '.$fields[6].' x '.$fields[7] : ''));
     $produit->volume = price2num($fields[8]);
-    $produit->volume_unit = 0;     
+    $produit->volume_unit = 0;
     $produit->weight = price2num($fields[9]);
     $produit->weight_units = 0;          // -3 = g
 
@@ -142,9 +142,9 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 
     $produit->status = 1;
     $produit->status_buy = 1;
-    
+
     $produit->finished = 1;
-    
+
     $produit->price_min = null;
     $produit->price_min_ttc = null;
     $produit->price = price2num($fields[11]);
@@ -152,25 +152,25 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $produit->price_base_type = 'TTC';
     $produit->tva_tx = price2num($fields[13]);
     $produit->tva_npr = 0;
-    
+
     $produit->cost_price = price2num($fields[16]);
-    
+
     // Extrafields
     $produit->array_options['options_ecotaxdeee']=price2num($fields[17]);
-    
+
     $ret=$produit->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
     }
-	else 
+	else
 	{
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
 	dol_syslog("Add prices");
-	
+
     // If we use price level, insert price for each level
 	if (! $errorrecord && 1)
 	{
@@ -181,14 +181,14 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else 
+    	else
     	{
     	    print " - updatePrice OK";
     	}
 	}
-	
+
 	dol_syslog("Add multilangs");
-	
+
 	// Add alternative languages
 	if (! $errorrecord && 1)
 	{
@@ -201,15 +201,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else 
+    	else
     	{
     	    print " - setMultiLangs OK";
     	}
 	}
-	
+
 	print "\n";
-	
-	if ($errorrecord) 
+
+	if ($errorrecord)
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 72a006bbe29..c94f74341f6 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -21,7 +21,7 @@
 
 /**
  *      \file       dev/initdata/import-thirdparties.php
- *		\brief      Script example to insert thirdparties from a csv file. 
+ *		\brief      Script example to insert thirdparties from a csv file.
  *                  To purge data, you can have a look at purge-data.php
  */
 
@@ -118,15 +118,15 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 {
     $i++;
     $errorrecord=0;
-    
+
     if ($startlinenb && $i < $startlinenb) continue;
     if ($endlinenb && $i > $endlinenb) continue;
-    
+
     $nboflines++;
-    
+
     $object = new User($db);
     $object->statut = 1;
-    
+
     $tmp=explode(' ',$fields[3],2);
     $object->firstname = trim($tmp[0]);
     $object->lastname = trim($tmp[1]);
@@ -134,23 +134,23 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     else $object->login=strtolower($object->firstname);
     $object->login=preg_replace('/ /','',$object->login);
     $object->password = 'init';
-    
+
     print "Process line nb ".$i.", login ".$object->login;
-    
+
     $ret=$object->create($user);
     if ($ret < 0)
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
     }
-	else 
+	else
 	{
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
 	print "\n";
-	
-	if ($errorrecord) 
+
+	if ($errorrecord)
 	{
 	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
 	    $error++;    // $errorrecord will be reset
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index ef37e25c04f..53717314d5f 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * or see http://www.gnu.org/
- * 
+ *
  * Get a distant dump file and load it into a mysql database
  */
 
@@ -74,7 +74,7 @@ $tables=array(
 
 $year=2010;
 $currentyear=$tmp['year'];
-while ($year <= $currentyear) 
+while ($year <= $currentyear)
 {
     //$year=2021;
     $delta=($currentyear - $year);
@@ -84,7 +84,7 @@ while ($year <= $currentyear)
     {
         foreach($tables as $tablekey => $tableval)
         {
-            print "\nCorrect ".$tablekey." for year ".$year." and move them to current year ".$currentyear." "; 
+            print "\nCorrect ".$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)";
             //$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." > NOW()";
             $resql = $db->query($sql);
@@ -110,14 +110,14 @@ while ($year <= $currentyear)
                         //print $sql2."\n";
                         $resql2 = $db->query($sql2);
                         if (! $resql2) dol_print_error($db);
-                    }            
+                    }
                     $i++;
                 }
             }
             else dol_print_error($db);
         }
     }
-    
+
     $year++;
 }
 
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index 6af3d378234..bbe101112d0 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -158,6 +158,22 @@
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
 
+    <!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="true"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.StartFile">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EndFile">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines">
+        <severity>0</severity>
+    </rule>
+
     <rule ref="Squiz.Functions.MultiLineFunctionDeclaration" />
 
     <!-- Rules from PEAR Standard -->
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 8f6090d7c8f..752e1c18de9 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com> 
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
  */
 
 /**
- * \file 		htdocs/accountancy/admin/importaccounts.php
+ * \file        htdocs/accountancy/admin/importaccounts.php
  * \ingroup		Advanced accountancy
  * \brief 		Page import accounting account
  */
@@ -83,7 +83,7 @@ if ($_POST["action"] == 'import') {
 				$accounting->pcg_type = $monType;
 				$accounting->pcg_subtype = $monSubType;
 				$accounting->active = 1;
-				
+
 				$result = $accounting->create($user);
 				if ($result > 0) {
 					setEventMessages($langs->trans("AccountingAccountAdd"), null, 'mesgs');
@@ -101,7 +101,7 @@ if ($_POST["action"] == 'import') {
 	print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
 }
 
-// list accounting account from product 
+// list accounting account from product
 
 $sql = "(SELECT p.rowid as product_id, p.accountancy_code_sell as accounting ";
 $sql .= " FROM  " . MAIN_DB_PREFIX . "product as p ";
@@ -172,9 +172,9 @@ if ($result) {
 		print '</tr>';
 		$i ++;
 	}
-	
+
 	print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Import") . '"></td></tr>';
-	
+
 	print '</table>';
 	print '</form>';
 } else {
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
index c4084b600eb..be335107839 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
@@ -82,7 +82,7 @@ $socid = GETPOST("socid", 'int');
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result < 0) 
+if ($result < 0)
 {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
index 61452230902..905361b4c8e 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
@@ -86,7 +86,7 @@ $socid = GETPOST("socid", 'int');
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result<0) 
+if ($result<0)
 {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 1e9acde2665..497d4748da8 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -420,7 +420,7 @@ if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
     print '</a>';
     print '</td>';
 }
-else 
+else
 {
     print '<td align="center">' . "\n";
     print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setreportlastnumreleve">' . img_picto($langs->trans("Disabled"),
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 4a006c56268..7bc968457f9 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -188,7 +188,7 @@ if ( ($action == 'update' && ! GETPOST("cancel",'alpha'))
 		{
 			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);
+		dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC1", GETPOST("clt1",'aZ09'),'chaine',0,'',$conf->entity);
 	}
 	if($_POST["optionlocaltax2"]=="localtax2on")
 	{
@@ -200,7 +200,7 @@ if ( ($action == 'update' && ! GETPOST("cancel",'alpha'))
 		{
 			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);
+		dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC2", GETPOST("clt2",'aZ09'),'chaine',0,'',$conf->entity);
 	}
 
 	if ($action != 'updateedit' && ! $error)
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 55426fa90eb..4617481d04d 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -385,7 +385,7 @@ class PrestaShopWebservice
 		else
 			throw new PrestaShopWebserviceException('Bad parameters given');
 
-		$request = self::executeRequest($url,  array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
+		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
 		self::checkStatusCode($request['status_code']);// check the response validity
 		return self::parseXML($request['response']);
 	}
diff --git a/htdocs/admin/dolistore/css/dolistore.css b/htdocs/admin/dolistore/css/dolistore.css
index bba808a21a0..fb4dc2d5bb1 100644
--- a/htdocs/admin/dolistore/css/dolistore.css
+++ b/htdocs/admin/dolistore/css/dolistore.css
@@ -6,10 +6,10 @@ div.divsearchfield {
 }
 
 .margeCoteGauche,.margeCote{
-    padding-right: 20px!important;   
+    padding-right: 20px!important;
 }
 .margeCote,.margeCoteDroite{
-    padding-left: 20px!important;    
+    padding-left: 20px!important;
 }
 .nomargesupinf{
     margin-top: 0;
@@ -26,13 +26,13 @@ div.divsearchfield {
     width: 100%;
 }
 .tree{
-    margin: 0px 0px 0px 0px; 
+    margin: 0px 0px 0px 0px;
     padding:0px;
     list-style: none; line-height: 2em; font-family: Arial;
 }
 .tree li{
     font-size: 16px;
-    position: relative;list-style: none; 
+    position: relative;list-style: none;
 }
 .tree li:before{
     position: absolute;
@@ -65,7 +65,7 @@ div.divsearchfield {
 .tree li.root:after{
     display: none;
 }
-.tree li:last-child:after{ 
+.tree li:last-child:after{
     display: none
 }
 .blockUI {
@@ -159,7 +159,7 @@ textarea.row4{
 
 .reviewList {
     max-height: 150px;
-    overflow-y: scroll; 
+    overflow-y: scroll;
 }
 
 .reviewRow{
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 606d3a5f201..dd3b1c5bff7 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -94,7 +94,7 @@ print "</tr>\n";
 foreach ($eventstolog as $key => $arr)
 {
 	if ($arr['id'])
-	{		
+	{
 		print '<tr class="oddeven">';
 		print '<td>'.$arr['id'].'</td>';
 		print '<td>';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 2eddf30ab90..4cb5a907927 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -79,10 +79,10 @@ if ($action == 'removebackgroundlogin' && ! empty($conf->global->MAIN_LOGIN_BACK
 
 if ($action == 'update')
 {
-	dolibarr_set_const($db, "MAIN_LANG_DEFAULT",				$_POST["MAIN_LANG_DEFAULT"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MULTILANGS",					$_POST["MAIN_MULTILANGS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_LANG_DEFAULT", $_POST["MAIN_LANG_DEFAULT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MULTILANGS", $_POST["MAIN_MULTILANGS"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_THEME",						$_POST["main_theme"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity);
 
 	$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
 	if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
@@ -133,21 +133,21 @@ if ($action == 'update')
 	if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity);    // If empty, we set to '0' ('000000' is for black)
 	else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT",			$_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT",		$_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT",			$_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED",	$_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_START_WEEK",					$_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS",		$_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS",		$_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_SHOW_LOGO",					$_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION",		$_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", $_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["main_disable_javascript"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_BUTTON_HIDE_UNAUTHORIZED", $_POST["MAIN_BUTTON_HIDE_UNAUTHORIZED"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_START_WEEK", $_POST["MAIN_START_WEEK"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_DAYS", $_POST["MAIN_DEFAULT_WORKING_DAYS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DEFAULT_WORKING_HOURS", $_POST["MAIN_DEFAULT_WORKING_HOURS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SHOW_LOGO", $_POST["MAIN_SHOW_LOGO"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", $_POST["MAIN_FIRSTNAME_NAME_POSITION"],'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK",		$_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
-	dolibarr_set_const($db, "MAIN_MOTD",						dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_HOME",						dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_HELP_DISABLELINK",			$_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0);	    // Param for all entities
-	dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK",         $_POST["MAIN_BUGTRACK_ENABLELINK"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_HELPCENTER_DISABLELINK", $_POST["MAIN_HELPCENTER_DISABLELINK"],'chaine',0,'',0);	// Param for all entities
+	dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr($_POST["main_motd"]),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr($_POST["main_home"]),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", $_POST["MAIN_HELP_DISABLELINK"],'chaine',0,'',0);	    // Param for all entities
+	dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", $_POST["MAIN_BUGTRACK_ENABLELINK"],'chaine',0,'',$conf->entity);
 
 	$varforimage='imagebackground'; $dirforimage=$conf->mycompany->dir_output.'/logos/';
 	if ($_FILES[$varforimage]["tmp_name"])
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 240901ec04d..2f36f239257 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -80,9 +80,9 @@ if ($action == 'setvalue' && $user->admin)
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION', GETPOST("fieldendlastsubscription"),'chaine',0,'',$conf->entity)) $error++;
 
 	// Subscriptions
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE',  GETPOST("fieldfirstsubscriptiondate"),'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE', GETPOST("fieldfirstsubscriptiondate"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT',GETPOST("fieldfirstsubscriptionamount"),'chaine',0,'',$conf->entity)) $error++;
-	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE',   GETPOST("fieldlastsubscriptiondate"),'chaine',0,'',$conf->entity)) $error++;
+	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE', GETPOST("fieldlastsubscriptiondate"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT', GETPOST("fieldlastsubscriptionamount"),'chaine',0,'',$conf->entity)) $error++;
 
 	// This one must be after the others
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index d24891f80f6..f9fe219afef 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -66,11 +66,11 @@ if ($action == 'update')
 
     if (! $error)
     {
-        dolibarr_set_const($db, "MAIN_MAX_DECIMALS_UNIT",   $_POST["MAIN_MAX_DECIMALS_UNIT"],'chaine',0,'',$conf->entity);
-        dolibarr_set_const($db, "MAIN_MAX_DECIMALS_TOT",    $_POST["MAIN_MAX_DECIMALS_TOT"],'chaine',0,'',$conf->entity);
-        dolibarr_set_const($db, "MAIN_MAX_DECIMALS_SHOWN",  $_POST["MAIN_MAX_DECIMALS_SHOWN"],'chaine',0,'',$conf->entity);
+        dolibarr_set_const($db, "MAIN_MAX_DECIMALS_UNIT", $_POST["MAIN_MAX_DECIMALS_UNIT"],'chaine',0,'',$conf->entity);
+        dolibarr_set_const($db, "MAIN_MAX_DECIMALS_TOT", $_POST["MAIN_MAX_DECIMALS_TOT"],'chaine',0,'',$conf->entity);
+        dolibarr_set_const($db, "MAIN_MAX_DECIMALS_SHOWN", $_POST["MAIN_MAX_DECIMALS_SHOWN"],'chaine',0,'',$conf->entity);
 
-        dolibarr_set_const($db, "MAIN_ROUNDING_RULE_TOT",   $_POST["MAIN_ROUNDING_RULE_TOT"],'chaine',0,'',$conf->entity);
+        dolibarr_set_const($db, "MAIN_ROUNDING_RULE_TOT", $_POST["MAIN_ROUNDING_RULE_TOT"],'chaine',0,'',$conf->entity);
 
         header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
         exit;
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 4ad7a74bcb9..3576ec845d1 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -65,27 +65,27 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 
 if ($action == 'update' && empty($_POST["cancel"]))
 {
-	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS",     GETPOST("MAIN_DISABLE_ALL_MAILS"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO",     GETPOST("MAIN_MAIL_FORCE_SENDTO"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT",     GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT"), 'chaine', 0, '', $conf->entity);
 	// Send mode parameters
-	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE",         GETPOST("MAIN_MAIL_SENDMODE"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT",        GETPOST("MAIN_MAIL_SMTP_PORT"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER",      GETPOST("MAIN_MAIL_SMTP_SERVER"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID",         GETPOST("MAIN_MAIL_SMTPS_ID"), 'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW",         GETPOST("MAIN_MAIL_SMTPS_PW"), 'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS",        GETPOST("MAIN_MAIL_EMAIL_TLS"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS",   GETPOST("MAIN_MAIL_EMAIL_STARTTLS"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS"), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED",     GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN",      GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR",    GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY"), 'chaine', 0, '', $conf->entity);
 	// Content parameters
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM",       GETPOST("MAIN_MAIL_EMAIL_FROM"), 'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO",		  GETPOST("MAIN_MAIL_ERRORS_TO"),  'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO",      GETPOST("MAIN_MAIL_AUTOCOPY_TO"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, 'MAIN_MAIL_DEFAULT_FROMTYPE', GETPOST('MAIN_MAIL_DEFAULT_FROMTYPE'),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", GETPOST("MAIN_MAIL_EMAIL_FROM"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO", GETPOST("MAIN_MAIL_ERRORS_TO"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", GETPOST("MAIN_MAIL_AUTOCOPY_TO"),'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'MAIN_MAIL_DEFAULT_FROMTYPE', GETPOST('MAIN_MAIL_DEFAULT_FROMTYPE'), 'chaine', 0, '', $conf->entity);
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index dd123a70a00..59fc0ade0cd 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -61,12 +61,12 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
 if ($action == 'update' && empty($_POST["cancel"]))
 {
     // Send mode parameters
-	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_EMAILING",       GETPOST("MAIN_MAIL_SENDMODE_EMAILING"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_EMAILING",      GETPOST("MAIN_MAIL_SMTP_PORT_EMAILING"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_EMAILING",    GETPOST("MAIN_MAIL_SMTP_SERVER_EMAILING"),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID_EMAILING",       GETPOST("MAIN_MAIL_SMTPS_ID_EMAILING"), 'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_EMAILING",       GETPOST("MAIN_MAIL_SMTPS_PW_EMAILING"), 'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_EMAILING",      GETPOST("MAIN_MAIL_EMAIL_TLS_EMAILING"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_EMAILING", GETPOST("MAIN_MAIL_SENDMODE_EMAILING"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_EMAILING", GETPOST("MAIN_MAIL_SMTP_PORT_EMAILING"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_EMAILING", GETPOST("MAIN_MAIL_SMTP_SERVER_EMAILING"),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID_EMAILING", GETPOST("MAIN_MAIL_SMTPS_ID_EMAILING"), 'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_EMAILING", GETPOST("MAIN_MAIL_SMTPS_PW_EMAILING"), 'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_EMAILING", GETPOST("MAIN_MAIL_EMAIL_TLS_EMAILING"),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS_EMAILING", GETPOST("MAIN_MAIL_EMAIL_STARTTLS_EMAILING"),'chaine',0,'',$conf->entity);
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 225860e78ad..09907652df0 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -64,10 +64,10 @@ if ($action == 'update' && ! $cancel)
 {
 	$_SESSION["mainmenu"]="home";   // Le gestionnaire de menu a pu changer
 
-	dolibarr_set_const($db, "MAIN_MENU_STANDARD",        GETPOST('MAIN_MENU_STANDARD','alpha'),'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_MENU_SMARTPHONE",      GETPOST('MAIN_MENU_SMARTPHONE','alpha'),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MENU_STANDARD", GETPOST('MAIN_MENU_STANDARD','alpha'),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MENU_SMARTPHONE", GETPOST('MAIN_MENU_SMARTPHONE','alpha'),'chaine',0,'',$conf->entity);
 
-	dolibarr_set_const($db, "MAIN_MENUFRONT_STANDARD",   GETPOST('MAIN_MENUFRONT_STANDARD','alpha'),'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MENUFRONT_STANDARD", GETPOST('MAIN_MENUFRONT_STANDARD','alpha'),'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MENUFRONT_SMARTPHONE", GETPOST('MAIN_MENUFRONT_SMARTPHONE','alpha'),'chaine',0,'',$conf->entity);
 
 	// Define list of menu handlers to initialize
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 0cf1b646eff..71656475e6f 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2018		Nicolas ZABOURI 		<info@inovea-conseil.com>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -672,7 +672,7 @@ if ($mode == 'common')
         print '<td class="center nowrap" width="120px">';
         print $versiontrans;
         if(!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)){
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';            
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
             if (!empty($objMod->url_last_version)) {
                 $newversion = getURLContent($objMod->url_last_version);
                 if(isset($newversion['content'])){
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 9acea7e3955..52ffa53ad59 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -54,29 +54,29 @@ if ($cancel) {
 
 if ($action == 'update')
 {
-	dolibarr_set_const($db, "MAIN_PDF_FORMAT",    $_POST["MAIN_PDF_FORMAT"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_FORMAT", $_POST["MAIN_PDF_FORMAT"],'chaine',0,'', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT",    $_POST["MAIN_PDF_MARGIN_LEFT"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT",   $_POST["MAIN_PDF_MARGIN_RIGHT"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP",     $_POST["MAIN_PDF_MARGIN_TOP"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM",  $_POST["MAIN_PDF_MARGIN_BOTTOM"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_LEFT", $_POST["MAIN_PDF_MARGIN_LEFT"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_RIGHT", $_POST["MAIN_PDF_MARGIN_RIGHT"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_TOP", $_POST["MAIN_PDF_MARGIN_TOP"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_MARGIN_BOTTOM", $_POST["MAIN_PDF_MARGIN_BOTTOM"],'chaine',0,'', $conf->entity);
 
-    dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS",    $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS",    $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS",    $_POST["MAIN_PROFID3_IN_ADDRESS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS",    $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT",    $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"],'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", $_POST["MAIN_PROFID1_IN_ADDRESS"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID2_IN_ADDRESS", $_POST["MAIN_PROFID2_IN_ADDRESS"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID3_IN_ADDRESS", $_POST["MAIN_PROFID3_IN_ADDRESS"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PROFID4_IN_ADDRESS", $_POST["MAIN_PROFID4_IN_ADDRESS"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", $_POST["MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"],'chaine',0,'', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS",    $_POST["MAIN_TVAINTRA_NOT_IN_ADDRESS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC",    $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DESC"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF",     $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_REF"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION",     $_POST["MAIN_PDF_USE_ISO_LOCATION"],'chaine',0,'',$conf->entity);
-	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS",     $_POST["MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", $_POST["MAIN_TVAINTRA_NOT_IN_ADDRESS"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DESC"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_REF"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", $_POST["MAIN_PDF_USE_ISO_LOCATION"],'chaine',0,'', $conf->entity);
+	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"],'chaine',0,'', $conf->entity);
 
 
-    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX",    $_POST["MAIN_PDF_MAIN_HIDE_SECOND_TAX"],'chaine',0,'',$conf->entity);
-    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX",     $_POST["MAIN_PDF_MAIN_HIDE_THIRD_TAX"],'chaine',0,'',$conf->entity);
+    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_SECOND_TAX", $_POST["MAIN_PDF_MAIN_HIDE_SECOND_TAX"],'chaine',0,'', $conf->entity);
+    dolibarr_set_const($db, "MAIN_PDF_MAIN_HIDE_THIRD_TAX", $_POST["MAIN_PDF_MAIN_HIDE_THIRD_TAX"],'chaine',0,'', $conf->entity);
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index abe2fbea655..b250bf28a87 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -243,14 +243,14 @@ if ($mode == 'config' && $user->admin)
     print "</tr>\n";
     $ret = $printer->listprinters();
     $nbofprinters = count($printer->listprinters);
-    
+
     if ($ret > 0) {
         setEventMessages($printer->error, $printer->errors, 'errors');
     } else {
-        for ($line=0; $line < $nbofprinters; $line++) 
+        for ($line=0; $line < $nbofprinters; $line++)
         {
             print '<tr class="oddeven">';
-            if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) 
+            if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid)
             {
                 print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
                 print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
@@ -285,7 +285,7 @@ if ($mode == 'config' && $user->admin)
         }
     }
 
-    if ($action!='editprinter') 
+    if ($action!='editprinter')
     {
         if ($nbofprinters > 0)
         {
@@ -299,7 +299,7 @@ if ($mode == 'config' && $user->admin)
             print '<th></th>';
             print "</tr>\n";
         }
-        
+
         print '<tr>';
         print '<td><input size="50" type="text" name="printername"></td>';
         $ret = $printer->selectTypePrinter();
@@ -315,7 +315,7 @@ if ($mode == 'config' && $user->admin)
     print '</table>';
 
     dol_fiche_end();
-    
+
     if ($action!='editprinter') {
         print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
     } else {
@@ -324,9 +324,9 @@ if ($mode == 'config' && $user->admin)
     print '</form>';
 
     print '<div><p></div>';
-    
+
     dol_fiche_head();
-    
+
     print $langs->trans("ReceiptPrinterTypeDesc")."<br><br>\n";
     print '<table class="noborder" width="100%">'."\n";
     print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
@@ -338,7 +338,7 @@ if ($mode == 'config' && $user->admin)
     dol_fiche_end();
 
     print '<div><p></div>';
-    
+
     dol_fiche_head();
     print $langs->trans("ReceiptPrinterProfileDesc")."<br><br>\n";
     print '<table class="noborder" width="100%">'."\n";
@@ -378,7 +378,7 @@ if ($mode == 'template' && $user->admin)
         setEventMessages($printer->error, $printer->errors, 'errors');
     } else {
         $max = count($printer->listprinterstemplates);
-        for ($line=0; $line < $max; $line++) 
+        for ($line=0; $line < $max; $line++)
         {
             print '<tr class="oddeven">';
             if ($action=='edittemplate' && $printer->listprinterstemplates[$line]['rowid']==$templateid) {
@@ -423,7 +423,7 @@ if ($mode == 'template' && $user->admin)
     print '<th>'.$langs->trans("Description").'</th>';
     print "</tr>\n";
     $max = count($printer->tags);
-    for ($tag=0; $tag < $max; $tag++) 
+    for ($tag=0; $tag < $max; $tag++)
     {
         print '<tr class="oddeven">';
         print '<td>&lt;'.$printer->tags[$tag].'&gt;</td><td>'.$langs->trans(strtoupper($printer->tags[$tag])).'</td>';
@@ -436,14 +436,14 @@ if ($mode == 'template' && $user->admin)
 }
 
 // to remove after test
-$object=new stdClass();
-$object->date_time = '2015-11-02 22:30:25';
-$object->id = 1234;
-$object->customer_firstname  = 'John';
-$object->customer_lastname  = 'Deuf';
-$object->vendor_firstname  = 'Jim';
-$object->vendor_lastname  = 'Big';
-$object->barcode = '3700123862396';
+// $object=new stdClass();
+// $object->date_time = '2015-11-02 22:30:25';
+// $object->id = 1234;
+// $object->customer_firstname  = 'John';
+// $object->customer_lastname  = 'Deuf';
+// $object->vendor_firstname  = 'Jim';
+// $object->vendor_lastname  = 'Big';
+// $object->barcode = '3700123862396';
 //$printer->sendToPrinter($object, 1, 16);
 //setEventMessages($printer->error, $printer->errors, 'errors');
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 3dbc785d1d7..45071117c89 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -48,12 +48,12 @@ $action=GETPOST('action','aZ09');
 
 if ($action == 'update' && empty($_POST["cancel"]))
 {
-	dolibarr_set_const($db, "MAIN_DISABLE_ALL_SMS",   $_POST["MAIN_DISABLE_ALL_SMS"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_DISABLE_ALL_SMS", $_POST["MAIN_DISABLE_ALL_SMS"], 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SMS_SENDMODE",      $_POST["MAIN_SMS_SENDMODE"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_SMS_SENDMODE", $_POST["MAIN_SMS_SENDMODE"], 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_MAIL_SMS_FROM",     $_POST["MAIN_MAIL_SMS_FROM"],'chaine',0,'',$conf->entity);
-	//dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO",    $_POST["MAIN_MAIL_AUTOCOPY_TO"],'chaine',0,'',$conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMS_FROM", $_POST["MAIN_MAIL_SMS_FROM"], 'chaine', 0, '', $conf->entity);
+	//dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", $_POST["MAIN_MAIL_AUTOCOPY_TO"], 'chaine', 0, '', $conf->entity);
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
@@ -169,21 +169,21 @@ if ($action == 'edit')
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	// Disable	
+	// Disable
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>';
 	print $form->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1);
 	print '</td></tr>';
 
-	// Separator	
+	// Separator
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
-	// Method	
+	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1);
 	else print '<font class="error">'.$langs->trans("None").'</font>';
     print '</td></tr>';
 
-	// From	
+	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_SMS_FROM" size="32" value="' . $conf->global->MAIN_MAIL_SMS_FROM;
 	print '"></td></tr>';
@@ -213,20 +213,20 @@ else
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	// Disable	
+	// Disable
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_SMS).'</td></tr>';
 
-	// Separator	
+	// Separator
 	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
 
-	// Method	
+	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
 	$text=$listofmethods[$conf->global->MAIN_SMS_SENDMODE];
 	if (empty($text)) $text=$langs->trans("Undefined").' '.img_warning();
 	print $text;
 	print '</td></tr>';
 
-	// From	
+	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMS_FROM",$langs->transnoentities("Undefined")).'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_SMS_FROM;
 	if (!empty($conf->global->MAIN_MAIL_SMS_FROM) && ! isValidPhone($conf->global->MAIN_MAIL_SMS_FROM)) print ' '.img_warning($langs->trans("ErrorBadPhone"));
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index b83f87af162..2e62f6f49e7 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -373,7 +373,7 @@ if($conf->invoice->enabled)
 	print "</tr>\n";
 }
 
-if($conf->order->enabled) 
+if($conf->order->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
@@ -388,7 +388,7 @@ if($conf->order->enabled)
 	print "</tr>\n";
 }
 
-if($conf->expedition->enabled) 
+if($conf->expedition->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index fda1946875a..65e19fb9d83 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -79,17 +79,17 @@ foreach($modulesdir as $dir)
 						{
 							try {
 	    						$objMod = new $modName($db);
-						
+
 			    				$modules[$objMod->numero]=$objMod;
 			    				$modules_names[$objMod->numero]=$objMod->name;
 	    						$modules_files[$objMod->numero]=$file;
 	    						$modules_fullpath[$file]=$dir.$file;
 	    						$picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic';
-							} 
+							}
 							catch(Exception $e)
 							{
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-							}	
+							}
 						}
 						else
 						{
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 38f0a8eb497..5cf72b302c9 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -54,11 +54,11 @@ if ($action == 'updateMask') {
         $error++;
     }
 
-    if (!$error) 
+    if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } 
-    else 
+    }
+    else
     {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index e6b4985f6b8..56e90c1a639 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -31,9 +31,9 @@ include '../master.inc.php';
 
 $phone = GETPOST('phone');
 $notfound = $langs->trans("Unknown");
- 
+
 // Security check
-if (empty($conf->clicktodial->enabled)) 
+if (empty($conf->clicktodial->enabled))
 {
     print "Error: Module Click to dial is not enabled.\n";
     exit;
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 7693063a517..3fd68b836f3 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -131,7 +131,7 @@ else if (GETPOST('downloadcsv','alpha'))
 		{
 			// Make the first fetch to get first line
 			$obj = $db->fetch_object($res);
-			if ($obj) 
+			if ($obj)
 			{
 				$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
 				$firstid = $obj->rowid;
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index d4149619aae..dc579711aa3 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -52,7 +52,7 @@ p {
 }
 .logopos {
 	padding-top: 20px;
-	max-height: 40px;	
+	max-height: 40px;
 }
 
 /* ------------------- Header ------------------- */
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 70c38205eac..30715f96a49 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2017 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015	   Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2018	   Nicolas ZABOURI	<info@inovea-conseil.com>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -1236,7 +1236,7 @@ class ActionComm extends CommonObject
 
                 if ((!$user->rights->agenda->allactions->read && $this->author->id != $user->id) || (!$user->rights->agenda->myactions->read && $this->author->id == $user->id))
                     $option = 'nolink';
-		
+
                 $label = $this->label;
 		if (empty($label)) $label=$this->libelle;   // For backward compatibility
 
@@ -1692,4 +1692,3 @@ class ActionComm extends CommonObject
     }
 
 }
-
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 4d10120aaeb..72058578db7 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -84,11 +84,11 @@ if (empty($template_id)) {
 	$result = $advTarget->fetch($template_id);
 }
 
-if ($result < 0) 
+if ($result < 0)
 {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-} 
-else 
+}
+else
 {
 	if (! empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
@@ -225,7 +225,7 @@ if ($action == 'add') {
 	} else {
 		$advTarget->contact_lines = array ();
 	}
-	
+
 	if ((count($advTarget->thirdparty_lines) > 0) || (count($advTarget->contact_lines) > 0)) {
 		// Add targets into database
 		$obj = new mailing_advthirdparties($db);
@@ -359,7 +359,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
 				setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 			}
 		} elseif ($action == 'savefilter') {
-			
+
 			$result = $advTarget->update($user);
 			if ($result < 0) {
 				setEventMessages($advTarget->error, $advTarget->errors, 'errors');
@@ -465,9 +465,9 @@ if ($object->fetch($id) >= 0) {
 
 	// Show email selectors
 	if ($object->statut == 0 && $user->rights->mailing->creer) {
-		
+
 		include DOL_DOCUMENT_ROOT . '/core/tpl/advtarget.tpl.php';
-		
+
 	}
 }
 
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index cd49ca863e6..724e0bcce15 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -57,7 +57,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
         <?php if(!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
             {
                 $url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
-                print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';  
+                print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
             }
         ?>
         </td>
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 10005f3004a..016d6a28c04 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -700,8 +700,8 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				} 
-				else 
+				}
+				else
 				{
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error ++;
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 176fdb626a5..44e4f72c496 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -31,10 +31,10 @@ class BankCateg // extends CommonObject
 	//public $element='bank_categ';			//!< Id that identify managed objects
 	//public $table_element='bank_categ';	//!< Name of table without prefix where object is stored
     public $picto='generic';
-    
+
 	public $id;
 	public $label;
-   
+
 
 	/**
 	 * Constructor
@@ -205,7 +205,7 @@ class BankCateg // extends CommonObject
 		{
 		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
     		$sql.= " WHERE fk_categorie = ".$this->id;
-    		
+
     		$resql = $this->db->query($sql);
     		if (!$resql)
     		{
@@ -213,13 +213,13 @@ class BankCateg // extends CommonObject
     		    $this->errors[] = "Error ".$this->db->lasterror();
     		}
 		}
-		
+
 		// Delete link between tag and bank lines
 		if (! $error)
 		{
 		    $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
 		    $sql.= " WHERE fk_categ = ".$this->id;
-		
+
 		    $resql = $this->db->query($sql);
 		    if (!$resql)
 		    {
@@ -227,21 +227,21 @@ class BankCateg // extends CommonObject
 		        $this->errors[] = "Error ".$this->db->lasterror();
 		    }
 		}
-		
+
 		// Delete bank categ
 		if (! $error)
 		{
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
     		$sql .= " WHERE rowid=".$this->id;
-    
+
     		$resql = $this->db->query($sql);
-    		if (!$resql) 
+    		if (!$resql)
     		{
     			$error++;
     			$this->errors[] = "Error ".$this->db->lasterror();
     		}
 		}
-		
+
     	// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 6984bbff5b4..09252bc0edc 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -44,37 +44,37 @@ $eventfound = array();
 //dol_syslog('time='.$time.' $_SESSION[auto_ck_events_not_before]='.$_SESSION['auto_check_events_not_before']);
 
 // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
-if ($time >= $_SESSION['auto_check_events_not_before']) 
+if ($time >= $_SESSION['auto_check_events_not_before'])
 {
     $time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY;   // Always defined
-    if (! empty($_SESSION['auto_check_events_not_before'])) 
+    if (! empty($_SESSION['auto_check_events_not_before']))
     {
         // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
-        // then we are not losing periods 
+        // then we are not losing periods
         $starttime = $_SESSION['auto_check_events_not_before'];
         // Protection to avoid too long sessions
-        if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT)) 
+        if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT))
         {
             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;
     }
-    
+
     $_SESSION['auto_check_events_not_before'] = $time + $time_update;
-    
-    // Force save of session change we did. 
+
+    // Force save of session change we did.
     // WARNING: Any change in sessions after that will not be saved !
     session_write_close();
-    
+
     require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-	
-    
+
+
     dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
-    
+
     $sql = 'SELECT id';
     $sql .= ' FROM ' . MAIN_DB_PREFIX . 'actioncomm a, ' . MAIN_DB_PREFIX . 'actioncomm_resources ar';
     $sql .= ' WHERE a.id = ar.fk_actioncomm';
@@ -91,11 +91,11 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
 
         $actionmod = new ActionComm($db);
 
-        while ($obj = $db->fetch_object($resql)) 
+        while ($obj = $db->fetch_object($resql))
         {
             $langs->load("agenda");
             $langs->load("commercial");
-            
+
             $actionmod->fetch($obj->id);
 
             // Message must be formated and translated to be used with javascript directly
@@ -105,7 +105,7 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             $event['tipo'] = $langs->transnoentities('Action' . $actionmod->code);
             $event['titulo'] = $actionmod->label;
             $event['location'] = $langs->transnoentities('Location').': '.$actionmod->location;
-            
+
             $eventfound[] = $event;
         }
     }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6db2388ce8c..21b715b0e13 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1864,7 +1864,7 @@ abstract class CommonObject
 							case 'order_supplier':
 								$this->updateline(
 									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,  $line->product_type, false,
+									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index bed227eb408..91d4245ff88 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -53,7 +53,7 @@ abstract class CommonObjectLine extends CommonObject
     /**
      *	Returns the translation key from units dictionary.
      *  A langs->trans() must be called on result to get translated value.
-     *  
+     *
      * 	@param	string $type Label type (long or short)
      *	@return	string|int <0 if ko, label if ok
      */
@@ -94,4 +94,3 @@ abstract class CommonObjectLine extends CommonObject
 
 	// For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
 }
-
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 34f725b8258..eb40e974ca9 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -45,7 +45,7 @@
  * <dol_cut_paper_partial>                          Cut ticket partially
  * <dol_open_drawer>                                Open cash drawer
  * <dol_activate_buzzer>                            Activate buzzer
- * 
+ *
  * Code which can be placed everywhere
  * <dol_print_qrcode>                               Print QR Code
  * <dol_print_date>                                 Print date AAAA-MM-DD
@@ -94,7 +94,7 @@
 
 require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/Escpos.php';
 
- 
+
 /**
  * Class to manage Receipt Printers
  */
@@ -313,16 +313,16 @@ class dolReceiptPrinter extends Escpos
     function selectTypePrinter($selected='', $htmlname='printertypeid')
     {
         global $langs;
-        
+
         $options = array(
             1 => $langs->trans('CONNECTOR_DUMMY'),
             2 => $langs->trans('CONNECTOR_FILE_PRINT'),
             3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
             4 => $langs->trans('CONNECTOR_WINDOWS_PRINT')
         );
-        
+
         $this->resprint = Form::selectarray($htmlname, $options, $selected);
-        
+
         return 0;
     }
 
@@ -337,7 +337,7 @@ class dolReceiptPrinter extends Escpos
     function selectProfilePrinter($selected='', $htmlname='printerprofileid')
     {
         global $langs;
-        
+
         $options = array(
             0 => $langs->trans('PROFILE_DEFAULT'),
             1 => $langs->trans('PROFILE_SIMPLE'),
@@ -345,7 +345,7 @@ class dolReceiptPrinter extends Escpos
             3 => $langs->trans('PROFILE_P822D'),
             4 => $langs->trans('PROFILE_STAR')
         );
-        
+
         $this->profileresprint = Form::selectarray($htmlname, $options, $selected);
         return 0;
     }
@@ -533,11 +533,11 @@ class dolReceiptPrinter extends Escpos
         $ret = $this->InitPrinter($printerid);
         if ($ret>0) {
             setEventMessages($this->error, $this->errors, 'errors');
-        } 
-        else 
+        }
+        else
         {
             $nboflines = count($vals);
-            for ($line=0; $line < $nboflines; $line++) 
+            for ($line=0; $line < $nboflines; $line++)
             {
                 switch ($vals[$line]['tag']) {
                     case 'DOL_ALIGN_CENTER':
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 2c45ef0266c..0434dc1e0a8 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -74,14 +74,14 @@ class FormContract
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  
+		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
 			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
 		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
 			{
 		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
 				$sql.= " OR c.fk_soc IS NULL)";
 		    	}
-		}	
+		}
 		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
 		$sql.= " ORDER BY c.ref ";
 
@@ -147,14 +147,14 @@ class FormContract
 			}
 			print '</select>';
 			$db->free($resql);
-			
+
 			if (!empty($conf->use_javascript_ajax))
 			{
 				// Make select dynamic
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 				print ajax_combobox($htmlname);
 			}
-			
+
 			return $num;
 		}
 		else
@@ -163,7 +163,7 @@ class FormContract
 			return -1;
 		}
 	}
-	
+
 	/**
 	 *	Show a form to select a contract
 	 *
@@ -178,7 +178,7 @@ class FormContract
 	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
 	{
 	    global $langs;
-	
+
         print "\n";
         print '<form method="post" action="'.$page.'">';
         print '<input type="hidden" name="action" value="setcontract">';
@@ -186,6 +186,6 @@ class FormContract
         $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty);
         print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
         print '</form>';
-	}	
-	
+	}
+
 }
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 712460f530f..c4ac522d98a 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -66,10 +66,10 @@ class FormPropal
 
         $prefix='';
         $listofstatus=array();
-        if ($mode == 'supplier') 
+        if ($mode == 'supplier')
         {
             $prefix='SupplierProposalStatus';
-            
+
             $langs->load("supplier_proposal");
             $listofstatus=array(
                 0=>array('id'=>0, 'code'=>'PR_DRAFT'),
@@ -82,7 +82,7 @@ class FormPropal
         else
         {
             $prefix="PropalStatus";
-            
+
             $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
             $sql .= " WHERE active = 1";
             dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
@@ -146,4 +146,3 @@ class FormPropal
         print '</select>';
     }
 }
-
diff --git a/htdocs/core/js/blockUI.js b/htdocs/core/js/blockUI.js
index 6abcc706e25..20c2bd348d4 100644
--- a/htdocs/core/js/blockUI.js
+++ b/htdocs/core/js/blockUI.js
@@ -41,7 +41,7 @@ $(document).ready(function() {
 				'-moz-border-radius':	 '10px',
 				'border-radius': 		 '10px'
 			},
-			
+
 			// styles applied when using $.growlUI
 			dolEventErrorCSS: {
 				width:  	'350px',
@@ -60,7 +60,7 @@ $(document).ready(function() {
 			}
 
 	};*/
-	
+
 	$.dolEventValid = function(title, message, timeout, onClose) {
 		var $m = $('<div class="dolEventValid"></div>');
 		if (title) $m.append('<h1>'+title+'</h1>');
@@ -73,7 +73,7 @@ $(document).ready(function() {
 			css: $.blockUI.events.dolEventValidCSS
 		});
 	};
-	
+
 	$.dolEventError = function(title, message, timeout, onClose) {
 		var $m = $('<div class="dolEventError"></div>');
 		if (title) $m.append('<h1>'+title+'</h1>');
@@ -87,7 +87,7 @@ $(document).ready(function() {
 		});
 		$('.dolEventError').click($.unblockUI);
 	};
-	
+
 	$.pleaseBePatient = function(message) {
 		$.blockUI({
 			message: message,
diff --git a/htdocs/core/js/listview.js b/htdocs/core/js/listview.js
index de3113d0fae..f5ee0af6568 100644
--- a/htdocs/core/js/listview.js
+++ b/htdocs/core/js/listview.js
@@ -22,28 +22,28 @@ var Listview_include = true;
 
 function Listview_OrderDown(idListe, column) {
 	var base_url = document.location.href;
-	
+
 	base_url = Listview_recup_form_param(idListe,base_url);
 	base_url = Listview_removeParam(base_url,'Listview['+encodeURIComponent(idListe)+'][orderBy]');
-	
+
 	base_url = Listview_removeParam(base_url,'get-all-for-export');
-	
+
 	document.location.href=Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","DESC");
 }
 function Listview_OrderUp(idListe, column) {
-	
+
 	var base_url = document.location.href;
-	
+
 	base_url = Listview_recup_form_param(idListe,base_url);
 	base_url = Listview_removeParam(base_url,'Listview['+encodeURIComponent(idListe)+'][orderBy]');
-	
+
 	base_url = Listview_removeParam(base_url,'get-all-for-export');
-	
+
 	document.location.href=Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][orderBy]["+encodeURIComponent(column)+"]","ASC");
 }
 function Listview_modifyUrl(strURL,paramName,paramNewValue){
 	    if (strURL.indexOf(paramName+'=')!=-1){
-        	
+
                 var strFirstPart=strURL.substring(0,strURL.indexOf(paramName+'=',0))+paramName+'=';
                 var strLastPart="";
                 if (strURL.indexOf('&',strFirstPart.length-1)>0)
@@ -56,55 +56,55 @@ function Listview_modifyUrl(strURL,paramName,paramNewValue){
                 else
                         strURL+='?'+paramName+'='+paramNewValue;
         }
-        
+
         return strURL;
 }
 function Listview_removeParam(strURL, paramMask) {
 	var cpt=0;
 	var url = '';
-	
+
 	 while(strURL.indexOf(paramMask)!=-1 && cpt++ <50){
 	 	var strFirstPart= strURL.substring(0,strURL.indexOf(paramMask)-1);
-	 	
+
 	 	var strLastPart='';
 	 	if (strURL.indexOf('&',strFirstPart.length+1)>0) {
-	 		strLastPart = strURL.substring(strURL.indexOf('&',strFirstPart.length+1),strURL.length);	
+	 		strLastPart = strURL.substring(strURL.indexOf('&',strFirstPart.length+1),strURL.length);
 	 	}
-	 		
+
 		url = strFirstPart+strLastPart;
-	 	
+
 	 }
-	 
+
 	 if(url=='')url = strURL;
-	 
+
 	 return url;
 }
 
 function Listview_recup_form_param(idListe,base_url) {
-	
+
 	$('#'+idListe+' tr.barre-recherche [listviewtbs],#'+idListe+' tr.barre-recherche-head input,#'+idListe+' tr.barre-recherche-head select,#'+idListe+' div.tabsAction input[listviewtbs]').each(function(i,item) {
 		if($(item).attr("name")) {
 			base_url = Listview_modifyUrl(base_url, $(item).attr("name") , $(item).val());
 		}
-		
+
 	});
-	
+
 	return base_url;
 }
 
 function Listview_GoToPage(idListe,pageNumber){
-	
+
 	var base_url = document.location.href;
-	
+
 	base_url = Listview_recup_form_param(idListe,base_url);
 	base_url =Listview_modifyUrl(base_url,"Listview["+encodeURIComponent(idListe)+"][page]",pageNumber);
-	
+
 	base_url = Listview_removeParam(base_url,'get-all-for-export');
-	
+
 	document.location.href=base_url;
 }
 function Listview_submitSearch(obj) {
-	
+
 	$form = $(obj).closest('form');
 	console.log($form);
 	if($form.length>0){
@@ -113,20 +113,20 @@ function Listview_submitSearch(obj) {
 }
 function Listview_launch_downloadAs(mode,url,token,session_name) {
 	 $('#listviewdAS_export_form').remove();
-	
+
 	$form = $('<form action="'+url+'" method="post" name="listviewdAS_export_form" id="listTBSdAS_export_form"></form>');
 	$form.append('<input type="hidden" name="mode" value="'+mode+'" />');
 	$form.append('<input type="hidden" name="token" value="'+token+'" />');
 	$form.append('<input type="hidden" name="session_name" value="'+session_name+'" />');
-	
+
 	$('body').append($form);
-	
+
     $('#listviewdAS_export_form').submit();
-	
+
 }
 
 function Listview_downloadAs(obj, mode,url,token,session_name) {
-	
+
 	$form = $(obj).closest('form');
 	$div = $form.find('div.tabsAction');
 	$div.append('<input type="hidden" listviewtbs="hidden" name="token" value="'+token+'" />');
@@ -134,33 +134,33 @@ function Listview_downloadAs(obj, mode,url,token,session_name) {
 	$div.append('<input type="hidden" listviewtbs="hidden" name="url" value="'+url+'" />');
 	$div.append('<input type="hidden" listviewtbs="hidden" name="session_name" value="'+session_name+'" />');
 	$div.append('<input type="hidden" listviewtbs="hidden" name="get-all-for-export" value="1" />');
-	
+
 	Listview_submitSearch(obj);
 }
 
 $(document).ready(function() {
 	$('tr.barre-recherche input').keypress(function(e) {
 	    if(e.which == 13) {
-	       
+
 	       var id_list = $(this).closest('table').attr('id');
-	       
+
 	       $('#'+id_list+' .list-search-link').click();
-	       
+
 	    }
 	});
-	
+
 	var $_GET = {};
-	
+
 	document.location.search.replace(/\??(?:([^=]+)=([^&]*)&?)/g, function () {
 	    function decode(s) {
 	        return decodeURIComponent(s.split("+").join(" "));
 	    }
-	
+
 	    $_GET[decode(arguments[1])] = decode(arguments[2]);
 	});
-	
+
 	if(typeof $_GET["get-all-for-export"] != "undefined") {
 		Listview_launch_downloadAs($_GET['mode'],$_GET['url'],$_GET['token'],$_GET['session_name']);
 	}
-	
+
 });
diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index de8b24af96c..44180b42acb 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -24,9 +24,9 @@ function regexEvent(objet,evt,type)
     {
           case 'days':
               var regex= /^[0-9]{1}([.,]{1}[0-9]{1})?$/;
-   
+
               if(regex.test(objet.value) )
-              { 
+              {
                 var tmp=objet.value.replace(',','.');
                 if(tmp<=1.5){
                     var tmpint=parseInt(tmp);
@@ -41,13 +41,13 @@ function regexEvent(objet,evt,type)
               }else{
                  objet.value= '0';
             }
-          break; 
+          break;
           case 'hours':
               var regex= /^[0-9]{1,2}:[0-9]{2}$/;
               var regex2=/^[0-9]{1,2}$/;
               var regex3= /^[0-9]{1}([.,]{1}[0-9]{1,2})?$/;
               if(!regex.test(objet.value))
-              { 
+              {
                   if(regex2.test(objet.value))
                     objet.value=objet.value+':00';
                   else if(regex3.test(objet.value)) {
@@ -63,25 +63,25 @@ function regexEvent(objet,evt,type)
               //var regex= /^[0-9:]{1}$/;
               //alert(event.charCode);
               var charCode = (evt.which) ? evt.which : event.keyCode;
-              
+
               if(((charCode >= 48) && (charCode <= 57)) || //num
                     (charCode===46) || (charCode===8)||// comma & periode
                     (charCode === 58) || (charCode==44) )// : & all charcode
               {
                   // ((charCode>=96) && (charCode<=105)) || //numpad
             	  return true;
-         
+
               }else
               {
                   return false;
               }
-                
-              break;    
+
+              break;
           default:
               break;
       }
-}    
-  
+}
+
 
 function pad(n) {
     return (n < 10) ? ("0" + n) : n;
@@ -95,7 +95,7 @@ function parseTime(timeStr, dt)
     if (!dt) {
         dt = new Date();
     }
- 
+
     var time = timeStr.match(/(\d+)(?::(\d\d))?\s*(p?)/i);
     if (!time) {
         return -1;
@@ -107,7 +107,7 @@ function parseTime(timeStr, dt)
     else {
         hours += (hours < 12 && time[3]) ? 12 : 0;
     }
- 
+
     dt.setHours(hours);
     dt.setMinutes(parseInt(time[2], 10) || 0);
     dt.setSeconds(0, 0);
@@ -122,10 +122,10 @@ function updateTotal(days,mode)
     {
         var total = new Date(0);
         total.setHours(0);
-        total.setMinutes(0);   
+        total.setMinutes(0);
         var nbline = document.getElementById('numberOfLines').value;
         for (var i=-1; i<nbline; i++)
-        { 
+        {
             var id='timespent['+i+']['+days+']';
             var taskTime= new Date(0);
             var element=document.getElementById(id);
@@ -133,7 +133,7 @@ function updateTotal(days,mode)
             {
             	/* alert(element.value);*/
                 if (element.value)
-                {   
+                {
                 	result=parseTime(element.value,taskTime);
                 }
                 else
@@ -147,14 +147,14 @@ function updateTotal(days,mode)
                 }
             }
 
-            var id='timeadded['+i+']['+days+']';   
+            var id='timeadded['+i+']['+days+']';
             var taskTime= new Date(0);
             var element=document.getElementById(id);
             if(element)
             {
             	/* alert(element.value);*/
                 if (element.value)
-                {   
+                {
                 	result=parseTime(element.value,taskTime);
                 }
                 else
@@ -178,7 +178,7 @@ function updateTotal(days,mode)
         		console.log(this.value)
             	alert(element.value);*/
                 if (this.value)
-                {   
+                {
                 	console.log(this.value+':00')
                 	result=parseTime(this.value+':00',taskTime);
                 }
@@ -202,7 +202,7 @@ function updateTotal(days,mode)
         		console.log(this.value)
             	alert(element.value);*/
                 if (this.value)
-                {   
+                {
                 	console.log('00:'+this.value)
                 	result=parseTime('00:'+"00".substring(0, 2 - this.value.length) + this.value,taskTime);
                 }
@@ -217,14 +217,14 @@ function updateTotal(days,mode)
         		console.log(total.getMinutes())
             }
         });
-        
+
         if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+days).addClass("bold");
         else jQuery('.totalDay'+days).removeClass("bold");
     	jQuery('.totalDay'+days).text(pad(total.getHours())+':'+pad(total.getMinutes()));
-    	
+
     	var total = new Date(0);
         total.setHours(0);
-        total.setMinutes(0); 
+        total.setMinutes(0);
         for (var i=0; i<7; i++)
         {
         	var taskTime= new Date(0);
@@ -242,14 +242,14 @@ function updateTotal(days,mode)
         var total =0;
         var nbline = document.getElementById('numberOfLines').value;
         for (var i=-1; i<nbline; i++)
-        { 
-            var id='timespent['+i+']['+days+']';   
+        {
+            var id='timespent['+i+']['+days+']';
             var taskTime= new Date(0);
             var element=document.getElementById(id);
             if(element)
             {
                 if (element.value)
-                {   
+                {
                     total+=parseInt(element.value);
 
                    }
@@ -259,13 +259,13 @@ function updateTotal(days,mode)
                 }
             }
 
-            var id='timeadded['+i+']['+days+']';   
+            var id='timeadded['+i+']['+days+']';
             var taskTime= new Date(0);
             var element=document.getElementById(id);
             if(element)
             {
                 if (element.value)
-                {   
+                {
                     total+=parseInt(element.value);
 
                    }
@@ -275,11 +275,9 @@ function updateTotal(days,mode)
                 }
             }
         }
-        
+
         if (total) jQuery('.totalDay'+days).addClass("bold");
         else jQuery('.totalDay'+days).removeClass("bold");
     	jQuery('.totalDay'+days).text(total);
     }
 }
-
-   
\ No newline at end of file
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 13956f688aa..efd245209d2 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -251,7 +251,7 @@ function barcode_encode_genbarcode($code,$encoding)
     $command=escapeshellarg($genbarcode_loc);
     //$paramclear=" \"".str_replace("\"", "\\\"",$code)."\" \"".str_replace("\"", "\\\"",strtoupper($encoding))."\"";
     $paramclear=" ".escapeshellarg($code)." ".escapeshellarg(strtoupper($encoding));
-    
+
     $fullcommandclear=$command." ".$paramclear." 2>&1";
     //print $fullcommandclear."<br>\n";exit;
 
@@ -277,8 +277,8 @@ function barcode_encode_genbarcode($code,$encoding)
     	"error" => ""
     );
     //var_dump($ret);
-    if (preg_match('/permission denied/i',$ret['bars'])) 
-    { 
+    if (preg_match('/permission denied/i',$ret['bars']))
+    {
     	$ret['error']=$ret['bars']; $ret['bars']='';
     	return $ret;
     }
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 00a06ca3f09..d9cad7f1c1e 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -48,8 +48,8 @@ function emailing_prepare_head(Mailing $object)
     	$h++;
 
 	}
-	
-	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR)) 
+
+	if (! empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index 7e89946d471..ecfce2108dd 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -36,7 +36,7 @@ $sql = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, t
 $resql = $db->query($sql);
 if ($resql)
 {
-    while ($row = $db->fetch_array($resql)) 
+    while ($row = $db->fetch_array($resql))
     {
         $_Avery_Labels[$row['code']]['name']=$row['name'];
         $_Avery_Labels[$row['code']]['paper-size']=$row['paper_size'];
diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index 5f7eabc7500..08b0e3be01a 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -18,7 +18,7 @@
 /**
  * \file    htdocs/core/lib/hrm.lib.php
  * \ingroup HRM
- * \brief   Library for hrm 
+ * \brief   Library for hrm
  */
 $langs->load('hrm');
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 4e7fa860529..451ac0731ef 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -36,7 +36,7 @@
 function facture_prepare_head($object)
 {
 	global $db, $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -63,7 +63,7 @@ function facture_prepare_head($object)
 	    $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 	    $sql .= " WHERE pfd.fk_facture = ".$object->id;
         $resql=$db->query($sql);
-        if ($resql) 
+        if ($resql)
         {
             $obj=$db->fetch_object($resql);
             if ($obj) $nbStandingOrders = $obj->nb;
@@ -152,12 +152,12 @@ function invoice_admin_prepare_head()
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
 	$head[$h][2] = 'attributeslines';
 	$h++;
-	
+
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facture_rec_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsCustomerInvoicesRec");
 	$head[$h][2] = 'attributesrec';
 	$h++;
-	
+
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_rec_cust_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLinesRec");
 	$head[$h][2] = 'attributeslinesrec';
@@ -172,7 +172,7 @@ function invoice_admin_prepare_head()
 function invoice_rec_prepare_head($object)
 {
 	global $db, $langs, $conf;
-	
+
 	$h = 0;
 	$head = array();
 
@@ -191,5 +191,3 @@ function invoice_rec_prepare_head($object)
 
 	return $head;
 }
-
-
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index 3f7029dd26b..b61c57b4bc3 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -59,7 +59,7 @@ function loan_prepare_head($object)
 	$tab++;
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{		
+	{
 		$nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 7e8bf3ae8d7..4981e0fffd0 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -258,13 +258,13 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='',
         foreach($object->fields as $key => $val)
         {
             $i++;
-            
-            $type = $val['type']; 
+
+            $type = $val['type'];
             $type = preg_replace('/:.*$/', '', $type);		// For case type = 'integer:Societe:societe/class/societe.class.php'
 
             if ($type == 'html') $type = 'text';            // html modulebuilder type is a text type in database
             else if ($type == 'price') $type = 'double';            // html modulebuilder type is a text type in database
-            else if ($type == 'link' || $type == 'sellist') $type = 'integer'; 
+            else if ($type == 'link' || $type == 'sellist') $type = 'integer';
             $texttoinsert.= "\t".$key." ".$type;
             if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
             if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
@@ -343,5 +343,3 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='',
 
     return $error ? -1 : 1;
 }
-
-
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index b0a30697413..3f09bd3410a 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -64,7 +64,7 @@ function build_calfile($format,$title,$desc,$events_array,$outputfile)
         && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60){
 	        $hh=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'hour');
 	        $mm=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'min');
-	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec'); 
+	        $ss=convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE,'sec');
 	        fwrite($calfileh,"X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
         }
 
@@ -520,4 +520,3 @@ function quotedPrintDecode($str)
 	$out = quoted_printable_decode($out);	// Available with PHP 4+
 	return trim($out);
 }
-
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 86c292ee80d..17a98d9cd77 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -113,7 +113,7 @@ class modPhpbarcode extends ModeleBarCode
 	 *	@param  string	 	$encoding		  Mode of encoding
 	 *	@param  string	 	$readable		  Code can be read
 	 *	@param	integer		$scale			  Scale
-	 *  @param  integer     $nooutputiferror  No output if error 
+	 *  @param  integer     $nooutputiferror  No output if error
 	 *	@return	int							  <0 if KO, >0 if OK
      */
 	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
@@ -154,7 +154,7 @@ class modPhpbarcode extends ModeleBarCode
 	 *	@param	string   	$encoding		  Mode of encoding
 	 *	@param  string	 	$readable		  Code can be read
 	 *	@param	integer		$scale			  Scale
-	 *  @param  integer     $nooutputiferror  No output if error 
+	 *  @param  integer     $nooutputiferror  No output if error
 	 *	@return	int							  <0 if KO, >0 if OK
 	 */
 	function writeBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
@@ -173,4 +173,3 @@ class modPhpbarcode extends ModeleBarCode
 	}
 
 }
-
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index 741c247579d..fcf01131f46 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -39,7 +39,7 @@ class modTcpdfbarcode extends ModeleBarCode
 	public $error='';
 	
 	var $is2d = false;
-	
+
 	/**
 	 *	Return description of numbering model
 	 *
@@ -60,8 +60,8 @@ class modTcpdfbarcode extends ModeleBarCode
 	function isEnabled()
 	{
 		return true;
-	}	 
-	
+	}
+
 	/**
 	 *	Test si les numeros deja en vigueur dans la base ne provoquent pas de
 	 *	de conflits qui empechera cette numerotation de fonctionner.
@@ -71,10 +71,10 @@ class modTcpdfbarcode extends ModeleBarCode
 	function canBeActivated()
 	{
 		global $langs;
-	
+
 		return true;
 	}
-	
+
 	/**
 	 *	Return true if encoding is supported
 	 *
@@ -88,7 +88,7 @@ class modTcpdfbarcode extends ModeleBarCode
 			return 0;
 		} else {
 			return 1;
-		}		
+		}
 	}
 
 	/**
@@ -104,17 +104,17 @@ class modTcpdfbarcode extends ModeleBarCode
 	function buildBarCode($code,$encoding,$readable='Y',$scale=1,$nooutputiferror=0)
 	{
 		global $_GET;
-		
+
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
 		if (empty($tcpdfEncoding)) return -1;
-				
+
 		$color = array(0,0,0);
 
 		$_GET["code"]=$code;
 		$_GET["type"]=$encoding;
 		$_GET["height"]=$height;
 		$_GET["readable"]=$readable;
-		
+
 		if ($code) {
 			// Load the tcpdf barcode class
 			if ($this->is2d) {
@@ -127,15 +127,15 @@ class modTcpdfbarcode extends ModeleBarCode
 				$width = 1;
 				require_once TCPDF_PATH.'tcpdf_barcodes_1d.php';
 				$barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding);
-			}		
-			
+			}
+
 			dol_syslog("buildBarCode::TCPDF.getBarcodePNG");
 			$barcodeobj->getBarcodePNG($width, $height, $color);
-			
+
 			return 1;
 		} else {
 			return -2;
-		}		
+		}
 	}
 
 	/**
@@ -177,8 +177,8 @@ class modTcpdfbarcode extends ModeleBarCode
 				$width = 1;
 				require_once TCPDF_PATH.'tcpdf_barcodes_1d.php';
 				$barcodeobj = new TCPDFBarcode($code, $tcpdfEncoding);
-			}		
-			
+			}
+
 			dol_syslog("writeBarCode::TCPDF.getBarcodePngData");
 			if ($imageData = $barcodeobj->getBarcodePngData($width, $height, $color)) {
 				if (function_exists('imagecreate')) {
@@ -191,16 +191,16 @@ class modTcpdfbarcode extends ModeleBarCode
 				}
 			} else {
 				return -4;
-			}			
+			}
 		} else {
 			return -2;
 		}
 	}
-	
+
 	/**
 	 *	get available output_modes for tcpdf class wth its translated description
 	 *
-	 * @param	string $dolEncodingType dolibarr barcode encoding type	
+	 * @param	string $dolEncodingType dolibarr barcode encoding type
 	 * @return	string tcpdf encoding type
 	 */
 	public function getTcpdfEncodingType($dolEncodingType)
@@ -237,7 +237,7 @@ class modTcpdfbarcode extends ModeleBarCode
 						'PHARMA' => 'PHARMA',
 						'PHARMA2T' => 'PHARMA2T'
 		);
-		
+
 		$tcpdf2dEncodingTypes = array(
 						'DATAMATRIX' => 'DATAMATRIX',
 						'PDF417' => 'PDF417',
@@ -245,9 +245,9 @@ class modTcpdfbarcode extends ModeleBarCode
 						'QRCODE,L' => 'QRCODE,L',
 						'QRCODE,M' => 'QRCODE,M',
 						'QRCODE,Q' => 'QRCODE,Q',
-						'QRCODE,H' => 'QRCODE,H'						
+						'QRCODE,H' => 'QRCODE,H'
 		);
-		
+
 		if (array_key_exists($dolEncodingType, $tcpdf1dEncodingTypes)) {
 			$this->is2d = false;
 			return $tcpdf1dEncodingTypes[$dolEncodingType];
@@ -256,6 +256,6 @@ class modTcpdfbarcode extends ModeleBarCode
 			return $tcpdf2dEncodingTypes[$dolEncodingType];
 		} else {
 			return '';
-		}		 
+		}
 	}
 }
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index c159a7af925..991ae97e8a8 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -44,7 +44,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-        
+
 		// Load traductions files requiredby by page
 		$langs->loadLangs(array("main", "bills"));
 
@@ -77,7 +77,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	/**
 	 *	Fonction to generate document on disk
 	 *
-	 *	@param	RemiseCheque	$object			Object RemiseCheque			
+	 *	@param	RemiseCheque	$object			Object RemiseCheque
 	 *	@param	string			$_dir			Directory
 	 *	@param	string			$number			Number
 	 *	@param	Translate		$outputlangs	Lang output object
@@ -91,7 +91,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
         // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
         $sav_charset_output=$outputlangs->charset_output;
         if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-        
+
         // Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
 
@@ -191,7 +191,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		$this->result = array('fullpath'=>$file);
-		
+
         $outputlangs->charset_output=$sav_charset_output;
 	    return 1;   // Pas d'erreur
 	}
@@ -210,7 +210,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	{
 		global $langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("compta", "banks"));
 
@@ -384,7 +384,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		{
 		    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
 		}
-		
+
 		return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 }
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 6d9e359c859..f4dad0b4a26 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -118,7 +118,7 @@ abstract class ModeleNumRefChequeReceipts
 
 /**
  *	\class      ModeleChequeReceipts
- *	\brief      Classe mere des modeles de 
+ *	\brief      Classe mere des modeles de
  */
 abstract class ModeleChequeReceipts extends CommonDocGenerator
 {
@@ -215,4 +215,3 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		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 f43ec0907ca..62fa2c73138 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -43,17 +43,17 @@ class pdf_strato extends ModelePDFContract
      * @var DoliDb Database handler
      */
     public $db;
-	
+
 	/**
      * @var string model name
      */
     public $name;
-	
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-	
+
 	/**
      * @var string document type
      */
@@ -63,8 +63,8 @@ class pdf_strato extends ModelePDFContract
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -75,32 +75,32 @@ class pdf_strato extends ModelePDFContract
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
@@ -177,7 +177,7 @@ class pdf_strato extends ModelePDFContract
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "companies", "contracts"));
 
@@ -537,9 +537,9 @@ class pdf_strato extends ModelePDFContract
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
-		
+
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "contract", "companies"));
 
@@ -721,4 +721,3 @@ class pdf_strato extends ModelePDFContract
 	}
 
 }
-
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index c4c665de56d..63adf232c1b 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 
 /**
- *	Class to build sending documents with model Merou 
+ *	Class to build sending documents with model Merou
  */
 class pdf_merou extends ModelePdfExpedition
 {
@@ -41,17 +41,17 @@ class pdf_merou extends ModelePdfExpedition
      * @var DoliDb Database handler
      */
     public $db;
-	
+
 	/**
      * @var string model name
      */
     public $name;
-	
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-	
+
 	/**
      * @var string document type
      */
@@ -61,8 +61,8 @@ class pdf_merou extends ModelePdfExpedition
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -73,37 +73,37 @@ class pdf_merou extends ModelePdfExpedition
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -162,10 +162,10 @@ class pdf_merou extends ModelePdfExpedition
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
-		
+
 		if ($conf->expedition->dir_output)
 		{
 			$object->fetch_thirdparty();
@@ -331,7 +331,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->SetDrawColor(120,120,120);
 					$pdf->Rect(10+3, $curY, 3, 3);
 					$pdf->Rect(20+3, $curY, 3, 3);
-					
+
 					//Insertion de la reference du produit
 					$pdf->SetXY(30, $curY);
 					$pdf->SetFont('','B', $default_font_size - 3);
@@ -424,7 +424,7 @@ class pdf_merou extends ModelePdfExpedition
                     @chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
-                
+
 				return 1;
 			}
 			else
@@ -456,7 +456,7 @@ class pdf_merou extends ModelePdfExpedition
 	{
 		global $langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index aad7fd07c1b..84a9831223b 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -40,17 +40,17 @@ class pdf_rouget extends ModelePdfExpedition
      * @var DoliDb Database handler
      */
     public $db;
-	
+
 	/**
      * @var string model name
      */
     public $name;
-	
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-	
+
 	/**
      * @var string document type
      */
@@ -60,8 +60,8 @@ class pdf_rouget extends ModelePdfExpedition
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -72,37 +72,37 @@ class pdf_rouget extends ModelePdfExpedition
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -193,7 +193,7 @@ class pdf_rouget extends ModelePdfExpedition
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 
@@ -1100,4 +1100,3 @@ class pdf_rouget extends ModelePdfExpedition
 	}
 
 }
-
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 539830cdc71..2d6a8850ed8 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -52,7 +52,7 @@ class pdf_standard extends ModeleExpenseReport
      * @var string model description (short text)
      */
     public $description;
-    
+
 	/**
      * @var string document type
      */
@@ -62,8 +62,8 @@ class pdf_standard extends ModeleExpenseReport
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -74,37 +74,37 @@ class pdf_standard extends ModeleExpenseReport
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -120,7 +120,7 @@ class pdf_standard extends ModeleExpenseReport
 	function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "trips", "projects"));
 
@@ -208,7 +208,7 @@ class pdf_standard extends ModeleExpenseReport
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "trips", "projects", "dict"));
 
@@ -567,7 +567,7 @@ class pdf_standard extends ModeleExpenseReport
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs,$hookmanager;
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "trips", "companies"));
 
@@ -919,4 +919,3 @@ class pdf_standard extends ModeleExpenseReport
 	}
 
 }
-
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index f7e7ca1d40f..7eb5abe1e5c 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -71,8 +71,8 @@ class pdf_crabe extends ModelePDFFactures
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -83,37 +83,37 @@ class pdf_crabe extends ModelePDFFactures
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -1843,4 +1843,3 @@ class pdf_crabe extends ModelePDFFactures
 	}
 
 }
-
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index e826b18f0e0..86e7eb10521 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -78,7 +78,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
         $texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
         $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">',$tooltip,1,1).'</td>';
         $texte.= '</tr>';
-        
+
         // Parametrage du prefix des avoirs
         $texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
         $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">',$tooltip,1,1).'</td>';
@@ -135,7 +135,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
         // Get Mask value
         $mask = '';
-        if (is_object($facture) && $facture->type == 1) 
+        if (is_object($facture) && $facture->type == 1)
         {
         	$mask=$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
         	if (! $mask)
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 551b9ded2cb..e542c564fd6 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -52,7 +52,7 @@ class pdf_soleil extends ModelePDFFicheinter
      * @var string model description (short text)
      */
     public $description;
-    
+
 	/**
      * @var string document type
      */
@@ -62,8 +62,8 @@ class pdf_soleil extends ModelePDFFicheinter
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -74,37 +74,37 @@ class pdf_soleil extends ModelePDFFicheinter
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -169,7 +169,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "interventions", "dict", "companies"));
 
@@ -552,7 +552,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	{
 		global $conf,$langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "interventions"));
 
@@ -732,4 +732,3 @@ class pdf_soleil extends ModelePDFFicheinter
 	}
 
 }
-
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 09b33aea877..5f8776b9cbc 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -648,8 +648,8 @@ class ImportCsv extends ModeleImports
 								}
 							} else {
 								// We have a last INSERT ID. Check if we have a row referencing this foreign key.
-								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make 
-								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record 
+								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
+								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to be know if record exists or not for the rowid.
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
@@ -771,5 +771,3 @@ function cleansep($value)
 {
 	return str_replace(array(',',';'),'/',$value);
 };
-
-
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index f260c255465..1c0116d92ad 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -672,8 +672,8 @@ class ImportXlsx extends ModeleImports
 								}
 							} else {
 								// We have a last INSERT ID. Check if we have a row referencing this foreign key.
-								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make 
-								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record 
+								// This is required when updating table with some extrafields. When inserting a record in parent table, we can make
+								// a direct insert into subtable extrafields, but when me wake an update, the insertid is defined and the child record
 								// may already exists. So we rescan the extrafield table to be know if record exists or not for the rowid.
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index f3329fa9b18..79cb4c4961c 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 
 /**
- *	Class to build Delivery Order documents with typhon model 
+ *	Class to build Delivery Order documents with typhon model
  */
 class pdf_typhon extends ModelePDFDeliveryOrder
 {
@@ -43,69 +43,69 @@ class pdf_typhon extends ModelePDFDeliveryOrder
      * @var DoliDb Database handler
      */
     public $db;
-    
+
 	/**
      * @var string model name
      */
     public $name;
-    
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-    
+
 	/**
      * @var string document type
      */
     public $type;
-    
+
     /**
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
 	public $version = 'dolibarr';
-	
+
 	/**
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -120,7 +120,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills", "sendings", "companies"));
 
@@ -192,7 +192,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "sendings", "deliveries"));
 
@@ -953,4 +953,3 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	}
 
 }
-
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index fb7b6c94519..beeadebeecd 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -32,9 +32,9 @@ class mailing_example extends MailingTargets
     var $desc='Put here a description';
 	// CHANGE THIS: Set to 1 if selector is available for admin users only
     var $require_admin=0;
-    // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector 
+    // CHANGE THIS: Add a tooltip language key to add a tooltip help icon after the email target selector
     var $tooltip='MyTooltipLangKey';
-    
+
     var $require_module=array();
     var $picto='';
     
@@ -148,4 +148,3 @@ class mailing_example extends MailingTargets
     }
 
 }
-
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index b3265ac35f7..21250bf693d 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -121,7 +121,7 @@ class mailing_pomme extends MailingTargets
 		$s.='<option value="1">'.$langs->trans("Enabled").'</option>';
 		$s.='<option value="0">'.$langs->trans("Disabled").'</option>';
 		$s.='</select>';
-		
+
 		$s.=' ';
 		$s.=$langs->trans("Employee").': ';
 		$s.='<select name="filteremployee" class="flat">';
@@ -129,7 +129,7 @@ class mailing_pomme extends MailingTargets
 		$s.='<option value="1">'.$langs->trans("Yes").'</option>';
 		$s.='<option value="0">'.$langs->trans("No").'</option>';
 		$s.='</select>';
-		
+
 		return $s;
 	}
 
@@ -159,7 +159,7 @@ class mailing_pomme extends MailingTargets
 	    if ($filtersarray) {
 		    dol_syslog(__METHOD__ . ": filtersarray parameter is deprecated", LOG_WARNING);
 	    }
-	    
+
 	    global $conf, $langs;
 		$langs->load("companies");
 
@@ -172,10 +172,10 @@ class mailing_pomme extends MailingTargets
 		$sql.= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
 		$sql.= " AND u.entity IN (0,".$conf->entity.")";
 		$sql.= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		if (isset($_POST["filter"]) && $_POST["filter"] == '1') $sql.= " AND u.statut=1"; 
-		if (isset($_POST["filter"]) && $_POST["filter"] == '0') $sql.= " AND u.statut=0"; 
-		if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '1') $sql.= " AND u.employee=1"; 
-		if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '0') $sql.= " AND u.employee=0"; 
+		if (isset($_POST["filter"]) && $_POST["filter"] == '1') $sql.= " AND u.statut=1";
+		if (isset($_POST["filter"]) && $_POST["filter"] == '0') $sql.= " AND u.statut=0";
+		if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '1') $sql.= " AND u.employee=1";
+		if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '0') $sql.= " AND u.employee=0";
 		$sql.= " ORDER BY u.email";
 
 		// Stocke destinataires dans cibles
@@ -225,4 +225,3 @@ class mailing_pomme extends MailingTargets
 	}
 
 }
-
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 1b5d2fef4fb..b43adf3b38d 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -77,7 +77,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	 * @param int	  $y		   y position in user units
 	 * @param int	  $w		   width in user units
 	 * @param int	  $h		   height in user units
-     * @return void
+	 * @return void
 	 */
 	private function writeBarcode(&$pdf, $code, $encoding, $is2d, $x, $y, $w, $h)
 	{
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 62898fc40a3..5bede258b07 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
@@ -932,109 +932,109 @@ class doc_generic_project_odt extends ModelePDFProjects
 								'title' => "ListProposalsAssociatedProject",
 								'class' => 'Propal',
 								'table' => 'propal',
-								'test' => $conf->propal->enabled && $user->rights->propale->lire 
+								'test' => $conf->propal->enabled && $user->rights->propale->lire
 						),
 						'order' => array(
 								'title' => "ListOrdersAssociatedProject",
 								'class' => 'Commande',
 								'table' => 'commande',
-								'test' => $conf->commande->enabled && $user->rights->commande->lire 
+								'test' => $conf->commande->enabled && $user->rights->commande->lire
 						),
 						'invoice' => array(
 								'title' => "ListInvoicesAssociatedProject",
 								'class' => 'Facture',
 								'table' => 'facture',
-								'test' => $conf->facture->enabled && $user->rights->facture->lire 
+								'test' => $conf->facture->enabled && $user->rights->facture->lire
 						),
 						'invoice_predefined' => array(
 								'title' => "ListPredefinedInvoicesAssociatedProject",
 								'class' => 'FactureRec',
 								'table' => 'facture_rec',
-								'test' => $conf->facture->enabled && $user->rights->facture->lire 
+								'test' => $conf->facture->enabled && $user->rights->facture->lire
 						),
 						'proposal_supplier' => array(
 								'title' => "ListSupplierProposalsAssociatedProject",
 								'class' => 'SupplierProposal',
 								'table' => 'supplier_proposal',
-								'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire 
+								'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
 						),
 						'order_supplier' => array(
 								'title' => "ListSupplierOrdersAssociatedProject",
 								'table' => 'commande_fournisseur',
 								'class' => 'CommandeFournisseur',
-								'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire 
+								'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
 						),
 						'invoice_supplier' => array(
 								'title' => "ListSupplierInvoicesAssociatedProject",
 								'table' => 'facture_fourn',
 								'class' => 'FactureFournisseur',
-								'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire 
+								'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
 						),
 						'contract' => array(
 								'title' => "ListContractAssociatedProject",
 								'class' => 'Contrat',
 								'table' => 'contrat',
-								'test' => $conf->contrat->enabled && $user->rights->contrat->lire 
+								'test' => $conf->contrat->enabled && $user->rights->contrat->lire
 						),
 						'intervention' => array(
 								'title' => "ListFichinterAssociatedProject",
 								'class' => 'Fichinter',
 								'table' => 'fichinter',
 								'disableamount' => 1,
-								'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire 
+								'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
 						),
 						'shipping' => array(
 								'title' => "ListShippingAssociatedProject",
 								'class' => 'Expedition',
 								'table' => 'expedition',
 								'disableamount' => 1,
-								'test' => $conf->expedition->enabled && $user->rights->expedition->lire 
+								'test' => $conf->expedition->enabled && $user->rights->expedition->lire
 						),
 						'trip' => array(
 								'title' => "ListTripAssociatedProject",
 								'class' => 'Deplacement',
 								'table' => 'deplacement',
 								'disableamount' => 1,
-								'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire 
+								'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
 						),
 						'expensereport' => array(
 								'title' => "ListExpenseReportsAssociatedProject",
 								'class' => 'ExpenseReportLine',
 								'table' => 'expensereport_det',
-								'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire 
+								'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
 						),
 						'donation' => array(
 								'title' => "ListDonationsAssociatedProject",
 								'class' => 'Don',
 								'table' => 'don',
-								'test' => $conf->don->enabled && $user->rights->don->lire 
+								'test' => $conf->don->enabled && $user->rights->don->lire
 						),
 						'loan' => array(
 								'title' => "ListLoanAssociatedProject",
 								'class' => 'Loan',
 								'table' => 'loan',
-								'test' => $conf->loan->enabled && $user->rights->loan->read 
+								'test' => $conf->loan->enabled && $user->rights->loan->read
 						),
 						'chargesociales' => array(
 								'title' => "ListSocialContributionAssociatedProject",
 								'class' => 'ChargeSociales',
 								'table' => 'chargesociales',
 								'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
-								'test' => $conf->tax->enabled && $user->rights->tax->charges->lire 
+								'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
 						),
 						'stock_mouvement' => array(
 								'title' => "ListMouvementStockProject",
 								'class' => 'MouvementStock',
 								'table' => 'stock_mouvement',
-								'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW)) 
+								'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
 						),
 						'agenda' => array(
 								'title' => "ListActionsAssociatedProject",
 								'class' => 'ActionComm',
 								'table' => 'actioncomm',
 								'disableamount' => 1,
-								'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire 
-						) 
+								'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
+						)
 				);
 
 				//Insert reference
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 229aec99beb..44683111e5a 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -42,69 +42,69 @@ class pdf_baleine extends ModelePDFProjects
      * @var DoliDb Database handler
      */
     public $db;
-    
+
 	/**
      * @var string model name
      */
     public $name;
-    
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-    
+
 	/**
      * @var string document type
      */
     public $type;
-    
+
     /**
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
 	public $version = 'dolibarr';
-	
+
 	/**
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
@@ -119,7 +119,7 @@ class pdf_baleine extends ModelePDFProjects
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "projects", "companies"));
 
@@ -179,7 +179,7 @@ class pdf_baleine extends ModelePDFProjects
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index b487c211376..330aefd5c67 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -64,7 +64,7 @@ class pdf_beluga extends ModelePDFProjects
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "projects", "companies"));
 
@@ -126,7 +126,7 @@ class pdf_beluga extends ModelePDFProjects
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
@@ -253,7 +253,7 @@ class pdf_beluga extends ModelePDFProjects
 				$iniY = $tab_top + $heightoftitleline + 1;
 				$curY = $tab_top + $heightoftitleline + 1;
 				$nexY = $tab_top + $heightoftitleline + 1;
-				
+
                 $listofreferent=array(
                     'propal'=>array(
                     	'name'=>"Proposals",
@@ -368,8 +368,8 @@ class pdf_beluga extends ModelePDFProjects
 
                     //var_dump("$key, $tablename, $datefieldname, $dates, $datee");
                     $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
-                    
-                    if ($key == 'agenda') 
+
+                    if ($key == 'agenda')
                     {
 //                    	var_dump($elementarray);
                     }
@@ -378,11 +378,11 @@ class pdf_beluga extends ModelePDFProjects
                     if ($num >= 0)
                     {
                         $nexY = $pdf->GetY() + 5;
-                        
+
                         $curY = $nexY;
                         $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
                         $pdf->SetTextColor(0,0,0);
-                          
+
                         $pdf->SetXY($this->posxref, $curY);
                         $pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
 
@@ -418,7 +418,7 @@ class pdf_beluga extends ModelePDFProjects
                             $num = count($elementarray);
 
 				// Loop on each lines
-				for ($i = 0; $i < $num; $i ++) 
+				for ($i = 0; $i < $num; $i ++)
 				{
 					$curY = $nexY;
 					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
@@ -496,10 +496,10 @@ class pdf_beluga extends ModelePDFProjects
 								$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
 								$pdf->MultiCell(0, 3, '');		// Set interline to 3
 								$pdf->SetTextColor(0,0,0);
-								
+
 								$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
 								$curY = $tab_top_newpage + $heightoftitleline + 1;
-								
+
 								// Label
 								$pdf->SetXY($this->posxref, $curY);
 								$posybefore=$pdf->GetY();
@@ -557,7 +557,7 @@ class pdf_beluga extends ModelePDFProjects
 					{
 						$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty)?$element->thirdparty->name:''), 1, 'L');
 					}
-					
+
                                 // Amount without tax
                                 if (empty($value['disableamount'])) {
                                     $pdf->SetXY($this->posxamountht, $curY);
@@ -610,7 +610,7 @@ class pdf_beluga extends ModelePDFProjects
                             $curY = $nexY;
                         }
                     }
-                
+
 					$nexY+=2;    // Passe espace entre les lignes
 
 					// Detect if some page were added automatically and output _tableau for past pages
@@ -775,7 +775,7 @@ class pdf_beluga extends ModelePDFProjects
 			$pdf->SetXY($posx,$posy);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : " . $object->thirdparty->getFullName($outputlangs), '', 'R');
 		}
-		
+
 		$pdf->SetTextColor(0,0,60);
 	}
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index bf78f7edae6..4d52707649e 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -44,79 +44,79 @@ class pdf_azur extends ModelePDFPropales
      * @var DoliDb Database handler
      */
     public $db;
-    
+
 	/**
      * @var string model name
      */
     public $name;
-    
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-    
+
     /**
      * @var string Save the name of generated file as the main doc when generating a doc with this template
      */
 	public $update_main_doc_field;
-	
+
 	/**
      * @var string document type
      */
     public $type;
-    
+
     /**
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
 	public $phpmin = array(5, 4);
-	
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
 	public $version = 'dolibarr';
-	
+
 	/**
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Objet societe qui emet
 	 */
-	public $emetteur;	 
+	public $emetteur;
 
 
 	/**
@@ -127,7 +127,7 @@ class pdf_azur extends ModelePDFPropales
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
 
@@ -219,7 +219,7 @@ class pdf_azur extends ModelePDFPropales
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
 
@@ -1432,7 +1432,7 @@ class pdf_azur extends ModelePDFPropales
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
 
@@ -1691,4 +1691,3 @@ class pdf_azur extends ModelePDFPropales
 		return ($tab_hl*7);
 	}
 }
-
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 66ad1413dcd..6adcd2e9cb7 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -87,7 +87,7 @@ class pdf_standard extends ModelePDFStock
 	public function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-        
+
 		// Load traductions files requiredby by page
 		$langs->loadLangs(array("main", "companies"));
 
@@ -114,12 +114,12 @@ class pdf_standard extends ModelePDFStock
 		// Recupere emetteur
 		$this->emetteur=$mysoc;
 		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-		
+
 		// Define position of columns
 		$this->wref = 15;
 		$this->posxdesc=$this->marge_gauche+1;
 		$this->posxlabel=$this->posxdesc+$this->wref;
-		$this->posxtva=80;		
+		$this->posxtva=80;
 		$this->posxqty=95;
 		$this->posxup=115;
 		$this->posxunit=135;
@@ -164,7 +164,7 @@ class pdf_standard extends ModelePDFStock
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-        
+
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
 
@@ -188,7 +188,7 @@ class pdf_standard extends ModelePDFStock
 			$stockFournisseur = new ProductFournisseur($this->db);
 			$supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id);
 			$object->supplierprices = $supplierprices;
-			
+
 			$productstatic=new Product($db);
 
 			if (! file_exists($dir))
@@ -268,8 +268,8 @@ class pdf_standard extends ModelePDFStock
 				/* Affichage de la liste des produits de l'entrepot                           */
 				/*                                                                            */
 				/* ************************************************************************** */
-				
-				$nexY+=5;				
+
+				$nexY+=5;
 				$nexY = $pdf->GetY();
 				$nexY+=10;
 
@@ -311,7 +311,7 @@ class pdf_standard extends ModelePDFStock
 								if ($objtp->label != '') $objp->produit = $objtp->label;
 							}
 						}
-						
+
 						$curY = $nexY;
 						$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
 						$pdf->SetTextColor(0,0,0);
@@ -319,7 +319,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->setTopMargin($tab_top_newpage);
 						$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
 						$pageposbefore=$pdf->getPage();
-						
+
 						// Description of product line
 						$curX = $this->posxdesc-1;
 
@@ -372,13 +372,13 @@ class pdf_standard extends ModelePDFStock
 						}
 
 						$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
-						
+
 						$productstatic->id=$objp->rowid;
 						$productstatic->ref = $objp->ref;
 						$productstatic->label = $objp->produit;
 						$productstatic->type=$objp->type;
 						$productstatic->entity=$objp->entity;
-						$productstatic->status_batch=$objp->tobatch;	
+						$productstatic->status_batch=$objp->tobatch;
 
 						// Ref.
 						$pdf->SetXY($this->posxdesc, $curY);
@@ -391,12 +391,12 @@ class pdf_standard extends ModelePDFStock
 						// Quantity
 						$valtoshow=price2num($objp->value, 'MS');
 						$towrite = (empty($valtoshow)?'0':$valtoshow);
-						
+
 						$pdf->SetXY($this->posxqty, $curY);
-						$pdf->MultiCell($this->posxup-$this->posxqty-0.8, 3, $towrite, 0, 'R');				
-						
+						$pdf->MultiCell($this->posxup-$this->posxqty-0.8, 3, $towrite, 0, 'R');
+
 						$totalunit+=$objp->value;
-							
+
 						$pdf->SetXY($this->posxup, $curY);
 						$pdf->MultiCell($this->posxunit-$this->posxup-0.8, 3, price(price2num($objp->ppmp,'MU'), 0, $outputlangs), 0, 'R');
 
@@ -429,7 +429,7 @@ class pdf_standard extends ModelePDFStock
 						}
 
 						$nexY+=2;    // Passe espace entre les lignes
-						
+
 						// Detect if some page were added automatically and output _tableau for past pages
 						while ($pagenb < $pageposafter)
 						{
@@ -466,20 +466,20 @@ class pdf_standard extends ModelePDFStock
 							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
 					}
-					
+
 					$db->free($resql);
-					
+
 					/**
 					 * footer table
 					 */
 					$nexY = $pdf->GetY();
 					$nexY+=2;
-					$curY = $nexY;					
-					
-					$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));					
+					$curY = $nexY;
+
+					$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
 					$pdf->line($this->marge_gauche, $curY-1, $this->page_largeur-$this->marge_droite, $curY-1);
 					$pdf->SetLineStyle(array('dash'=>0));
-					
+
 					$pdf->SetFont('','B',$default_font_size-1);
 					$pdf->SetTextColor(0,0,120);
 
@@ -487,7 +487,7 @@ class pdf_standard extends ModelePDFStock
 					$pdf->SetXY($this->posxdesc, $curY);
 					$pdf->MultiCell($this->wref, 3, $langs->trans("Total"), 0, 'L');
 
-					// Quantity				
+					// Quantity
 					$valtoshow=price2num($totalunit, 'MS');
 					$towrite = empty($valtoshow)?'0':$valtoshow;
 
@@ -736,8 +736,8 @@ class pdf_standard extends ModelePDFStock
 					}
 				}
 				*/
-				$tab_top = $tab_top_newpage+21;               
-				
+				$tab_top = $tab_top_newpage+21;
+
 				// Show square
 				if ($pagenb == 1)
 				{
@@ -749,7 +749,7 @@ class pdf_standard extends ModelePDFStock
 					$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;
 				}
-				
+
 				$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -836,21 +836,21 @@ class pdf_standard extends ModelePDFStock
 
 	    // Output Rect
 	    //$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-		
+
 		$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
-		$pdf->SetDrawColor(220,26,26);	
+		$pdf->SetDrawColor(220,26,26);
 		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite, $tab_top);
 		$pdf->SetLineStyle(array('dash'=>0));
 		$pdf->SetDrawColor(128,128,128);
 		$pdf->SetTextColor(0,0,120);
-		
+
 	    if (empty($hidetop))
 	    {
 	        //$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
 	        $pdf->SetXY($this->posxdesc-1, $tab_top+1);
 	        $pdf->MultiCell($this->wref,3, $outputlangs->transnoentities("Ref"),'','L');
 	    }
-	        
+
 		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
@@ -860,7 +860,7 @@ class pdf_standard extends ModelePDFStock
 
 	    //$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
 	    if (empty($hidetop))
-	    {	
+	    {
 	        $pdf->SetXY($this->posxqty-1, $tab_top+1);
 	        $pdf->MultiCell($this->posxup-$this->posxqty-1,2, $outputlangs->transnoentities("Units"),'','C');
 	    }
@@ -873,7 +873,7 @@ class pdf_standard extends ModelePDFStock
 	    }
 
 		//$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-		if (empty($hidetop)) 
+		if (empty($hidetop))
 		{
 			$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '',
@@ -887,18 +887,18 @@ class pdf_standard extends ModelePDFStock
 			$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("SellPriceMin"),'','C');
 	    }
 
-	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);	   
+	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 	    if (empty($hidetop))
 	    {
 	        $pdf->SetXY($this->postotalht-1, $tab_top+1);
 	        $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht,2, $outputlangs->transnoentities("EstimatedStockValueSellShort"),'','C');
 	    }
-		
-		$pdf->SetDrawColor(220,26,26);	
+
+		$pdf->SetDrawColor(220,26,26);
 		$pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26)));
-		$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);	 
+		$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);
 		$pdf->SetLineStyle(array('dash'=>0));
-		
+
 	}
 
 	/**
@@ -914,7 +914,7 @@ class pdf_standard extends ModelePDFStock
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey="")
 	{
 	    global $conf,$langs,$db,$hookmanager;
-        
+
 	    // Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
 
@@ -961,7 +961,7 @@ class pdf_standard extends ModelePDFStock
 	        $text=$this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
-		
+
 	    $pdf->SetFont('','B', $default_font_size + 3);
 	    $pdf->SetXY($posx,$posy);
 	    $pdf->SetTextColor(0,0,60);
@@ -981,22 +981,22 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetXY($posx,$posy);
 	    $pdf->SetTextColor(0,0,60);
 	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
-		
+
 		$posy+=4;
 		$pdf->SetXY($posx-50,$posy);
 		$pdf->MultiCell(150, 3, $object->lieu, '', 'R');
-		
-		
+
+
 		// Parent entrepot
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ParentWarehouse").' :', '', 'R');
-		
+
 		$posy+=4;
 		$pdf->SetXY($posx-50,$posy);
 		$e = new Entrepot($db);
-		if(!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0) 
+		if(!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
 		{
 			$pdf->MultiCell(150, 3, $e->libelle, '', 'R');
 		}
@@ -1004,14 +1004,14 @@ class pdf_standard extends ModelePDFStock
 		{
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
-		
+
 		// Description
 		$nexY = $pdf->GetY();
 		$nexY+=5;
 		$pdf->SetXY($posx,$posy);
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Description").' : </b>'.nl2br($object->description), 0, 1);
 		$nexY = $pdf->GetY();
-		
+
 		$calcproductsunique=$object->nb_different_products();
 		$calcproducts=$object->nb_products();
 
@@ -1023,12 +1023,12 @@ class pdf_standard extends ModelePDFStock
 		$valtoshow=price2num($calcproducts['nb'], 'MS');
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfProducts").' : </b>'.(empty($valtoshow)?'0':$valtoshow), 0, 1);
 		$nexY = $pdf->GetY();
-		
+
 		// Value
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("EstimatedStockValueShort").' : </b>'. price((empty($calcproducts['value'])?'0':price2num($calcproducts['value'],'MT')), 0, $langs, 0, -1, -1, $conf->currency), 0, 1);
 		$nexY = $pdf->GetY();
-		
-		
+
+
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
@@ -1056,7 +1056,7 @@ class pdf_standard extends ModelePDFStock
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("LastMovement").' : </b>'.$toWrite, 0, 1);
 		$nexY = $pdf->GetY();
 
-		
+
 	    /*if ($object->ref_client)
 	    {
 	        $posy+=5;
@@ -1147,4 +1147,3 @@ class pdf_standard extends ModelePDFStock
 	}
 
 }
-
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index d14a9bdcdc8..be563f4d495 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -40,75 +40,75 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
      * @var DoliDb Database handler
      */
     public $db;
-    
+
 	/**
      * @var string model name
      */
     public $name;
-    
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-    
+
 /**
      * @var string document type
      */
     public $type;
-    
+
     /**
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
 	public $phpmin = array(5, 4);
-	
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
 	public $version = 'dolibarr';
-	
+
 	/**
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Objet societe qui emet
 	 */
-	public $emetteur;	 
-    
+	public $emetteur;
+
 
 
 	/**
@@ -1249,4 +1249,3 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	}
 
 }
-
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 bda0170397d..1bd1b89cd38 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -42,17 +42,17 @@ class pdf_standard extends ModelePDFSuppliersPayments
      * @var DoliDb Database handler
      */
     public $db;
-    
+
 	/**
      * @var string model name
      */
     public $name;
-    
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-    
+
 	/**
      * @var string document type
      */
@@ -62,54 +62,54 @@ class pdf_standard extends ModelePDFSuppliersPayments
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
      */
 	public $version = 'dolibarr';
-	
+
 	/**
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
 	public $marge_basse;
-    
+
 	/**
 	 * Issuer
 	 * @var Societe
 	 */
-	public $emetteur;	 
+	public $emetteur;
 
 
 	/**
@@ -120,7 +120,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
 
@@ -814,4 +814,3 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	}
 
 }
-
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 5f971cab2d1..7d7009a3c58 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -42,17 +42,17 @@ class pdf_aurore extends ModelePDFSupplierProposal
      * @var DoliDb Database handler
      */
     public $db;
-	
+
 	/**
      * @var string model name
      */
     public $name;
-	
+
 	/**
      * @var string model description (short text)
      */
     public $description;
-	
+
 	/**
      * @var string document type
      */
@@ -62,8 +62,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
      * @var array() Minimum version of PHP required by module.
 	 * e.g.: PHP ≥ 5.4 = array(5, 4)
      */
-	public $phpmin = array(5, 4); 
-	
+	public $phpmin = array(5, 4);
+
 	/**
      * Dolibarr version of the loaded document
      * @public string
@@ -74,32 +74,32 @@ class pdf_aurore extends ModelePDFSupplierProposal
      * @var int page_largeur
      */
     public $page_largeur;
-	
+
 	/**
      * @var int page_hauteur
      */
     public $page_hauteur;
-	
+
 	/**
      * @var array format
      */
     public $format;
-	
+
 	/**
      * @var int marge_gauche
      */
 	public $marge_gauche;
-	
+
 	/**
      * @var int marge_droite
      */
 	public $marge_droite;
-	
+
 	/**
      * @var int marge_haute
      */
 	public $marge_haute;
-	
+
 	/**
      * @var int marge_basse
      */
@@ -120,7 +120,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
-		
+
 		// Translations
 		$langs->loadLangs(array("main", "bills"));
 
@@ -160,7 +160,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->posxdesc=$this->marge_gauche+1;
 		$this->posxdiscount=162;
 		$this->postotalht=174;
-		
+
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
 		    $this->posxtva=101;
@@ -172,7 +172,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		    $this->posxup=126;
 		    $this->posxqty=145;
 		}
-		
+
 		if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxup=$this->posxtva;
 		$this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);	// width of images
 		if ($this->page_largeur < 210) // To work with US executive format
@@ -211,7 +211,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
 
@@ -524,7 +524,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					{
 					    $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R');
 					}
-					
+
 					// Unit
 					if($conf->global->PRODUCT_USE_UNITS)
 					{
@@ -1232,7 +1232,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		        $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
 		    }
 		}
-		
+
 		if($conf->global->PRODUCT_USE_UNITS) {
 		    $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 		    if (empty($hidetop)) {
@@ -1274,7 +1274,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
-		
+
 		// Translations
 		$outputlangs->loadLangs(array("main", "bills", "supplier_proposal", "companies"));
 
@@ -1496,4 +1496,3 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	}
 
 }
-
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
index 98a3c7142af..abc341f9a30 100644
--- a/htdocs/core/modules/syslog/mod_syslog_firephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -126,8 +126,8 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 			if (is_object($langs))   // $langs may not be defined yet.
 			{
 				$errors[] = $langs->trans("ErrorFailedToOpenFile", self::$firephp_class_path);
-			} 
-			else 
+			}
+			else
 			{
 				$errors[] = "ErrorFailedToOpenFile " . self::$firephp_class_path;
 			}
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index a25abbdde6a..05db2d46fd3 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -1,6 +1,6 @@
 <?php
 
-/* 
+/*
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
@@ -36,8 +36,8 @@ print '<script type="text/javascript" language="javascript">
 		});
 	});
 </script>';
-		
-		
+
+
 		print_fiche_titre($langs->trans("AdvTgtTitle"));
 
 		print '<div class="tabBar">' . "\n";
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 317cb6a22c6..f8f5595887d 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -155,12 +155,9 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	                        }
 	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
 		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
-		                    if ($mailfile->error) 
-		                    {
+		                    if ($mailfile->error) {
 	                            setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-		                    } 
-		                    else 
-		                    {
+		                    } else {
 		                        $result = $mailfile->sendfile();
 		                    }
 	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index d7ad6587845..f8d51bb6e35 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -36,7 +36,7 @@ $total=0; $ilink=0;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
-    
+
     $trclass='oddeven';
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
@@ -66,7 +66,7 @@ if (count($linkedObjectBlock) > 1)
     	<td align="right"></td>
     	<td align="right"></td>
     </tr>
-    <?php  
+    <?php
 }
 ?>
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 08600d71ee5..d084f9be546 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -101,7 +101,7 @@ if ($action == 'add') {
 		$action = "create";
 		$error++;
 	}
-	
+
 	if (! GETPOST('socid')) {
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Customer")), null, 'errors');
 		$action = "create";
@@ -144,7 +144,7 @@ if ($action == 'add') {
 
 		$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
 		$object->date_when = $date_next_execution;
-		
+
 		if ($object->create($user) > 0) {
 			$id = $object->id;
 			$action = '';
@@ -155,10 +155,10 @@ if ($action == 'add') {
 	}
 } elseif ($action == 'createfrommodel') {
 	$newinter = new fichinter($db);
-	
+
 	// on récupère les enregistrements
 	$object->fetch($id);
-	
+
 
 	// on transfert les données de l'un vers l'autre
 	if ($object->socid > 0) {
@@ -167,14 +167,14 @@ if ($action == 'add') {
 		$newinter->fk_contrat=$object->fk_contrat;
 	} else
 		$newinter->socid=GETPOST("socid");
-	
+
 	$newinter->entity=$object->entity;
 	$newinter->duree=$object->duree;
-	
+
 	$newinter->description=$object->description;
 	$newinter->note_private=$object->note_private;
 	$newinter->note_public=$object->note_public;
-	
+
 	// on créer un nouvelle intervention
 	$extrafields = new ExtraFields($db);
 	$extralabels = $extrafields->fetch_name_optionals_label($newinter->table_element);
@@ -182,7 +182,7 @@ if ($action == 'add') {
 	$newinter->array_options = $array_options;
 
 	$newfichinterid = $newinter->create($user);
-	
+
 	if ($newfichinterid > 0) {
 		// on ajoute les lignes de détail ensuite
 		foreach ($object->lines as $ficheinterligne)
@@ -205,14 +205,14 @@ if ($action == 'add') {
 	header('Location: '.$_SERVER["PHP_SELF"]);
 	exit;
 } elseif ($action == 'setfrequency' && $user->rights->ficheinter->creer) {
-	// Set frequency and unit frequency	
+	// Set frequency and unit frequency
 	$object->fetch($id);
 	$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
 } elseif ($action == 'setdate_when' && $user->rights->ficheinter->creer) {
 	// Set next date of execution
 	$object->fetch($id);
 	$date = dol_mktime(
-					GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, 
+					GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0,
 					GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear')
 	);
 	if (!empty($date)) $object->setNextDate($date);
@@ -239,7 +239,7 @@ if (! empty($conf->projet->enabled))
 $now = dol_now();
 $tmparray=dol_getdate($now);
 $today = dol_mktime(
-				23, 59, 59, 
+				23, 59, 59,
 				$tmparray['mon'], $tmparray['mday'], $tmparray['year']
 );   // Today is last second of current day
 
@@ -265,7 +265,7 @@ if ($action == 'create') {
 		$rowspan=4;
 		if (! empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++;
 		if (! empty($conf->contrat->enabled) && $object->fk_contrat > 0) $rowspan++;
-		
+
 		print '<table class="border" width="100%">';
 
 		$object->fetch_thirdparty();
@@ -297,12 +297,12 @@ if ($action == 'create') {
 			// Duration
 			print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
 			print '<td colspan="3">'.convertSecondToTime(
-							$object->duration, 'all', 
+							$object->duration, 'all',
 							$conf->global->MAIN_DURATION_OF_WORKDAY
 			).'</td>';
 			print '</tr>';
 		}
-		
+
 		// Project
 		if (! empty($conf->projet->enabled)) {
 			$formproject = new FormProjets($db);
@@ -345,7 +345,7 @@ if ($action == 'create') {
 		print "</td><td>";
 		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;";
 		print $form->selectarray(
-						'unit_frequency', 
+						'unit_frequency',
 						array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')),
 						(GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m')
 		);
@@ -423,7 +423,7 @@ if ($action == 'create') {
 			}
 			$db->free($result);
 
-		} else 
+		} else
 			print $db->error();
 		print "</table>";
 
@@ -465,7 +465,7 @@ if ($action == 'create') {
 } else {
 	/*
 	 * View mode
-	 * 
+	 *
 	 */
 	if ($id > 0) {
 		if ($object->fetch($id) > 0) {
@@ -496,7 +496,7 @@ if ($action == 'create') {
 						$morehtmlref.=img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 					}
 					if ($action == 'classify') {
-						
+
 						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 						$morehtmlref.='<input type="hidden" name="action" value="classin">';
 						$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -511,7 +511,7 @@ if ($action == 'create') {
 										$object->socid, $object->fk_project,
 										'none', 0, 0, 0, 1
 						);
-					}	
+					}
 				} else {
 					if (! empty($object->fk_project)) {
 						$proj = new Project($db);
@@ -566,7 +566,7 @@ if ($action == 'create') {
 				if ($action == 'contrat') {
 					$formcontract= new Formcontract($db);
 					$formcontract->formSelectContract(
-									$_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, 
+									$_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid,
 									$object->fk_contrat, 'contratid', 0, 1
 					);
 				} else {
@@ -593,9 +593,9 @@ if ($action == 'create') {
 
 			$title = $langs->trans("Recurrence");
 			print load_fiche_titre($title, '', 'calendar');
-	
+
 			print '<table class="border" width="100%">';
-	
+
 			// if "frequency" is empty or = 0, the reccurence is disabled
 			print '<tr><td style="width: 50%">';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -615,26 +615,26 @@ if ($action == 'create') {
 				print '<tr><td>';
 				print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;";
 				print $form->selectarray(
-								'unit_frequency', 
-								array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), 
+								'unit_frequency',
+								array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')),
 								($object->unit_frequency?$object->unit_frequency:'m')
 				);
 				print '</td>';
 				print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
 			} else {
-				if ($object->frequency > 0) 
+				if ($object->frequency > 0)
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				else 
+				else
 					print $langs->trans("NotARecurringInterventionalTemplate");
 			}
 			print '</td></tr>';
-	
+
 			// Date when
 			print '<tr><td>';
 			if ( $user->rights->ficheinter->creer && ($action == 'date_when' || $object->frequency > 0)) {
 				print $form->editfieldkey(
-								$langs->trans("NextDateToExecution"), 'date_when', $object->date_when, 
+								$langs->trans("NextDateToExecution"), 'date_when', $object->date_when,
 								$object, $user->rights->facture->creer, 'day'
 				);
 			} else {
@@ -649,12 +649,12 @@ if ($action == 'create') {
 			}
 			print '</td>';
 			print '</tr>';
-	
+
 			// Max period / Rest period
 			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, 
+								$langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max,
 								$object, $user->rights->facture->creer
 				);
 			} else
@@ -672,29 +672,29 @@ if ($action == 'create') {
 
 			print '</td>';
 			print '</tr>';
-	
+
 			print '</table>';
-	
+
 			// Frequencry/Recurring section
 			if ($object->frequency > 0) {
 				print '<br>';
 				if (empty($conf->cron->enabled)) {
 					$txtinfoadmin=$langs->trans(
-									"EnableAndSetupModuleCron", 
+									"EnableAndSetupModuleCron",
 									$langs->transnoentitiesnoconv("Module2300Name")
 					);
 					print info_admin($txtinfoadmin);
 				}
 				print '<div class="underbanner clearboth"></div>';
 				print '<table class="border centpercent">';
-	
+
 				// Nb of generation already done
 				print '<tr><td style="width: 50%">'.$langs->trans("NbOfGenerationDone").'</td>';
 				print '<td>';
 				print $object->nb_gen_done?$object->nb_gen_done:'0';
 				print '</td>';
 				print '</tr>';
-	
+
 				// Date last
 				print '<tr><td>';
 				print $langs->trans("DateLastGeneration");
@@ -733,7 +733,7 @@ if ($action == 'create') {
 			$num = count($object->lines);
 			$i = 0;
 			while ($i < $num) {
-				
+
 				// Show product and description
 				if (isset($object->lines[$i]->product_type))
 					$type=$object->lines[$i]->product_type;
@@ -785,7 +785,7 @@ if ($action == 'create') {
 		$sql = "SELECT f.rowid as fich_rec, s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, ";
 		$sql.= " f.duree, f.fk_contrat, f.fk_projet, f.frequency, f.nb_gen_done, f.nb_gen_max,";
 		$sql.= " f.date_last_gen, f.date_when, f.datec";
-		 
+
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter_rec as f";
 		$sql.= " , ".MAIN_DB_PREFIX."societe as s ";
 		if (! $user->rights->societe->client->voir && ! $socid) {
@@ -810,7 +810,7 @@ if ($action == 'create') {
 		if ($resql) {
 			$num = $db->num_rows($resql);
 			print_barre_liste(
-							$langs->trans("RepeatableInterventional"), $page, 
+							$langs->trans("RepeatableInterventional"), $page,
 							$_SERVER['PHP_SELF'], "&socid=$socid", $sortfield, $sortorder,
 							'', $num, '', 'title_commercial.png'
 			);
@@ -821,12 +821,12 @@ if ($action == 'create') {
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre">';
 			print_liste_field_titre(
-							$langs->trans("Ref"), $_SERVER['PHP_SELF'], "f.titre", "", "", 
+							$langs->trans("Ref"), $_SERVER['PHP_SELF'], "f.titre", "", "",
 							'width="200px" align="left"', $sortfiled, $sortorder
 			);
 
 			print_liste_field_titre(
-							$langs->trans("Company"), $_SERVER['PHP_SELF'], "s.nom", "", "", 
+							$langs->trans("Company"), $_SERVER['PHP_SELF'], "s.nom", "", "",
 							'width="200px" align="left"', $sortfiled, $sortorder
 			);
 			if (! empty($conf->contrat->enabled))
@@ -844,7 +844,7 @@ if ($action == 'create') {
 				);
 			print_liste_field_titre(
 							$langs->trans("Duration"), $_SERVER['PHP_SELF'],
-							'f.duree', '', '', 
+							'f.duree', '', '',
 							'width="50px" align="right"', $sortfiled, $sortorder
 			);
 			// Recurring or not
@@ -910,7 +910,7 @@ if ($action == 'create') {
 					print '<td align=right>'.convertSecondToTime($objp->duree).'</td>';
 
 					print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
-					
+
 					print '<td align="center">';
 					if ($objp->frequency) {
 						print $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') ;
@@ -933,7 +933,7 @@ if ($action == 'create') {
 						print '<span class="opacitymedium">'.$langs->trans('NA').'</span>';
 						print '</td>';
 					}
-					
+
 					if ($user->rights->ficheinter->creer) {
 						// Action column
 						print '<td align="center">';
@@ -953,7 +953,7 @@ if ($action == 'create') {
 						$i++;
 					}
 				}
-			} else 
+			} else
 				print '<tr class="oddeven"><td colspan="6">'.$langs->trans("NoneF").'</td></tr>';
 
 			print "</table>";
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 6ebb90817fd..0ed6f7fed14 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -350,9 +350,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				} 
-				else 
-				{
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error ++;
 				}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 11c40ff45a8..e26f6faf8b3 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1160,9 +1160,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				} 
-				else 
-				{
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error ++;
 				}
diff --git a/htdocs/fourn/js/lib_dispatch.js b/htdocs/fourn/js/lib_dispatch.js
index c2c570643f8..d183aeb4e48 100644
--- a/htdocs/fourn/js/lib_dispatch.js
+++ b/htdocs/fourn/js/lib_dispatch.js
@@ -23,23 +23,23 @@
 /**
  * addDispatchLine
  * Adds new table row for dispatching to multiple stock locations
- * 
+ *
  * @param	index	int		index of product line. 0 = first product line
  * @param	type	string	type of dispatch (batch = batch dispatch, dispatch = non batch dispatch)
  * @param	mode	string	'qtymissing' will create new line with qty missing, 'lessone' will keep 1 in old line and the rest in new one
  */
-function addDispatchLine(index, type, mode) 
+function addDispatchLine(index, type, mode)
 {
 	mode = mode || 'qtymissing'
-	
+
 	console.log("fourn/js/lib_dispatch.js Split line type="+type+" index="+index+" mode="+mode);
 	var $row = $("tr[name='"+type+'_0_'+index+"']").clone(true), 		// clone first batch line to jQuery object
 		nbrTrs = $("tr[name^='"+type+"_'][name$='_"+index+"']").length, // position of line for batch
 		qtyOrdered = parseFloat($("#qty_ordered_0_"+index).val()), 		// Qty ordered is same for all rows
 		qty = parseFloat($("#qty_"+(nbrTrs - 1)+"_"+index).val()),
 		qtyDispatched;
-			
-	if (mode === 'lessone') 
+
+	if (mode === 'lessone')
 	{
 		qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + 1;
 	}
@@ -47,7 +47,7 @@ function addDispatchLine(index, type, mode)
 	{
 		qtyDispatched = parseFloat($("#qty_dispatched_0_"+index).val()) + qty;
 	}
-	
+
 	if (qtyDispatched < qtyOrdered)
 	{
 		//replace tr suffix nbr
@@ -62,19 +62,19 @@ function addDispatchLine(index, type, mode)
 		$row.attr('name',type+'_'+nbrTrs+'_'+index);
 		//insert new row before last row
 		$("tr[name^='"+type+"_'][name$='_"+index+"']:last").after($row);
-		
+
 		//remove cloned select2 with duplicate id.
 		$("#s2id_entrepot_"+nbrTrs+'_'+index).detach();			// old way to find duplicated select2 component
 		$(".csswarehouse_"+nbrTrs+"_"+index+":first-child").parent("span.selection").parent(".select2").detach();
-		
+
 		/*  Suffix of lines are:  _ trs.length _ index  */
 		$("#qty_"+nbrTrs+"_"+index).focus();
 		$("#qty_dispatched_0_"+index).val(qtyDispatched);
-		
+
 		//hide all buttons then show only the last one
 		$("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide();
 		$("tr[name^='"+type+"_'][name$='_"+index+"']:last .splitbutton").show();
-		
+
 		if (mode === 'lessone')
 		{
 			qty = 1; // keep 1 in old line
@@ -94,11 +94,11 @@ function addDispatchLine(index, type, mode)
 
 /**
  * onChangeDispatchLineQty
- * 
- * Change event handler for dispatch qty input field, 
+ *
+ * Change event handler for dispatch qty input field,
  * recalculate qty dispatched when qty input has changed.
  * If qty is more then qty ordered reset input qty to max qty to dispatch.
- * 
+ *
  * element requires arbitrary data qty (value before change), type (type of dispatch) and index (index of product line)
  */
 
@@ -124,4 +124,4 @@ function onChangeDispatchLineQty() {
 		}
 		$(this).data('qty', $(this).val());
 	}
-}
\ No newline at end of file
+}
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 744e679194e..195e48bb222 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -42,7 +42,7 @@ class Establishment extends CommonObject
 	public $fk_element = 'fk_establishment';
 	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto='building';
-    
+
     public $id;
     public $ref;
 	public $rowid;
@@ -216,7 +216,7 @@ class Establishment extends CommonObject
 
             $this->country_id   = $obj->country_id;
             $this->country_code = $obj->country_code;
-            $this->country      = $obj->country;			
+            $this->country      = $obj->country;
 
 			return 1;
 		}
@@ -394,7 +394,7 @@ class Establishment extends CommonObject
 
         return '';
     }
-    
+
     /**
      * Initialise object with example values
      * Id must be 0 if object instance is a specimen
@@ -405,5 +405,5 @@ class Establishment extends CommonObject
     {
         $this->id = 0;
         $this->ref = 'DEAAA';
-    }    
+    }
 }
diff --git a/htdocs/index.php b/htdocs/index.php
index df1c18176e7..bbdac41aad6 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -568,7 +568,7 @@ if (! empty($valid_dashboardlines))
         if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX))
 	{
 		$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.price($board->total)	.'</span></a>';
-	}	    
+	}
         $boxwork .= '</div>';
         if ($board->nbtodolate > 0)
         {
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 6ea6d451e92..2e005a30b21 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -1,5 +1,5 @@
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org> 
- * Copyright (C) 2009-2017 Laurent Destailleur  <eldy@users.sourceforge.net> 
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2009-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,16 +89,16 @@ div.soustitre {
 	body {
 		margin: 15px 4px 4px;
 	}
-	
-	input, input[type=text], input[type=password], select, textarea     { 
-		min-width: 20px; 
+
+	input, input[type=text], input[type=password], select, textarea     {
+		min-width: 20px;
     	min-height: 1.4em;
     	line-height: 1.4em;
     	padding: .4em .1em;
     	border: 1px solid #BBB;
     	/* max-width: inherit; why this ? */
      }
-     
+
     .hideonsmartphone { display: none; }
     .noenlargeonsmartphone { width : 50px !important; display: inline !important; }
     .maxwidthonsmartphone { max-width: 100px; }
@@ -120,13 +120,13 @@ div.soustitre {
     	padding-left: 0;
     	padding-right: 0;
 	}
-	
+
 	table.main-inside {
 		padding-left: 1px;
 		padding-right: 1px;
 		line-height: 20px;
 	}
-	
+
 	span.titre {
 	    font-size: 90%;
 	    font-weight: normal;
@@ -146,7 +146,7 @@ input:disabled
 	padding: 0 0 0 0;
 	margin: 0 0 0 0;
 	color: #AAA !important;
-	cursor: not-allowed !important; 
+	cursor: not-allowed !important;
 }
 
 input[type=submit] {
@@ -212,7 +212,7 @@ table.listofchoices, table.listofchoices tr, table.listofchoices td {
 }
 .blinkwait {
 	font-weight: bold;
-	text-decoration:blink !important;	
+	text-decoration:blink !important;
 }
 
 .installchoices table tr td  {
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index eda61f27b98..c7822961570 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -422,13 +422,14 @@ class MultiCurrency extends CommonObject
 		}
 	 }
 
-	 /**
-	  * Try get label of code in llx_currency then add rate
-	  *
-	  * @param	string	$code	currency code
-	  * @param	double	$rate	new rate
-	  * @return int -1 if KO, 1 if OK, 2 if label found and OK
-	  */
+	/**
+	 * Try get label of code in llx_currency then add rate.
+	 *
+	 * @param	string	$code	currency code
+	 * @param	double	$rate	new rate
+	 *
+	 * @return int -1 if KO, 1 if OK, 2 if label found and OK
+	 */
 	function addRateFromDolibarr($code, $rate)
 	{
 	 	global $db, $user;
@@ -457,7 +458,7 @@ class MultiCurrency extends CommonObject
 		return -1;
 	}
 
-	/**
+	 /**
 	 * Add new entry into llx_multicurrency_rate to historise
 	 *
 	 * @param double	$rate	rate value
@@ -467,7 +468,7 @@ class MultiCurrency extends CommonObject
 	public function updateRate($rate)
 	{
 	 	return $this->addRate($rate);
-	}
+	 }
 
 	/**
 	 * Fetch CurrencyRate object in $this->rate
@@ -488,9 +489,9 @@ class MultiCurrency extends CommonObject
 			return $this->rate->fetch($obj->rowid);
 		}
 
-	}
+	 }
 
-	/**
+	 /**
 	 * Get id of currency from code
 	 *
 	 * @param DoliDB	$db		object db
@@ -508,9 +509,9 @@ class MultiCurrency extends CommonObject
 		$resql = $db->query($sql);
 		if ($resql && $obj = $db->fetch_object($resql)) return $obj->rowid;
 		else return 0;
-	}
+	 }
 
-	/**
+	 /**
 	 * Get id and rate of currency from code
 	 *
 	 * @param DoliDB	$db		object db
@@ -571,29 +572,28 @@ class MultiCurrency extends CommonObject
 		 else return $amount;
 	  }
 
-	  /**
-	   *  Get current invoite rate
-	   *
-	   *  @param	int 	$fk_facture 	id of facture
-	   *  @param 	string 	$table 			facture or facture_fourn
+	/**
+	 *  Get current invoite rate
+	 *
+	 *  @param	int 	$fk_facture 	id of facture
+	 *  @param 	string 	$table 			facture or facture_fourn
      *  @return bool
-	   */
-	   public static function getInvoiceRate($fk_facture, $table='facture')
-	   {
-		 global $db;
+	 */
+	public static function getInvoiceRate($fk_facture, $table='facture')
+	{
+		global $db;
 
-		 $sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture;
+		$sql = 'SELECT multicurrency_tx FROM '.MAIN_DB_PREFIX.$table.' WHERE rowid = '.$fk_facture;
 
-		 dol_syslog(__METHOD__,LOG_DEBUG);
-		 $resql = $db->query($sql);
-		 if ($resql && ($line = $db->fetch_object($resql)))
-		 {
-		 	return $line->multicurrency_tx;
-		 }
-
-		 return false;
-	   }
+		dol_syslog(__METHOD__,LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql && ($line = $db->fetch_object($resql)))
+		{
+			return $line->multicurrency_tx;
+		}
 
+		return false;
+	}
 
 	/**
 	 * With free account we can't set source then recalcul all rates to force another source
@@ -636,13 +636,13 @@ class MultiCurrency extends CommonObject
 		global $db,$conf;
 
 		$ch = curl_init('http://apilayer.net/api/live?access_key='.$key.'');
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($ch);
-        curl_close($ch);
-        $response = json_decode($response);
+                curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                $response = curl_exec($ch);
+                curl_close($ch);
+                $response = json_decode($response);
 
-        if ($response->success)
-        {
+                if ($response->success)
+                {
 
 			$TRate = $response->quotes;
 			$timestamp = $response->timestamp;
diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css
index 7e359bd134e..e790d2d59f8 100644
--- a/htdocs/opensurvey/css/style.css
+++ b/htdocs/opensurvey/css/style.css
@@ -104,10 +104,10 @@ borghesi@unistra.fr
 Ce logiciel est régi par la licence CeCILL-B soumise au droit français et
 respectant les principes de diffusion des logiciels libres. Vous pouvez
 utiliser, modifier et/ou redistribuer ce programme sous les conditions
-de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA 
+de la licence CeCILL-B telle que diffusée par le CEA, le CNRS et l'INRIA
 sur le site "http://www.cecill.info".
 
-Le fait que vous puissiez accéder à cet en-tête signifie que vous avez 
+Le fait que vous puissiez accéder à cet en-tête signifie que vous avez
 pris connaissance de la licence CeCILL-B, et que vous en avez accepté les
 termes. Vous pouvez trouver une copie de la licence dans le fichier LICENCE.
 
@@ -120,10 +120,10 @@ Creation : Feb 2008
 borghesi@unistra.fr
 
 This software is governed by the CeCILL-B license under French law and
-abiding by the rules of distribution of free software. You can  use, 
+abiding by the rules of distribution of free software. You can  use,
 modify and/ or redistribute the software under the terms of the CeCILL-B
 license as circulated by CEA, CNRS and INRIA at the following URL
-"http://www.cecill.info". 
+"http://www.cecill.info".
 
 The fact that you are presently reading this means that you have had
 knowledge of the CeCILL-B license and that you accept its terms. You can
@@ -133,12 +133,12 @@ find a copy of this license in the file LICENSE.
 */
 
 /*
-Le fichier style.css est le fichier de style de studs. Il se trouve à la racine 
+Le fichier style.css est le fichier de style de studs. Il se trouve à la racine
 du répertoire studs. Il contient toutes les mises en forme des fichiers PHP
 de Studs.
 */
 /*bandeau de titre*/
-div.bandeau{ 
+div.bandeau{
 	line-height:35px;
 	text-align:center;
 	background-color: #0b419b;
@@ -146,7 +146,7 @@ div.bandeau{
 	vertical-align:middle;
 	font-size:35px;
 	font-family:arial, sans-serif;
-	padding:8px; 
+	padding:8px;
 	height:35px;
 	position:static;
 	top:6px;
@@ -154,30 +154,30 @@ div.bandeau{
 	right:6px;
 
 }
-div.logo{ 
+div.logo{
 	height:64px;
 	float:right;
 	top:8px;
 	right:8px;
 	margin-left: 0;
-	margin-right:0; 
+	margin-right:0;
 	margin-bottom:auto;
 }
 /*Sous bandeau avec bouton de navigation*/
-div.bandeautitre{ 
+div.bandeautitre{
 	height:17px;
 	font-size:14px;
 	font-weight:bold;
 	text-align:center;
 	vertical-align:middle;
 	font-family:arial, sans-serif;
- 	padding:3px; 
+ 	padding:3px;
 	position:static;
 	top:57px;
 	left:6px;
 	right:6px;
-} 
-div.sousbandeau{ 
+}
+div.sousbandeau{
 	height:17px;
 	background-color: #DDDDDD;
 	font-size:11px;
@@ -191,15 +191,15 @@ div.sousbandeau{
 	right:6px;
 }
 /*bandeau de pied*/
-div.surbandeaupied{ 
+div.surbandeaupied{
 	background-color: #0077DD;
 	position:absolute;
 	bottom:30px;
 	left:6px;
-	right:6px; 
+	right:6px;
 	height:6px;
 }
-div.bandeaupied{ 
+div.bandeaupied{
 	text-align:center;
 	background-color: #0b419b;
 	color:white;
@@ -209,29 +209,29 @@ div.bandeaupied{
 	position:fixed;
 	bottom:6px;
 	left:6px;
-	right:6px; 
+	right:6px;
 	margin:2px;
 }
-div.surbandeaupiedmobile{ 
+div.surbandeaupiedmobile{
 	background-color: #0077DD;
-	position:static; 
+	position:static;
 	bottom:32px;
 	left:6px;
-	right:6px; 
+	right:6px;
 	height:6px;
 }
-div.bandeaupiedmobile{ 
+div.bandeaupiedmobile{
 	text-align:center;
 	background-color: #0b419b;
 	color:white;
 	font-size:11px;
 	font-family:arial, sans-serif;
-	padding:6px; 
-	position:static; 
+	padding:6px;
+	position:static;
 }
 /*les boutons se trouvant dans le sousbandeau*/
 div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a {
- 	background-color: #0b419b; 
+ 	background-color: #0b419b;
 	height:16px;
 	padding: 2px 6px 2px 6px;
 	vertical-align:middle;
@@ -249,7 +249,7 @@ span.sousbandeaulangue {
 	float:right;
 }
 /*corps de la page index.php*/
-div.corps{ 
+div.corps{
 	font-size:12px;
 	font-family:arial, sans-serif;
 	position:static;
@@ -257,10 +257,10 @@ div.corps{
 }
 div.corps  table{
 	font-family:arial, sans-serif;
-	font-size:12px;	
+	font-size:12px;
 	font-weight:bold;
 }
-div.corpscentre{ 
+div.corpscentre{
 	font-size:12px;
 	font-family:arial, sans-serif;
 	text-align:center;
@@ -285,7 +285,7 @@ div.jourschoisis {
 div.bodydate {
 	padding:10px;
 	font-family:arial, sans-serif;
-	font-size:12px;	
+	font-size:12px;
 	text-align:center;
 	position:static;
 	top:330px;
@@ -294,7 +294,7 @@ div.bodydate {
 }
 div.bodydate table{
 	font-family:arial, sans-serif;
-	font-size:12px;	
+	font-size:12px;
 	font-weight:bold;
 }
 /*cadre de commentaires*/
@@ -302,7 +302,7 @@ div.presentationdate {
 	width:100%;
 	font-family:arial, sans-serif;
 	text-align:center;
-	font-size:12px;	
+	font-size:12px;
 	border-top:1px solid;
 	border-bottom:1px solid;
 	border-left: none;
@@ -321,14 +321,14 @@ div.presentationdatefin {
     border: 1px solid;
     margin-top: 10px;
 	margin-left: 30%;
-    margin-right: 30%; 
+    margin-right: 30%;
 	position:static;
 }
 /*cadre principal de studs.php*/
 div.cadre {
-	padding:10px; 
+	padding:10px;
 	font-family:arial, sans-serif;
-	font-size:12px;	
+	font-size:12px;
 	position:static;
 	top:235px;
 	text-align:center;
@@ -350,54 +350,54 @@ div.cadre td {
 }
 /*case de tableau OK dans affichage de sondage*/
 div.cadre td.ok {
-	background-color: #66FF99; 
-	font-size:12px;	
+	background-color: #66FF99;
+	font-size:12px;
 	text-align:center;
 }
 /*Case de tableau NON dans affichage de sondage*/
 div.cadre td.non {
-	background-color: #FF7777; 
+	background-color: #FF7777;
 	min-width: 60px;
 }
 /*Case de tableau VIDE dans affichage de sondage*/
 div.cadre td.vide {
-	background-color: #DDDDDD; 
+	background-color: #DDDDDD;
 	text-align:center;
 }
 /*Case de tableau contenant les noms dans affichage de sondage*/
 div.cadre td.nom {
-	background-color: #DDDDDD; 
-	font-size:12px;	 
+	background-color: #DDDDDD;
+	font-size:12px;
 	text-align:center;
 }
 div.cadre td.casevide {
-	background-color: white; 
+	background-color: white;
 	text-align:center;
 }
 /*les cases contenant les sommes de chaque colonne dans l'affichage de calendrier*/
 div.cadre td.somme {
 	font-weight:  bold;
-	font-size:14px; 
+	font-size:14px;
 }
 
 /*Case de tableau SUJET dans affichage de sondage*/
 div.cadre td.sujet, div.cadre td.jour, div.cadre td.heure {
 	border: 2px;
-	background-color: #DDDDDD; 
+	background-color: #DDDDDD;
 	font-size:14px;
 	padding:1px 5px;
 }
 
 div.cadre td.annee {
 	border: 2px;
-	background-color: #969696; 
+	background-color: #969696;
 	font-weight: bold;
 	font-size:14px;
 	padding:1px 5px;
 }
 div.cadre td.mois {
 	border: 2px;
-	background-color: #C0C0C0; 
+	background-color: #C0C0C0;
 	font-weight: bold;
 	font-size:14px;
 	padding:1px 5px;
@@ -421,7 +421,7 @@ div.calendrier td.joursemaine {
 	font-family:arial, sans-serif;
 	font-size:14px;
 	border: 2px;
-	background-color: white; 
+	background-color: white;
 }
 div.calendrier td.jourwe {
 	width:65px;
@@ -429,7 +429,7 @@ div.calendrier td.jourwe {
 	font-family:arial, sans-serif;
 	font-size:14px;
 	border: 2px;
-	background-color: #C0C0C0; 
+	background-color: #C0C0C0;
 }
 /*jour avant le premier jour du mois dans calendrier*/
 div.calendrier td.avant {
@@ -438,21 +438,21 @@ div.calendrier td.avant {
 	border: 2px;
 	font-family:arial, sans-serif;
 	font-size:13px;
-	background-color: #DDDDDD; 
+	background-color: #DDDDDD;
 }
 /*jour libre dans calendrier*/
 div.calendrier td.libre {
 	width:65px;
 	text-align: center;
 	border: 2px;
-	background-color: #66FF99; 
+	background-color: #66FF99;
 }
 /*jour deja selectionné dans calendrier*/
 div.calendrier td.choisi {
 	width:65px;
 	text-align: center;
 	border: 2px;
-	background-color: #0077DD; 
+	background-color: #0077DD;
 }
 /* Le paragraphe de fin */
 p.affichageresultats{
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 47dd65b9f0c..9abb4dbb3f2 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -49,19 +49,19 @@ print $langs->trans("DirectPrintingJobsDesc").'<br><br>';
 // List Jobs from printing modules
 $object = new PrintingDriver($db);
 $result = $object->listDrivers($db, 10);
-foreach ($result as $driver) 
+foreach ($result as $driver)
 {
     require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
     $classname = 'printing_'.$driver;
     $langs->load($driver);
     $printer = new $classname($db);
-    if ($conf->global->{$printer->active}) 
+    if ($conf->global->{$printer->active})
     {
         //$printer->list_jobs('commande');
         $result = $printer->list_jobs();
         print $printer->resprint;
-        
-        if ($result > 0) 
+
+        if ($result > 0)
         {
             setEventMessages($printer->error, $printer->errors, 'errors');
         }
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8f347ad3721..78415504477 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3657,7 +3657,7 @@ class Product extends CommonObject
         $result.=$linkstart;
 		if ($withpicto) {
 			if ($this->type == Product::TYPE_PRODUCT) $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
-			if ($this->type == Product::TYPE_SERVICE) $result.=(img_object(($notooltip?'':$label), 'service',  ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+			if ($this->type == Product::TYPE_SERVICE) $result.=(img_object(($notooltip?'':$label), 'service', ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
 		}
 		$result.= $newref;
 		$result.= $linkend;
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index 4884d7ab065..56459ab7be9 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -1,51 +1,50 @@
 <?php
 
-    require '../../../main.inc.php';
-    require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
-  
-    $get = GETPOST('get');
-    $put = GETPOST('put');
-    
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
+
+$get = GETPOST('get');
+$put = GETPOST('put');
+
     switch ($put)
     {
         case 'qty':
         	if (empty($user->rights->stock->creer)) { echo -1; exit; }
-            
+
             $fk_det_inventory = GETPOST('fk_det_inventory');
-            
+
             $det = new Inventorydet($db);
             if( $det->fetch( $fk_det_inventory))
             {
                 $det->qty_view+=GETPOST('qty');
                 $res = $det->update($user);
-                
+
                 echo $det->qty_view;
             }
             else
             {
                 echo -2;
-            }            
-           
+            }
+
             break;
-			
+
         case 'pmp':
         	if (empty($user->rights->stock->creer) || empty($user->rights->stock->changePMP)) { echo -1; exit; }
-            
+
             $fk_det_inventory = GETPOST('fk_det_inventory');
-            
+
             $det = new Inventorydet($db);
             if( $det->fetch( $fk_det_inventory))
             {
                 $det->new_pmp=price2num(GETPOST('pmp'));
                 $det->update($user);
-                
+
                 echo $det->new_pmp;
             }
             else
             {
                 echo -2;
-            }            
-            
+            }
+
             break;
     }
- 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 9b26eecc426..28f08035198 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -748,8 +748,8 @@ if ($resql)
 			if (! empty($arrayfields['p.duration']['checked']))
 			{
 				print '<td align="center">';
-        			
-				if (preg_match('/([^a-z]+)[a-z]$/i',$obj->duration))	
+
+				if (preg_match('/([^a-z]+)[a-z]$/i',$obj->duration))
 				{
 					$duration_value	= substr($obj->duration,0,dol_strlen($obj->duration)-1);
 					$duration_unit	= substr($obj->duration,-1);
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 6aa5386de50..a72ea28928b 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -464,9 +464,7 @@ if (empty($reshook))
 			$sql .= " WHERE rowid = " . $rowid;
 
 			$result = $db->query($sql);
-		} 
-		else 
-		{
+		} else {
 			setEventMessages(('delete_price_by_qty'.$langs->transnoentities(MissingIds)), null,'errors');
 		}
 	}
@@ -479,9 +477,7 @@ if (empty($reshook))
 		$sql .= " WHERE fk_product_price = " . $priceid;
 
 		$result = $db->query($sql);
-		} 
-		else 
-		{
+		} else {
 			setEventMessages(('delete_price_by_qty'.$langs->transnoentities(MissingIds)), null,'errors');
 		}
 	}
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index bb9072b485d..1ed59eb058f 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -167,7 +167,7 @@ class Productlot extends CommonObject
 					$error++;
 				}
 			}
-			
+
 			if (! $error && ! $notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action to call a trigger.
@@ -235,7 +235,7 @@ class Productlot extends CommonObject
 				//$this->ref = $obj->fk_product.'_'.$obj->batch;
 
 				$this->batch = $obj->batch;
-				$this->entity = (!empty($obj->entity)?$obj->entity:$conf->entity); // Prevent "null" entity 
+				$this->entity = (!empty($obj->entity)?$obj->entity:$conf->entity); // Prevent "null" entity
 				$this->fk_product = $obj->fk_product;
 				$this->eatby = $this->db->jdate($obj->eatby);
 				$this->sellby = $this->db->jdate($obj->sellby);
@@ -301,7 +301,7 @@ class Productlot extends CommonObject
 
 		// Check parameters
 		// Put here code to add a control on parameters values
-		
+
 		if (empty($this->oldcopy))
 		{
 			$org=new self($this->db);
@@ -341,7 +341,7 @@ class Productlot extends CommonObject
 				$error++;
 			}
 		}
-		
+
 		if (!$error && !$notrigger) {
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action calls a trigger.
@@ -583,4 +583,3 @@ class Productlot extends CommonObject
 	}
 
 }
-
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index c1631b3ff18..07432766fbc 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -1030,7 +1030,7 @@ if ($resql)
 	        print '<td>'.'<a href="'
 								.DOL_URL_ROOT.'/product/stock/mouvement.php'
 								.'?id='.$objp->entrepot_id
-								.'&amp;search_inventorycode='.$objp->inventorycode							   
+								.'&amp;search_inventorycode='.$objp->inventorycode
 							    .'&amp;search_type_mouvement='.$objp->type_mouvement
 						.'">'
 							.$objp->inventorycode
@@ -1176,4 +1176,3 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id>0)
 // End of page
 llxFooter();
 $db->close();
-
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 9d4ac0fb122..8a39327b7c0 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -83,7 +83,7 @@ if ($id > 0 || ! empty($ref))
 
 }
 
-if(empty($id) && !empty($object->id)) $id = $object->id; 
+if(empty($id) && !empty($object->id)) $id = $object->id;
 
 $modulepart='product';
 
@@ -989,8 +989,8 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 
 	print "</table>";
 
-	if (!empty($user->rights->produit->creer)){ 
-	    print '</form>'; 
+	if (!empty($user->rights->produit->creer)){
+	    print '</form>';
 	}
 }
 
diff --git a/htdocs/public/demo/demo.css b/htdocs/public/demo/demo.css
index c4624f2d943..d137b7be456 100644
--- a/htdocs/public/demo/demo.css
+++ b/htdocs/public/demo/demo.css
@@ -16,19 +16,19 @@ a:hover {
 	border: 1px solid #bbb;
 	border-radius: 8px;
 	-moz-border-radius: 8px;
-	box-shadow: 2px 2px 8px #BBB; 
+	box-shadow: 2px 2px 8px #BBB;
 }
 .CTable {
 	padding: 6px;
 	font-weight: normal;
 	color: #444444 !important;
-	
+
 	margin: 8px 0px 8px 2px;
-	
+
 	/*border: 1px solid #bbb;
 	border-radius: 8px;
 	-moz-border-radius: 8px;*/
-	
+
 	background: -webkit-linear-gradient(bottom, rgb(255,255,255) 85%, rgb(255,255,255) 100%);
 }
 .csscolumns {
@@ -129,4 +129,4 @@ img.demothumb {
         margin-left: 0px;
         margin-right: 0px;
     }
-}
\ No newline at end of file
+}
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index b92e84b8352..5edf85f9dac 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -546,7 +546,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     $isempty=1;
     if (count($listoftype)==1) { $defaulttype=$tmp[0]; $isempty=0; }
     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 $form->selectarray("type", $adht->liste_array(), GETPOST('type')?GETPOST('type'):$defaulttype, $isempty);
     print '</td></tr>'."\n";
 }
 else
@@ -561,7 +561,7 @@ $morphys["mor"] = $langs->trans("Moral");
 if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
 {
     print '<tr class="morphy"><td class="titlefield">'.$langs->trans('Nature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
-    print $form->selectarray("morphy",  $morphys, GETPOST('morphy'), 1);
+    print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
     print '</td></tr>'."\n";
 }
 else
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index 623baa2020a..3b25349324c 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -19,13 +19,13 @@
  *	\file       htdocs/public/notice.php
  *	\brief      Dolibarr page to show a notice.
  *              Default notice is a message to say network connection is off.
- *              You can also call this page with URL: 
+ *              You can also call this page with URL:
  *                /public/notice.php?lang=xx_XX&transkey=translation_key  (key must be inside file main.lang, error.lang or other.lang)
  *                /public/notice.php?transphrase=url_encoded_sentence_to_show
  */
 
 define('NOCSRFCHECK',1);
-define('NOLOGIN',1);		
+define('NOLOGIN',1);
 
 require '../main.inc.php';
 
@@ -43,8 +43,8 @@ else
 {
     $langs->load("error");
     $langs->load("other");
-    
-    if (GETPOST('transphrase')) print GETPOST('transphrase'); 
+
+    if (GETPOST('transphrase')) print GETPOST('transphrase');
     if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey'));
 }
 
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 2625cf6d438..45aeb0d1321 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -441,15 +441,15 @@ if ($action == 'charge' && ! empty($conf->stripe->enabled))
 				$service = 'StripeLive';
 				$servicestatus = 1;
 			}
-			
+
 
 			$thirdparty = new Societe($db);
 			$thirdparty->fetch($thirdparty_id);
 
 			// Create Stripe customer
 			include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-			$stripe = new Stripe($db);  
-      $stripeacc = $stripe->getStripeAccount($service);
+			$stripe = new Stripe($db);
+            $stripeacc = $stripe->getStripeAccount($service);
 			$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 1);
 
 			// Create Stripe card from Token
@@ -1694,4 +1694,3 @@ htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix,$object);
 llxFooter('', 'public');
 
 $db->close();
-
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index a269fea0b80..faca27f78c7 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -41,13 +41,13 @@ if (isset($_GET['connect'])){
 	{
 		$endpoint_secret =  $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
-    $servicestatus = 0;
+        $servicestatus = 0;
 	}
 	else
 	{
 		$endpoint_secret =  $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
-    $servicestatus = 1;    
+        $servicestatus = 1;
 	}
 }
 else {
@@ -55,13 +55,13 @@ else {
 	{
 		$endpoint_secret =  $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
-    $servicestatus = 0;
+        $servicestatus = 0;
 	}
 	else
 	{
 		$endpoint_secret =  $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
-    $servicestatus = 1;
+        $servicestatus = 1;
 	}
 }
 $payload = @file_get_contents("php://input");
@@ -229,35 +229,35 @@ elseif ($event->type == 'charge.failed') {
 }
 elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated==true)) {
 
-  $fulltag=$event->data->object->metadata->FULLTAG;
+    $fulltag=$event->data->object->metadata->FULLTAG;
 	// Save into $tmptag all metadata
 	$tmptag=dolExplodeIntoArray($fulltag,'.','=');
-  
-  if (! empty($tmptag['ORD'])){
-  $order=new Commande($db);
-	$order->fetch('',$tmptag['ORD']);
-  $origin='order';
-  $item=$order->id;
-  } elseif (! empty($tmptag['INV'])) {
-  $invoice = new Facture($db);
-	$invoice->fetch('',$tmptag['INV']);
-  $origin='invoice';
-  $item=$invoice->id;
-  }
 
-  $stripe=new Stripe($db); 
-  $stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
-  $stripecu = $stripe->getStripeCustomerAccount($tmptag['CUS'], $servicestatus);		// Get thirdparty cu_...
+    if (! empty($tmptag['ORD'])) {
+        $order=new Commande($db);
+	    $order->fetch('',$tmptag['ORD']);
+        $origin='order';
+        $item=$order->id;
+    } elseif (! empty($tmptag['INV'])) {
+        $invoice = new Facture($db);
+	    $invoice->fetch('',$tmptag['INV']);
+        $origin='invoice';
+        $item=$invoice->id;
+    }
+
+    $stripe=new Stripe($db);
+    $stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
+    $stripecu = $stripe->getStripeCustomerAccount($tmptag['CUS'], $servicestatus);		// Get thirdparty cu_...
 	$charge=$stripe->createPaymentStripe($event->data->object->amount/100,$event->data->object->currency,$origin,$item,$event->data->object->id,$stripecu,$stripeacc,$servicestatus);
-  
-	if (isset($charge->id) && $charge->statut=='error'){
+
+	if (isset($charge->id) && $charge->statut=='error') {
 		$msg=$charge->message;
 		$code=$charge->code;
 		$error++;
-	}              
+	}
 	elseif (isset($charge->id) && $charge->statut=='success' && (! empty($tmptag['ORD']))) {
-    //$order=new Commande($db);
-	  //$order->fetch('',$tmptag['ORD']);
+        //$order=new Commande($db);
+	    //$order->fetch('',$tmptag['ORD']);
 		$invoice = new Facture($db);
 		$idinv=$invoice->createFromOrder($order,$user);
 
@@ -273,17 +273,17 @@ elseif (($event->type == 'source.chargeable') && ($event->data->object->type ==
 				$ifverif=$invoice->socid;
 				$currency=$invoice->multicurrency_code;
 				$total=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
-			}else{
+			} else {
 				$msg=$invoice->error;
 				$error++;
 			}
-		}else{
+		} else {
 			$msg=$invoice->error;
 			$error++;
 		}
 	}
 
-	if (!$error){
+	if (!$error) {
 		$datepaye = dol_now();
 		$paymentType ="CB";
 		$amounts=array();
@@ -299,10 +299,10 @@ elseif (($event->type == 'source.chargeable') && ($event->data->object->type ==
 		$paiement->note         = '';
 	}
 
-	if (! $error){
+	if (! $error) {
 		$paiement_id=$paiement->create($user, 0);
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($invoice->lines)){
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($invoice->lines)) {
 			$outputlangs = $langs;
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
@@ -316,17 +316,17 @@ elseif (($event->type == 'source.chargeable') && ($event->data->object->type ==
 
 			$invoice->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-		if ($paiement_id < 0){
+		if ($paiement_id < 0) {
 			$msg=$paiement->errors;
 			$error++;
-		}else{
+		} else {
 			if ($event->data->object->metadata->source=='order') {
 				$order->classifyBilled($user);
 			}
 		}
 	}
 
-	if (! $error){
+	if (! $error) {
 		$label='(CustomerInvoicePayment)';
 		if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
 		$paiement->addPaymentToBank($user,'payment',$label,$conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS,'','');
@@ -349,4 +349,3 @@ elseif ($event->type == 'customer.deleted') {
 	$db->query($sql);
 	$db->commit();
 }
-
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index c3c4979a843..d451d96d011 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -226,12 +226,9 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
                 }
                 include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
                 $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-                if ($mailfile->error || $mailfile->errors) 
-                {
+                if ($mailfile->error || $mailfile->errors) {
                     setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-                } 
-                else 
-                {
+                } else {
                     $result = $mailfile->sendfile();
                 }
                 if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
@@ -290,12 +287,9 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
 	                }
 	                include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
 	                $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
-	                if ($mailfile->error || $mailfile->errors) 
-                    {
+	                if ($mailfile->error || $mailfile->errors) {
                         setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-                    } 
-	                else 
-	                {
+                    } else {
 	                    $result = $mailfile->sendfile();
 	                }
 	                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
@@ -316,9 +310,7 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
 
             setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
         }
-    } 
-    else 
-    {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index fe1dacbbbc7..5ab17fedba2 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -121,8 +121,7 @@ if ($action == "view_ticketlist") {
         }
     }
 
-    if ($error || $errors) 
-    {
+    if ($error || $errors) {
         setEventMessages($object->error, $object->errors, 'errors');
         $action = '';
     }
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 38fcb3c4991..b2bb0100d6d 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -112,8 +112,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
         }
     }
 
-    if ($error || $errors) 
-    {
+    if ($error || $errors) {
         setEventMessages($object->error, $object->errors, 'errors');
         $action = '';
     }
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 7ca7ed21295..4bb3e0d0923 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014      Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018           Nicolas ZABOURI         <info@inovea-conseil.com>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 5b9282a6e79..415ed32a62a 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -118,14 +118,14 @@ if (! $rowid) {
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 	}
 
-	foreach ($txn->data as $txn) 
+	foreach ($txn->data as $txn)
 	{
 		//$charge = $txn;
 		//var_dump($txn);
-		
+
 		// The metadata FULLTAG is defined by the online payment page
 		/*$FULLTAG=$charge->metadata->FULLTAG;
-		
+
 		// Save into $tmparray all metadata
 		$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
 		// Load origin object according to metadata
@@ -145,7 +145,7 @@ if (! $rowid) {
 		{
 			$memberstatic->id = 0;
 		}*/
-		
+
 		$societestatic->fetch($charge->metadata->idcustomer);
 		$societestatic->id = $charge->metadata->idcustomer;
 		$societestatic->lastname = $obj->lastname;
@@ -156,7 +156,7 @@ if (! $rowid) {
 		$societestatic->societe_id = $obj->fk_soc;
 
 		print '<TR class="oddeven">';
-		
+
 		// Ref
 		print "<TD><A href='" . DOL_URL_ROOT . "/stripe/transaction.php?rowid=" . $txn->source . "'>" . $txn->source . "</A></TD>\n";
 		// Stripe customer
diff --git a/htdocs/support/default.css b/htdocs/support/default.css
index 17204387eb4..6737a6ede00 100644
--- a/htdocs/support/default.css
+++ b/htdocs/support/default.css
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> 
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -147,7 +147,7 @@ padding: 4px 4px 4px 4px;
 
 tr.title
 {
-background: #DDDFDD;	
+background: #DDDFDD;
 }
 
 table { font-size: 12px; }
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index bc560d38f8f..50ff0cc6eed 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -18,7 +18,7 @@ CKEDITOR.editorConfig = function( config )
 	//config.extraPlugins = 'docprops,scayt,showprotected';
 	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
 	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
-	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' 
+	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea'
 	//config.language = 'de';
 	//config.defaultLanguage = 'en';
 	//config.contentsLanguage = 'fr';
@@ -29,7 +29,7 @@ CKEDITOR.editorConfig = function( config )
 	//config.autoParagraph = false;
 	//config.removeFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd';		// See also rules on this.dataProcessor.writer.setRules
 	//config.forcePasteAsPlainText = true;
-	
+
 	config.toolbar_Full =
 	[
 	    ['Templates','NewPage'],
@@ -51,7 +51,7 @@ CKEDITOR.editorConfig = function( config )
 	];
 
 	// Used for mailing fields
-	config.toolbar_dolibarr_mailings = 
+	config.toolbar_dolibarr_mailings =
 	[
 	 	['Maximize','Preview'],
 	 	['SpellChecker', 'Scayt'],
@@ -64,7 +64,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'],
 	 	['Source']
 	 ];
-	
+
 	// Used for notes fields
 	config.toolbar_dolibarr_notes =
 	[
@@ -78,7 +78,7 @@ CKEDITOR.editorConfig = function( config )
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'],
 	 	['Source']
 	];
-	
+
 	// Used for details lines
 	config.toolbar_dolibarr_details =
 	[
@@ -91,12 +91,12 @@ CKEDITOR.editorConfig = function( config )
 	    ['Link','Unlink','SpecialChar'],
 	 	['Source']
 	];
-	
+
 	// Used for mailing fields
 	config.toolbar_dolibarr_readonly =
 	[
 	 	['Maximize'],
 	 	['Find'],
 	 	['Source']
-	];	
+	];
 };
diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
index bc560d38f8f..50ff0cc6eed 100644
--- a/htdocs/theme/md/ckeditor/config.js
+++ b/htdocs/theme/md/ckeditor/config.js
@@ -18,7 +18,7 @@ CKEDITOR.editorConfig = function( config )
 	//config.extraPlugins = 'docprops,scayt,showprotected';
 	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
 	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
-	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' 
+	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea'
 	//config.language = 'de';
 	//config.defaultLanguage = 'en';
 	//config.contentsLanguage = 'fr';
@@ -29,7 +29,7 @@ CKEDITOR.editorConfig = function( config )
 	//config.autoParagraph = false;
 	//config.removeFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd';		// See also rules on this.dataProcessor.writer.setRules
 	//config.forcePasteAsPlainText = true;
-	
+
 	config.toolbar_Full =
 	[
 	    ['Templates','NewPage'],
@@ -51,7 +51,7 @@ CKEDITOR.editorConfig = function( config )
 	];
 
 	// Used for mailing fields
-	config.toolbar_dolibarr_mailings = 
+	config.toolbar_dolibarr_mailings =
 	[
 	 	['Maximize','Preview'],
 	 	['SpellChecker', 'Scayt'],
@@ -64,7 +64,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'],
 	 	['Source']
 	 ];
-	
+
 	// Used for notes fields
 	config.toolbar_dolibarr_notes =
 	[
@@ -78,7 +78,7 @@ CKEDITOR.editorConfig = function( config )
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'],
 	 	['Source']
 	];
-	
+
 	// Used for details lines
 	config.toolbar_dolibarr_details =
 	[
@@ -91,12 +91,12 @@ CKEDITOR.editorConfig = function( config )
 	    ['Link','Unlink','SpecialChar'],
 	 	['Source']
 	];
-	
+
 	// Used for mailing fields
 	config.toolbar_dolibarr_readonly =
 	[
 	 	['Maximize'],
 	 	['Find'],
 	 	['Source']
-	];	
+	];
 };
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 17cead40826..1a393861b46 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1619,12 +1619,9 @@ class Ticket extends CommonObject
                 }
                 include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
                 $mailfile = new CMailFile($subject, $info_sendto['email'], $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, 0);
-                if ($mailfile->error || $mailfile->errors)
-                {
+                if ($mailfile->error || $mailfile->errors) {
                     setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-                }
-                else
-                {
+                } else {
                     $result = $mailfile->sendfile();
                     if ($result > 0) {
                         $nb_sent++;
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index 3083c5e67ca..49265f25001 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -374,7 +374,8 @@ if (! empty($id) || ! empty($ref)) {
 
 	<?php
 
-	// End of page
-    llxFooter();
-    $db->close();
-}
\ No newline at end of file
+  // End of page
+  llxFooter();
+}
+
+$db->close();
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index 0836036afa5..e1db7d199cf 100644
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -117,7 +117,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesCreate
-     * 
+     *
      * @return	void
      */
     public function testChargeSocialesCreate()
@@ -139,10 +139,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesFetch
-     * 
+     *
      * @param	int		$id		Id of social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesCreate
      * The depends says test is run only if previous is ok
      */
@@ -164,10 +164,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesValid
-     * 
+     *
      * @param	Object		$localobject	Social contribution
      * @return	void
-     * 
+     *
      * @depends	testChargeSocialesFetch
      * The depends says test is run only if previous is ok
      */
@@ -188,10 +188,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesOther
-     * 
+     *
      * @param	Object	$localobject		Social contribution
      * @return	void
-     * 
+     *
      * @depends testChargeSocialesValid
      * The depends says test is run only if previous is ok
      */
@@ -216,10 +216,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
 
     /**
      * testChargeSocialesDelete
-     * 
+     *
      * @param	int		$id			Social contribution
      * @return 	void
-     * 
+     *
      * @depends	testChargeSocialesOther
      * The depends says test is run only if previous is ok
      */
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 54ebca5ac67..31c682bafee 100644
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -263,14 +263,14 @@ class CoreTest extends PHPUnit_Framework_TestCase
 		    // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
 		    if ($type != 2)
 		    {
-		        $inj += preg_match('/delete\s+from/i',	 $val);
-		        $inj += preg_match('/create\s+table/i',	 $val);
-		        $inj += preg_match('/update.+set.+=/i',  $val);
-		        $inj += preg_match('/insert\s+into/i', 	 $val);
-		        $inj += preg_match('/select.+from/i', 	 $val);
-		        $inj += preg_match('/union.+select/i', 	 $val);
-		        $inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-		        $inj += preg_match('/(\.\.%2f)+/i',		 $val);
+		        $inj += preg_match('/delete\s+from/i', $val);
+		        $inj += preg_match('/create\s+table/i', $val);
+		        $inj += preg_match('/update.+set.+=/i', $val);
+		        $inj += preg_match('/insert\s+into/i', $val);
+		        $inj += preg_match('/select.+from/i', $val);
+		        $inj += preg_match('/union.+select/i', $val);
+		        $inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
+		        $inj += preg_match('/(\.\.%2f)+/i', $val);
 		    }
 		    // For XSS Injection done by adding javascript with script
 		    // This is all cases a browser consider text is javascript:
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index d41eefcbd39..2ec4c16a8d7 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -117,7 +117,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupCreate
-     * 
+     *
      * @return	void
      */
     public function testUserGroupCreate()
@@ -139,7 +139,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupFetch
-     * 
+     *
      * @param   int $id             Id of group
      * @return  void
      * @depends testUserGroupCreate
@@ -163,7 +163,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupUpdate
-     * 
+     *
      * @param   Object $localobject Group
      * @return  void
      * @depends testUserGroupFetch
@@ -187,7 +187,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupAddRight
-     * 
+     *
      * @param   Object $localobject Object to show
      * @return  void
      * @depends testUserGroupUpdate
@@ -210,7 +210,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupDelRight
-     * 
+     *
      * @param   Object $localobject Object
      * @return  void
      * @depends testUserGroupAddRight
@@ -233,7 +233,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupOther
-     * 
+     *
      * @param   Object $localobject Object
      * @return  void
      * @depends testUserGroupDelRight
@@ -261,7 +261,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
 
     /**
      * testUserGroupDelete
-     * 
+     *
      * @param   int $id             Id of object
      * @return  void
      * @depends testUserGroupOther