Look: Modif esth�tiques mineurs sur page affichant relev�s

htdocs/compta/bank/ligne.php

@@ -359,7 +359,7 @@ if ($result)
         if (! $objp->rappro)
         {
             print '<td colspan="3">';
-            print '<input name="amount" class="flat" size="10" value="'.price($objp->amount).'"> '.$conf->monnaie;
+            print '<input name="amount" class="flat" size="10" value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie);
             print '</td><td align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'">';
         }
         else
@@ -372,7 +372,7 @@ if ($result)
         print "</form>";
     
         // Type paiement
-        print "<tr><td>".$langs->trans("Type")."</td><td colspan=\"3\">";
+        print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero")."</td><td colspan=\"3\">";
         print "<form method=\"post\" action=\"ligne.php?rowid=$objp->rowid\">";
         print '<input type="hidden" name="action" value="type">';
         print "<input type=\"hidden\" name=\"orig_account\" value=\"".$orig_account."\">";

htdocs/compta/bank/rappro.php

@@ -171,16 +171,16 @@ if ($resql)
         dolibarr_print_error($db);
     }
 
-    print '<table class="noborder" width="100%">';
+    print '<table class="border" width="100%">';
     print "<tr class=\"liste_titre\">\n";
-    print '<td>'.$langs->trans("Date").'</td>';
-    print '<td>'.$langs->trans("DateValue").'</td>';
+    print '<td align="center">'.$langs->trans("DateOperationShort").'</td>';
+    print '<td align="center">'.$langs->trans("DateValueShort").'</td>';
     print '<td>'.$langs->trans("Type").'</td>';
     print '<td>'.$langs->trans("Description").'</td>';
-    print '<td align="right">'.$langs->trans("Debit").'</td>';
-    print '<td align="right">'.$langs->trans("Credit").'</td>';
-    print '<td align="center" width="60">'.$langs->trans("Action").'</td>';
-    print '<td align="center" width="100" colspan="2">'.$langs->trans("AccountStatement").' (Ex: YYYYMM)</td>';
+    print '<td align="right" width="60" nowrap>'.$langs->trans("Debit").'</td>';
+    print '<td align="right" width="60" nowrap>'.$langs->trans("Credit").'</td>';
+    print '<td align="center" width="40">'.$langs->trans("Action").'</td>';
+    print '<td align="center">'.$langs->trans("AccountStatement").'<br>(Ex: YYYYMM)</td>';
     print "</tr>\n";
 
 
@@ -196,21 +196,40 @@ if ($resql)
         print "<input type=\"hidden\" name=\"account\" value=\"".$_GET["account"]."\">";
         print "<input type=\"hidden\" name=\"rowid\" value=\"".$objp->rowid."\">";
 
-        print '<td nowrap>'.dolibarr_print_date($objp->do).'</td>';
-        print '<td nowrap>'.dolibarr_print_date($objp->dv).'</td>';
-        print '<td nowrap>'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>';
-        print '<td><a href="ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">'.$objp->label.'</a>';
+        print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->do,"%d/%m/%Y").'</td>';
+        print '<td align="center" nowrap="nowrap">'.dolibarr_print_date($objp->dv,"%d/%m/%Y").'</td>';
+        print '<td nowrap="nowrap">'.$objp->type.($objp->num_chq?' '.$objp->num_chq:'').'</td>';
+        print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">'.$objp->label.'</a>';
+        
         /*
-         * Ajout les liens
+         * Ajout les liens (societe, company...)
          */
+        $newline=1;
         $links = $acct->get_url($objp->rowid);
         foreach($links as $key=>$val)
         {
-            print ' - ';
-            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-            // if ($links[$key]['type']=='payment') { print img_object($langs->trans('ShowPayment'),'payment').' '; }
-            // if ($links[$key]['type']=='company') { print img_object($langs->trans('ShowCustomer'),'company').' '; }
-            print $links[$key]['label'].'</a>';
+            if (! $newline) print ' - ';
+            else print '<br>';
+            if ($links[$key]['type']=='payment') {
+                print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+                print img_object($langs->trans('ShowPayment'),'payment').' ';
+                print $langs->trans("Payment");
+                print '</a>';
+                $newline=0;
+            }
+            elseif ($links[$key]['type']=='company') {
+                print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+                print img_object($langs->trans('ShowCustomer'),'company').' ';
+                print dolibarr_trunc($links[$key]['label'],24);
+                print '</a>';
+                $newline=0;
+            }
+            else {
+                print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+                print $links[$key]['label'];
+                print '</a>';
+                $newline=0;
+            }
         }
         print '</td>';
 
