diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index dd79ee54ba1599a900392ffc2596a0fc4568b0a2..8967e22a160180d34266f34e5e464433f5cea262 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -316,7 +316,6 @@ print '<td align="right">%</td>'; print '</tr>'; $oldyear=0; -$var=true; foreach ($data as $val) { $year = $val['year']; @@ -324,7 +323,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.'&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 @@ foreach ($data as $val) } - print '<tr '.$bc[$var].' height="24">'; + print '<tr class="oddeven" height="24">'; print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&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 index eb6aea4f2dcdc58c3a9513bb866f7a12425c6a45..2b3c897f3cef908c8028bc7261667c6b2e50e2d0 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -69,22 +69,22 @@ print "</tr>\n"; $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 index 9483e79dba4d7a9ec98a7d7541ecd58006414b38..495085bc2745d5454d1daeb175706f566bfbfbfc 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3599,12 +3599,11 @@ else if ($id > 0 || ! empty($ref)) 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 @@ else if ($id > 0 || ! empty($ref)) 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 @@ else if ($id > 0 || ! empty($ref)) $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 @@ else if ($id > 0 || ! empty($ref)) 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 index 771911363388a683f2729090a011f9fc7fc45d7d..55ff4dad6e3f705ff6bfbb1dbcb3f2b96d1894e8 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/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.'&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 @@ foreach ($data as $val) 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.'&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 index f0b520bb11ed6645e67539f47657e550601f7653..fbd391ffe2ac25123d7de0e4373a186ca61b3d30 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -184,7 +184,6 @@ print "<td>".$langs->trans("Account")."</td>"; 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 @@ foreach ($tabfac as $key => $val) { 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 @@ foreach ($tabfac as $key => $val) } } } - - $var = !$var; } print "</table>"; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 670d89fd2cbd601d2953970c1d13b5154c82d3cc..fd0c45be7cde8216df8332b061972b1690bc0c7a 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -216,7 +216,6 @@ print '<td>'.$langs->trans('Account').'</td>'; 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 @@ foreach ($tabfac as $key => $val) { 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 @@ foreach ($tabfac as $key => $val) } } } - - $var = !$var; } print "</table>"; diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index e9a90667e69e4249152a53fd3e83d2e65813e0ac..c73f79c60a419b792c9f01409bc71933cb311385 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -145,7 +145,7 @@ if ($year) 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 @@ if ($year) $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&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&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 index dbbf9d09ac79b09e68ce5585bdd87707161e2101..973135765dc3d332752ed6fffb891cf12158c4e9 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -129,14 +129,12 @@ if ($result) 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 " "; diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 064f41e41e80c5e2a63dd58cbf1389c39e833f46..f2240a070e6f5a811e23c513db45d6703ec9ee7a 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -138,7 +138,6 @@ if ($resql) 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 @@ if ($resql) { $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 index c5d441e3260cadd16c47a9a09a6c3ee1005c798f..7e0c4f81e4b63b48dc7af29fed48e9ac2774d4f7 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -127,13 +127,11 @@ if ($prev_id) 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 index 64ddb12a7bcd4fca29045e3598d845b08418aa25..933c23b0e7e36668cb442fe7c18dafa1003f5dc9 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -298,16 +298,13 @@ if ($id) 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 index f7fe4b77e7ddd4dcb515e0ad15a86e5a4842b33b..2fa8a2554070348c7f8ab021cbe0c1cf30f6bad0 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -159,15 +159,11 @@ if ($result) 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 " "; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index ef72ca8f6e52d61c11e8a39cd1e5beaadabfb0e8..0f737a50f2292507e0ab8800a5905d0e899c3421 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -94,15 +94,13 @@ if ($result) 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).' '; 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 index b666b355e24c282e55299eac0cd69e3414000f4e..406c2303b6aace3e577029082ed24775ba73238d 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -96,13 +96,11 @@ if ($resql) 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 @@ if ($resql) print '</td><td align="right">'; print round($row[0]/$total*100,2)." %"; print '</td></tr>'; - $i++; } @@ -192,8 +189,6 @@ if ($resql) 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); @@ -201,7 +196,7 @@ if ($resql) { $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 @@ if ($resql) print '</td><td align="right">'; print round($row[0]/$total*100,2)." %"; - print '</td></tr>'; - $i++; }