diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 4c91efc265c..46b2b827d73 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -91,7 +91,7 @@ if ($id > 0)
 	if ($result > 0)
 	{
 
-		// Construit liste des fichiers
+		// Build file list
 		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file)
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index e4f6ffc397a..4ad7a74bcb9 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -366,7 +366,7 @@ if ($action == 'edit')
 	{
 
 		$mainstmpid=(! empty($conf->global->MAIN_MAIL_SMTPS_ID)?$conf->global->MAIN_MAIL_SMTPS_ID:'');
-		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
+		print '<tr class="drag drop oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
@@ -386,7 +386,7 @@ if ($action == 'edit')
 	{
 
 		$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
-		print '<tr '.$bcdd[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
+		print '<tr class="drag drop oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 6427befd03e..92efa8918ee 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -100,7 +100,7 @@ if ($object->id)
 	dol_fiche_head($head, 'document', $langs->trans("Asset"), -1, 'generic');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 7fc12129cc5..a5998e220f7 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -239,7 +239,7 @@ if ($object->id > 0)
 
 	print '<table class="border" width="100%">';
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 6caa262500e..7b01c1c5a22 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -303,8 +303,6 @@ if ($object->fetch($id) >= 0)
 			// Sort $modulenames
 			sort($modulenames);
 
-			$var = true;
-
 			// Loop on each submodule
             foreach($modulenames as $modulename)
             {
@@ -330,16 +328,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/propal/document.php b/htdocs/comm/propal/document.php
index 2f16cd54864..cbdfd44383c 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -94,7 +94,7 @@ if ($object->id > 0)
 	$head = propal_prepare_head($object);
 	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index e7d0514a022..fc8192f7edb 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref))
 		$head = commande_prepare_head($object);
 		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
 
-		// Construit liste des fichiers
+		// Build file list
 		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file)
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index d41bbd77bbe..f908b68b35c 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
         dol_fiche_head($head, 'document', $langs->trans("FinancialAccount"), -1, 'account');
 
 
-        // Construit liste des fichiers
+        // Build file list
         $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$',
                 $sortfield,
                 (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index e11a608c7d0..faa9a8ed199 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -124,7 +124,7 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index c2b3595b476..e34a2aedb21 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -91,7 +91,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents',  $langs->trans("TripCard"), 0, 'trip');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 1fd8c40bf1f..0ce8ad7eb92 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -104,7 +104,7 @@ if ($id > 0 || ! empty($ref))
 
     	$totalpaye = $object->getSommePaiement();
 
-		// Construit liste des fichiers
+		// Build file list
 		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file)
diff --git a/htdocs/compta/salaries/document.php b/htdocs/compta/salaries/document.php
index 99c34f60815..b40fef80a51 100644
--- a/htdocs/compta/salaries/document.php
+++ b/htdocs/compta/salaries/document.php
@@ -90,7 +90,7 @@ if ($object->id)
 
 	dol_fiche_head($head, 'documents',  $langs->trans("SalaryPayment"), -1, 'payment');
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 5f3fc5aa4eb..6c2bbd22a83 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -136,7 +136,7 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    // Construit liste des fichiers
+    // Build file list
     $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index b83cad80bdd..790058c20a9 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -122,7 +122,7 @@ if ($object->id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    // Construit liste des fichiers
+    // Build file list
     $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 1a60ddaaccb..07795da30d0 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -97,7 +97,7 @@ if ($object->id)
     dol_fiche_head($head, 'documents', $title, -1, 'contact');
 
 
-    // Construit liste des fichiers
+    // Build file list
     $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 20a70830952..4b7a9b4faf5 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -103,7 +103,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents', $langs->trans("Contract"), -1, 'contract');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index b36159f9340..dbedf2be1ce 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -66,7 +66,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
 ?>
 <?php $coldisplay=0; ?>
 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
-<tr <?php echo 'id="row-'.$line->id.'" '.$bcdd[$var]; echo $domData; ?> >
+<tr  id="row-<?php echo $line->id?> class="drag drop oddeven" <?php echo $domData; ?> >
 	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 	<td class="linecolnum" align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
 	<?php } ?>
@@ -321,7 +321,7 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcdd[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $line->showOptionals($extrafieldsline, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 020272d5bae..7459bf82453 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -107,7 +107,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents',  $langs->trans("Donation"), -1, 'generic');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 5d76a5f4918..2be84cf26b7 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)){
 		dol_fiche_head($head, 'documents', $langs->trans("Shipment"), -1, 'sending');
 	
 
-		// Construit liste des fichiers
+		// Build file list
 		$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		$totalsize=0;
 		foreach($filearray as $key => $file){
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 0ac498ca775..16db5311028 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -103,7 +103,7 @@ if ($object->id)
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 6e84f457eb1..d52ed81da48 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -94,7 +94,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents',  $langs->trans("InterventionCard"), -1, 'intervention');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 59358279e31..19a084cde86 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -107,7 +107,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'documents', $langs->trans('SupplierOrder'), -1, 'order');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 1f0c9f86739..9c111ebe773 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -145,7 +145,7 @@ if ($object->id > 0)
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 9d5618f3a2a..cec638a769b 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -99,7 +99,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents', $langs->trans("CPTitreMenu"), -1,'holiday');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/index.php b/htdocs/index.php
index 2843289c557..902ea6882a6 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -675,8 +675,8 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 
 //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();
 
+// End of page
 llxFooter();
-
 $db->close();
 
 
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index f9d17c563fa..b90144ea8f8 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -134,7 +134,7 @@ if ($object->id)
 	print '<div class="underbanner clearboth"></div>';
 
 
-    // Construit liste des fichiers
+    // Build file list
     $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
     $totalsize=0;
     foreach($filearray as $key => $file)
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index f005fbf8354..9dd021326b0 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -113,7 +113,7 @@ if ($object->id)
 	dol_fiche_head($head, 'document', $langs->trans("MyObject"), -1, 'myobject@mymodule');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 83d59a26a90..4f6ec9cf403 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -197,7 +197,7 @@ if ($object->id)
     print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 
 	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index f79a0d74d98..6a3925c4a55 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -122,7 +122,7 @@ if ($object->id)
     print $hookmanager->resPrint;
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 
 	$totalsize=0;
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 6c9b4b154bf..7571f466c46 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -147,6 +147,7 @@ if (! empty($source) && in_array($ref, array('member_ref', 'contractline_ref', '
 {
     $langs->load("errors");
     dol_print_error_email('BADREFINONLINESIGNFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
+    // End of page
     llxFooter();
     $db->close();
     exit;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index a189781c8c1..91a62ea347c 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -617,8 +617,9 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
 {
 	$langs->load("errors");
 	dol_print_error_email('BADREFINPAYMENTFORM', $langs->trans("ErrorBadLinkSourceSetButBadValueForRef", $source, $ref));
-	llxFooter();
-	$db->close();
+	// End of page
+    llxFooter();
+    $db->close();;
 	exit;
 }
 
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index e350c746c12..a90d68ff94c 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -162,6 +162,6 @@ if ($id > 0 || ! empty($ref))
 	include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index edaf52baba3..6a32ba9f645 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -91,7 +91,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), -1, 'resource');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
@@ -142,7 +142,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 8ef3168ee96..7ca7ed21295 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -289,5 +289,6 @@ else
 print '</table>';
 print "</form>\n";
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 9116cdd0387..f811d0e07ed 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -100,5 +100,6 @@ if ($id > 0 || ! empty($ref))
 	dol_fiche_end();
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 6a359232a16..34bdb688835 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index ecbefe2cb1d..a833363aff1 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -835,7 +835,6 @@ print '</form>';
 
 dol_fiche_end();
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 11131eb25af..39f3ab53866 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index ebd35a6575c..ffcd894e84a 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -190,7 +190,6 @@ if ($socid > 0)
     }
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 419c007906a..5343c5509a1 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2650,7 +2650,6 @@ else
     }
 }
 
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index e15c0864574..1222689358f 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -174,6 +174,6 @@ if ($messagetoshow)
 	print nl2br($messagetoshow);
 }
 
-
+// End of page
 llxFooter();
-$db->close();
+$db->close();;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 947c35a2d5c..c46f046f483 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -650,6 +650,6 @@ else {
 
 print "</form>";
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 37fb07eb652..24ec0026455 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -171,8 +171,6 @@ if ($action != 'presend')
 	}
 }
 
-
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index e393fa64a2c..25478e133af 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -105,7 +105,7 @@ if ($object->id)
 	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
@@ -169,6 +169,6 @@ else
 	accessforbidden('',0,0);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 1bed6e635a0..b7ce405b433 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -365,6 +365,6 @@ else
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index d0e7fd19062..a8ae45b317c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1301,5 +1301,6 @@ print "</div>";
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index e31a07e8e65..169d2b687e9 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -129,6 +129,7 @@ else
 	print $langs->trans("ErrorRecordNotFound");
 }
 
+// End of page
 llxFooter();
 $db->close();
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index cd8212ae327..fb4b51f17c8 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -532,7 +532,6 @@ if ($result > 0)
 }
 else dol_print_error('','RecordNotFound');
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 3326e431178..9980cf19a2a 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -105,6 +105,6 @@ else
 	dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 89aad30e2f5..d099cfcc103 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1610,7 +1610,6 @@ if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights-
 	print '</form>';
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index e35cf186ae3..45d7f9ad020 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -615,6 +615,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	}
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 08e2f593acb..dd06346ca33 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -147,7 +147,6 @@ if ($socid)
 	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index dfe78041f8a..a2f09f9b77d 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -343,5 +343,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index d00b3144185..760bfef4d27 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -549,8 +549,6 @@ if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nb
 	print $formfile->showdocuments('massfilesarea_mymodule','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
 }
 
