Merge pull request #6829 from grandoc/new_branch_10_05

Update code using new css class
Dolibarr · May 13, 2017 · b568877 · b568877
2 parents 4221bdc + 26df028
commit b568877
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 59 deletions.
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
@@ -316,15 +316,14 @@
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
 	while (! empty($year) && $oldyear > $year+1)
 	{ // If we have empty year
 		$oldyear--;
 
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
@@ -336,7 +335,7 @@
 	}
 
 
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
@@ -69,22 +69,22 @@ function valeur($sql)
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement";
 $paiem = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
+print "<tr class=\"oddeven\"><td>Somme des paiements (associes a une facture)</td><td align=\"right\">".price($paiem)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0";
 $credits = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
+print "<tr class=\"oddeven\"><td>Somme des credits</td><td align=\"right\">".price($credits)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0";
 $debits = valeur($sql);
-print "<tr ".$bc[$var]."><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
+print "<tr class=\"oddeven\"><td>Somme des debits</td><td align=\"right\">".price($debits)."</td></tr>";
 
 
 $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank ";
 $solde = valeur($sql);
-print "<tr ".$bc[$var]."><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
+print "<tr class=\"oddeven\"><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
 
 
 print "</table>";

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
@@ -3599,12 +3599,11 @@
             print '</tr>';
 
             $total_prev_ht = $total_prev_ttc = 0;
-            $var = true;
             foreach ($object->tab_previous_situation_invoice as $prev_invoice) {
                 $totalpaye = $prev_invoice->getSommePaiement();
                 $total_prev_ht += $prev_invoice->total_ht;
                 $total_prev_ttc += $prev_invoice->total_ttc;
-                print '<tr ' . $bc[$var] . '>';
+                print '<tr class="oddeven">';
                 print '<td>' . $prev_invoice->getNomUrl(1) . '</td>';
                 print '<td></td>';
                 if (! empty($conf->banque->enabled))
@@ -3614,10 +3613,9 @@
                 print '<td align="right">' . $prev_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
 
-                $var = ! $var;
             }
 
-            print '<tr ' . $bc[$var] . '>';
+            print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
             print '<td align="right"><b>' . price($total_prev_ht) . '</b></td>';
             print '<td align="right"><b>' . price($total_prev_ttc) . '</b></td>';
@@ -3638,12 +3636,11 @@
 
             $total_next_ht = $total_next_ttc = 0;
 
-            $var = true;
             foreach ($object->tab_next_situation_invoice as $next_invoice) {
                 $totalpaye = $next_invoice->getSommePaiement();
                 $total_next_ht += $next_invoice->total_ht;
                 $total_next_ttc += $next_invoice->total_ttc;
-                print '<tr ' . $bc[$var] . '>';
+                print '<tr class="oddeven">';
                 print '<td>' . $next_invoice->getNomUrl(1) . '</td>';
                 print '<td></td>';
                 if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
@@ -3652,10 +3649,9 @@
                 print '<td align="right">' . $next_invoice->getLibStatut(3, $totalpaye) . '</td>';
                 print '</tr>';
 
-                $var = ! $var;
             }
 
-            print '<tr ' . $bc[$var] . '>';
+            print '<tr class="oddeven">';
             print '<td colspan="2" align="right"></td>';
 		    if (! empty($conf->banque->enabled)) print '<td align="right"></td>';
 

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
@@ -293,15 +293,14 @@
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
 	$year = $val['year'];
 	while ($year && $oldyear > $year+1)
 	{	// If we have empty year
 		$oldyear--;
 
-		print '<tr '.$bc[$var].' height="24">';
+		print '<tr class="oddeven" height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
 		print '<td align="right">0</td>';
 		print '<td align="right"></td>';
@@ -312,7 +311,7 @@
 		print '</tr>';
 	}
 
-	print '<tr '.$bc[$var].' height="24">';
+	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
 	print '<td align="right">'.$val['nb'].'</td>';
 	print '<td align="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['nb_diff']).'</td>';

diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
@@ -184,7 +184,6 @@
 print "<td>".$langs->trans("Type")."</td><td align='right'>".$langs->trans("Debit")."</td><td align='right'>".$langs->trans("Credit")."</td>";
 print "</tr>\n";
 
-$var=false;
 
 $invoicestatic=new FactureFournisseur($db);
 $companystatic=new Fournisseur($db);
@@ -229,7 +228,7 @@
 		{
 			if (isset($line['nomtcheck']) || $mt)
 			{
-				print "<tr ".$bc[$var]." >";
+				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
@@ -249,8 +248,6 @@
 			}
 		}
 	}
-
-	$var = !$var;
 }
 
 print "</table>";

diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
@@ -216,7 +216,6 @@
 print '<td>'.$langs->trans('Type').'</td><td align="right">'.$langs->trans('Debit').'</td><td align="right">'.$langs->trans('Credit').'</td>';
 print "</tr>\n";
 
-$var=false;
 
 $invoicestatic=new Facture($db);
 $companystatic=new Client($db);
@@ -262,7 +261,7 @@
 		{
 			if (isset($line['nomtcheck']) || $mt)
 			{
-				print "<tr ".$bc[$var]." >";
+				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
@@ -282,8 +281,6 @@
 			}
 		}
 	}
-
-	$var = !$var;
 }
 
 print "</table>";

diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
@@ -145,7 +145,7 @@
         print '<td align="right">'.$langs->trans("Size").'</td>';
         print '<td align="right">'.$langs->trans("Date").'</td>';
         print '</tr>';
-        $var=true;
+
         if (is_resource($handle))
         {
             while (($file = readdir($handle))!==false)
@@ -155,7 +155,7 @@
 
                     $tfile = $dir . '/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
-                    print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
+                    print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
                     print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
                     print '<td align="right">'.dol_print_date(dol_filemtime($tfile),"dayhour").'</td></tr>';
                 }

diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
@@ -129,14 +129,12 @@
   print '</td>';
   print '</tr>';
 
-  $var=True;
 
   while ($i < min($num,$limit))
   {
-      $obj = $db->fetch_object($result);
-
+      $obj = $db->fetch_object($result);     
 
-      print "<tr ".$bc[$var]."><td>";
+      print '<tr class="oddeven"><td>';
 
       print $bon->LibStatut($obj->statut,2);
       print "&nbsp;";

diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
@@ -138,7 +138,6 @@
   	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
   	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td align="center">'.$langs->trans("Invoice").'</td></tr>';
 
-  	$var=True;
 	$total = 0;
 
 	if ($num > 0)
@@ -148,7 +147,7 @@
         {
     		$obj = $db->fetch_object($resql);
 
-    		print "<tr ".$bc[$var]."><td>";
+    		print '<tr class="oddeven"><td>';
 
     		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
     		print img_picto('', 'statut'.$obj->statut).' ';

diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
@@ -127,13 +127,11 @@
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Status").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-		$var=false;
-
 		while ($i < $num)
 		{
 			$row = $db->fetch_row($resql);
 
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 
 			print $ligne->LibStatut($row[1],1);
 

diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
@@ -298,16 +298,13 @@
 		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
 		print '</tr>';
 
-		$var=True;
-
 		$total = 0;
 
-		$var=false;
 		while ($i < min($num,$conf->liste_limit))
 		{
 			$obj = $db->fetch_object($result);
 
-			print "<tr ".$bc[$var]."><td>";
+			print '<tr class="oddeven"><td>';
 
 			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
 			print img_object($langs->trans("ShowBill"),"bill");

diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
@@ -159,15 +159,11 @@
     print '</td>';
     print '</tr>';
 
-    $var=True;
-
     while ($i < min($num,$limit))
     {
-        $obj = $db->fetch_object($result);
-
-
+        $obj = $db->fetch_object($result);    
 
-        print "<tr ".$bc[$var]."><td>";
+        print '<tr class="oddeven"><td>';
 
         print $ligne->LibStatut($obj->statut_ligne,2);
         print "&nbsp;";

diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
@@ -94,15 +94,13 @@
 	print_liste_field_titre($langs->trans("Reason"),$_SERVER["PHP_SELF"],"pr.motif","",$urladd);
 	print "</tr>\n";
 
-	$var=True;
-
 	$total = 0;
 
 	while ($i < min($num,$conf->liste_limit))
 	{
 		$obj = $db->fetch_object($result);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 		print $ligne->LibStatut($obj->statut,2).'&nbsp;';
 		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
 

diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
@@ -96,13 +96,11 @@
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=false;
-
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 
 		print $ligne->LibStatut($row[2],1);
 		//print $st[$row[2]];
@@ -119,7 +117,6 @@
 		print '</td><td align="right">';
 		print round($row[0]/$total*100,2)." %";
 		print '</td></tr>';
-
 
 		$i++;
 	}
@@ -192,16 +189,14 @@
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
 	print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=True;
-
 	require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 	$Rejet = new RejetPrelevement($db, $user);
 
 	while ($i < $num)
 	{
 		$row = $db->fetch_row($resql);
 
-		print "<tr ".$bc[$var]."><td>";
+		print '<tr class="oddeven"><td>';
 		print $Rejet->motifs[$row[2]];
 
 		print '</td><td align="center">'.$row[1];
@@ -215,9 +210,7 @@
 		print '</td><td align="right">';
 		print round($row[0]/$total*100,2)." %";
 
-
 		print '</td></tr>';
-
 
 		$i++;
 	}