@@ -226,18 +245,18 @@ if ($resql)
         if ($objp->rappro)
         {
             // Si ligne déjà rapprochée, on affiche relevé.
-            print "<td align=\"center\"><a href=\"releve.php?num=$objp->num_releve&amp;account=$acct->id\">$objp->num_releve</a></td>";
+            print "<td align=\"center\" nowrap=\"nowrap\"><a href=\"releve.php?num=$objp->num_releve&amp;account=$acct->id\">$objp->num_releve</a></td>";
         }
         else
         {
             // Si pas encore rapprochée
             if ($user->rights->banque->modifier)
             {
-                print '<td align="center" width="30">';
+                print '<td align="center" width="30" nowrap="nowrap">';
 
                 print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;orig_account='.$acct->id.'">';
                 print img_edit();
-                print '</a>&nbsp; &nbsp;';
+                print '</a>&nbsp; ';
 
                 if ($objp->do <= mktime() ) {
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?action=del&amp;rowid='.$objp->rowid.'&amp;account='.$acct->id.'">';
@@ -245,7 +264,7 @@ if ($resql)
                     print '</a>';
                 }
                 else {
-                    print "&nbsp;";	// On n'empeche la suppression car le raprochement ne pourra se faire qu'après la date passée et que l'écriture apparaissent bien sur le compte.
+                    print "&nbsp;";	// On n'empeche la suppression car le raprochement ne pourra se faire qu'après la date passée et que l'écriture apparaisse bien sur le compte.
                 }
                 print "</td>";
             }
@@ -256,24 +275,25 @@ if ($resql)
         }
 
 
-        // Affiche bouton "Rapprocher"
-        if ($objp->do <= mktime() ) {
-            print "<td align=\"center\">";
+        // Affiche zone saisie relevé + bouton "Rapprocher"
+        if ($objp->do <= mktime())
+        {
+            print '<td align="center" nowrap="nowrap">';
             print "<input class=\"flat\" name=\"num_releve\" type=\"text\" value=\"\" size=\"8\">";
+            print ' &nbsp; ';
+            print "<input class=\"button\" type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">";
             if ($options)
             {
                 print "<br><select class=\"flat\" name=\"cat1\">$options";
                 print "</select>";
             }
             print "</td>";
-            print "<td align=\"center\"><input class=\"button\" type=\"submit\" value=\"".$langs->trans("Rapprocher")."\">";
-            print "</td>";
         }
         else
         {
-            print "<td align=\"left\" colspan=\"2\">";
-            print "Ecriture future. Ne peut pas encore être rapprochée.";
-            print "</td>";
+            print '<td align="left">';
+            print 'Ecriture future. Ne peut pas encore être rapprochée.';
+            print '</td>';
         }
 
         print "</tr>\n";

htdocs/compta/bank/releve.php

@@ -111,180 +111,223 @@ if (! isset($_GET["num"]))
 }
 else
 {
-  /**
-   * Vue d'un releve
-   *
-   */
-  if ($_GET["rel"] == 'prev')
+    /**
+     *      Affiche liste ecritures d'un releve
+     */
+    if ($_GET["rel"] == 'prev')
     {
-      // Recherche valeur pour num = numéro relevé précédent
-      $sql = "SELECT distinct(num_releve) as num";
-      $sql.= " FROM ".MAIN_DB_PREFIX."bank";
-      $sql.= " WHERE num_releve < ".$_GET["num"]." AND fk_account = ".$_GET["account"];
-      $sql.= " ORDER BY num_releve DESC";
-      $result = $db->query($sql);
-      if ($result)
-	{
-	  $var=True;  
-	  $numrows = $db->num_rows($result);
-	  $i = 0; 
-	  if ($numrows > 0)
-	    {
-	      $obj = $db->fetch_object($result);
-	      $num = $obj->num;
-	    }
-	}
+        // Recherche valeur pour num = numéro relevé précédent
+        $sql = "SELECT distinct(num_releve) as num";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank";
+        $sql.= " WHERE num_releve < ".$_GET["num"]." AND fk_account = ".$_GET["account"];
+        $sql.= " ORDER BY num_releve DESC";
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $var=True;
+            $numrows = $db->num_rows($result);
+            $i = 0;
+            if ($numrows > 0)
+            {
+                $obj = $db->fetch_object($result);
+                $num = $obj->num;
+            }
+        }
     }
