diff --git a/.tx/config b/.tx/config
index db380163540..27327f033ea 100644
--- a/.tx/config
+++ b/.tx/config
@@ -38,6 +38,12 @@ source_file = htdocs/langs/en_US/bills.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.blockedlog]
+file_filter = htdocs/langs/<lang>/blockedlog.lang
+source_file = htdocs/langs/en_US/blockedlog.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.bookmarks]
 file_filter = htdocs/langs/<lang>/bookmarks.lang
 source_file = htdocs/langs/en_US/bookmarks.lang
diff --git a/ChangeLog b/ChangeLog
index e5a062a9a7e..49b632dff92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@ NEW: Dolibarr can provide information in page title when multicompany is enabled
  Android application like DoliDroid able to provide native features for multicompany module
 
 
+For developers:
+Code changes to be more compatible with PSR2
+
+
 
 ***** ChangeLog for 8.0.0 compared to 7.0.0 *****
 
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index ddc5f4bf6d5..b8ddcebf18c 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -374,6 +374,9 @@
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
+    <rule ref="PSR2.Classes.ClassDeclaration" />
+    <rule ref="PSR2.Methods.FunctionClosingBrace" />
+
 	<!-- This is not in PSR2 -->
 	<rule ref="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore">
         <severity>0</severity>
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index 2acbc2d7e10..3d1445b0cce 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -65,7 +65,6 @@ class autoTranslator
 		//ini_set('default_charset','UTF-8');
 		ini_set('default_charset',$this->_outputpagecode);
 		$this->parse_refLangTranslationFiles();
-
 	}
 
 	/**
@@ -347,5 +346,4 @@ class autoTranslator
 
 		return $rep;
 	}
-
 }
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index d0191d92c09..e1a881c9dfa 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 /**
  * Class to manage categories of an accounting account
  */
-class AccountancyCategory 	// extends CommonObject
+class AccountancyCategory // extends CommonObject
 {
     /**
      * @var DoliDB Database handler.
@@ -58,7 +58,12 @@ class AccountancyCategory 	// extends CommonObject
 
 	public $id;
 	public $code;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $range_account;
 	public $sens;
 	public $category_type;
@@ -824,5 +829,4 @@ class AccountancyCategory 	// extends CommonObject
 			return -1;
 		}
 	}
-
 }
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 2748971d008..91cc87e6952 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -30,20 +30,25 @@ class AccountingJournal extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='accounting_journal';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='accounting_journal';
-	
+
 	public $fk_element = '';
 	public $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	public $picto = 'generic';
 
-	var $rowid;
+	public $rowid;
 
 	public $code;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $nature;		// 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
 	public $active;
 
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 8b88d6437e0..fe91fc74436 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -279,5 +279,4 @@ abstract class ActionsAdherentCardCommon
             }
         }
     }
-
 }
diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
index 415474ef70e..c5d6a89a152 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -118,7 +118,6 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
 		{
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
-
 	}
 
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 27ddd47088e..41764c38bd6 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -692,7 +692,6 @@ class Adherent extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -2116,7 +2115,6 @@ class Adherent extends CommonObject
 			$this->error=$this->db->error();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -2683,5 +2681,4 @@ class Adherent extends CommonObject
 
 		return 0;
 	}
-
 }
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 57a16c812e3..b7d510a3e0f 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -558,5 +558,4 @@ class AdherentType extends CommonObject
 
 		return '';
 	}
-
 }
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index bfa990a04c0..eb722b987a9 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -181,5 +181,4 @@ class AdherentStats extends Stats
 
 		return $this->_getAllByYear($sql);
 	}
-
 }
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 1758da55b1b..8591dd13195 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -409,5 +409,4 @@ class Members extends DolibarrApi
 
 		return $result;
 	}
-
 }
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index bcba76056f1..ecf7f45d371 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -320,5 +320,4 @@ class MembersTypes extends DolibarrApi
 
         return $object;
     }
-
 }
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 9999734a8f8..a3205c11a27 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -181,7 +181,6 @@ function create_script_table($list)
         print '</tr>';
     }
     print '</table>';
-
 }
 
 /**
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index 5495009917a..8d8281745fa 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -195,6 +195,5 @@ class DolibarrApiAccess implements iAuthenticate
         return $requires
             ? static::$role == 'admin' || in_array(static::$role, (array) $requires)
             : true;
-
     }
 }
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 1a958210559..9389e2ff5ed 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -918,5 +918,4 @@ class Setup extends DolibarrApi
 
     	return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
     }
-
 }
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 4913921dbbc..036aa8dc0ba 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -35,22 +35,22 @@ class Asset extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'asset';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'asset';
-	
+
 	/**
 	 * @var int  Does module support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
 	public $ismultientitymanaged = 0;
-	
+
 	/**
 	 * @var int  Does asset support extrafields ? 0=No, 1=Yes
 	 */
 	public $isextrafieldmanaged = 1;
-	
+
 	/**
 	 * @var string String with name of icon for asset. Must be the part after the 'object_' into object_asset.png
 	 */
@@ -98,7 +98,12 @@ class Asset extends CommonObject
 	public $rowid;
 	public $ref;
 	public $entity;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $amount;
 	public $fk_soc;
 	public $description;
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 45656dd0813..e6b95d7ad37 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -438,5 +438,4 @@ class AssetType extends CommonObject
 	{
 		return '';
 	}
-
 }
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 11bb3aa2d0f..b976857a522 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -54,7 +54,6 @@ class BlockedLogAuthority
     {
 
     	$this->db = $db;
-
 	}
 
 	/**
@@ -90,7 +89,6 @@ class BlockedLogAuthority
     {
 
 		return md5($this->signature.$this->blockchain);
-
 	}
 
 	/**
@@ -103,7 +101,6 @@ class BlockedLogAuthority
     {
 
 		return ($hash === $this->getBlockchainHash() );
-
 	}
 
 	/**
@@ -116,7 +113,6 @@ class BlockedLogAuthority
     {
 
 		$this->blockchain.=$block;
-
 	}
 
 	/**
@@ -197,7 +193,6 @@ class BlockedLogAuthority
 			$this->error=$this->db->error();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -252,7 +247,6 @@ class BlockedLogAuthority
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -291,7 +285,6 @@ class BlockedLogAuthority
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -340,5 +333,4 @@ class BlockedLogAuthority
 
 		return 1;
 	}
-
 }
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 654709cec6f..eaec787b099 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -283,7 +283,6 @@ class BlockedLog
 		}
 
 		return '<i class="opacitymedium">'.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).'</i>';
-
 	}
 
 	/**
@@ -676,7 +675,6 @@ class BlockedLog
 			$this->error=$this->db->error();
 			return -1;
 		}
-
 	}
 
 
@@ -716,8 +714,6 @@ class BlockedLog
 		if($res===false) return false;
 
 		return true;
-
-
 	}
 
 	/**
@@ -1060,5 +1056,4 @@ class BlockedLog
 
 		return $result;
 	}
-
 }
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 9491b10c267..2d156832861 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -226,7 +226,6 @@ class Bookmark extends CommonObject
             $this->error=$this->db->lasterror();
             return -1;
         }
-
     }
 
 	/**
@@ -256,5 +255,4 @@ class Bookmark extends CommonObject
 	{
 	    return '';
 	}
-
 }
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 5e431514d1c..78b76e20d11 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -138,6 +138,5 @@ class Auth
 
 		return $ret;
 	}
-
 }
 
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index ac26a326962..755c48faf88 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -167,7 +167,6 @@ class Facturation
         $_SESSION['poscart']=$newcartarray;
 
         $this->raz();
-
     }
 
     /**
@@ -269,7 +268,6 @@ class Facturation
         $this->prixTotalHt('RESET');
         $this->montantTva('RESET');
         $this->prixTotalTtc('RESET');
-
     }
 
 
@@ -324,7 +322,6 @@ class Facturation
         {
             $this->ref = $aRef;
         }
-
     }
 
     /**
@@ -348,7 +345,6 @@ class Facturation
         {
             $this->qte = $aQte;
         }
-
     }
 
     /**
@@ -372,7 +368,6 @@ class Facturation
         {
             $this->stock = $aStock;
         }
-
     }
 
     /**
@@ -396,7 +391,6 @@ class Facturation
         {
             $this->remise_percent = $aRemisePercent;
         }
-
     }
 
     /**
@@ -421,7 +415,6 @@ class Facturation
             $this->montant_remise = $aMontantRemise;
 
         }
-
     }
 
     /**
@@ -446,7 +439,6 @@ class Facturation
             $this->prix = $aPrix;
 
         }
-
     }
 
     /**
@@ -470,7 +462,6 @@ class Facturation
             $this->tva = $aTva;
 
         }
-
     }
 
     /**
@@ -518,7 +509,6 @@ class Facturation
             $this->mode_reglement = $aModeReglement;
 
         }
-
     }
 
     /**
@@ -543,7 +533,6 @@ class Facturation
             $this->montant_encaisse = $aMontantEncaisse;
 
         }
-
     }
 
     /**
@@ -567,7 +556,6 @@ class Facturation
             $this->montant_rendu = $aMontantRendu;
 
         }
-
     }
 
     /**
@@ -637,7 +625,6 @@ class Facturation
             $this->montant_tva = $aMontantTva;
 
         }
-
     }
 
     /**
@@ -661,5 +648,4 @@ class Facturation
             $this->prix_total_ttc = $aTotalTtc;
         }
     }
-
 }
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index b0854dcf7e1..f5c61751e35 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2007       Patrick Raguin          <patrick.raguin@gmail.com>
  * Copyright (C) 2013-2016  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2013-2016  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2018  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>
@@ -51,7 +51,7 @@ class Categorie extends CommonObject
 	const TYPE_USER      = 'user';
 	const TYPE_PROJECT   = 'project';
 	const TYPE_ACCOUNT   = 'bank_account';
-    const TYPE_BANK_LINE = 'bank_line';
+    	const TYPE_BANK_LINE = 'bank_line';
 
 	public $picto = 'category';
 
@@ -152,14 +152,19 @@ class Categorie extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='category';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='categorie';
 
 	public $fk_parent;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $description;
 	/**
 	 * @var string     Color
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 1f50d4f3c69..6ad7ce68ba7 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -437,7 +437,6 @@ class ActionComm extends CommonObject
             $this->error=$this->db->lasterror();
             return -1;
         }
-
     }
 
 	/**
@@ -648,7 +647,6 @@ class ActionComm extends CommonObject
         }
 
         return $num;
-
     }
 
 	/**
@@ -1692,5 +1690,4 @@ class ActionComm extends CommonObject
 
     	return $error;
     }
-
 }
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 57d2d0f8fbc..ca1a97c5406 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -228,5 +228,4 @@ class ActionCommReminder extends CommonObject
 	{
 		$this->initAsSpecimenCommon();
 	}
-
 }
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index e5818a9f462..dedc515f61c 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -293,7 +293,6 @@ class AgendaEvents extends DolibarrApi
                 'message' => 'Agenda Event deleted'
             )
         );
-
     }
 
     /**
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 6c2c162b810..2fcd4e63bd7 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -226,5 +226,4 @@ class CActionComm
         $transcode=$langs->trans("Action".$this->code);
         if ($transcode != "Action".$this->code) return $transcode;
     }
-
 }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 47361e6b49f..4d8675bc8ee 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -44,7 +44,6 @@ class ICal
 	 */
 	public function __construct()
 	{
-
 	}
 
 	/**
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 519d6c8c08a..f07f308e74a 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -66,7 +66,6 @@ $modulesdir = dolGetModulesDirs('/mailings');
 $object = new Mailing($db);
 
 
-
 /*
  * Actions
  */
@@ -330,16 +329,14 @@ if ($object->fetch($id) >= 0)
 				// Si le module mailing est qualifie
 				if ($qualified)
 				{
-					$var = ! $var;
-
 					if ($allowaddtarget)
 					{
-						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
+						print '<form class="oddeven tagtr" name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 					}
 					else
 					{
-					    print '<div '.$bctag[$var].'>';
+					    print '<div class="oddeven tagtr">';
 					}
 
 					print '<div class="tagtd">';
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index abdbf2024af..14d1fb20f4e 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -974,5 +974,4 @@ class AdvanceTargetingMailing extends CommonObject
 
 		return $return_sql_criteria;
 	}
-
 }
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index d7265afec72..fa7a9a1bc9e 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -93,7 +93,6 @@ class Mailing extends CommonObject
 		$this->statut_dest[1] = 'MailingStatusSent';
 		$this->statut_dest[2] = 'MailingStatusRead';
 		$this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe';    // Read but ask to not be contacted anymore
-
 	}
 
 	/**
@@ -647,5 +646,4 @@ class Mailing extends CommonObject
 		    if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3');
 		}
 	}
-
 }
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 0313add9cae..fc721912462 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -491,7 +491,6 @@ class Proposals extends DolibarrApi
 				'message' => 'Commercial Proposal deleted'
 			)
 		);
-
 	}
 
 	/**
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7e472ae852d..cce61c10b1d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -49,22 +49,22 @@ class Propal extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='propal';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='propal';
-	
+
 	public $table_element_line='propaldet';
 	public $fk_element='fk_propal';
 	public $picto='propal';
-	
+
 	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 * @var int
 	 */
 	public $ismultientitymanaged = 1;
-	
+
 	/**
 	 * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
 	 * @var integer
@@ -1578,10 +1578,10 @@ class Propal extends CommonObject
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
 		$sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,';
 		$sql.= ' d.fk_unit,';
-		$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+		$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobach as product_batch,';
 		$sql.= ' p.weight, p.weight_units, p.volume, p.volume_units,';
-		$sql.= ' d.date_start, d.date_end';
-		$sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
+		$sql.= ' d.date_start, d.date_end,';
+		$sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
 		$sql.= ' WHERE d.fk_propal = '.$this->id;
@@ -1643,7 +1643,8 @@ class Propal extends CommonObject
 				$line->libelle			= $objp->product_label;		// TODO deprecated
 				$line->product_label	= $objp->product_label;
 				$line->product_desc     = $objp->product_desc; 		// Description produit
-				$line->fk_product_type  = $objp->fk_product_type;
+				$line->product_tobatch  = $objp->product_tobatch;
+				$line->fk_product_type  = $objp->fk_product_type;	// TODO deprecated
 				$line->fk_unit          = $objp->fk_unit;
 				$line->weight = $objp->weight;
 				$line->weight_units = $objp->weight_units;
@@ -3219,7 +3220,7 @@ class Propal extends CommonObject
 			{
 				$response->nbtodo++;
 				$response->total+=$obj->total_ht;
-				
+
 				if ($mode == 'opened')
 				{
 					$datelimit = $this->db->jdate($obj->datefin);
@@ -3530,8 +3531,8 @@ class Propal extends CommonObject
 	 */
 	function getLinesArray()
 	{
-		// TODO Duplicate with fetch_lines ? Wich one to keep ?
-
+		return $this->fetch_lines();
+		/*
 		$this->lines = array();
 
 		$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
@@ -3620,7 +3621,7 @@ class Propal extends CommonObject
 		{
 			$this->error=$this->db->error();
 			return -1;
-		}
+		}*/
 	}
 
 	/**
@@ -3684,7 +3685,7 @@ class PropaleLigne extends CommonObjectLine
 	 * @var string ID to identify managed object
 	 */
 	public $element='propaldet';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