-
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 964280055c2..e142ca524b4 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -354,7 +354,7 @@ if (! empty($conf->use_javascript_ajax))
 	print '</script>';
 }
 
-
+// End of page
 llxFooter();
 $db->close();
 
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 1464c9c2e6b..2f3d184fdb9 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -207,5 +207,6 @@ if (!$rowid)
 
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index fc7ffa828e0..5b9282a6e79 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -203,5 +203,6 @@ if (! $rowid) {
 	print '</FORM>';
 } else {}
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 545d953e753..24ae20848f1 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -143,6 +143,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 1f5b9582558..7d153a78cdc 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -145,6 +145,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index fdf51406e8e..7be0dcbc78a 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -202,6 +202,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 12de448829e..cf500246290 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -87,7 +87,7 @@ if ($object->id > 0)
 	$head = supplier_proposal_prepare_head($object);
 	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
@@ -170,5 +170,6 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 0e1b51480c1..cec80662c41 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -375,6 +375,6 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 3f83b4dca88..95a753272be 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -123,5 +123,6 @@ print '</div>';
 
 dol_fiche_end();
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index ba54859a207..ff531b05d83 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -143,6 +143,6 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index e31cd98912d..d1d80387f6e 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -138,7 +138,7 @@ if ($object->id)
 
     dol_fiche_end();
 