-  elseif ($_GET["rel"] == 'next')
+    elseif ($_GET["rel"] == 'next')
     {
-      // Recherche valeur pour num = numéro relevé précédent
-      $sql = "SELECT distinct(num_releve) as num";
-      $sql.= " FROM ".MAIN_DB_PREFIX."bank";
-      $sql.= " WHERE num_releve > ".$_GET["num"]." AND fk_account = ".$_GET["account"];
-      $sql.= " ORDER BY num_releve ASC";
-      $result = $db->query($sql);
-      if ($result)
-	{
-	  $var=True;  
-	  $numrows = $db->num_rows($result);
-	  $i = 0; 
-	  if ($numrows > 0)
-	    {
-	      $obj = $db->fetch_object($result);
-	      $num = $obj->num;
-	    }
-	}
+        // Recherche valeur pour num = numéro relevé précédent
+        $sql = "SELECT distinct(num_releve) as num";
+        $sql.= " FROM ".MAIN_DB_PREFIX."bank";
+        $sql.= " WHERE num_releve > ".$_GET["num"]." AND fk_account = ".$_GET["account"];
+        $sql.= " ORDER BY num_releve ASC";
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $var=True;
+            $numrows = $db->num_rows($result);
+            $i = 0;
+            if ($numrows > 0)
+            {
+                $obj = $db->fetch_object($result);
+                $num = $obj->num;
+            }
+        }
     }
