From 98a12e1b403be942501218db4aa0841ea732ddf6 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 8 Sep 2003 12:25:39 +0000
Subject: [PATCH] =?UTF-8?q?Modifs=20mineures=20de=20pr=E9sentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/bank/account.php3 | 171 +++++++++++++++-----------------
 1 file changed, 80 insertions(+), 91 deletions(-)

diff --git a/htdocs/compta/bank/account.php3 b/htdocs/compta/bank/account.php3
index 7d6d6a3f6a7..d86b075e707 100644
--- a/htdocs/compta/bank/account.php3
+++ b/htdocs/compta/bank/account.php3
@@ -107,11 +107,11 @@ if ($account)
   print '<TABLE border="1" width="100%" cellspacing="0" cellpadding="2">';
   print "<TR>";
   print '<td>&nbsp;</td>';
-  print '<td>&nbsp;</td><td><input type="text" name="req_desc" class="flat" size="24"></TD>';
-  print '<td align="right"><input type="text" name="req_debit" class="flat" size="6"></TD>';
-  print '<td align="right"><input type="text" name="req_credit" class="flat" size="6"></TD>';
-  print "<td align=\"right\">-</TD>";
-  print '<td align="right"><input type="submit" value="Chercher" class="flat"></td>';
+  print '<td>&nbsp;</td><td><input type="text" name="req_desc" size="24"></TD>';
+  print '<td align="right"><input type="text" name="req_debit" size="6"></TD>';
+  print '<td align="right"><input type="text" name="req_credit" size="6"></TD>';
+  print '<td>&nbsp;</td>';
+  print '<td align="right"><input type="submit" value="Chercher"></td>';
   print "</TR>\n";
   print "</form>";
   /*
@@ -214,97 +214,86 @@ if ($account)
 	  $time = time();
 	  if ($i > ($nbline - $viewline))
 	    {
+	      $var=!$var;
 
-	      if (!$psol && $action !='search')
+	      if ($objp->do > $time && !$sep)
 		{
-		  print "<tr $bc[$var]><td colspan=\"4\">&nbsp;</td>";
-		  print "<td align=\"right\">".price($total)."</b></td><td>&nbsp;</td>";
-		  print '<td colspan="2">&nbsp;</td></tr>';
-		  $psol = 1;		  
+		  $sep = 1 ;
+		  print "<tr><td align=\"right\" colspan=\"5\">&nbsp;</td>";
+		  print "<td align=\"right\"><b>".price($total - $objp->amount)."</b></td>";
+		  print "<td>&nbsp;</td>";
+		  print '</tr><tr>';
+		  print '<td><input name="dateoy" type="text" size="4" value="'.strftime("%Y",time()).'" maxlength="4">';
+		  print '<input name="dateo" type="text" size="4" maxlength="4"></td>';
+		  print '<td>';
+		  print '<select name="operation">';
+		  print '<option value="CB">CB';
+		  print '<option value="CHQ">CHQ';
+		  print '<option value="DEP">DEP';
+		  print '<option value="TIP">TIP';
+		  print '<option value="PRE">PRE';
+		  print '<option value="VIR">VIR';
+		  print '</select></td>';
+		  print '<td><input name="num_chq" type="text" size="6">&nbsp;-';
+		  print "<input name=\"label\" type=\"text\" size=40></td>";
+		  print "<td><input name=\"debit\" type=\"text\" size=8></td>";
+		  print "<td><input name=\"credit\" type=\"text\" size=8></td>";
+		  print "<td colspan=\"3\" align=\"center\"><select name=\"cat1\">$options</select></td>";
+		  print "</tr><tr><td colspan=\"3\"><small>YYYYMMDD</small></td><td>0000.00</td>";
+		  print '<td colspan="4" align="center"><input type="submit" value="ajouter"></td></tr>';
+		}
+		  
+	      print "<tr $bc[$var]>";
+	      print "<td>".strftime("%d %b %y",$objp->do)."</TD>\n";
+	      print "<td>".$objp->fk_type."</TD>\n";
+		  
+	      if ($objp->num_chq)
+		{
+		  print "<td>CHQ $objp->num_chq - $objp->label</td>";
 		}
 	      else
 		{
-		  $var=!$var;
-
-		  if ($objp->do > $time && !$sep)
-		    {
-		      $sep = 1 ;
-		      print "<tr><td align=\"right\" colspan=\"5\">&nbsp;</td>";
-		      print "<td align=\"right\"><b>".price($total - $objp->amount)."</b></td>";
-		      print "<td>&nbsp;</td>";
-		      print '</tr><tr>';
-		      print '<td><input name="dateoy" type="text" size="4" value="'.strftime("%Y",time()).'" maxlength="4">';
-		      print '<input name="dateo" type="text" size="4" maxlength="4"></td>';
-		      print '<td>';
-		      print '<select name="operation">';
-		      print '<option value="CB">CB';
-		      print '<option value="CHQ">CHQ';
-		      print '<option value="DEP">DEP';
-		      print '<option value="TIP">TIP';
-		      print '<option value="PRE">PRE';
-		      print '<option value="VIR">VIR';
-		      print '</select></td>';
-		      print '<td><input name="num_chq" type="text" size="6">&nbsp;-';
-		      print "<input name=\"label\" type=\"text\" size=40></td>";
-		      print "<td><input name=\"debit\" type=\"text\" size=8></td>";
-		      print "<td><input name=\"credit\" type=\"text\" size=8></td>";
-		      print "<td colspan=\"3\" align=\"center\"><select name=\"cat1\">$options</select></td>";
-		      print "</tr><tr><td colspan=\"3\"><small>YYYYMMDD</small></td><td>0000.00</td>";
-		      print '<td colspan="4" align="center"><input type="submit" value="ajouter"></td></tr>';
-		    }
-		  
-		  print "<tr $bc[$var]>";
-		  print "<td>".strftime("%d %b %y",$objp->do)."</TD>\n";
-		  print "<td>".$objp->fk_type."</TD>\n";
-		  
-		  if ($objp->num_chq)
-		    {
-		      print "<td>CHQ $objp->num_chq - $objp->label</td>";
-		    }
-		  else
-		    {
-		      print "<td>$objp->label&nbsp;</td>";
-		    }
-
-		  if ($objp->amount < 0)
-		    {
-		      print "<td align=\"right\">".price($objp->amount * -1)."</TD><td>&nbsp;</td>\n";
-		    }
-		  else
-		    {
-		      print "<td>&nbsp;</td><td align=\"right\">".price($objp->amount)."</TD>\n";
-		    }
-		  
-		  if ($action !='search')
-		    {
-		      if ($total > 0)
-			{
-			  print '<td align="right">'.price($total)."</TD>\n";
-			}
-		      else
-			{
-			  print "<td align=\"right\"><b>".price($total)."</b></TD>\n";
-			}
-		    }
-		  else
-		    {
-		      print '<td align="right">-</TD>';
-		    }
-
-		  if ($objp->rappro)
-		    {
-		      print "<td align=\"center\"><a href=\"releve.php3?num=$objp->num_releve&account=$account\">$objp->num_releve</a></td>";
-		    }
-		  else
-		    {
-		      print "<td align=\"center\"><a href=\"$PHP_SELF?action=del&rowid=$objp->rowid&account=$account\">[Del]</a></td>";
-		    }
-		  		  
-		  print "</tr>";
-		  
+		  print "<td>$objp->label&nbsp;</td>";
 		}
+	      
+	      if ($objp->amount < 0)
+		{
+		  print "<td align=\"right\">".price($objp->amount * -1)."</TD><td>&nbsp;</td>\n";
+		}
+	      else
+		{
+		  print "<td>&nbsp;</td><td align=\"right\">".price($objp->amount)."</TD>\n";
+		}
+	      
+	      if ($action !='search')
+		{
+		  if ($total > 0)
+		    {
+		      print '<td align="right">'.price($total)."</TD>\n";
+		    }
+		  else
+		    {
+		      print "<td align=\"right\"><b>".price($total)."</b></TD>\n";
+		    }
+		}
+	      else
+		{
+		  print '<td align="right">-</TD>';
+		}
+	      
+	      if ($objp->rappro)
+		{
+		  print "<td align=\"center\"><a href=\"releve.php3?num=$objp->num_releve&account=$account\">$objp->num_releve</a></td>";
+		}
+	      else
+		{
+		  print "<td align=\"center\"><a href=\"$PHP_SELF?action=del&rowid=$objp->rowid&account=$account\">[Del]</a></td>";
+		}
+	      
+	      print "</tr>";
+	      
 	    }
-	  	  
+	  
 	  $i++;
 	}
       $db->free();
@@ -341,9 +330,9 @@ if ($account)
       print '<td><input name="debit" type="text" size="8"></td>';
       print '<td><input name="credit" type="text" size="8"></td>';
       print "<td colspan=\"2\" align=\"center\"><select name=\"cat1\">$options</select></td>";
-      print '</tr><tr><td colspan="2"><small>YYYYMMDD</small></td><td>0000.00</td>';
+      print '</tr><tr><td colspan="3"><small>YYYYMMDD</small></td><td>0000.00</td>';
       
-      print '<td colspan="4" align="center"><input type="submit" value="Ajouter"></td></tr>';
+      print '<td colspan="3" align="center"><input type="submit" value="Ajouter"></td></tr>';
       
   }
   print "</table></form>";