diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 6d553f1b236..204ac36ea03 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -182,7 +182,8 @@ if ($result)
 		$formquestion=array();
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'),'confirm_purge',$formquestion,'no',1);
 	}
-
+	
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"e.dateevent","","",'align="left"',$sortfield,$sortorder);
@@ -195,7 +196,6 @@ if ($result)
 
 
 	// Lignes des champs de filtres
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<tr class="liste_titre">';
 
 	print '<td class="liste_titre" width="15%">'.$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).$form->select_date($date_end,'date_end',0,0,0,'',1,0,1).'</td>';
@@ -222,7 +222,6 @@ if ($result)
 	print '</td>';
 
 	print "</tr>\n";
-	print '</form>';
 
 	$var=True;
 
@@ -283,7 +282,7 @@ if ($result)
 		if ($usefilter) print '<tr><td colspan="6">'.$langs->trans("NoEventFoundWithCriteria").'</td></tr>';
 		else print '<tr><td colspan="6">'.$langs->trans("NoEventOrNoAuditSetup").'</td></tr>';
 	}
-	print "</table>";
+	print "</table></form>";
 	$db->free($result);
 
 	if ($num)
diff --git a/htdocs/comm/askpricesupplier/index.php b/htdocs/comm/askpricesupplier/index.php
index 4eddadf3803..681a889ed25 100644
--- a/htdocs/comm/askpricesupplier/index.php
+++ b/htdocs/comm/askpricesupplier/index.php
@@ -61,15 +61,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  * Search form
  */
 $var=false;
-print '<table class="noborder nohover" width="100%">';
 print '<form method="post" action="'.DOL_URL_ROOT.'/comm/askpricesupplier/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchRequest").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 print '</tr>';
-print "</form></table><br>\n";
+print "</table></form><br>\n";
 
 
 /*
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index ef2e2c48bf8..43441306e34 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -96,7 +96,8 @@ if ($result)
 
 	$param = "&amp;sall=".$sall;
 	if ($filteremail) $param.='&amp;filteremail='.urlencode($filteremail);
-
+	
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<table class="liste">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
@@ -108,7 +109,6 @@ if ($result)
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
 	print "</tr>\n";
 
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="sref" value="'.$sref.'" size="6">';
@@ -123,7 +123,6 @@ if ($result)
 	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print "</td>";
 	print "</tr>\n";
-	print '</form>';
 
 	$var=True;
 
@@ -177,7 +176,7 @@ if ($result)
 		print "</tr>\n";
 		$i++;
 	}
-	print "</table>";
+	print '</table></form>';
 	$db->free($result);
 }
 else
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 428e561f4fe..8fc50f853c6 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -63,15 +63,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  * Search form
  */
 $var=false;
-print '<table class="noborder nohover" width="100%">';
 print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchPropal").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 print '</tr>';