-  else {
-    // On veut le relevé num
-    $num=$_GET["num"];
-  }
-  $ve=$_GET["ve"];
-  
-  $mesprevnext ="<a href=\"releve.php?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_previous()."</a> &nbsp;";
-  $mesprevnext.= $langs->trans("AccountStatement")." $num";
-  $mesprevnext.=" &nbsp; <a href=\"releve.php?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_next()."</a>";
-  print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>',$mesprevnext);
-  print '<br>';
-
-  print "<form method=\"post\" action=\"releve.php\">";
-  print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-  print '<table class="border" width="100%">';
-  print "<tr class=\"liste_titre\">";
-  print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("DateValue").'</td><td>'.$langs->trans("Type").'</td><td width="30%">'.$langs->trans("Description").'</td>';
-  print '<td align="right">'.$langs->trans("Debit").'</td>';
-  print '<td align="right">'.$langs->trans("Credit").'</td>';
-  print '<td align="right">'.$langs->trans("Balance").'</td>';
-  print '<td>&nbsp;</td>';
-  print "</tr>\n";
- 
-
-  $sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < $num AND fk_account = ".$acct->id;
-  $resql=$db->query($sql);
-  if ($resql)
-  {
-      $total = $db->result(0, 0);
-      $db->free($resql);
-  }
-
-  $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
-  $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
-  $sql .= " WHERE num_releve='".$num."'";
-  if (!isset($num)) {
-  	$sql .= " or num_releve is null";
-  }
-  $sql .= " AND fk_account = ".$acct->id;
-  $sql .= " ORDER BY datev ASC";
-  $result = $db->query($sql);
-  if ($result)
-    {
-      $var=True;  
-      $numrows = $db->num_rows($result);
-      $i = 0; 
-
-      // Ligne Solde début releve
-      print "<tr><td colspan=\"4\"><a href=\"releve.php?num=$num&amp;ve=1&amp;rel=$rel&amp;account=".$acct->id."\">Vue etendue</a></td>";
-      print "<td align=\"right\" colspan=\"2\"><b>".$langs->trans("Solde initial")." :</b></td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
-
-      while ($i < $numrows)
-	{
-	  $objp = $db->fetch_object($result);
-	  $total = $total + $objp->amount;
-	  
-	  $var=!$var;
-	  print "<tr $bc[$var]>";
-	  
-	  print '<td>'.dolibarr_print_date($objp->do).'</td><td valign="center">';
-
-	  /* Mise à jour de la date de valeur */
-
-	  print '<a href="releve.php?action=dvprev&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
-	  print img_previous() . "</a> ";
-	  print strftime("%d/%m/%Y",$objp->dv) ." ";
-	  print '<a href="releve.php?action=dvnext&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
-	  print img_next();
-
-	  print "</td>\n";
-	  print '<td>'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').'</td>';
-	  print "<td>$objp->label";
-	  
-	  if ($ve)
-	    {
-	      $sql = "SELECT label FROM ".MAIN_DB_PREFIX."bank_categ as ct, ".MAIN_DB_PREFIX."bank_class as cl WHERE ct.rowid=cl.fk_categ AND cl.lineid=$objp->rowid";
-	      $resc = $db->query($sql);
-	      if ($resc)
-		{
-		  $numc = $db->num_rows($resc);
-		  $ii = 0; 
-		  while ($ii < $numc)
-		    {
-		      $objc = $db->fetch_object($resc);
-		      print "<br>-&nbsp;<i>$objc->label</i>";
-		      $ii++;
-		    }
-		}
-	      else
-		{
-		  dolibarr_print_error($db);
-		}
-	    }
-	  
-	  print "</td>";
-	  
-	  if ($objp->amount < 0)
-	    {
-	      $totald = $totald + abs($objp->amount);
-	      print '<td align="right">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
-	    }
-	  else
-	    {
-	      $totalc = $totalc + abs($objp->amount);
-	      print "<td>&nbsp;</td><td align=\"right\">".price($objp->amount)."</td>\n";
-	    }
+    else {
+        // On veut le relevé num
+        $num=$_GET["num"];
+    }
+    $ve=$_GET["ve"];
     
-	  print "<td align=\"right\">".price($total)."</td>\n";
-	  
-	  if ($user->rights->banque->modifier)
-	    {
-	      print "<td align=\"center\"><a href=\"ligne.php?rowid=$objp->rowid&amp;account=".$acct->id."\">";
-	      print img_edit();
-	      print "</a></td>";
-	    }
-	  else
-	    {
-	      print "<td align=\"center\">&nbsp;</td>";
-	    }
-	  print "</tr>";
-	  $i++;
-	}
-      $db->free($result);
+    $mesprevnext ="<a href=\"releve.php?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_previous()."</a> &nbsp;";
+    $mesprevnext.= $langs->trans("AccountStatement")." $num";
+    $mesprevnext.=" &nbsp; <a href=\"releve.php?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$acct->id\">".img_next()."</a>";
+    print_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>',$mesprevnext);
+    print '<br>';
+    
+    print "<form method=\"post\" action=\"releve.php\">";
+    print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+
+    print '<table class="border" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td align="center">'.$langs->trans("DateOperationShort").'</td>';
+    print '<td align="center">'.$langs->trans("DateValueShort").'</td>';
+    print '<td>'.$langs->trans("Type").'</td>';
+    print '<td>'.$langs->trans("Description").'</td>';
+    print '<td align="right" width="60">'.$langs->trans("Debit").'</td>';
+    print '<td align="right" width="60">'.$langs->trans("Credit").'</td>';
+    print '<td align="right">'.$langs->trans("Balance").'</td>';
+    print '<td>&nbsp;</td>';
+    print "</tr>\n";
+    
+    
+    $sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank WHERE num_releve < $num AND fk_account = ".$acct->id;
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $total = $db->result(0, 0);
+        $db->free($resql);
     }