@@ -4255,5 +4256,4 @@ class PropaleLigne extends CommonObjectLine
 			return -2;
 		}
 	}
-
 }
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index c0266d76d70..60011592afe 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -473,7 +473,6 @@ class Orders extends DolibarrApi
                 'message' => 'Order deleted'
             )
         );
-
     }
 
     /**
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2f4bbe7a4a9..4c2cd368aac 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3428,7 +3428,6 @@ class Commande extends CommonOrder
 			if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderProcessed').$billedtext.' </span>'.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6');
 			if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return '<span class="hideonsmartphone">'.$langs->trans('StatusOrderDelivered').' </span>'.img_picto($langs->trans('StatusOrderDelivered'),'statut6');
 		}
-
 	}
 
 
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 6ab9965f307..13d7e245f05 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -222,6 +222,5 @@ class CommandeStats extends Stats
 
 		return $this->_getAllByProduct($sql);
 	}
-
 }
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 1ef5063fab9..bba4e2ff001 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1175,7 +1175,6 @@ class Account extends CommonObject
 		}
 
 		return $solde;
-
 	}
 
 	/**
@@ -1520,7 +1519,6 @@ class Account extends CommonObject
 	 */
 	function info($id)
 	{
-
 	}
 
 	/**
@@ -1565,7 +1563,6 @@ class Account extends CommonObject
 
 		//Get the order the properties are shown
 		return $fieldarray;
-
 	}
 
 	/**
@@ -1639,7 +1636,6 @@ class Account extends CommonObject
 		$this->owner_address   = 'Owner address';
 		$this->country_id      = 1;
 	}
-
 }
 
 
@@ -2331,5 +2327,4 @@ class AccountLine extends CommonObject
 		}
 		return 0;
 	}
-
 }
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 44e4f72c496..9aefcd5d863 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -33,7 +33,11 @@ class BankCateg // extends CommonObject
     public $picto='generic';
 
 	public $id;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
 
 
 	/**
@@ -339,5 +343,4 @@ class BankCateg // extends CommonObject
 		$this->id = 0;
 		$this->label = '';
 	}
-
 }
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index afd2523f247..74df6c24ad6 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -601,5 +601,4 @@ class PaymentVarious extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
 }
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 9df18d769b2..c78ca6707eb 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -154,7 +154,6 @@ class Deplacement extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -454,5 +453,4 @@ class Deplacement extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
 }
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index ab2903c95b4..5075d9d8cb7 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1259,5 +1259,4 @@ class Invoices extends DolibarrApi
         }
         return $invoice;
     }
-
 }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 007b6f06313..4687a841807 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1860,7 +1860,5 @@ class FactureLigneRec extends CommonInvoiceLine
     		$this->db->rollback();
     		return -2;
     	}
-
     }
-
 }
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 913e86b68c9..da0d66b2784 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1552,7 +1552,6 @@ class Facture extends CommonInvoice
 				}
 			}
 		}
-
 	}
 
 	/**
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index e8d8d30e1b5..ef54a6ffa5f 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -224,7 +224,5 @@ class FactureStats extends Stats
 
 		return $this->_getAllByProduct($sql);
 	}
-
-
 }
 
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 18a43d6d68d..2bdd288e748 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -482,5 +482,4 @@ class PaymentTerm // extends CommonObject
 		$this->nbjour='';
 		$this->decalage='';
 	}
-
 }
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index babdcf86152..18b284f9187 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -644,14 +644,13 @@ class Localtax extends CommonObject
 	 *
 	 * @param   int		$status     Statut
 	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 * @return	string  		    Libelle du statut
+	 * @return	string              Libelle du statut
 	 */
     // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-    function LibStatut($status,$mode=0)
+    function LibStatut($status, $mode=0)
     {
-        global $langs;	// TODO Renvoyer le libelle anglais et faire traduction a affichage
+        global $langs;  // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
         return '';
     }
-
 }
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 920811feb56..e858f599cc8 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -1106,5 +1106,4 @@ class RemiseCheque extends CommonObject
 		}
 		return $langs->trans('Unknown');
 	}
-
 }
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index 1919b5fa94c..c9794d9662e 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -369,8 +369,5 @@ class Cpaiement
 		$this->active = '';
 		$this->accountancy_code = '';
 		$this->module = '';
-
-
 	}
-
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 352f76b3fc1..7eba6afec29 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -165,7 +165,6 @@ class BonPrelevement extends CommonObject
 		}
 
 		return $result;
-
 	}
 
 	/**
@@ -1467,7 +1466,6 @@ class BonPrelevement extends CommonObject
 		if (! empty($conf->global->MAIN_UMASK))
 		@chmod($this->file, octdec($conf->global->MAIN_UMASK));
 		return $result;
-
 	}
 
 
@@ -1700,7 +1698,6 @@ class BonPrelevement extends CommonObject
 		fputs($this->file, substr("                                        ",0,5));
 
 		fputs($this->file, "\n");
-
 	}
 
 	/**
@@ -1956,5 +1953,4 @@ class BonPrelevement extends CommonObject
 			if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6');
 		}
 	}
-
 }
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index e05d27d10d6..095defe986a 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -69,7 +69,6 @@ class RejetPrelevement
 
     	$this->facturer[0]=$langs->trans("NoInvoiceRefused");
 		$this->facturer[1]=$langs->trans("InvoiceRefused");
-
 	}
 
 	/**
@@ -198,7 +197,6 @@ class RejetPrelevement
 			dol_syslog("RejetPrelevement::Create Rollback");
 			$this->db->rollback();
 		}
-
 	}
 
 	/**
@@ -328,7 +326,6 @@ class RejetPrelevement
 		}
 
 		return $arr;
-
 	}
 
 	/**
@@ -372,5 +369,4 @@ class RejetPrelevement
 			return -2;
 		}
 	}
-
 }
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index bee34153da1..5aa11229452 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -51,7 +51,12 @@ class PaymentSalary extends CommonObject
 	public $fk_project;
 	public $type_payment;
 	public $num_payment;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $datesp;
 	public $dateep;
 	public $fk_bank;
@@ -629,5 +634,4 @@ class PaymentSalary extends CommonObject
 	    }*/
 	    return '';
 	}
-
 }
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index c6ce0983bac..bfa8c97a058 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -524,8 +524,5 @@ class Cchargesociales
 		$this->fk_pays = '';
 		$this->module = '';
 		$this->accountancy_code = '';
-
-
 	}
-
 }
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 2110b7f610a..bad851450a7 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -289,7 +289,6 @@ class ChargeSociales extends CommonObject
             $this->db->rollback();
             return -1;
         }
-
     }
 
 
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 07d637075f5..4a989554b69 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -43,22 +43,22 @@ class PaymentSocialContribution extends CommonObject
 
 	public $picto = 'payment';
 
-	var $fk_charge;
-	var $datec='';
-	var $tms='';
-	var $datep='';
+	public $fk_charge;
+	public $datec='';
+	public $tms='';
+	public $datep='';
 	/**
 	 * @deprecated
 	 * @see amount
 	 */
-	var $total;
-    var $amount;            // Total amount of payment
-    var $amounts=array();   // Array of amounts
-	var $fk_typepaiement;
-	var $num_paiement;
-	var $fk_bank;
-	var $fk_user_creat;
-	var $fk_user_modif;
+	public $total;
+    public $amount;            // Total amount of payment
+    public $amounts=array();   // Array of amounts
+	public $fk_typepaiement;
+	public $num_paiement;
+	public $fk_bank;
+	public $fk_user_creat;
+	public $fk_user_modif;
 
 	/**
 	 *	Constructor
@@ -501,8 +501,6 @@ class PaymentSocialContribution extends CommonObject
 		$this->fk_bank='';
 		$this->fk_user_creat='';
 		$this->fk_user_modif='';
-
-
 	}
 
 
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 2fc8a738f07..06c65500527 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -318,5 +318,4 @@ abstract class ActionsContactCardCommon
             $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
         }
     }
-
 }
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 8bfca9c6dd6..566434c1d5a 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -117,7 +117,6 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 		{
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
-
 	}
 
 
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 8c206554ee1..04252433824 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -55,13 +55,13 @@ class Contracts extends DolibarrApi
     }
 
     /**
-     * Get properties of a contrat object
+     * Get properties of a contract object
      *
-     * Return an array with contrat informations
+     * Return an array with contract informations
      *
      * @param       int         $id         ID of contract
      * @return 	array|mixed data without useless information
-	 *
+     *
      * @throws 	RestException
      */
     function get($id)
@@ -457,7 +457,7 @@ class Contracts extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        // TODO Check the lineid $lineid is a line of ojbect
+        // TODO Check the lineid $lineid is a line of object
 
         $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
         if ($updateRes > 0) {
@@ -472,7 +472,7 @@ class Contracts extends DolibarrApi
     /**
      * Update contract general fields (won't touch lines of contract)
      *
-     * @param int   $id             Id of contrat to update
+     * @param int   $id             Id of contract to update
      * @param array $request_data   Datas
      *
      * @return int
@@ -537,11 +537,10 @@ class Contracts extends DolibarrApi
                 'message' => 'Contract deleted'
             )
         );
-
     }
 
     /**
-     * Validate an contract
+     * Validate a contract
      *
      * @param   int $id             Contract ID
      * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 33aa7559d30..c7601cf9c1d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -45,22 +45,22 @@ class Contrat extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='contrat';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='contrat';
-	
+
 	public $table_element_line='contratdet';
 	public $fk_element='fk_contrat';
     public $picto='contract';
-    
+
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
      * @var int
      */
     public $ismultientitymanaged = 1;
-    
+
     /**
      * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
      * @var integer
@@ -241,8 +241,8 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User who activate contract
 	 *  @param  int			$line_id    Id of line to activate
-	 *  @param  int			$date       Date d'ouverture
-	 *  @param  int|string	$date_end   Date fin prevue
+	 *  @param  int			$date       Opening date
+	 *  @param  int|string	$date_end   Expected end date
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
@@ -264,7 +264,7 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User		$user       Objet User who close contract
 	 *  @param  int			$line_id    Id of line to close
-	 *  @param  int			$date_end	Date end
+	 *  @param  int			$date_end	End date
 	 * 	@param	string		$comment	A comment typed by user
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
@@ -522,13 +522,12 @@ class Contrat extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
 	 * Unvalidate a contract
 	 *
-	 * @param	User	$user      		Objet User
+	 * @param	User	$user      		Object User
      * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
@@ -570,7 +569,7 @@ class Contrat extends CommonObject
 			// End call triggers
 		}
 
-		// Set new ref and define current statut
+		// Set new ref and define current status
 		if (! $error)
 		{
 			$this->statut=0;
@@ -668,7 +667,7 @@ class Contrat extends CommonObject
 				$this->db->free($resql);
 
 
-				// Retreive all extrafield
+				// Retreive all extrafields
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
@@ -701,7 +700,6 @@ class Contrat extends CommonObject
 			$this->error=$this->db->error();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -732,7 +730,7 @@ class Contrat extends CommonObject
 		$this->lines=array();
         $pos = 0;
 
-		// Selectionne les lignes contrats liees a un produit
+		// Selects contract lines related to a product
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
 		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
 		$sql.= " d.total_ht,";
@@ -766,7 +764,7 @@ class Contrat extends CommonObject
 				$line->id				= $objp->rowid;
 				$line->ref				= $objp->rowid;
 				$line->fk_contrat		= $objp->fk_contrat;
-				$line->desc				= $objp->description;  // Description ligne
+				$line->desc				= $objp->description;  // Description line
 				$line->qty				= $objp->qty;
 				$line->vat_src_code 	= $objp->vat_src_code ;
 				$line->tva_tx			= $objp->tva_tx;
@@ -797,9 +795,9 @@ class Contrat extends CommonObject
 				$line->fk_unit           = $objp->fk_unit;
 
 				$line->ref				= $objp->product_ref;	// deprecated
-				$line->product_ref		= $objp->product_ref;   // Ref product
-				$line->product_desc		= $objp->product_desc;  // Description product
-				$line->product_label	= $objp->product_label; // Label product
+				$line->product_ref		= $objp->product_ref;   // Product Ref
+				$line->product_desc		= $objp->product_desc;  // Product Description
+				$line->product_label	= $objp->product_label; // Product Label
 
 				$line->description		= $objp->description;
 
@@ -817,7 +815,7 @@ class Contrat extends CommonObject
 				$line->date_fin_prevue   = $this->db->jdate($objp->date_fin_validite);
 				$line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
 
-				// Retreive all extrafield for contract
+				// Retreive all extrafields for contract
 				// fetch optionals attributes and labels
 				$line->fetch_optionals();
 
@@ -923,7 +921,7 @@ class Contrat extends CommonObject
 				$modCodeContract = new $module();
 
 				if (!empty($modCodeContract->code_auto)) {
-					// Mise a jour ref
+					// Update ref
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
 					if ($this->db->query($sql))
 					{
@@ -947,14 +945,14 @@ class Contrat extends CommonObject
 				}
 			}
 
-			// Insert contacts commerciaux ('SALESREPSIGN','contrat')
+			// Insert business contacts ('SALESREPSIGN','contrat')
 			if (! $error)
 			{
     			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
     			if ($result < 0) $error++;
 			}
 
-			// Insert contacts commerciaux ('SALESREPFOLL','contrat')
+			// Insert business contacts ('SALESREPFOLL','contrat')
 			if (! $error)
 			{
                 $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
@@ -2473,7 +2471,7 @@ class ContratLigne extends CommonObjectLine
 	 * @var string ID to identify managed object
 	 */
 	public $element='contratdet';
-    
+
     /**
 	 * @var string Name of table without prefix where object is stored
 	 */
@@ -2483,7 +2481,7 @@ class ContratLigne extends CommonObjectLine
 	 * @var int ID
 	 */
 	public $id;
-	
+
 	var $ref;
 	var $tms;
 
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 6ccf61690ed..9bcfb002bb6 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -260,6 +260,5 @@ class box_actions extends ModeleBoxes
 
 		return '';
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 50cebe91b1f..c3a29877104 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -161,6 +161,5 @@ class box_bookmarks extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index fc31baee716..96ccd7b675d 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -163,7 +163,6 @@ class box_clients extends ModeleBoxes
                 'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
-
 	}
 
 	/**
@@ -178,6 +177,5 @@ class box_clients extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 86660258cd0..5aeb6179207 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -202,6 +202,5 @@ class box_commandes extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index b951e0fe79b..8606d9b91f7 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -174,7 +174,6 @@ class box_comptes extends ModeleBoxes
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
-
 	}
 
 	/**
@@ -189,6 +188,5 @@ class box_comptes extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 37e32d07198..4feb101c090 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -189,6 +189,5 @@ class box_contacts extends ModeleBoxes
 	{
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 027fa2cc84a..6f9a62e1063 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -185,6 +185,5 @@ class box_contracts extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 4c2ca4236ca..f08c809627d 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -198,6 +198,5 @@ class box_external_rss extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 84f27257889..348bd7b9fe5 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -206,5 +206,4 @@ class box_factures extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 011942b9cc4..c865cf185c4 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -218,6 +218,5 @@ class box_factures_fourn extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 9f696eac2b9..e8dedf59c41 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -191,7 +191,6 @@ class box_factures_fourn_imp extends ModeleBoxes
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
-
     }
 
 	/**
@@ -206,6 +205,5 @@ class box_factures_fourn_imp extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 1faeb789337..54d265bf6af 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -209,5 +209,4 @@ class box_factures_imp extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index a831bc163ce..76d1414f53f 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -170,6 +170,5 @@ class box_ficheinter extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 1bfd7d7ac16..0ca14fae7f5 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -150,7 +150,6 @@ class box_fournisseurs extends ModeleBoxes
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
-
     }
 
 	/**
@@ -165,6 +164,5 @@ class box_fournisseurs extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 334cbc0fc56..16668987a40 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -159,7 +159,6 @@ class box_goodcustomers extends ModeleBoxes
 				'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
-
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 4eb91d36e60..c22163779a8 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -280,6 +280,5 @@ class box_graph_invoices_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 337b4283e94..a7f504b2d01 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -279,6 +279,5 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index b05395169fa..329fef77fba 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -278,6 +278,5 @@ class box_graph_orders_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 86a813407a6..de962149cdf 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -277,6 +277,5 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 9ed59422466..42afa4fbfe0 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -401,7 +401,6 @@ class box_graph_product_distribution extends ModeleBoxes
 				'text' => $mesg
 			);
 		}
-
 	}
 
 	/**
@@ -416,6 +415,5 @@ class box_graph_product_distribution extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index d7691e05c30..c19235c2fb2 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -281,6 +281,5 @@ class box_graph_propales_permonth extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index 38745616aa4..c8149c6384b 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -98,7 +98,6 @@ class box_lastlogin extends ModeleBoxes
             'td' => '',
             'text' => $tmp,
         );
-        
     }
 
 
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 063a7390808..6f7e62aa457 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -168,7 +168,6 @@ class box_members extends ModeleBoxes
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }
-
     }
 
 	/**
@@ -183,6 +182,5 @@ class box_members extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index f6e91169eae..cadda2b8058 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -230,6 +230,5 @@ class box_produits extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 0bd7a5e2ad7..648da118e09 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -242,6 +242,5 @@ class box_produits_alerte_stock extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 6c959deb303..cb45c12351e 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -184,7 +184,6 @@ class box_project extends ModeleBoxes
             'td' => '',
             'text' => "&nbsp;",
         );
-
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index a208671835f..6db4ac11250 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -192,6 +192,5 @@ class box_propales extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 912d0191e8d..629da790f3c 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -180,6 +180,5 @@ class box_prospect extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 38532ca3d2f..41d287d0c37 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -222,7 +222,6 @@ class box_services_contracts extends ModeleBoxes
                 'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}
-
 	}
 
 	/**
@@ -237,6 +236,5 @@ class box_services_contracts extends ModeleBoxes
     {
 		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
 	}
-
 }
 
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index ab5ad0c54a7..afc087ad715 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -184,6 +184,5 @@ class box_services_expired extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
- }
+}
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 934be175c15..97b4bf8feec 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -188,6 +188,5 @@ class box_supplier_orders extends ModeleBoxes
     {
         return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
     }
-
 }
 
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 7d40ee8482d..9625cfa1bea 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -137,7 +137,6 @@ class box_task extends ModeleBoxes
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
 		$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
 		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
-
 	}
 
 	/**
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 61af58a4b8b..4377b90d17a 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -31,7 +31,7 @@
  *
  * Boxes parent class
  */
