Merge pull request #6805 from grandoc/new_branch_06_05

Update code using new css class

htdocs/admin/stock.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012-2013 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2013      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2017 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -436,7 +436,6 @@ if ($virtualdiffersfromphysical)
 print '<br />';
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-	$var=false;
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
@@ -444,8 +443,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	print '<td align="center" width="100">&nbsp;</td>'."\n";
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -458,8 +456,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	print '</td></tr>';
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -472,8 +469,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	print '</td></tr>';
 	
 	// Example with a yes / no select
-	$var=!$var;
-	print '<tr '.$bc[$var].'>';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
 	print '<td align="center" width="20">&nbsp;</td>';
 	print '<td align="right" width="300">';
@@ -488,7 +484,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	print '</table>';
 }
 
-$var=true;
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
@@ -510,8 +505,6 @@ if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULAT
     print "</td>\n</tr>\n";
 }
 
-
-
 print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
 print '<td width="160" align="right">';
@@ -524,8 +517,6 @@ print '</form>';
 print "</td>\n";
 print "</tr>\n";
 
-
-
 print '<tr class="oddeven">';
 print '<td width="60%">'.$langs->trans("AllowAddLimitStockByWarehouse").'</td>';
 

htdocs/categories/index.php

@@ -112,8 +112,7 @@ if ($catname || $id > 0)
 	$var=true;
 	foreach ($cats as $cat)
 	{
-		$var = ! $var;
-		print "\t<tr ".$bc[$var].">\n";
+		print "\t".'<tr class="oddeven">'."\n";
 		print "\t\t<td>";
 		$categstatic->id=$cat->id;
 		$categstatic->ref=$cat->label;

htdocs/categories/viewcat.php

@@ -289,11 +289,9 @@ else
 	print "</tr>\n";
 	if (count($cats) > 0)
 	{
-		$var=true;
 		foreach ($cats as $cat)
-		{
-			
-			print "\t<tr ".$bc[$var].">\n";
+		{			
+			print "\t".'<tr class="oddeven">'."\n";
 			print "\t\t".'<td class="nowrap">';
 			print "<a href='viewcat.php?id=".$cat->id."&amp;type=".$type."'>".$cat->label."</a>";
 			print "</td>\n";
@@ -360,11 +358,9 @@ if ($object->type == Categorie::TYPE_PRODUCT)
 
 		if (count($prods) > 0)
 		{
-			$var=true;
 			foreach ($prods as $prod)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $prod->getNomUrl(1);
 				print "</td>\n";
@@ -411,12 +407,9 @@ if ($object->type == Categorie::TYPE_SUPPLIER)
 
 		if (count($socs) > 0)
 		{
-			$var=true;
 			foreach ($socs as $soc)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
-
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
 				print "</td>\n";
@@ -464,14 +457,13 @@ if($object->type == Categorie::TYPE_CUSTOMER)
 		if (count($socs) > 0)
 		{
 			$i = 0;
-			$var=true;
 			foreach ($socs as $key => $soc)
 			{
 				if ($user->societe_id > 0 && $soc->id != $user->societe_id)	continue; 	// External user always see only themself
 
 				$i++;
 				
-				print "\t<tr ".$bc[$var].">\n";
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $soc->getNomUrl(1);
 				print "</td>\n";
@@ -520,11 +512,9 @@ if ($object->type == Categorie::TYPE_MEMBER)
 
 		if (count($prods) > 0)
 		{
-			$var=true;
 			foreach ($prods as $key => $member)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				$member->ref=$member->login;
 				print $member->getNomUrl(1,0);
@@ -574,12 +564,11 @@ if($object->type == Categorie::TYPE_CONTACT)
 		if (count($contacts) > 0)
 		{
 			$i = 0;
-			$var=true;
 			foreach ($contacts as $key => $contact)
 			{
 				$i++;
 				
-				print "\t<tr ".$bc[$var].">\n";
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $contact->getNomUrl(1,'category');
 				print "</td>\n";
@@ -629,11 +618,9 @@ if ($object->type == Categorie::TYPE_ACCOUNT)
 
         if (count($accounts) > 0)
         {
-            $var=true;
             foreach ($accounts as $key => $account)
-            {
-                
-                print "\t<tr ".$bc[$var].">\n";
+            {              
+                print "\t".'<tr class="oddeven">'."\n";
                 print '<td class="nowrap" valign="top">';
                 print $account->getNomUrl(1,0);
                 print "</td>\n";
@@ -684,11 +671,9 @@ if ($object->type == Categorie::TYPE_PROJECT)
 
 		if (count($projects) > 0)
 		{
-			$var=true;
 			foreach ($projects as $key => $project)
-			{
-				
-				print "\t<tr ".$bc[$var].">\n";
+			{				
+				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $project->getNomUrl(1,0);
 				print "</td>\n";

htdocs/comm/card.php

@@ -788,8 +788,7 @@ if ($id > 0)
 
             while ($i < $num && $i < $MAXLIST) {
                 $objp = $db->fetch_object($resql);
-                $var = ! $var;
-                print "<tr " . $bc[$var] . ">";
+                print '<tr class="oddeven">';
                 print '<td class="nowrap">';
                 $sendingstatic->id = $objp->id;
                 $sendingstatic->ref = $objp->ref;

htdocs/comm/index.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * 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
@@ -479,7 +479,6 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$var=false;
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -544,7 +543,6 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var=false;
 		$num = $db->num_rows($result);
 		$i = 0;
 
@@ -633,11 +631,10 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 
 			$staticcontrat=new Contrat($db);
 
-			$var=false;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var]."><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), 'contract')." ".$obj->ref."</a></td>";
+				print '<tr class="oddeven"><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
 				print '<td>';
                 $companystatic->id=$objp->rowid;
                 $companystatic->name=$objp->name;
@@ -686,8 +683,6 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 		$i = 0;
 		if ($num > 0)
 		{
-			$var=true;
-
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 
@@ -785,8 +780,6 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 		$i = 0;
 		if ($num > 0)
 		{
-			$var=true;
-
 			print '<table class="noborder" width="100%">';
 			print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></th></tr>';
 

htdocs/comm/propal/stats/index.php

@@ -293,7 +293,6 @@ print '<td align="right">%</td>';
 print '</tr>';
 
 $oldyear=0;
-$var=true;
 foreach ($data as $val)
 {
     $year = $val['year'];
@@ -301,7 +300,7 @@ foreach ($data as $val)
     {	// 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>';
@@ -311,7 +310,7 @@ foreach ($data as $val)
         print '<td align="right"></td>';
         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.($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>';