-  // Ligne Total
-  print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total")." :</td><td align=\"right\">".price($totald)."</td><td align=\"right\">".price($totalc)."</td><td>&nbsp;</td><td>&nbsp;</td></tr>";
-  // Ligne Solde
-  print "<tr><td align=\"right\" colspan=\"4\">&nbsp;</td><td align=\"right\" colspan=\"2\"><b>".$langs->trans("Solde final")." :</b></td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
-  print "</table></form>\n";
-  
+    
+    $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type";
+    $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+    $sql .= " WHERE num_releve='".$num."'";
+    if (!isset($num))
+    {
+        $sql .= " or num_releve is null";
+    }
+    $sql .= " AND fk_account = ".$acct->id;
+    $sql .= " ORDER BY datev ASC";
+    $result = $db->query($sql);
+
+    if ($result)
+    {
+        $var=True;
+        $numrows = $db->num_rows($result);
+        $i = 0;
+    
+        // Ligne Solde début releve
+        print "<tr><td colspan=\"4\"><a href=\"releve.php?num=$num&amp;ve=1&amp;rel=$rel&amp;account=".$acct->id."\">&nbsp;</a></td>";
+        print "<td align=\"right\" colspan=\"2\"><b>".$langs->trans("InitialBankBalance")." :</b></td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
+    
+        while ($i < $numrows)
+        {
+            $objp = $db->fetch_object($result);
+            $total = $total + $objp->amount;
+    
+            $var=!$var;
+            print "<tr $bc[$var]>";
+    
+            // Date operation
+            print '<td nowrap="nowrap" align="center">'.dolibarr_print_date($objp->do,"%d/%m/%Y").'</td>';
+    
+            // Date de valeur
+            print '<td align="center" valign="center" nowrap="nowrap">';
+            print '<a href="releve.php?action=dvprev&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
+            print img_previous().'</a> ';
+            print dolibarr_print_date($objp->dv,"%d/%m/%Y") .' ';
+            print '<a href="releve.php?action=dvnext&amp;num='.$num.'&amp;account='.$_GET["account"].'&amp;dvid='.$objp->rowid.'">';
+            print img_next().'</a>';
+            print "</td>\n";
+    
+            // Num chq
+            print '<td nowrap="nowrap">'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').'</td>';
+    
+            // Libelle
+            print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">'.$objp->label.'</a>';
+    
+            /*
+             * Ajout les liens (societe, company...)
+             */
+            $newline=1;
+            $links = $acct->get_url($objp->rowid);
+            foreach($links as $key=>$val)
+            {
+                if (! $newline) print ' - ';
+                else print '<br>';
+                if ($links[$key]['type']=='payment') {
+                    print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+                    print img_object($langs->trans('ShowPayment'),'payment').' ';
+                    print $langs->trans("Payment");
+                    print '</a>';
+                    $newline=0;
+                }
+                elseif ($links[$key]['type']=='company') {
+                    print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+                    print img_object($langs->trans('ShowCustomer'),'company').' ';
+                    print dolibarr_trunc($links[$key]['label'],24);
+                    print '</a>';
+                    $newline=0;
+                }
+                else {
+                    print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+                    print $links[$key]['label'];
+                    print '</a>';
+                    $newline=0;
+                }
+            }
+    
+            // Catégories
+            if ($ve)
+            {
+                $sql = "SELECT label FROM ".MAIN_DB_PREFIX."bank_categ as ct, ".MAIN_DB_PREFIX."bank_class as cl WHERE ct.rowid=cl.fk_categ AND cl.lineid=$objp->rowid";
+                $resc = $db->query($sql);
+                if ($resc)
+                {
+                    $numc = $db->num_rows($resc);
+                    $ii = 0;
+                    if ($numc && ! $newline) print '<br>';
+                    while ($ii < $numc)
+                    {
+                        $objc = $db->fetch_object($resc);
+                        print "<br>-&nbsp;<i>$objc->label</i>";
+                        $ii++;
+                    }
+                }
+                else
+                {
+                    dolibarr_print_error($db);
+                }
+            }
+    
+            print "</td>";
+    
+            if ($objp->amount < 0)
+            {
+                $totald = $totald + abs($objp->amount);
+                print '<td align="right" nowrap=\"nowrap\">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
+            }
+            else
+            {
+                $totalc = $totalc + abs($objp->amount);
+                print "<td>&nbsp;</td><td align=\"right\" nowrap=\"nowrap\">".price($objp->amount)."</td>\n";
+            }
+    
+            print "<td align=\"right\" nowrap=\"nowrap\">".price($total)."</td>\n";
+    
+            if ($user->rights->banque->modifier)
+            {
+                print "<td align=\"center\"><a href=\"ligne.php?rowid=$objp->rowid&amp;account=".$acct->id."\">";
+                print img_edit();
+                print "</a></td>";
+            }
+            else
+            {
+                print "<td align=\"center\">&nbsp;</td>";
+            }
+            print "</tr>";
+            $i++;
+        }
+        $db->free($result);
+    }
+
+    // Ligne Total
+    print "<tr><td align=\"right\" colspan=\"4\">".$langs->trans("Total")." :</td><td align=\"right\">".price($totald)."</td><td align=\"right\">".price($totalc)."</td><td>&nbsp;</td><td>&nbsp;</td></tr>";
+
+    // Ligne Solde
+    print "<tr><td align=\"right\" colspan=\"4\">&nbsp;</td><td align=\"right\" colspan=\"2\"><b>".$langs->trans("EndBankBalance")." :</b></td><td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
+    print "</table></form>\n";
 }
 $db->close();
 

