Merge pull request #8978 from grandoc/new_branch_17_06_2018

clean and update code

htdocs/compta/clients.php

@@ -172,14 +172,10 @@ if ($resql)
 	print '</td>';
 	print "</tr>\n";
 
-	$var=true;
-
 	while ($i < min($num,$conf->liste_limit))
 	{
 		$obj = $db->fetch_object($resql);
 
-
-
 		print '<tr class="oddeven">';
 		print '<td>';
 		$thirdpartystatic->id=$obj->rowid;

htdocs/compta/index.php

@@ -568,10 +568,8 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 		print '</tr>';
 		if ($num)
 		{
-			$var = true;
 			$total_ttc = $totalam = $total = 0;
 
-			$var=true;
 			while ($i < $num && $i < $max)
 			{
 				$objp = $db->fetch_object($result);
@@ -632,7 +630,6 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		$resql = $db->query($sql);
 		if ( $resql )
 		{
-			$var = false;
 			$num = $db->num_rows($resql);
 
 			print '<table class="noborder" width="100%">';
@@ -664,7 +661,6 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 					print '<td align="center">'.$chargestatic->getLibStatut(3).'</td>';
 					print '</tr>';
 					$tot_ttc+=$obj->amount;
-					$var = !$var;
 					$i++;
 				}
 
@@ -722,7 +718,6 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 	$resql = $db->query($sql);
 	if ( $resql )
 	{
-		$var=false;
 		$num = $db->num_rows($resql);
 
 		if ($num)
@@ -838,7 +833,6 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$var=false;
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -972,7 +966,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 	$resql=$db->query($sql);
 	if ($resql)
 	{
-		$var=false;
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -1023,7 +1016,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 				$total_ttc +=  $obj->total_ttc;
 				$totalam +=  $obj->am;
 				$i++;
-				$var = !$var;
 			}
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).')</font> </td>';
@@ -1057,7 +1049,6 @@ if ($resql)
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
 	print "</tr>\n";
-	$var = true;
 	$i = 0;
 	while ($i < $db->num_rows($resql))
 	{

htdocs/compta/paiement.php

@@ -589,7 +589,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<td align="right">&nbsp;</td>';
                 print "</tr>\n";
 
-                $var=true;
                 $total=0;
                 $totalrecu=0;
                 $totalrecucreditnote=0;
@@ -599,7 +598,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 {
                     $objp = $db->fetch_object($resql);
 
-
 					$soc = new Societe($db);
 					$soc->fetch($objp->socid);
 
@@ -842,7 +840,6 @@ if (! GETPOST('action','aZ09'))
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=true;
 
         print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
         print '<table class="noborder" width="100%">';

htdocs/compta/paiement_charge.php

@@ -272,7 +272,6 @@ if ($action == 'create')
 	print '<td align="center">'.$langs->trans("Amount").'</td>';
 	print "</tr>\n";
 
-	$var=true;
 	$total=0;
 	$totalrecu=0;
 
@@ -280,8 +279,6 @@ if ($action == 'create')
 	{
 		$objp = $charge;
 
-
-
 		print '<tr class="oddeven">';
 
 		if ($objp->date_ech > 0)
@@ -325,7 +322,7 @@ if ($action == 'create')
 	if ($i > 1)
 	{
 		// Print total
-		print "<tr ".$bc[!$var].">";
+		print '<tr class="oddeven">';
 		print '<td colspan="2" align="left">'.$langs->trans("Total").':</td>';
 		print "<td align=\"right\"><b>".price($total_ttc)."</b></td>";
 		print "<td align=\"right\"><b>".price($totalrecu)."</b></td>";

htdocs/compta/recap-compta.php

@@ -129,7 +129,6 @@ if ($id > 0)
 		$resql=$db->query($sql);
 		if ($resql)
 		{
-			$var=true;
 			$num = $db->num_rows($resql);
 
 			// Boucle sur chaque facture

htdocs/compta/salaries/index.php

@@ -140,7 +140,6 @@ if ($result)
     $num = $db->num_rows($result);
     $i = 0;
     $total = 0 ;
-	$var=true;
 
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;

htdocs/compta/sociales/index.php

@@ -137,7 +137,6 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	$var=true;
 
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;

htdocs/compta/sociales/payments.php

@@ -158,12 +158,10 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		$total = 0;
 		$totalnb = 0;
 		$totalpaye = 0;
-		$var=true;
 
 		while ($i < min($num, $limit))
 		{
 			$obj = $db->fetch_object($resql);
-			$var = !$var;
 			print '<tr class="oddeven">';
 			// Ref payment
 			$payment_sc_static->id=$obj->pid;
@@ -253,14 +251,13 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"pv.datev","",$param,'align="center"',$sortfield,$sortorder);
 			print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
 		    print "</tr>\n";
-		    $var=1;
+
 		    while ($i < $num)
 		    {
 		        $obj = $db->fetch_object($result);
 
 		        $total = $total + $obj->amount;
 
-
 		        print '<tr class="oddeven">';
 		        print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
 
@@ -355,14 +352,13 @@ while($j<$numlt)
 			print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"pv.datep","",$param,'align="center"',$sortfield,$sortorder);
 			print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
 			print "</tr>\n";
-			$var=1;
+
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
 
 				$total = $total + $obj->amount;
 
-
 				print '<tr class="oddeven">';
 				print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
 
@@ -437,14 +433,13 @@ if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
             print_liste_field_titre("DatePayment",$_SERVER["PHP_SELF"],"s.datep","",$param,'align="center"',$sortfield,$sortorder);
             print_liste_field_titre("PayedByThisPayment",$_SERVER["PHP_SELF"],"s.amount","",$param,'align="right"',$sortfield,$sortorder);
             print "</tr>\n";
-            $var=1;
+
             while ($i < $num)
             {
                 $obj = $db->fetch_object($result);
 
                 $total = $total + $obj->amount;
 
-
                 print '<tr class="oddeven">';
 
                 print '<td align="left">'.dol_print_date($db->jdate($obj->dateep),'day').'</td>'."\n";

htdocs/compta/stats/cabyuser.php

@@ -327,8 +327,7 @@ print_liste_field_titre(
 	"",
 	'align="center" width="20%"'
 	);
-print "</tr>\n";
+print "</tr>\n"; 
-$var=true;
 
 if (count($amount)) {
     $arrayforsort=$name;

htdocs/compta/tva/list.php

@@ -141,7 +141,6 @@ if ($result)
     $num = $db->num_rows($result);
     $i = 0;
     $total = 0 ;
-	$var=true;
 
 	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;

htdocs/contrat/services_list.php

@@ -531,7 +531,6 @@ print "</tr>\n";
 $contractstatic=new Contrat($db);
 $productstatic=new Product($db);
 
-$var=true;
 $i=0;
 $totalarray=array();
 while ($i < min($num,$limit))

htdocs/don/payment/payment.php

@@ -249,7 +249,6 @@ if (GETPOST('action','aZ09') == 'create')
 	print '<td align="center">'.$langs->trans("Amount").'</td>';
 	print "</tr>\n";
 
-	$var=true;
 	$total=0;
 	$totalrecu=0;
 
@@ -257,8 +256,6 @@ if (GETPOST('action','aZ09') == 'create')
 	{
 		$objp = $don;
 
-		
-
 		print '<tr class="oddeven">';
 
 		print '<td align="right">'.price($objp->amount)."</td>";
@@ -288,7 +285,7 @@ if (GETPOST('action','aZ09') == 'create')
 	if ($i > 1)
 	{
 		// Print total
-		print "<tr ".$bc[!$var].">";
+		print '<tr class="oddeven">';
 		print '<td colspan="2" align="left">'.$langs->trans("Total").':</td>';
 		print "<td align=\"right\"><b>".price($total_ttc)."</b></td>";
 		print "<td align=\"right\"><b>".price($totalrecu)."</b></td>";

htdocs/expensereport/list.php

@@ -644,7 +644,6 @@ if ($resql)
 	if ($num > 0)
 	{
         $i=0;
-    	$var=true;
     	$totalarray=array();
  	    while ($i < min($num,$limit))
 		{

htdocs/exports/class/export.class.php

@@ -80,7 +80,6 @@ class Export
 
 		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $var=true;
         $i=0;
 
         // Define list of modules directories into modulesdir
@@ -595,8 +594,6 @@ class Export
 				// Genere ligne de titre
 				$objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
 
-				$var=true;
-
 				while ($obj = $this->db->fetch_object($resql))
 				{
 					// Process special operations

htdocs/exports/export.php

@@ -585,12 +585,10 @@ if ($step == 2 && $datatoexport)
 	//    $this->array_export_entities[0]=$module->export_fields_entities[$r];
 	//    $this->array_export_alias[0]=$module->export_fields_alias[$r];
 
-    $var=true;
     $i = 0;
 
     foreach($fieldsarray as $code=>$label)
     {
-
         print '<tr class="oddeven">';
 
         $i++;
@@ -779,7 +777,6 @@ if ($step == 3 && $datatoexport)
 	// Select request if all fields are selected
 	$sqlmaxforexport=$objexport->build_sql(0, array(), array());
 
-	$var=true;
 	$i = 0;
 	// on boucle sur les champs
 	foreach($fieldsarray as $code => $label)
@@ -977,7 +974,6 @@ if ($step == 4 && $datatoexport)
     //print '<td>'.$langs->trans("FieldsTitle").'</td>';
     print '</tr>';
 
-    $var=true;
     foreach($array_selected as $code=>$value)
     {
         print '<tr class="oddeven">';
@@ -1074,7 +1070,7 @@ if ($step == 4 && $datatoexport)
 		print '<td>'.$langs->trans("ExportModelName").'</td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
-		$var=false;
+
 		print '<tr class="oddeven">';
 		print '<td><input name="export_name" size="32" value=""></td><td align="right">';
         print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
@@ -1091,10 +1087,8 @@ if ($step == 4 && $datatoexport)
 		{
 			$num = $db->num_rows($resql);
 			$i = 0;
-			$var=false;
 			while ($i < $num)
 			{
-
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
@@ -1229,8 +1223,7 @@ if ($step == 5 && $datatoexport)
 
     print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
 
-    // Liste des formats d'exports disponibles
+    // List of available export formats
-    $var=true;
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
     print '<td class="titlefield">'.$langs->trans("AvailableFormats").'</td>';
@@ -1248,7 +1241,6 @@ if ($step == 5 && $datatoexport)
     		unset($liste[$key]);
     	}
 
-
         print '<tr class="oddeven">';
         print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).' ';
 	    $text=$objmodelexport->getDriverDescForKey($key);

htdocs/exports/index.php

@@ -60,7 +60,6 @@ print '<td>'.$langs->trans("Module").'</td>';
 print '<td>'.$langs->trans("ExportableDatas").'</td>';
 //print '<td>&nbsp;</td>';
 print '</tr>';
-$var=true;
 if (count($export->array_export_code))
 {
 	foreach ($export->array_export_code as $key => $value)
@@ -112,8 +111,7 @@ print '<br>';
 //print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
-// List of available export format
+// List of available export formats
-$var=true;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
@@ -125,7 +123,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 $model=new ModeleExports($db);
 $liste=$model->liste_modeles($db);    // This is not a static method for exports because method load non static properties
 
-$var=true;
 foreach($liste as $key => $val)
 {
     if (preg_match('/__\(Disabled\)__/',$liste[$key]))
@@ -133,7 +130,6 @@ foreach($liste as $key => $val)
     	$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
     }
 
-
 	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
 	$text=$model->getDriverDescForKey($key);