-class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty" boxes
+class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes
 {
 	/**
 	 * @var DoliDB Database handler
@@ -503,8 +503,6 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 		}
 		return $widget;
 	}
-
-
 }
 
 
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 2c5912deee2..0fdd3333549 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -471,7 +471,6 @@ class CMailFile
 			// --------------------------------------
 			$this->error = 'Bad value for sendmode';
 		}
-
 	}
 
 
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index b224d4b98b6..5bc8105049e 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -246,5 +246,4 @@ class CSMSFile
             @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
         }
     }
-
 }
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index 75d4b340687..e1a50c63083 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -180,5 +180,4 @@ class AntiVir
 
 		return $ret;
 	}
-
 }
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 86917922550..c65b2ba6fe1 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -210,5 +210,4 @@ class Canvas
 			return $ret;
 		}
 	}
-
 }
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index f49d39e8fdd..30f426ec30d 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -333,5 +333,4 @@ class Ccountry // extends CommonObject
 			return 1;
 		}
 	}
-
 }
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index e0436091a43..5a1bcd8440d 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -778,7 +778,6 @@ abstract class CommonDocGenerator
 		}
 
 		return $array_to_fill;
-
 	}
 
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7f2e8738201..0d76ff1955a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1069,7 +1069,6 @@ abstract class CommonObject
 			dol_print_error($this->db);
 			return -1;
 		}
-
 	}
 
 	/**
@@ -2041,7 +2040,6 @@ abstract class CommonObject
             $this->db->commit();
             return 1;
         }
-
 	}
 
 
@@ -4650,7 +4648,6 @@ abstract class CommonObject
 		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
-
 	}
 
 
@@ -7274,5 +7271,4 @@ abstract class CommonObject
 	{
 		return count($this->comments);
 	}
-
 }
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index b3e5033330d..2ea53a345d8 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -144,6 +144,5 @@ abstract class CommonOrderLine extends CommonObjectLine
 	public $info_bits = 0;
 
 	public $special_code = 0;
-
 }
 
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 6d9efc286c4..26227048782 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -273,5 +273,4 @@ abstract class CommonStickerGenerator
 		$this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc);
 		$this->Set_Char_Size($pdf, $format['font-size']);
 	}
-
 }
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index c86051d7088..34b2fd97c55 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -666,7 +666,6 @@ class Conf
 				$this->loghandlers[$handler] = $loghandlerinstance;
 			}
 		}
-
 	}
 }
 
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index fbd7b7b1448..5129ac54ece 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -75,7 +75,6 @@ class CoreObject extends CommonObject
         {
 			return false;
 		}
-
 	}
 
     /**
@@ -271,7 +270,6 @@ class CoreObject extends CommonObject
             $this->db->rollback();
             return -1;
         }
-
 	}
 
     /**
@@ -437,5 +435,4 @@ class CoreObject extends CommonObject
 
 		return 1;
 	}
-
 }
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index bb75a36de96..3b1016aa55f 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -317,5 +317,4 @@ class Cstate // extends CommonObject
 			return 1;
 		}
 	}
-
 }
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 184f5f26a2c..aa3e6620d4f 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -333,5 +333,4 @@ class Ctypent // extends CommonObject
 			return 1;
 		}
 	}
-
 }
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 9e0e5b90377..d459ff6fb41 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -36,7 +36,7 @@ class Ctyperesource
 	 * @var string Id to identify managed objects
 	 */
 	public $element = 'ctyperesource';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
@@ -48,7 +48,12 @@ class Ctyperesource
 	public $lines = array();
 
 	public $code;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $active;
 
 
@@ -463,7 +468,6 @@ class Ctyperesource
 		$this->label = '';
 		$this->active = '';
 	}
-
 }
 
 /**
@@ -475,16 +479,20 @@ class CtyperesourceLine
 	 * @var int ID
 	 */
 	public $id;
+
 	/**
 	 * @var mixed Sample line property 1
 	 */
-
 	public $code;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $active;
 
 	/**
 	 * @var mixed Sample line property 2
 	 */
-
 }
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index cd508c23310..52d9b47ecdf 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -135,7 +135,6 @@ class DolEditor
             $this->height				= $height;
             $this->width				= $width;
     	}
-
     }
 
     /**
@@ -346,5 +345,4 @@ class DolEditor
         if ($noprint) return $out;
         else print $out;
     }
-
 }
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 6b50b27f3f3..55ecc77291a 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1129,5 +1129,4 @@ class DolGraph
 		}
 		return 0;
 	}
-
 }
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 81e9c5eab9e..a00da884aba 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -204,7 +204,6 @@ class dolReceiptPrinter extends Escpos
             'dol_print_if_customer_tax_number',
             'dol_print_if_customer_account_balance_positive',
         );
-
     }
 
     /**
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 9e462e36e74..ffff8ef1941 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -424,7 +424,6 @@ class EmailSenderProfile extends CommonObject
 	{
 		$this->initAsSpecimenCommon();
 	}
-
 }
 
 /**
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 6a2374a7d3b..b4fa7133bff 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -297,5 +297,4 @@ class Events // extends CommonObject
 		$this->dateevent=time();
 		$this->description='This is a specimen event';
 	}
-
 }
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index da76800e691..d7b16293a11 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -461,7 +461,6 @@ class ExtraFields
 		{
 			return 0;
 		}
-
 	}
 
 	/**
@@ -502,7 +501,6 @@ class ExtraFields
 		{
 			return 0;
 		}
-
 	}
 
 	/**
@@ -612,7 +610,6 @@ class ExtraFields
 		{
 			return 0;
 		}
-
 	}
 
 	/**
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index a1e41f4fa3a..98c53c92b20 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -336,5 +336,4 @@ class Fiscalyear extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
-
 }
diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php
index 49b767a6f3d..993d884c88b 100644
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
@@ -24,19 +24,18 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 
 
 /**
- *	Class of a generic business object
+ *  Class of a generic business object
  */
 
 class GenericObject extends CommonObject
 {
     /**
-     *  Constructor
+     * Constructor
      *
-     *  @param      DoliDB      $db      Database handler
+     * @param       DoliDB      $db     Database handler
      */
     function __construct($db)
     {
         $this->db=$db;
     }
-
 }
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 9e2bd344171..b078fdc0405 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -283,5 +283,4 @@ class HookManager
 
         return ($error?-1:$resaction);
 	}
-
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 96fb24ec9b1..0419e2cfc68 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7158,5 +7158,4 @@ class Form
 
 		return $out;
 	}
-
 }
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index ed50a59cb25..7fc07ab46ed 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -368,5 +368,4 @@ class FormActions
         else print $out;
         return '';
     }
-
 }
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 75b5ddea5c9..6780f01735a 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -188,5 +188,4 @@ class FormBarCode
             print '</td></tr></table></form>';
         }
     }
-
 }
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 0f6938610ff..8d64a01eb65 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -878,5 +878,4 @@ class FormCompany
     		}
     	}
     }
-
 }
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index dff31917126..474a7125a9d 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -188,5 +188,4 @@ class FormContract
         print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
         print '</form>';
     }
-
 }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 30e40e194cc..003235f57c9 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1662,7 +1662,6 @@ class FormFile
 
 		// Include template
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
-
 	}
 
 	/**
@@ -1834,5 +1833,4 @@ class FormFile
 		}
 		return $out;
 	}
-
 }
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 127df27934b..3edfb2d2f77 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2005-2012 Regis Houssin	    <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2011 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015-2017 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015-2017 Nicolas ZABOURI        <info@inovea-conseil.com>
+ * Copyright (C) 2015-2017 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
@@ -40,50 +40,53 @@ class FormMail extends Form
      */
     public $db;
 
-	var $withform;				// 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
+	public $withform;				// 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
 
-	var $fromname;
-	var $frommail;
-	var $replytoname;
-	var $replytomail;
-	var $toname;
-	var $tomail;
-	var $trackid;
+	public $fromname;
+	public $frommail;
+	public $replytoname;
+	public $replytomail;
+	public $toname;
+	public $tomail;
+	public $trackid;
+
+	public $withsubstit;			// Show substitution array
+	public $withfrom;
 
-	var $withsubstit;			// Show substitution array
-	var $withfrom;
 	/**
 	 * @var int
 	 * @deprecated Fill withto with array before calling method.
 	 * @see withto
 	 */
 	public $withtosocid;
+
 	/**
 	 * @var int|int[]
 	 */
 	public $withto;				// Show recipient emails
-	var $withtofree;			// Show free text for recipient emails
-	var $withtocc;
-	var $withtoccc;
-	var $withtopic;
-	var $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
-	var $withmaindocfile;		// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
-	var $withbody;
 
-	var $withfromreadonly;
-	var $withreplytoreadonly;
-	var $withtoreadonly;
-	var $withtoccreadonly;
-	var $withtocccreadonly;
-	var $withtopicreadonly;
-	var $withfilereadonly;
-	var $withdeliveryreceipt;
-	var $withcancel;
-	var $withfckeditor;
+	public $withtofree;			// Show free text for recipient emails
+	public $withtocc;
+	public $withtoccc;
+	public $withtopic;
+	public $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+	public $withmaindocfile;		// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
+	public $withbody;
 
-	var $substit=array();
-	var $substit_lines=array();
-	var $param=array();
+	public $withfromreadonly;
+	public $withreplytoreadonly;
+	public $withtoreadonly;
+	public $withtoccreadonly;
+	public $withtocccreadonly;
+	public $withtopicreadonly;
+	public $withfilereadonly;
+	public $withdeliveryreceipt;
+	public $withcancel;
+	public $withfckeditor;
+
+	public $substit=array();
+	public $substit_lines=array();
+	public $param=array();
 
 	public $withtouser=array();
 	public $withtoccuser=array();