htdocs/compta/facture.php

@@ -1267,7 +1267,7 @@ else
 			print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">';
 
 			/*
-			 * Paiements
+			 * Liste des paiements
 			 */
 			print $langs->trans('Payments').' :<br>';
 			$sql = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,';
@@ -1281,7 +1281,7 @@ else
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$i = 0; $total = 0;
+				$i = 0; $totalpaye = 0;
 				print '<table class="noborder" width="100%">';
 				print '<tr class="liste_titre"><td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Type').'</td>';
 				print '<td align="right">'.$langs->trans('Amount').'</td><td>&nbsp;</td></tr>';

htdocs/fourn/paiement/fiche.php

@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -182,14 +181,17 @@ if ($resql)
 	$total = 0;
 	print '<br><table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans('Bill').'</td><td>'.$langs->trans('Company').'</td>';
-	print '<td align="right">'.$langs->trans('AmountTTC').'</td><td align="center">'.$langs->trans('Status').'</td>';
+	print '<td width="80">'.$langs->trans('Bill').'</td>';
+	print '<td width="80" align="center">'.$langs->trans('Status').'</td>';
+	print '<td>'.$langs->trans('Company').'</td>';
+	print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
 	{
 		$var=True;
 
+    	$fac_static=new FactureFournisseur($db);
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($resql);
@@ -198,10 +200,9 @@ if ($resql)
 			print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$objp->facid.'">'.img_object($langs->trans('ShowBill'),'bill').' ';
 			print $objp->facnumber;
 			print "</a></td>\n";
+			print '<td align="center">'.$fac_static->LibStatut($objp->paye,$objp->fk_statut).'</td>';
 			print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->idp.'">'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.'</a></td>';
 			print '<td align="right">'.price($objp->amount).'</td>';
-			$fac=new FactureFournisseur($db);
-			print '<td align="center">'.$fac->LibStatut($objp->paye,$objp->fk_statut).'</td>';
 			print "</tr>\n";
 			if ($objp->paye == 1)
 			{

htdocs/langs/en_US/banks.lang

@@ -15,6 +15,7 @@ SavingAccounts=Saving accounts
 ErrorBankLabelAlreadyExists=Financial account label already exists
 BankBalance=Balance
 InitialBankBalance=Initial balance
+EndBankBalance=End balance
 CurrentBalance=Current balance
 RIB=RIB
 IBAN=IBAN number

htdocs/langs/en_US/main.lang

@@ -117,6 +117,9 @@ DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
 DateValue=Value date
+DateValueShort=Value date
+DateOperation=Operation date
+DateOperationShort=Ope. Date
 DateLimit=Limit date
 DateRequest=Request date 
 DateProcess=Process date

htdocs/langs/fr_FR/banks.lang

@@ -15,6 +15,7 @@ SavingAccounts=Comptes
 ErrorBankLabelAlreadyExists=Libellé de compte financier déjà existant
 BankBalance=Solde
 InitialBankBalance=Solde initial
+EndBankBalance=Solde final
 CurrentBalance=Solde actuel
 RIB=RIB
 IBAN=Identifiant IBAN

htdocs/langs/fr_FR/main.lang

@@ -116,6 +116,9 @@ DateValidation=Date validation
 DateClosing=Date clôture
 DateDue=Date échéance
 DateValue=Date valeur
+DateValueShort=Date valeur
+DateOperation=Date opération
+DateOperationShort=Date opé.
 DateLimit=Date limite
 DateRequest=Date demande
 DateProcess=Date traitement