-    // Construit liste des fichiers
+    // Build file list
     $filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
     $totalsize = 0;
     foreach ($filearray as $key => $file) {
@@ -158,5 +158,6 @@ else
     accessforbidden('', 0, 0);
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 9f431909957..48e2b4091d6 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index ff07845f92d..81dc7c290c1 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 1764ab5baf4..3146f1095b0 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -218,7 +218,6 @@ print "</div>";
 
 print "</form>\n";
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 7f11911a46b..136384877fb 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -559,6 +559,6 @@ if ($id && $action == 'edit' && $user->rights->user->user->creer) print '</form>
 
 if ($id && $action == 'create' && $user->rights->user->user->creer) print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8fd979015bf..6c57af79de2 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2538,5 +2538,6 @@ if (! empty($conf->api->enabled) && ! empty($conf->use_javascript_ajax))
 	print '</script>';
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index a4c4e90f99d..bfab243bbaf 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -216,7 +216,6 @@ if ($id > 0)
 
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index a917a972ddc..6b22a303f96 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -141,7 +141,7 @@ if ($object->id)
     print '<div class="fichecenter">';
     print '<div class="underbanner clearboth"></div>';
 
-	// Construit liste des fichiers
+	// Build file list
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 	$totalsize=0;
 	foreach($filearray as $key => $file)
@@ -178,6 +178,6 @@ else
 	accessforbidden('',0,0);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 47a5a5df9eb..44eef8dfc1f 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -586,5 +586,6 @@ else
     }
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index bb9d05d59f1..5bc6130a2b6 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -212,5 +212,6 @@ else
 
 print '</table>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 946ba132af8..745f9002055 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -227,6 +227,6 @@ else
     dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 0d019b1226c..4b4b181cdc8 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -349,5 +349,6 @@ if ($object->id > 0)
     dol_fiche_end();
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 0b1842dabde..a33049ffbad 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -204,6 +204,6 @@ jQuery(document).ready(function() {
 </script>';
 */
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 6ace60c2fca..f9ccd9aa7ca 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -286,6 +286,6 @@ if ($canreadperms)
 //print '</td></tr></table>';
 print '</div></div></div>';
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 19ecf15eb65..8fba36a3e8a 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -93,6 +93,6 @@ print '</div>';
 
 dol_fiche_end();
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 4f9eac61d9f..4a4ffeb875d 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -218,5 +218,6 @@ else
 
 print '</table>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index a1f0cdd5471..f610d6b720e 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -628,5 +628,6 @@ print "</form>\n";
 
 $db->free($result);
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 5b787ded7b0..5e1c33cb57d 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -158,6 +158,6 @@ if ($id)
 	print "</form>\n";
 }
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e8914298ac3..7e04adab9a7 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -507,7 +507,6 @@ if ($result > 0)
 }
 else dol_print_error('','RecordNotFound');
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 1bf0dbbe785..5c2869847c6 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -374,5 +374,6 @@ if ($action == 'edit')
     print '</form>';
 }
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 30b988d3b22..e6487cba47c 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -400,6 +400,6 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 dol_fiche_end();
 
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index 57db7c49f20..c21049a5c76 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -71,7 +71,7 @@ print '</table>';
 print '<br><div style="text-align: center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';
 print '</form>';
 