@@ -1391,7 +1394,6 @@ class FormMail extends Form
 
 		return $tmparray;
 	}
-
 }
 
 
@@ -1401,7 +1403,12 @@ class FormMail extends Form
 class ModelMail
 {
 	public $id;
-	public $label;
+
+	/**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $topic;
 	public $content;
 	public $content_lines;
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index e891e3dacbe..405e47e19c7 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -282,6 +282,5 @@ class FormMargin
 		print '</table>';
 		print '</div>';
 	}
-
 }
 
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 68fa96e03ee..781b3f76e4f 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -100,6 +100,5 @@ class FormOrder extends Form
 
 		return 1;
 	}
-
 }
 
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 6d2964f29bf..9a4bdc46b75 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -1269,5 +1269,4 @@ class FormOther
             dol_print_error($this->db);
         }
     }
-
 }
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 25c41d3bd70..61c633c720b 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -668,5 +668,4 @@ class FormProjets
 			return -1;
 		}
 	}
-
 }
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index d2307c5cfb1..1db9fe4d3d8 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -361,5 +361,4 @@ function limitChars(textarea, limit, infodiv)
 
         print "<!-- End form SMS -->\n";
     }
-
 }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index 08a01c5e8f2..653fe4b74b6 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -121,5 +121,4 @@ class FormSocialContrib
             dol_print_error($db,$db->lasterror());
         }
     }
-
 }
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 5b883835fd3..e14d8217b55 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -205,5 +205,4 @@ class FormWebsite
 
     	return $out;
     }
-
 }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 4125aa89eb9..1c5c733491c 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -281,6 +281,5 @@ class InfoBox
             return -1;
         }
     }
-
 }
 
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 28692774d02..16d2b4b7542 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -369,5 +369,4 @@ class Interfaces
         }
         return $triggers;
     }
-
 }
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 0d695baaf8d..02298ac53ff 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -41,7 +41,12 @@ class Link extends CommonObject
     public $entity;
     public $datea;
     public $url;
+    
+    /**
+     * @var string proper name for given parameter
+     */
     public $label;
+    
     public $objecttype;
     public $objectid;
 
@@ -385,7 +390,5 @@ class Link extends CommonObject
             $this->db->rollback();
             return -1;
         }
-
     }
-
 }
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index d1276610830..5078d7759ea 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -694,5 +694,4 @@ class Menubase
             }
         }
    }
-
 }
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index f5c0020bac1..8087d316cf4 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -729,6 +729,5 @@ class Notify
 		if (! $error) return $num;
 		else return -1 * $error;
 	}
-
 }
 
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index 37c46f3b64e..dcc396b2f81 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -543,5 +543,4 @@ class SimpleOpenID
         	return $server;
 	    }
     }
-
 }
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index beaf85c60b7..9b6dc2eee7d 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -733,7 +733,6 @@ class RssParser
 
         }
     }
-
 }
 
 
@@ -790,5 +789,4 @@ function xml2php($xml)
     }
 
     return $array;
-
 }
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index eeb84b87f38..2481e9b457b 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1170,7 +1170,6 @@ class SMTPs
 			$this->_setErr(102, 'eMail type not defined.');
 			return false;
 		}
-
 	}
 
 	/**
@@ -1849,8 +1848,6 @@ class SMTPs
 
 		return implode("\n", $_errMsg);
 	}
-
-
 }
 
 
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 81fcb25e2b4..c3dc5547d88 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -330,5 +330,4 @@ class vCard
     {
         return $this->filename;
     }
-
 }
diff --git a/htdocs/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php
index 62d84e11186..35449693599 100644
--- a/htdocs/core/class/workboardresponse.class.php
+++ b/htdocs/core/class/workboardresponse.class.php
@@ -72,5 +72,4 @@ class WorkboardResponse
 	 * @var int
 	 */
 	public $total = 0;
-
 }
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 4abe445c774..b4c5d770253 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -482,5 +482,4 @@ interface Database
 	 */
     // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	function select_db($database);
-
 }
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 096979f56ef..9561747caf3 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -1196,5 +1196,4 @@ class DoliDBMssql extends DoliDB
 
 	    return $result;
 	}
-
 }
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 8a8846088e3..b62a6b2474f 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -1411,5 +1411,4 @@ class DoliDBSqlite3 extends DoliDB
       }
       return floor($days/7+1);
     }
-
 }
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 3116d85287a..ded980e3246 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -215,7 +215,6 @@ function checkSwiftForAccount($account)
     } else {
         return false;
     }
-
 }
 
 /**
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 084c06a08e1..1b10f6d4233 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -439,7 +439,6 @@ function dol_get_next_week($day, $week, $month, $year)
 	$tmparray=dol_getdate($time,true);
 
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
-
 }
 
 /**	Return GMT time for first day of a month or year
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a7001d357b8..feb41f5dffd 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -651,7 +651,6 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0,
 function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0)
 {
 	// TODO
-
 }
 
 /**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a06a0d7764..412b1427f46 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4859,7 +4859,6 @@ function get_localtax_by_third($local)
 	}
 
 	return 0;
-
 }
 
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index ea596294bf7..4553fec4641 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1771,7 +1771,7 @@ function getSoapParams()
  */
 function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
 {
-	global $db,$conf;
+	global $db, $conf, $langs;
 
 	$ret='';
 
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index bf586b83f88..6dcc7825153 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -114,5 +114,4 @@ function resource_admin_prepare_head()
 	complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove');
 
 	return $head;
-
 }
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index dd919fd20a3..fa6e1b3084d 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -335,6 +335,5 @@ class MenuManager
         //print 'xx'.$mode;
         return 0;
     }
-
 }
 
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index a9d8e2f9a41..172b6c483c5 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -57,7 +57,6 @@ class MenuManager
 	 */
 	function loadMenu()
 	{
-
 	}
 
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index a63839ac526..f2ea6c7802c 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -32,7 +32,7 @@
  *
  * Parent class for module descriptor class files
  */
-class DolibarrModules           // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed.
+class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed.
 {
 	/**
 	 * @var DoliDb Database handler
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index afecc770fb9..9143d87ea73 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -281,8 +281,6 @@ class pdf_ban extends ModeleBankAccountDoc
 		global $conf,$mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
-
-
 	}
 
 	/**
@@ -369,7 +367,6 @@ class pdf_ban extends ModeleBankAccountDoc
 	    	}
 	    }
         */
-
 	}
 
 	/**
@@ -387,5 +384,4 @@ class pdf_ban extends ModeleBankAccountDoc
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		//return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index cc501124922..44a3ed233db 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -424,7 +424,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		global $conf,$mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
-
 	}
 
 
@@ -595,7 +594,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	    	}
 	    }
         */
-
 	}
 
 	/**
@@ -613,5 +611,4 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'PAYMENTORDER_FREE_TEXT',null,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 17a98d9cd77..2cca0e8927d 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -171,5 +171,4 @@ class modPhpbarcode extends ModeleBarCode
 
 		return $result;
 	}
-
 }
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 5453123ecff..bd61dab4ff4 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -254,7 +254,6 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		{
 			return -2;
 		}
-
 	}
 
 	/**
@@ -302,5 +301,4 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		return $result;
 	}
-
 }
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 279a5f0abf8..44d7eccbb07 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -44,7 +44,6 @@ abstract class ModeleBarCode
 	{
 		return true;
 	}
-
 }
 
 
@@ -177,6 +176,5 @@ abstract class ModeleNumRefBarCode
 
         return $s;
     }
-
 }
 
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index d62be900266..32e0d373631 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -150,5 +150,4 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index eba953d63a7..ec276d52935 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -136,5 +136,4 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 17146eaa9ab..166c7f389d1 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -495,5 +495,4 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 40203247804..d2f355d5057 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -656,7 +656,6 @@ class pdf_einstein extends ModelePDFCommandes
     // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-
 	}
 
 
@@ -1445,5 +1444,4 @@ class pdf_einstein extends ModelePDFCommandes
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'ORDER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index 88fae0a3c53..8d99fc00378 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -73,5 +73,4 @@ class pdf_proforma extends pdf_einstein
 
 		parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
 	}
-
 }
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 13ad87d6531..a66c2c9f985 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -150,5 +150,4 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index f0d92237e00..21235229793 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -144,5 +144,4 @@ class mod_commande_saphir extends ModeleNumRefCommandes
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 6fa66409023..b58a67a2cb0 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -478,5 +478,4 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 		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 fd4944fd335..843d6df8afe 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -720,5 +720,4 @@ class pdf_strato extends ModelePDFContract
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'CONTRACT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index 6f99672fe48..ffa75f4f3ba 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -129,5 +129,4 @@ class mod_contract_magre extends ModelNumRefContracts
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index f43c054cb89..beeabd6b140 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -147,5 +147,4 @@ class mod_contract_serpis extends ModelNumRefContracts
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index bc57ec97b8e..ee2dca6e0fd 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -426,5 +426,4 @@ $chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante',
 		return $somme. ' et z&eacute;ro '. $dev2;
 	else
 		return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2;
-
 }
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index c172ced1b17..9971c3acd81 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -536,5 +536,4 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 46d05ea0a57..65866306f06 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -834,7 +834,6 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 
 		}
-
 	}
 
 	/**
@@ -1100,5 +1099,4 @@ class pdf_rouget extends ModelePdfExpedition
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'SHIPPING_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index d756f9dd3c9..8865fed7d77 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -133,5 +133,4 @@ class mod_expedition_ribera extends ModelNumRefExpedition
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index fed13ba70d0..c74d621f01d 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -145,5 +145,4 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 0734fd501dd..43c76a2c497 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -777,7 +777,6 @@ class pdf_standard extends ModeleExpenseReport
 				}
 			}
 		}
-
    	}
 
 	/**
@@ -918,5 +917,4 @@ class pdf_standard extends ModeleExpenseReport
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'EXPENSEREPORT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index a90ead9a5eb..f0a1573b996 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -49,7 +49,6 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
 
 		return $liste;
 	}
-
 }
 
 /**
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index a77ed90b964..d3ad7419c2e 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -76,7 +76,6 @@ class ExportCsv extends ModeleExports
 		// If driver use an external library, put its name here
 		$this->label_lib='Dolibarr';
 		$this->version_lib=DOL_VERSION;
-
 	}
 
 	/**
@@ -351,5 +350,4 @@ class ExportCsv extends ModeleExports
 
 		return ($addquote?'"':'').$newvalue.($addquote?'"':'');
 	}
-
 }
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index c92ace3d53d..46f4d8960c2 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -122,5 +122,4 @@ class ExportExcel2007 extends ExportExcel
     	}
 		return 1;
 	}
-
 }
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 5f0ea6f2ad5..b5391896b78 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -302,5 +302,4 @@ class ExportTsv extends ModeleExports
 
     	return $newvalue;
     }
-
 }
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index e669a0c9b9b..ae409d71b05 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -163,5 +163,4 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 	{
 		return $this->libversion[$key];
 	}
-
 }
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 8a3974a632d..623473d5595 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -503,5 +503,4 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6ae35bca776..892a4a01269 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -912,7 +912,6 @@ class pdf_crabe extends ModelePDFFactures
 			$this->error=$this->db->lasterror();
 			return -1;
 		}
-
 	}
 
 
@@ -1845,5 +1844,4 @@ class pdf_crabe extends ModelePDFFactures
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index c6bba0a6232..5a2d1281385 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -219,6 +219,5 @@ class mod_facture_mars extends ModeleNumRefFactures
 	{
 		return $this->getNextValue($objsoc,$objforref,$mode);
 	}
-
 }
 
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 86e7eb10521..89c526bc334 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -175,5 +175,4 @@ class mod_facture_mercure extends ModeleNumRefFactures
     {
         return $this->getNextValue($objsoc,$objforref,$mode);
     }
-
 }
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 53ae127b734..524eeebdd5f 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -235,6 +235,5 @@ class mod_facture_terre extends ModeleNumRefFactures
 	{
 		return $this->getNextValue($objsoc,$objforref,$mode);
 	}
-
 }
 
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 841355acd1d..aaec15d6672 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -731,5 +731,4 @@ class pdf_soleil extends ModelePDFFicheinter
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'FICHINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 278e20ae7de..3e6193e0740 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -137,6 +137,5 @@ class mod_arctic extends ModeleNumRefFicheinter
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
 
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index ac953499bc0..c412c1d340c 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -145,5 +145,4 @@ class mod_pacific extends ModeleNumRefFicheinter
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 0ec68d8778b..91bf0f511bb 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -148,5 +148,4 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	{
 		return $this->getNextValue($fuser,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index ba6cdef6eb0..08ecb719266 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -768,7 +768,6 @@ class ImportCsv extends ModeleImports
 
 		return 1;
 	}
-
 }
 
 /**
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index b0a28674fa2..09c45da2a72 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -792,5 +792,4 @@ class ImportXlsx extends ModeleImports
 
 		return 1;
 	}
-
 }
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 83b7321afd0..a76ae01a325 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -34,13 +34,21 @@ class ModeleImports
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
     public $datatoimport;
 
     public $error='';
 
-    public $id;           // Id of driver
-	public $label;        // Label of driver
+    /**
+	 * @var int id of driver
+	 */
+	public $id;
+
+    /**
+     * @var string proper name for given parameter
+     */
+    public $label;
+
 	public $extension;    // Extension of files imported by driver
 	public $version;      // Version of driver
 
@@ -251,5 +259,4 @@ class ModeleImports
 	{
 		return $this->libversion[$key];
 	}
-
 }
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index 9906d2c1660..8705d985661 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -953,5 +953,4 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'DELIVERY_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index c09ef660dff..9cf6de78aea 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -154,5 +154,4 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
     {
         return $this->getNextValue($objsoc,$object);
     }
-
 }
diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php
index ed36e396182..4fed4689738 100644
--- a/htdocs/core/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php
@@ -151,5 +151,4 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
     {
         return $this->getNextValue($objsoc,$object);
     }
-
 }
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index ef0f1c21b88..59fc4f14039 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -278,7 +278,6 @@ class mailing_advthirdparties extends MailingTargets
 
 		$s.='</select>';
 		return $s;
-
 	}
 
 
@@ -301,5 +300,4 @@ class mailing_advthirdparties extends MailingTargets
 			return $contactstatic->getNomUrl(0, '', 0, '', -1, 1);
 		}
 	}