-print "</form></table><br>\n";
+print "</table></form><br>\n";
 
 
 /*
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 0d72eac46e3..f5f600ddd08 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -54,15 +54,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 if (! empty($conf->propal->enabled))
 {
 	$var=false;
-	print '<table class="noborder nohover" width="100%">';
 	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal.php">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAProposal").'</td></tr>';
 	print '<tr '.$bc[$var].'><td>';
 	print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 	print '</tr>';
-	print "</form></table><br>\n";
+	print "</table></form><br>\n";
 }
 
 /*
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 7957803a5d5..5baa7b7c30f 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -62,15 +62,15 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Search customer orders
 $var=false;
-print '<table class="noborder nohover" width="100%">';
 print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
 print '</tr>';
-print "</form></table><br>\n";
+print "</table></form><br>\n";
 
 
 /*
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index b854503f084..00755959ab9 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -158,7 +158,6 @@ if ($result)
 	$db->free($result);
 }
 
-print "</form>";
 
 /*
  * Line to add category
@@ -172,9 +171,7 @@ if ($action != 'edit')
 	print '</tr>';
 }
 
-print "</table>";
-
-print "</form>";
+print '</table></form>';
 
 llxFooter();
 
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index e69e2dce2e7..4186dae5561 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -596,8 +596,7 @@ if ($result)
             }
             print '</tr>';
 
-            print "</table>";
-            print '</form>';
+            print '</table></form>';
         }
 
     }
@@ -610,22 +609,21 @@ print '</div>';
 
 
 // List of bank categories
-
 print '<br>';
-print '<table class="noborder" width="100%">';
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?rowid='.$rowid.'&amp;id='.$id.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="class">';
 print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
+
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Rubriques").'</td><td colspan="2">';
 if ($user->rights->banque->modifier)
 {
     print '<select class="flat" name="cat1">'.$options.'</select>&nbsp;';
     print '<input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
 }
-print "</tr>";
-print "</form>";
+print '</tr>';
 
 $sql = "SELECT c.label, c.rowid";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_class as a, ".MAIN_DB_PREFIX."bank_categ as c";
@@ -650,13 +648,13 @@ if ($result)
         {
             print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=delete_categ&amp;rowid='.$rowid.'&amp;fk_categ='.$objp->rowid.'">'.img_delete($langs->trans("Remove")).'</a></td>';
         }
-        print "</tr>";
+        print '</tr>';
 
         $i++;
     }
     $db->free($result);
 }
-print "</table>";
+print '</table></form>';
 
 llxFooter();
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index eedb0183759..cd07db385aa 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -153,7 +153,9 @@ if ($resql)
 	if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices");
 	if ($mode == "5") $title=$langs->trans("ListOfClosedServices");
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,$totalnboflines,'title_commercial.png');
-
+	
+	print '<form method="POST" action="'. $_SERVER["PHP_SELF"] .'">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="liste" width="100%">';
 
 	print '<tr class="liste_titre">';
@@ -169,9 +171,6 @@ if ($resql)
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "cd.statut,c.statut",$param,"","align=\"right\"",$sortfield,$sortorder);
 	print "</tr>\n";
 
-	print '<form method="POST" action="'. $_SERVER["PHP_SELF"] .'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">';
 	print '<input type="hidden" name="filter" value="'.$filter.'">';
@@ -203,7 +202,6 @@ if ($resql)
     print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
-	print '</form>';
 
 	$contractstatic=new Contrat($db);
 	$productstatic=new Product($db);
@@ -278,7 +276,7 @@ if ($resql)
 	}
 	$db->free($resql);
 
-	print "</table>";
+	print '</table></form>';
 
 }
 else
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index f924922cb87..89d658fa01a 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1023,14 +1023,13 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
 	{
 		//Add the year filter input
+		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<table width="100%">';
 		print '<tr>';
 		print '<td>'.$langs->trans("Year").'</td>';
-		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
-		print '</form>';
 		print "</tr>\n";
-		print '</table>';
+		print '</table></form>';
 	}
 }
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ffc453d395c..e72af4de601 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -888,11 +888,11 @@ if ($action == 'create')
 					}
 					else
 					{
-						print '<tr><td colspan="3" ></td><td align="center">';
+						print '<tr><td colspan="3" ></td><td align="center">';
 						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
-						print '</td>';
-						
-						print '<td align="left">';
+						print '</td>';
+						
+						print '<td align="left">';
 						print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle);
 					}
 				}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 5863161a995..b6ba93fe91e 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -654,11 +654,11 @@ class Expedition extends CommonObject
 					{
 						// line without batch detail
 						
-						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref));
-						if ($result < 0) {
-							$error++; break;
-						}
+						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
+						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref));
+						if ($result < 0) {
+							$error++; break;
+						}
 					}
 					else
 					{
@@ -859,7 +859,7 @@ class Expedition extends CommonObject
 				{
 					// $value['q']=qty to move
 					// $value['id_batch']=id into llx_product_batch of record to move
-					//var_dump($value);
+					//var_dump($value);
 								
 					$linebatch = new ExpeditionLineBatch($this->db);
 					$ret=$linebatch->fetchFromStock($value['id_batch']);	// load serial, sellby, eatby
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 2d5d0e207c6..dbfece18381 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -48,13 +48,13 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 $var=false;
-print '<table class="noborder nohover" width="100%">';
 print '<form method="post" action="list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASending").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</form></table><br>\n";
+print "</table></form><br>\n";
 
 /*
  * Shipments to validate
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 60b9b65e8e8..c877589851d 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -58,15 +58,15 @@ print '<tr valign="top"><td class="notopnoleft" width="30%">';
  * Search form
  */
 $var=false;
-print '<table class="noborder nohover" width="100%">';
 print '<form method="post" action="list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="search_ref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
 print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="search_all" size="18"></td>';
 print '</tr>';
-print "</form></table><br>\n";
+print "</table></form><br>\n";
 
 
 /*
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 49c16d38bc8..a1fa57f97f4 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -453,7 +453,9 @@ if (($action != 'create' && $action != 'add') && !$error) {
 			$companystatic->nom = $soc->nom;
 			print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
 		}
-
+		
+		print '<form method="get" action="orderstoinvoice.php">';
+		print '<input type="hidden" name="socid" value="' . $socid . '">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
@@ -465,8 +467,6 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print "</tr>\n";
 
 		// Lignes des champs de filtre
-		print '<form method="get" action="orderstoinvoice.php">';
-		print '<input type="hidden" name="socid" value="' . $socid . '">';
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">';
 		// REF
@@ -497,7 +497,6 @@ if (($action != 'create' && $action != 'add') && !$error) {
 		print '</td>';
 
 		print '</td></tr>';
-		print '</form>';
 
 		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
 		$var = True;