+// End of page
 llxFooter();
-
 $db->close();
 
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 3addef7ddf9..3f298ae93e6 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -299,5 +299,6 @@ if ($action == 'edit') { ?>
 	<?php
 }
 
+// End of page
 llxFooter();
-$db->close();
+$db->close();;
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index b741fef40bb..636824d1980 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -773,7 +773,6 @@ if (! empty($id) || ! empty($ref))
 	// not found
 }
 
-
+// End of page
 llxFooter();
-
 $db->close();
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index c4d775f3d50..c3fbc39b82c 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -97,5 +97,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index f0dd8e9cb74..74da8a8043e 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -144,5 +144,6 @@ print '</div>';
 
 print '</form>';
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index af859175946..f9420919e91 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -50,7 +50,6 @@ if ($action == 'up') {
 
 $langs->load('products');
 
-$var = false;
 $title = $langs->trans($langs->trans('ProductAttributes'));
 
 $variants = $object->fetchAll();
@@ -122,7 +121,7 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 			<th class="liste_titre" colspan="2"></th>
 		</tr>
 		<?php foreach ($variants as $key => $attribute): ?>
-		<tr id="row-<?php echo $attribute->id ?>" <?php echo $bcdd[$var] ?>>
+		<tr id="row-<?php echo $attribute->id ?>" class="drag drop oddeven">
 			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->ref) ?></a></td>
 			<td><a href="card.php?id=<?php echo $attribute->id ?>"><?php echo dol_htmlentities($attribute->label) ?></a></td>
 			<td align="right"><?php echo $attribute->countChildValues() ?></td>
@@ -143,7 +142,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 			</td>
 		</tr>
 		<?php
-			$var = !$var;
 			endforeach
 		?>
 
@@ -151,4 +149,6 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 
 <?php
 
-llxFooter();
\ No newline at end of file
+// End of page
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index e0e549cf2a7..5c49e457c4f 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -156,6 +156,6 @@ if (! empty($conf->use_javascript_ajax))
 	print '</script>';
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index ff33c44763d..ceb6f5480d9 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2439,8 +2439,6 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 	}
 }
 
-
-
+// End of page
 llxFooter();
-
 $db->close();