-
 }
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 303db374a6f..45f404f276e 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -450,5 +450,4 @@ class mailing_contacts1 extends MailingTargets
 
 		return parent::add_to_target($mailing_id, $cibles);
 	}
-
 }
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index 469446f13b7..af4073038cd 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -147,5 +147,4 @@ class mailing_example extends MailingTargets
 
         return '';
     }
-
 }
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index b450b7d8e7d..ab0cca6e0d4 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -320,5 +320,4 @@ class mailing_fraise extends MailingTargets
 
         return parent::add_to_target($mailing_id, $cibles);
     }
-
 }
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 0af98ae149a..9d1a0458e88 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 /**
  *		Parent class of emailing target selectors modules
  */
-class MailingTargets    // This can't be abstract as it is used for some method
+class MailingTargets // This can't be abstract as it is used for some method
 {
     /**
      * @var DoliDB Database handler.
@@ -253,5 +253,4 @@ class MailingTargets    // This can't be abstract as it is used for some method
 
         $this->update_nb($mailing_id);
     }
-
 }
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index e5f91b3ed5d..29e8de8bb98 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -224,5 +224,4 @@ class mailing_pomme extends MailingTargets
 
 		return parent::add_to_target($mailing_id, $cibles);
 	}
-
 }
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 3dea8e07ecc..7a0744e7c65 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -310,7 +310,6 @@ class mailing_thirdparties extends MailingTargets
                 $s.='<option value="0">'.$langs->trans("Disabled").'</option>';
 		$s.='</select>';
 		return $s;
-
 	}
 
 
@@ -324,5 +323,4 @@ class mailing_thirdparties extends MailingTargets
 	{
 		return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
 	}
-
 }
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index ccbb1825245..3a6484f37bb 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -242,5 +242,4 @@ class mailing_thirdparties_services_expired extends MailingTargets
     {
         return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$id.'">'.img_object('',"company").'</a>';
     }
-
 }
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 141b334ef21..30c719689f2 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -221,5 +221,4 @@ class mailing_xinputfile extends MailingTargets
 
 		return parent::add_to_target($mailing_id, $cibles);
 	}
-
 }
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index dbbdba7efa3..89c626c447d 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -158,7 +158,5 @@ class mailing_xinputuser extends MailingTargets
 		   	$this->error = $langs->trans("ErrorBadEmail",$email);
 			return -1;
 		}
-
 	}
-
 }
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 2638f387823..1531248d746 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -443,5 +443,4 @@ class pdf_standard extends CommonStickerGenerator
 
 		return 1;
 	}
-
 }
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 071ceeb8def..b1dc86d4e4d 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -165,6 +165,4 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
 		return -1;
 	}
-
-
 }
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index ba56042ec61..8aef56a4e57 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -287,6 +287,5 @@ class modAccounting extends DolibarrModules
 			'aa.account_parent'=>array('rule'=>'zeroifnull'),
 		);
 		$this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28");
-
 	}
 }
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index de84c653060..4c22f4b31b4 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -362,7 +362,6 @@ class modAdherent extends DolibarrModules
 				'test'=>true,
 			),
         );
-
     }
 
 
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index d5620d6805b..525c27488a7 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -419,7 +419,5 @@ class modAgenda extends DolibarrModules
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
 		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
 		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
-
 	}
-
 }
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index c227352225d..e0ad2db49b7 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -331,5 +331,4 @@ class modAsset extends DolibarrModules
 
 		return $this->_init($sql,$options);
 	}
-
 }
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 602085b9f5a..3ca1a082580 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -199,7 +199,6 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
 		$this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')';
 		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
-
 	}
 
 
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 191e12bc2eb..db844393cd0 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -101,6 +101,5 @@ class modBookmark extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 }
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 41349d214fc..3c523a61ab4 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -98,7 +98,6 @@ class modComptabilite extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 
 
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index 329a77437e0..5ef202cda86 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -320,5 +320,4 @@ class modDav extends DolibarrModules
 
 		return $this->_remove($sql, $options);
 	}
-
 }
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index dacfad736bf..76bdb2ccb63 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -140,7 +140,6 @@ class modDon extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 
 
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index c7bc152ff64..a164bec953c 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -82,6 +82,5 @@ class modDynamicPrices extends DolibarrModules
         $this->rights = array();
         $this->rights_class = 'dynamicprices';
         $r=0;
-
     }
 }
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index b88438f5fe1..9b0d2e42a45 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -94,6 +94,5 @@ class modExport extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 }
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index cf02888b9d2..8d1bf055673 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -135,5 +135,4 @@ class modExternalRss extends DolibarrModules
 
 		return $this->_remove($sql,$options);
     }
-
 }
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index 18bb0b000b2..374e9b2f02a 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -113,7 +113,6 @@ class modExternalSite extends DolibarrModules
 			'user'=>0
 		);
 		$r++;
-
 	}
 }
 
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 7db2ac45e30..d30da2d3664 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -196,7 +196,6 @@ class modFicheinter extends DolibarrModules
         $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
         $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention').')';
         $r++;
-
     }
 
 
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index d713b4edc4a..5da8cf74e71 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -120,7 +120,6 @@ class modHRM extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 
 	/**
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index ffaac0bf29e..42bbc07c616 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -91,6 +91,5 @@ class modImport extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 }
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 563dddca3cc..915b9e732a1 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -90,7 +90,6 @@ class modLabel extends DolibarrModules
 		$this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission
 		$this->rights[4][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[4][4] = 'supprimer';
-
 	}
 
 	/**
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index 70386a1647a..662ded1da21 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -145,7 +145,6 @@ class modLoan extends DolibarrModules
 		// Exports
 		//--------
 		$r=0;
-
 	}
 
 
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 062b9113e76..749369ee8e9 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -133,7 +133,6 @@ class modMailing extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 
 
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 8403147fd74..e1a8f7c2cd6 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -83,6 +83,5 @@ class modMailmanSpip extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 }
diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index 3f106de6c78..b27a03cc798 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -98,6 +98,5 @@ class modModuleBuilder extends DolibarrModules
             'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)',
             'target'=>'_modulebuilder',
             'user'=>0);
-
     }
 }
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 74689230525..674b7c88fe7 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -119,8 +119,6 @@ class modOauth extends DolibarrModules
         //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
         //$r++;
-
-
     }
 
 
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index cc74273d29c..afa7ac3abb8 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -135,7 +135,6 @@ class modPrelevement extends DolibarrModules
 		// Menus
 		//-------
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
 	}
 
 
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index ea086e2dbbe..d66e8d21d6f 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -117,7 +117,5 @@ class modPrinting extends DolibarrModules
                                 'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
         $r++;
-
-
     }
 }
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index ac968233772..dd5fa032394 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -104,7 +104,6 @@ class modProductBatch extends DolibarrModules
 
 		// Exports
 		$r=0;
-
 	}
 
 	/**
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 5b3b2fdd4d8..68f3a222e96 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -283,6 +283,5 @@ class modPropale extends DolibarrModules
 		);
 
 		return $this->_init($sql,$options);
-
 	}
 }
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index b2ed975a404..df151e63ad3 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -119,8 +119,6 @@ class modReceiptPrinter extends DolibarrModules
         //                        'user'=>0);                     // 0=Menu for internal users, 1=external users, 2=both
 
         $r++;
-
-
     }
 
 
@@ -143,5 +141,4 @@ class modReceiptPrinter extends DolibarrModules
             );
         return $this->_init($sql,$options);
     }
-
 }
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index b088a301c6b..d125a9c55ac 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -285,7 +285,6 @@ class modResource extends DolibarrModules
 		$this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
 		$this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00");
 		$this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref');
-
 	}
 
 	/**
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 9622e087699..e6064d57ec0 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -348,7 +348,6 @@ class modStock extends DolibarrModules
 		$this->import_run_sql_after_array[$r]=array(    // Because we may change data that are denormalized, we must update dernormalized data after.
 		    'UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);'
 		);
-
 	}
 	
 	
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index bb3cda6a837..ca8f5960f03 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -257,5 +257,4 @@ class modSupplierProposal extends DolibarrModules
 
 	    return $this->_remove($sql, $options);
 	}
-
 }
\ No newline at end of file
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 91ed84366de..7dacae51b67 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -174,7 +174,6 @@ class modTax extends DolibarrModules
 		$this->import_examplevalues_array[$r]=array('t.label'=>"VAT Payment 1st quarter 2016",'t.fk_typepayment'=>"CHQ (must be id or code found into dictionary)",
 		    't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456'
 		);
-
 	}
 
 
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index bc871d9c0e0..e567ffc8367 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -305,5 +305,4 @@ class modTicket extends DolibarrModules
 
         return $this->_init($sql, $options);
     }
-
 }
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 19e146a6e8c..c9a69a7e053 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -291,7 +291,6 @@ class modUser extends DolibarrModules
 			'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00"
 		);
 		$this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login');
-
 	}
 
 
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index ab87cbbf60e..1bd19c5e43c 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -136,5 +136,4 @@ class mod_payment_ant extends ModeleNumRefPayments
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index c05b42064f4..94fc445a1e2 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -150,5 +150,4 @@ class mod_payment_cicada extends ModeleNumRefPayments
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index b067d831997..97cd483e680 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -88,5 +88,4 @@ class PrintingDriver
         if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
         else return $this->desc;
     }
-
 }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index d4a8f044ba3..d0a1497c0a0 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -515,5 +515,4 @@ class printing_printgcp extends PrintingDriver
 
         return $error;
     }
-
 }
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 69ed4a5d484..3363755139f 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -318,5 +318,4 @@ class printing_printipp extends PrintingDriver
         $this->resprint = $html;
         return $error;
     }
-
 }
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index d1f9f2e8bbb..8c86e4ec5d1 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -166,6 +166,4 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
 		return -1;
 	}
-
-
 }
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index 6fc3b477603..c93e4b50fe3 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -500,5 +500,4 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 269aa4bd8ca..0d701d55774 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -835,5 +835,4 @@ class pdf_standard extends ModelePDFProduct
 	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index a7dfdfc9fac..3f8796927d9 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -305,7 +305,5 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		{
 			return -2;
 		}
-
 	}
-
 }
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 7dff50cacad..3202bf9ca1d 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -249,5 +249,4 @@ abstract class ModeleProductCode
     {
         return 0;
     }
-
 }
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 6610df963e0..c86f0186811 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
@@ -179,7 +179,6 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$resarray = $this->fill_substitutionarray_with_extrafields($task,$resarray,$extrafields,'task',$outputlangs);
 
 		return $resarray;
-
 	}
 
 	/**
@@ -1191,5 +1190,4 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 4dea22de614..9e04e8dc6f3 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -672,5 +672,4 @@ class pdf_baleine extends ModelePDFProjects
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 475dd3d75e8..f4542cac67b 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -795,5 +795,4 @@ class pdf_beluga extends ModelePDFProjects
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 89aeefc5fab..7c5e5f3acf4 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -583,7 +583,6 @@ class pdf_timespent extends ModelePDFProjects
 	    	}
 	    }
         */
-
 	}
 
 	/**
@@ -601,5 +600,4 @@ class pdf_timespent extends ModelePDFProjects
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index a01e6fdfeac..b0d0d7d5069 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -852,5 +852,4 @@ class doc_generic_task_odt extends ModelePDFTask
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 2f388392329..1e0d084fbba 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -524,5 +524,4 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index bef150b1e79..c82b922b577 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -841,7 +841,6 @@ class pdf_azur extends ModelePDFPropales
     // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-
 	}
 
 
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index cac76d47b5a..fe63b28f843 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -155,5 +155,4 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 54d894c20b5..52dba1beac5 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -139,5 +139,4 @@ class mod_propale_saphir extends ModeleNumRefPropales
 
 		return  $numFinal;
 	}
-
 }
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 62584af5bbf..801b3820bc5 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -80,7 +80,6 @@ class pdf_paiement
 		}
 		// which type of document will be generated: clients (client) or providers (fourn) invoices
 		$this->doc_type = "client";
-
 	}
 
 
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index 384b956e85d..df3071f7b26 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -108,6 +108,5 @@ class modGeneratePassNone extends ModeleGenPassword
 	{
 		return 1;
 	}
-
 }
 
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 60537bca1d3..d0ae019bf09 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -113,7 +113,6 @@ class modGeneratePassPerso extends ModeleGenPassword
 		//$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
 		//$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
 		//$this->All =  $this->Spe;
-
 	}
 
 	/**
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index 60378cf03a4..e1f73b134be 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -89,6 +89,5 @@ abstract class ModeleGenPassword
     {
         return 1;
     }
-
 }
 
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index c0baf2d4c30..285b7b2db82 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -429,5 +429,4 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$this->error='UnknownError';
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 63dc9839b02..b8d3ad53092 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -325,7 +325,5 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		{
 			return -2;
 		}
-
 	}
-
 }
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index dfced8a2f23..d9f65560705 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -271,5 +271,4 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		}
 		return $res;
 	}
-
 }
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 6d3d136e46c..c0ff3b0e5fc 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -58,7 +58,6 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 
         return $liste;
     }
-
 }
 
 /**
@@ -254,7 +253,6 @@ abstract class ModeleThirdPartyCode
     {
         return 0;
     }
-
 }
 
 
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 662d3d60485..20957f26415 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -500,5 +500,4 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 9d83cf811cd..a9a55e75cfc 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -899,7 +899,6 @@ class pdf_standard extends ModelePDFStock
 		$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->SetLineStyle(array('dash'=>0));
-
 	}
 
 	/**
@@ -1146,5 +1145,4 @@ class pdf_standard extends ModelePDFStock
 	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index 52ed64946d9..3380b27095f 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -901,7 +901,6 @@ class pdf_stdmovement extends ModelePDFMovement
 		$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->SetLineStyle(array('dash'=>0));
-
 	}
 
 	/**
@@ -1148,5 +1147,4 @@ class pdf_stdmovement extends ModelePDFMovement
 	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 	    return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index 285bccf9048..3423c4b2547 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -60,7 +60,6 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
 
 		return $list;
 	}
-
 }
 
 /**
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 6356720a31a..2c267258d81 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -925,7 +925,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetXY($this->postotalht-1, $tab_top+1);
 			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHTShort"),'','C');
 		}
-
 	}
 
 	/**
@@ -1018,7 +1017,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$this->error=$this->db->lasterror();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -1250,5 +1248,4 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index 1cbeca5dac7..83bb6ba4184 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -63,7 +63,6 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 
 		return $liste;
 	}
-
 }
 
 
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index e4f6fda8e48..12d7f2c9391 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -717,7 +717,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
     // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-
 	}
 
 
@@ -1375,5 +1374,4 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_ORDER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
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 0c75e8c4832..fe225447e3b 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -569,7 +569,6 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		// Date
 		$pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy);
 		$pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1);
-
 	}
 
 
@@ -615,7 +614,6 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 		// 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
-
 	}
 
 
@@ -814,5 +812,4 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index f7f97d075d5..8d3b2c57f6f 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -136,5 +136,4 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
     {
         return $this->getNextValue($objsoc,$objforref);
     }
-
 }
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 162ddda7f7f..26b805f42f1 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -150,5 +150,4 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index 7f4e2fcf84b..a457d120aab 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -48,7 +48,6 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 
 		return $liste;
 	}
-
 }
 
 /**
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 26972ef31e6..a95ad54ba02 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -515,5 +515,4 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 6f07f64a7c5..fc8ccc9e24e 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -709,7 +709,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
     // phpcs:ignore PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-
 	}
 
 
@@ -1498,5 +1497,4 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 372b3189292..b821805f1f9 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -152,5 +152,4 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	{
 		return $this->getNextValue($objsoc,$objforref);
 	}
-
 }
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 8781628917f..1a5995b8fc9 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -127,5 +127,4 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 
 		return  $numFinal;
 	}
-
 }
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index b70b9babd05..aa8b4c4e3f5 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -140,5 +140,4 @@ class mod_ticket_simple extends ModeleNumRefTicket
         dol_syslog("mod_ticket_simple::getNextValue return " . $this->prefix . $yymm . "-" . $num);
         return $this->prefix . $yymm . "-" . $num;
     }
-
 }
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 2d521f18a5b..3371a071c8a 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -121,5 +121,4 @@ class mod_ticket_universal extends ModeleNumRefTicket
 
         return $numFinal;
     }
-
 }
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 724f09083c5..e3959497a34 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -434,5 +434,4 @@ class doc_generic_user_odt extends ModelePDFUser
 		}
 		return $array_other;
 	}
-
 }
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index c7e501dcfc8..100fa286763 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -511,5 +511,4 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 		return -1;
 	}
-
 }
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index f47daa0d419..a66eb12c78e 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -146,5 +146,4 @@ abstract class DolibarrTriggers
 	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
-
 }
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index c2f15bd336d..5bddfe2fd43 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -202,5 +202,4 @@ class InterfaceLogevents extends DolibarrTriggers
             return -1;
         }
     }
-
 }
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 94aaaeaa542..4bd95caeb58 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -309,5 +309,4 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 
         return 0;
     }
-
 }
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 481df585f3a..0c509a1d5b3 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -927,5 +927,4 @@ class InterfaceActionsAuto extends DolibarrTriggers
             return -1;
 		}
     }
-
 }
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 2750834bac6..a4ac9361a29 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -133,5 +133,4 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 1;
 		}
     }
-
 }
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 7677c1743a8..9ed11f41b97 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -799,5 +799,4 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 		return $result;
 	}
-
 }
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index c5f704fdcb1..ea3ae2c67aa 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -148,5 +148,4 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 
 		return 0;
     }
-
 }
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 8698b08a5c3..8b4351499ce 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -131,5 +131,4 @@ class InterfaceNotification extends DolibarrTriggers
 
 		return $ret;
 	}
-
 }
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 9e5121112d0..3a7d4b84801 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -106,7 +106,6 @@ class CdavLib
 		}
 
 		return $sql;
-
 	}
 
 	/**
@@ -295,5 +294,4 @@ class CdavLib
 		}
 		return $calevents;
 	}
-
 }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index ad58004b0d0..d2039a200cb 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -692,7 +692,6 @@ class Don extends CommonObject
             dol_print_error($this->db);
             return -1;
         }
-
     }
 
     /**
@@ -1052,5 +1051,4 @@ class Don extends CommonObject
 			return 0;
 		}
 	}
-
 }
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 2db4c401818..3a839c2e759 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -491,8 +491,6 @@ class PaymentDonation extends CommonObject
 		$this->fk_bank='';
 		$this->fk_user_creat='';
 		$this->fk_user_modif='';
-
-
 	}
 
 
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 0772b3fbdf5..6393d201188 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -791,8 +791,5 @@ class EcmDirectory // extends CommonObject
             }
         }
         return $result;
-
     }
-
-
 }
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 0e07c3706a4..109b847fc62 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -472,7 +472,6 @@ class Shipments extends DolibarrApi
                 'message' => 'Shipment deleted'
             )
         );
-
     }
 
     /**
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 80fe07378b6..863efe96a93 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1298,7 +1298,6 @@ class Expedition extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -1709,7 +1708,6 @@ class Expedition extends CommonObject
 			$this->lines[]=$line;
 			$xnbp++;
 		}
-
 	}
 
 	/**
@@ -1852,7 +1850,6 @@ class Expedition extends CommonObject
 		$sql.= ' WHERE rowid='.$id;
 
 		$resql = $this->db->query($sql);
-
 	}
 
 	/**
@@ -1869,7 +1866,6 @@ class Expedition extends CommonObject
 		$sql.= ' WHERE rowid='.$id;
 
 		$resql = $this->db->query($sql);
-
 	}
 
 
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 18a5fdbec6b..3fc821c7b85 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -236,5 +236,4 @@ class ExpeditionLineBatch extends CommonObject
 			return -1;
 		}
 	}
-
 }
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index d83714356a2..80c22fb961a 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -445,7 +445,6 @@ class ExpenseReports extends DolibarrApi
                 'message' => 'Expense Report deleted'
             )
         );
-
     }
 
     /**
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index fb872ca2f5c..7ccb88d82ee 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -898,7 +898,6 @@ class ExpenseReport extends CommonObject
                 return -1;
             }
         }
-
     }
 
     /**
@@ -1765,8 +1764,6 @@ class ExpenseReport extends CommonObject
 			$this->error = 'ErrorExpenseNotDraft';
             return -3;
         }
-
-
 	}
 
 	/**
@@ -2390,7 +2387,6 @@ class ExpenseReport extends CommonObject
     	}
     	return 0;
     }
-
 }
 
 
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 732d55de298..0dceeae4808 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -248,7 +248,6 @@ class PaymentExpenseReport extends CommonObject
 		if (isset($this->fk_user_modif))	$this->fk_user_modif=trim($this->fk_user_modif);
 
 
-
 		// Check parameters
 		// Put here code to add control on parameters values
 
@@ -489,8 +488,6 @@ class PaymentExpenseReport extends CommonObject
 		$this->fk_bank='';
 		$this->fk_user_creat='';
 		$this->fk_user_modif='';
-
-
 	}
 
 
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 0bc9715f753..fd685ad74fd 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -880,5 +880,4 @@ class Export
 			dol_print_error($this->db);
 		}
 	}
-
 }
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 7701af5fe91..3f3315b6028 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -317,7 +317,6 @@ class Interventions extends DolibarrApi
 		    	'message' => 'Intervention deleted'
 	    	)
     	);
-
     }
 
     /**
@@ -456,6 +455,4 @@ class Interventions extends DolibarrApi
         }
         return $fichinter;
     }
-
-
 }
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 2cc7f3b834b..9c40dad3d0c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -275,7 +275,6 @@ class Fichinter extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -1669,5 +1668,4 @@ class FichinterLigne extends CommonObjectLine
 			return -2;
 		}
 	}
-
 }
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index aa6d85d0c3f..40a1b7eef2f 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -210,6 +210,5 @@ class FichinterStats extends Stats
 
 		return $this->_getAllByProduct($sql);
 	}
-
 }
 
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 27cbf0f8bb5..66f0c730938 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -142,7 +142,6 @@ class Fournisseur extends Societe
 			$this->error=$this->db->error();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -210,5 +209,4 @@ class Fournisseur extends Societe
 		}
 		return $arr;
 	}
-
 }
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 619ffd1d060..10bf73b015c 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -548,8 +548,6 @@ class CommandeFournisseurDispatch extends CommonObject
 		$this->batch='';
 		$this->eatby='';
 		$this->sellby='';
-
-
 	}
 
 	/**
@@ -647,5 +645,4 @@ class CommandeFournisseurDispatch extends CommonObject
 			return - 1;
 		}
 	}
-
 }
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index f507f417684..77a31689237 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -183,7 +183,6 @@ class ProductFournisseur extends Product
             $this->db->rollback();
             return -1;
         }
-
     }
 
 
@@ -872,5 +871,4 @@ class ProductFournisseur extends Product
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
-
 }
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 26a29db83ea..19a8705aa42 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -796,5 +796,4 @@ class PaiementFourn extends Paiement
 
 		return parent::fetch_thirdparty($force_thirdparty_id);
 	}
-
 }
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 20664b6d679..f1fa3214e12 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -511,9 +511,18 @@ if ($id > 0 || ! empty($ref)) {
 				print '<tr class="liste_titre">';
 
 				print '<td>' . $langs->trans("Description") . '</td>';
-				print '<td></td>';
-				print '<td></td>';
-				print '<td></td>';
+				if (! empty($conf->productbatch->enabled))
+				{
+					print '<td>' . $langs->trans("batch_number") . '</td>';
+					print '<td>' . $langs->trans("EatByDate") . '</td>';
+					print '<td>' . $langs->trans("SellByDate") . '</td>';
+				}
+				else
+				{
+					print '<td></td>';
+					print '<td></td>';
+					print '<td></td>';
+				}
 				print '<td align="right">' . $langs->trans("SupplierRef") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyOrdered") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyDispatchedShort") . '</td>';
@@ -521,16 +530,6 @@ if ($id > 0 || ! empty($ref)) {
 				print '<td width="32"></td>';
 				print '<td align="right">' . $langs->trans("Warehouse") . '</td>';
 				print "</tr>\n";
-
-				if (! empty($conf->productbatch->enabled)) {
-					print '<tr class="liste_titre">';
-					print '<td></td>';
-					print '<td>' . $langs->trans("batch_number") . '</td>';
-					print '<td>' . $langs->trans("EatByDate") . '</td>';
-					print '<td>' . $langs->trans("SellByDate") . '</td>';
-					print '<td colspan="5">&nbsp;</td>';
-					print "</tr>\n";
-				}
 			}
 
 			$nbfreeproduct = 0;		// Nb of lins of free products/services
@@ -593,7 +592,7 @@ if ($id > 0 || ! empty($ref)) {
 
 						// Supplier ref
 						print '<td align="right">'.$objp->sref.'</td>';
-						
+
 						// Qty ordered
 						print '<td align="right">' . $objp->qty . '</td>';
 
@@ -638,7 +637,7 @@ if ($id > 0 || ! empty($ref)) {
 							$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo' . $suffix . 'month'), GETPOST('dluo' . $suffix . 'day'), GETPOST('dluo' . $suffix . 'year'));
 							$form->select_date($dluodatesuffix, 'dluo' . $suffix, '', '', 1, "");
 							print '</td>';
-							print '<td colspan="2">&nbsp</td>'; // Qty ordered + qty already dispatached
+							print '<td colspan="3">&nbsp</td>'; // Supplier ref + Qty ordered + qty already dispatched
 						} else {
 							$type = 'dispatch';
 							print '<td align="right">';
@@ -650,7 +649,7 @@ if ($id > 0 || ! empty($ref)) {
 							print '</tr>';
 
 							print '<tr class="oddeven" name="' . $type . $suffix . '">';
-							print '<td colspan="6">';
+							print '<td colspan="7">';
 							print '<input name="fk_commandefourndet' . $suffix . '" type="hidden" value="' . $objp->rowid . '">';
 							print '<input name="product' . $suffix . '" type="hidden" value="' . $objp->fk_product . '">';
 
@@ -672,7 +671,7 @@ if ($id > 0 || ! empty($ref)) {
 						print '<input id="qty' . $suffix . '" name="qty' . $suffix . '" type="text" class="width50 right" value="' . (GETPOST('qty' . $suffix) != '' ? GETPOST('qty' . $suffix) : $remaintodispatch) . '">';
 						print '</td>';
 
-                        print '<td>';
+						print '<td>';
 						if (! empty($conf->productbatch->enabled) && $objp->tobatch == 1) {
 						    $type = 'batch';
 						    //print img_picto($langs->trans('AddDispatchBatchLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"');
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index c87dc73287e..0240ff8a34c 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1019,7 +1019,6 @@ class Holiday extends CommonObject
 
 		$statut.= '</select>'."\n";
 		print $statut;
-
 	}
 
 	/**
@@ -1249,7 +1248,6 @@ class Holiday extends CommonObject
 				return -1;
 			}
 		}
-
 	}
 
 	/**
@@ -1327,7 +1325,6 @@ class Holiday extends CommonObject
 		$sql.= " WHERE fk_user = '".$user_id."'";
 
 		$this->db->query($sql);
-
 	}
 
 
@@ -1883,5 +1880,4 @@ class Holiday extends CommonObject
 		$this->halfday=0;
 		$this->fk_type=1;
 	}
-
 }
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 87b74af9f20..3d3e195b7c9 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -358,5 +358,4 @@ class Import
 			return 1;
 		}
 	}
-
 }
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
index 261bdde5812..444d8ec641f 100644
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
+++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php
@@ -289,7 +289,6 @@ class PHPExcel_Shared_OLERead {
 
 			$offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
 		}
-
 	}
 
 	/**
diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
index 4846910fa29..93e85582d5c 100644
--- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
+++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php
@@ -1042,7 +1042,6 @@ class PHPExcel_Writer_Excel2007_Chart extends
     }
 
     $objWriter->endElement();
-
   }
 
   /**
@@ -1322,7 +1321,6 @@ class PHPExcel_Writer_Excel2007_Chart extends
       $objWriter->endElement();
     }
     $objWriter->endElement();
-
   }
 
   /**
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index 81df41d55e0..56f98d28449 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -36,6 +36,15 @@ ALTER TABLE llx_accounting_account ADD CONSTRAINT fk_accounting_account_fk_pcg_v
 
 ALTER TABLE llx_accounting_account MODIFY COLUMN account_number varchar(32) NOT NULL;
 
+create table llx_facture_rec_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)
+) ENGINE=innodb;
+
+
 -- For 9.0
 
 ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent varchar(32) DEFAULT NULL;
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index b6fbc62963a..474447f6de0 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -1062,7 +1062,6 @@ class Livraison extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
-
 }
 
 
@@ -1124,5 +1123,4 @@ class LivraisonLigne extends CommonObjectLine
 	{
 		$this->db=$db;
 	}
-
 }
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index e608cb3b8da..b1bcbc65567 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -286,7 +286,6 @@ class Loan extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 64d2dcf4d59..c33e015ec79 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -448,5 +448,4 @@ class MailmanSpip
 	        }
         }
     }
-
 }
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 789e4e469f9..45008aa76f3 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -240,5 +240,4 @@ class ActionsMyModule
 	}
 
 	/* Add here any other hooked methods... */
-
 }
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 50527690bbb..36b8b1d3fa8 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -279,7 +279,6 @@ class MyModuleApi extends DolibarrApi
                 'message' => 'MyObject deleted'
             )
         );
-
     }
 
 
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 1cab58da7b2..9b52b3119f6 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -200,5 +200,4 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 		if ($a < 0) return -1;
 		return $a;
 	}
-
 }
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index f516f60a98d..728270d6179 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -346,5 +346,4 @@ class modMyModule extends DolibarrModules
 
 		return $this->_remove($sql, $options);
 	}
-
 }
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index c7822961570..2e3723ab667 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -488,7 +488,6 @@ class MultiCurrency extends CommonObject
 			$this->rate = new CurrencyRate($this->db);
 			return $this->rate->fetch($obj->rowid);
 		}
-
 	 }
 
 	 /**
@@ -940,5 +939,4 @@ class CurrencyRate extends CommonObjectLine
 			return 1;
 		}
 	}
-
 }
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index ae9578db9b7..62a9a798617 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -673,5 +673,4 @@ class Opensurveysondage extends CommonObject
 	        if ($status==self::STATUS_CLOSED) return '<span class="hideonsmartphone">'.$langs->trans('Closed').' </span>'.img_picto($langs->trans('Closed'),'statut6');
 	    }
 	}
-
 }
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 4855799c508..4a6dbe63768 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -287,7 +287,6 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
 
         return $mesg;
     }
-
 }
 
 /**
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index b6c036825c8..c24d5a8214a 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -239,7 +239,6 @@ class ActionsCardProduct
 		{
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
-
 	}
 
 
@@ -433,5 +432,4 @@ class ActionsCardProduct
 			dol_print_error($this->db);
 		}
 	}
-
 }
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 4f418517c6b..3d10988de85 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -218,7 +218,6 @@ class ActionsCardService
 		{
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
-
 	}
 
 
@@ -365,5 +364,4 @@ class ActionsCardService
 			print $sql;
 		}
 	}
-
 }
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 792bf6ad2f2..4eee6ffe502 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -33,7 +33,7 @@ class FormProduct
      * @var DoliDB Database handler.
      */
     public $db;
-	
+
 	/**
 	 * @var string Error code (or message)
 	 */
@@ -189,7 +189,6 @@ class FormProduct
 		}
 
 		return $final_label;
-
 	}
 
 	/**
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a420b9c8852..717e25ab980 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -47,12 +47,12 @@ class Product extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='product';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element='product';
-	
+
 	public $fk_element='fk_product';
 	protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet');    // To test if we can delete object
 	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -647,7 +647,6 @@ class Product extends CommonObject
             dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING);
             return -3;
         }
-
 	}
 
 
@@ -3036,7 +3035,6 @@ class Product extends CommonObject
 		{
 			return 1;
 		}
-
 	}
 
 	/**
@@ -4738,5 +4736,4 @@ class Product extends CommonObject
             dol_print_error($this->db);
         }
     }
-
 }
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 0fc3c50efbd..16ff44e563c 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -395,8 +395,6 @@ class Productbatch extends CommonObject
 		$this->eatby='';
 		$this->batch='';
 		$this->import_key='';
-
-
 	}
 
 	/**
@@ -544,5 +542,4 @@ class Productbatch extends CommonObject
             return -1;
         }
     }
-
 }
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 3b9365d0850..6321958dd75 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -632,10 +632,7 @@ class Propalmergepdfproduct extends CommonObject
 		$this->datec='';
 		$this->tms='';
 		$this->import_key='';
-
-
 	}
-
 }
 
 /**
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index ccd59c51c2c..19fa3e3e627 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -460,7 +460,6 @@ class Inventory extends CommonObject
 	{
 		$this->initAsSpecimenCommon();
 	}
-
 }
 
 /**
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 1a7edf914e0..8fa05f5c453 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -93,7 +93,6 @@ class Entrepot extends CommonObject
 		{
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
 		}
-
 	}
 
 	/**
@@ -167,7 +166,6 @@ class Entrepot extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-
 	}
 
 	/**
@@ -301,7 +299,6 @@ class Entrepot extends CommonObject
 			$this->error=$this->db->lasterror();
 			return -1;
 		}
-
 	}
 
 
@@ -720,7 +717,6 @@ class Entrepot extends CommonObject
 		}
 
 		return $TChildWarehouses;
-
 	}
 
 	/**
@@ -754,5 +750,4 @@ class Entrepot extends CommonObject
 
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
-
 }
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 0dbe197981c..0c501a1a09f 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -582,5 +582,4 @@ class Productlot extends CommonObject
 		$this->fk_user_modif = '';
 		$this->import_key = '';
 	}
-
 }
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index d5ea2e1f45f..651ee59c22e 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -573,8 +573,5 @@ class ProductStockEntrepot extends CommonObject
 		$this->seuil_stock_alerte = '';
 		$this->desiredstock = '';
 		$this->import_key = '';
-
-
 	}
-
 }
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index e5a73590d75..6deacab7204 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -483,7 +483,6 @@ class Projects extends DolibarrApi
                 'message' => 'Project deleted'
             )
         );
-
     }
 
     /**
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index cd79a12cecc..294c0f0faae 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -487,7 +487,6 @@ class Tasks extends DolibarrApi
                 'message' => 'Task deleted'
             )
         );
-
     }
 
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 81be3d3d893..61918622743 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1611,7 +1611,6 @@ class Project extends CommonObject
 		}else {
 			return 1;
 		}
-
 	}
 
 	/**
@@ -1645,7 +1644,6 @@ class Project extends CommonObject
 		}else {
 			return 1;
 		}
-
 	}
 
 	/**
@@ -2013,5 +2011,4 @@ class Project extends CommonObject
 
 	    $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0);
 	}
-
 }
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index bc85e5bae78..dc76e098b59 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -271,8 +271,6 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project
 
     $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($note)."', g));";
     echo $s;
-
-
 }
 
 /**
diff --git a/htdocs/public/onlinesign/index.html b/htdocs/public/onlinesign/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/public/onlinesign/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/public/test/index.html b/htdocs/public/test/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/public/test/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/public/ticket/img/index.html b/htdocs/public/ticket/img/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/public/ticket/img/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index bb0499f43e6..52b3b843fa1 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -25,11 +25,18 @@ if (!defined('NOCSRFCHECK'))   define('NOCSRFCHECK', '1');
 if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
 if (!defined("NOLOGIN"))       define("NOLOGIN", '1');				// If this page is public (can be called outside logged session)
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retreive from object ref and not from url.
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other', 'ticket', 'errors'));
@@ -64,5 +71,8 @@ if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
 }
 
 // End of page
-llxFooter();
+htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix,$object);
+
+llxFooter('', 'public');
+
 $db->close();
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index de6666701d0..13de6e62ccf 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -572,7 +572,6 @@ class Dolresource extends CommonObject
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
-
     }
 
      /**
@@ -651,7 +650,6 @@ class Dolresource extends CommonObject
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
-
     }
 
     /**
@@ -730,7 +728,6 @@ class Dolresource extends CommonObject
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
-
     }
 
     /**
@@ -880,7 +877,6 @@ class Dolresource extends CommonObject
             $i++;
         }
         return $i;
-
     }
 
 
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 969717bf949..6ed6038af81 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -210,5 +210,4 @@ class FormResource
     	print '</select>';
     	if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     }
-
 }
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 6d03c016e6b..30b1667afcf 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -424,5 +424,4 @@ abstract class ActionsCardCommon
             $this->object->country_label=	$tmparray['label'];
         }
     }
-
 }
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 2718e7e8d3c..1949f696a86 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -219,5 +219,4 @@ class ActionsCardCompany extends ActionsCardCommon
 	{
 		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
 	}
-
 }
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 380ee3513a8..c662ce2ae6f 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -135,5 +135,4 @@ class ActionsCardIndividual extends ActionsCardCommon
 	{
 		return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select);
 	}
-
 }
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 599b48153ad..1cb4f1c4b65 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -228,7 +228,6 @@ class Address
 				return $result;
 			}
 		}
-
 	}
 
 	/**
@@ -488,7 +487,6 @@ class Address
 			dol_print_error($this->db);
 		}
 	}
-
 }
 
 
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 3e39768ada9..07bc59f4757 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1527,7 +1527,6 @@ class Thirdparties extends DolibarrApi
 				$i++;
 			}
 		}
-
 	}
 
 	/**
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 26fd6d4e2cd..9c24aecae85 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -89,7 +89,6 @@ class Client extends Societe
             $this->error=$this->db->lasterror();
             return -1;
         }
-
     }
 
 	/**
@@ -115,5 +114,4 @@ class Client extends Societe
 		}
 		return 1;
     }
-
 }
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index ae7424af1bb..3a3b9126b7b 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -415,6 +415,5 @@ class CompanyBankAccount extends Account
 
 		$this->socid = 0;
 	}
-
 }
 
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 0b4919eef79..4f3b666049b 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -566,5 +566,4 @@ class CompanyPaymentMode extends CommonObject
 	{
 		$this->initAsSpecimenCommon();
 	}
-
 }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b0d491f33fb..5c15f82952f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -45,12 +45,12 @@ class Societe extends CommonObject
 	 * @var string ID to identify managed object
 	 */
 	public $element='societe';
-	
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'societe';
-	
+
 	public $fk_element='fk_soc';
 	public $fieldsforcombobox='nom,name_alias';
 	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
@@ -1349,114 +1349,6 @@ class Societe extends CommonObject
 		return $result;
 	}
 
-	/**
-	 * 	Search and fetch thirparties by name
-	 *
-	 * 	@param		string		$name		Name
-	 * 	@param		int			$type		Type of thirdparties (0=any, 1=customer, 2=prospect, 3=supplier)
-	 * 	@param		array		$filters	Array of couple field name/value to filter the companies with the same name
-	 * 	@param		boolean		$exact		Exact string search (true/false)
-	 * 	@param		boolean		$case		Case sensitive (true/false)
-	 * 	@param		boolean		$similar	Add test if string inside name into database, or name into database inside string. Do not use this: Not compatible with other database.
-	 * 	@param		string		$clause		Clause for filters
-	 * 	@return		array|int				<0 if KO, array of thirdparties object if OK
-	 */
-	function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
-	{
-		$thirdparties = array();
-
-		dol_syslog("searchByName name=".$name." type=".$type." exact=".$exact);
-
-		// Check parameter
-		if (empty($name))
-		{
-			$this->errors[]='ErrorBadValueForParameter';
-			return -1;
-		}
-
-		// Generation requete recherche
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		$sql.= " WHERE entity IN (".getEntity('category').")";
-		if (! empty($type))
-		{
-			if ($type == 1 || $type == 2)
-				$sql.= " AND client = ".$type;
-			elseif ($type == 3)
-				$sql.= " AND fournisseur = 1";
-		}
-		if (! empty($name))
-		{
-			if (! $exact)
-			{
-				if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1)
-				{
-					$name = str_replace('*', '%', $name);
-				}
-				else
-				{
-					$name = '%'.$name.'%';
-				}
-			}
-			$sql.= " AND ";
-			if (is_array($filters) && ! empty($filters))
-				$sql.= "(";
-			if ($similar)
-			{
-				// For test similitude (string inside name into database, or name into database inside string)
-				// Do not use this. Not compatible with other database.
-				$sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)";
-			}
-			else
-			{
-				if (! $case)
-					$sql.= "nom LIKE '".$this->db->escape($name)."'";
-				else
-					$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
-			}
-		}
-		if (is_array($filters) && ! empty($filters))
-		{
-			foreach($filters as $field => $value)
-			{
-				if (! $exact)
-				{
-					if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1)
-					{
-						$value = str_replace('*', '%', $value);
-					}
-					else
-					{
-						$value = '%'.$value.'%';
-					}
-				}
-				if (! $case)
-					$sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
-				else
-					$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
-			}
-			if (! empty($name))
-				$sql.= ")";
-		}
-
-		$res  = $this->db->query($sql);
-		if ($res)
-		{
-			while ($rec = $this->db->fetch_array($res))
-			{
-				$soc = new Societe($this->db);
-				$soc->fetch($rec['rowid']);
-				$thirdparties[] = $soc;
-			}
-
-			return $thirdparties;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
 	/**
 	 *    Delete a third party from database and all its dependencies (contacts, rib...)
 	 *
@@ -2443,7 +2335,6 @@ class Societe extends CommonObject
 		{
 			dol_print_error($this->db);
 		}
-
 	}
 
 
@@ -3864,7 +3755,6 @@ class Societe extends CommonObject
 		if ($statut==1) return $langs->trans("Customer");
 		if ($statut==2) return $langs->trans("Prospect");
 		if ($statut==3) return $langs->trans("ProspectCustomer");
-
 	}
 
 
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 4fa83f5fe0e..f3c76be9d35 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -236,5 +236,4 @@ class ActionsStripeconnect
 		}
 		return 0;
 	}
-
 }
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index b8472d0b821..8d829ba55f5 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -47,7 +47,6 @@ class Stripe extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-
 	}
 
 
@@ -501,5 +500,4 @@ class Stripe extends CommonObject
 		}
 		return $return;
 	}
-
 }
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 7c7b9eaa732..a9b44339930 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2646,7 +2646,6 @@ class SupplierProposal extends CommonObject
 
 	    return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
-
 }
 
 
@@ -3219,5 +3218,4 @@ class SupplierProposalLine extends CommonObjectLine
             return -2;
         }
     }
-
 }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5403fcbcdad..6577bc1357f 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2475,7 +2475,6 @@ class Ticket extends CommonObject
         }
         return false;
     }
-
 }
 
 
@@ -2595,5 +2594,4 @@ class TicketsLine
  	 * Close ticket date
 	 */
     public $date_close = '';
-
 }
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c67bba222ef..5ac081eeb1e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -562,7 +562,6 @@ class User extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-
 	}
 
 
@@ -686,7 +685,6 @@ class User extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-
 	}
 
 
@@ -1254,7 +1252,6 @@ class User extends CommonObject
 			$this->db->rollback();
 			return $result;
 		}
-
 	}
 
 	/**
@@ -1664,7 +1661,6 @@ class User extends CommonObject
 			$this->db->rollback();
 			return -2;
 		}
-
 	}
 
 	/**
@@ -3177,7 +3173,5 @@ class User extends CommonObject
 			$this->errors[] = $this->db->lasterror();
 			return -1;
 		}
-
 	}
-
 }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 95272011762..98d20bd0ad5 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -385,7 +385,6 @@ class UserGroup extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-
 	}
 
 
@@ -511,7 +510,6 @@ class UserGroup extends CommonObject
 			$this->db->commit();
 			return 1;
 		}
-
 	}
 
 
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index ceeaf35fddf..0d7cabba4e4 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -70,13 +70,20 @@ if (GETPOST('dol_no_mouse_hover'))       $url.=(preg_match('/\?/',$url)?'&':'?')
 if (GETPOST('dol_use_jmobile'))          $url.=(preg_match('/\?/',$url)?'&':'?').'dol_use_jmobile=1';
 
 // Destroy session
-$prefix=dol_getprefix('');
+/*$prefix=dol_getprefix('');
 $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
 if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
 session_name($sessionname);
 session_destroy();
 dol_syslog("End of session ".$sessionname);
+*/
+dol_syslog("End of session ".session_id());
+if (session_status() === PHP_SESSION_ACTIVE)
+{
+	session_destroy();
+}
+
 
 // Not sure this is required
 unset($_SESSION['dol_login']);
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 092937234fc..d4e29841821 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -763,8 +763,6 @@ class Website extends CommonObject
 		$this->fk_user_modif = $user->id;
 		$this->date_creation = dol_now();
 		$this->tms = dol_now();
-
-
 	}
 
 
@@ -1034,5 +1032,4 @@ class Website extends CommonObject
 			return $object->id;
 		}
 	}
-
 }
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 249e6015d83..4b313808e0d 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -539,5 +539,4 @@ class WebsitePage extends CommonObject
 		$this->date_creation = $now - (24 * 30 * 3600);
 		$this->date_modification = $now - (24 * 7 * 3600);
 	}
-
 }
diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index b9a3788bd80..5bd472cb6e1 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -221,5 +221,4 @@ class AccountingAccountTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index c3406d28bf7..1da26e53228 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -242,5 +242,4 @@ class ActionCommTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index 5cf34e969b1..beb6400cc33 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -164,5 +164,4 @@ class AdminLibTest extends PHPUnit_Framework_TestCase
 		$moduledescriptor->init();
 		$conf->setValues($db);
     }
-
 }
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 66636ad7619..15c3ee3f429 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -250,4 +250,3 @@ class AllTests
         return $suite;
     }
 }
-
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index a212ff0317a..e6da5cf9598 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -220,5 +220,4 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/BonPrelevementTest.php b/test/phpunit/BonPrelevementTest.php
index 0124b25e6c6..b87a902c9d4 100644
--- a/test/phpunit/BonPrelevementTest.php
+++ b/test/phpunit/BonPrelevementTest.php
@@ -178,5 +178,4 @@ class BonPrelevementTest extends PHPUnit_Framework_TestCase
     	return $result;
     }
 */
-
 }
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index 06f24ba45e0..8e1772a475c 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -103,7 +103,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
         $db=$this->savdb;
 
         $conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
-        
+
         print __METHOD__."\n";
     }
     /**
@@ -177,23 +177,22 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
         $result=$localobject->getValidAddress($src,3,1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
-        
+
         $src='John Doe <john@doe.com>';
         $result=$localobject->getValidAddress($src,4);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'John Doe');
-        
+
         $src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
         $result=$localobject->getValidAddress($src,4);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'John Doe,John Doe2,John Doe3');
-        
+
         $src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
         $result=$localobject->getValidAddress($src,4,0,2);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result,'John Doe,John Doe2...');
-        
+
         return $result;
     }
-
 }
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 574a8d793f9..b45dd44923e 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -335,5 +335,4 @@ class CategorieTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_array($retarray));
         return $retarray;
     }
-
 }
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index e1db7d199cf..2ba51bba87b 100644
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -239,5 +239,4 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 460a3e2fbeb..98069d9f415 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -247,5 +247,4 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
 
         return;
     }
-
 }
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 7b2f3f07e2b..5319acdfabc 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -383,5 +383,4 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 443bd1d1932..0e907861128 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -292,5 +292,4 @@ class CommandeTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 95ea937a017..98cff57f7fa 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -233,5 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $localobject->id;
     }
-
 }
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index 5adf002c885..4b92a3085f6 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -218,5 +218,4 @@ class ContratTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 645993d8659..4a133396675 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -442,5 +442,4 @@ class DateLibTest extends PHPUnit_Framework_TestCase
    		$prev = dol_get_first_day_week($day, $month, $year);
 		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
     }
-
 }
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
index 668af000204..e787edafda8 100644
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -199,5 +199,4 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-
 }
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index e695bff34a3..5477341e2e8 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -255,7 +255,6 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
 
         $localobject=new Entrepot($db);
 
-
         return;
     }
 }
diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
index b9af3dc1078..f6b5aba11f5 100644
--- a/test/phpunit/ExpenseReportTest.php
+++ b/test/phpunit/ExpenseReportTest.php
@@ -151,7 +151,7 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase
         $localobject2->initAsSpecimen();        // Init a speciment with lines
         $localobject2->status = 0;
         $localobject2->fk_statut = 0;
-        
+
         $result=$localobject2->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertGreaterThanOrEqual(0, $result);
@@ -312,5 +312,4 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 364eaf7568d..1507bf02899 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -128,31 +128,31 @@ class ExportTest extends PHPUnit_Framework_TestCase
     public function testExportOther()
     {
         global $conf,$user,$langs,$db;
-    
+
         $model='csv';
-    
+
         // Creation of class to export using model ExportXXX
         $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
         $file = "export_".$model.".modules.php";
         $classname = "Export".$model;
         require_once $dir.$file;
         $objmodel = new $classname($this->db);
-    
+
         // First test without option USE_STRICT_CSV_RULES
         unset($conf->global->USE_STRICT_CSV_RULES);
-        
+
         $valtotest='A simple string';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, 'A simple string');
-        
+
         $valtotest='A string with , and ; inside';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '"A string with , and ; inside"');
-        
+
         $valtotest='A string with " inside';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
@@ -164,48 +164,47 @@ class ExportTest extends PHPUnit_Framework_TestCase
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
-        
+
         $valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
-        
+
         // Same tests with strict mode
         $conf->global->USE_STRICT_CSV_RULES=1;
-        
+
         $valtotest='A simple string';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, 'A simple string');
-        
+
         $valtotest='A string with , and ; inside';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '"A string with , and ; inside"');
-        
+
         $valtotest='A string with " inside';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '"A string with "" inside"');
-        
+
         $valtotest='A string with " inside and '."\r\n".' carriage returns';
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
-        
+
         $valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
-        
     }
-    
+
     /**
      * Test export function for a personalized dataset
      *
@@ -353,5 +352,4 @@ class ExportTest extends PHPUnit_Framework_TestCase
 
         return true;
     }
-    
 }
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index 7985e8f0931..c451f62b10c 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -266,5 +266,4 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index 5fe0df4e5d0..f5737e5623a 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -333,5 +333,4 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
     	$this->assertEquals(20.03, $localobject3->total_tva);
     	$this->assertEquals(115.43, $localobject3->total_ttc);
     }
-
 }
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
index baa72b7020a..1a7bca70eb1 100644
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -242,5 +242,4 @@ class FichinterTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index feac8b212ed..2c95ca4c8ed 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -502,5 +502,4 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
         $user->rights->facture->lire = $savpermlire;
         $user->rights->facture->creer = $savpermcreer;
     }
-
 }
diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php
index 30c96600210..744fcfb4061 100644
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -136,5 +136,4 @@ class FormAdminTest extends PHPUnit_Framework_TestCase
     	print __METHOD__." result=".$result."\n";
     	return $result;
     }
-
 }
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 470a570bf6e..a9df42b8b1c 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -138,7 +138,6 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
      */
     public function testIsValidMailDomain()
     {
-
     }
 
     /**
@@ -241,10 +240,9 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
         print __METHOD__." for ".$ip." result=".$result."\n";
     	$this->assertEquals(2,$result,$ip);
 
-    	$ip='192.168.0.0';
-    	$result=is_ip($ip);
+        $ip='192.168.0.0';
+        $result=is_ip($ip);
         print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2,$result,$ip);
-
+        $this->assertEquals(2,$result,$ip);
     }
 }
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index e32b17ec09d..012b4f9413d 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -110,7 +110,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 
         print __METHOD__."\n";
     }
-	/**
+
+    /**
 	 * End phpunit tests
 	 *
 	 * @return	void
@@ -121,7 +122,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
     }
 
 
-
     /**
      * testIsValidMXRecord
      *
@@ -390,7 +390,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         $input='This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
         $after=dol_textishtml($input);
         $this->assertFalse($after);
-
     }
 
 
@@ -837,7 +836,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         $object->country_code='CA';
         $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
         $this->assertEquals('<span style="margin-right: 10px;">(123) 456-7890</span>', $phone, 'Phone for CA 1');
-
     }
 
 
@@ -1008,7 +1006,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         // Test RULE 5 (FR-US)
         $vat=get_default_tva($companyfr,$companyus,0);
         $this->assertEquals(0,$vat,'RULE 5 ECOMMERCE_200238EC');
-
     }
 
     /**
@@ -1210,5 +1207,4 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
 
 		return true;
 	}
-
 }
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index 3204e9f07b1..55589b87f56 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -349,5 +349,4 @@ class HolidayTest extends PHPUnit_Framework_TestCase
     	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
     	$this->assertTrue($result, 'result should be true, there is no overlapping');
     }
-
 }
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index 41c7005e25d..a25d907d4b6 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -143,5 +143,4 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
 
 		return 1;
     }
-
 }
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index 067b06910c9..39b4207489c 100644
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -134,5 +134,4 @@ class ImportTest extends PHPUnit_Framework_TestCase
 
 		return true;
     }
-
 }
diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php
index e6f130d2e3b..857decc8be7 100644
--- a/test/phpunit/MarginsLibTest.php
+++ b/test/phpunit/MarginsLibTest.php
@@ -136,7 +136,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals(25,$result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(20,$result[2]);
-		
+
 		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
 		print __METHOD__." result[0]=".$result[0]."\n";
 		$this->assertEquals(8,$result[0]);
@@ -144,8 +144,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals(12.5,$result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(1/9*100,$result[2]);
-		
+
 		return 0;
     }
-
 }
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 589a9116c78..0021c21391e 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -152,5 +152,4 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 
         return 0;
     }
-
 }
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index 826b55851e2..bf9a427587d 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -250,5 +250,4 @@ class MouvementStockTest extends PHPUnit_Framework_TestCase
 
     	return $localobject;
     }
-
 }
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 4a3dfb7c1c9..8fa5f58e164 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -573,5 +573,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-
 }
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index fb48279cd66..5570b32fc69 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -135,13 +135,12 @@ class PaypalTest extends PHPUnit_Framework_TestCase
 
 		$urltotest=getPaypalPaymentUrl(1,'free');
 		print "urltotest=".$urltotest."\n";
-		
+
 		$result=getURLContent($urltotest, 'GET');
-		
+
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThanOrEqual($result, 0);
 
     	return $result;
     }
-
 }
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index d3b1efaf072..ecbd10b5490 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -351,5 +351,4 @@ class PricesTest extends PHPUnit_Framework_TestCase
         //$this->assertEquals(0.25,$newlocalobject->total_tva);
         //$this->assertEquals(2.73,$newlocalobject->total_ttc);
     }
-
 }
diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index c2f5d5b8161..a5dc9e0f5e2 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -237,5 +237,4 @@ class ProjectTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 3d45673074a..341ea02c5d0 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -291,5 +291,4 @@ class PropalTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 40153f2cffd..ad3eb29be2f 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -224,5 +224,4 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $this->assertNotNull($object, "Parsing of json result must no be null");
       $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
     }
-
-}
\ No newline at end of file
+}
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 7fe65f101de..1b3b20899ef 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -294,5 +294,4 @@ class SecurityTest extends PHPUnit_Framework_TestCase
 		$result=restrictedArea($user,'societe');
 		$this->assertEquals(1,$result);
     }
-
 }
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 31aa98fd082..8baab7e2f1d 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -455,5 +455,4 @@ class SocieteTest extends PHPUnit_Framework_TestCase
 
         return $localobjectadd->id;
     }
-
 }
diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php
index 13e715ff8f5..c8f0471e9a9 100644
--- a/test/phpunit/SupplierProposalTest.php
+++ b/test/phpunit/SupplierProposalTest.php
@@ -276,5 +276,4 @@ class SupplierProposalTest extends PHPUnit_Framework_TestCase
     	$this->assertLessThan($result, 0);
     	return $result;
     }
-
 }
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index 2ec4c16a8d7..fe8b019da20 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -283,5 +283,4 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
         $this->assertLessThan($result, 0);
         return $result;
     }
-
 }
diff --git a/test/phpunit/UtilsTest.php b/test/phpunit/UtilsTest.php
index b80ce84f624..511e7d7fd32 100644
--- a/test/phpunit/UtilsTest.php
+++ b/test/phpunit/UtilsTest.php
@@ -146,7 +146,4 @@ class UtilsTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         return $result;
     }
-
-
-
 }
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 6f7ca3610cd..b336ef15ff3 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -418,5 +418,4 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-
 }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 7fb2d101184..79202a9d2eb 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -178,5 +178,4 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
 
         return $result;
     }
-
 }
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 45b01aa77d3..2b8bfc0aac1 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -207,5 +207,4 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
 
         return $result;
     }
-
 }
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index bcbb37b0419..e8b343c7a89 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -322,5 +322,4 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
 
         return 0;
     }
-
 }
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index e1c2249b62a..b9a04d2f1fa 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -398,5 +398,4 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
 
     	return $result;
     }
-
 }
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index bfcdb400cc6..96e3687df1c 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -206,5 +206,4 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase
 
         return $result;
     }
-
 }
diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php
index 3bbf3469b17..055640d4a36 100644
--- a/test/phpunit/XCalLibTest.php
+++ b/test/phpunit/XCalLibTest.php
@@ -137,5 +137,4 @@ class XCalLibTest extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$resultback."\n";
         $this->assertEquals($stringtoencode,$resultback);
     }
-
 }