';
-$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount,";
+$sql = "SELECT count(b.rowid)";
+$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
+$sql.= " WHERE b.fk_type = 'CHQ'AND b.fk_bordereau = 0";
+$sql.= " AND b.amount > 0";
+
+$resql = $db->query($sql);
+
+print '';
+print '';
+print '| '.$langs->trans("BankChecks")." | \n";
+print " \n";
+
+if ($resql)
+{
+ $var=true;
+ if ($row = $db->fetch_row($resql) )
+ {
+ $num = $row[0];
+ }
+ print "";
+ print '| '.$langs->trans("BankChecksToReceipt").' | ';
+ print ''.$num.' | ';
+ print " \n";
+}
+else
+{
+ dolibarr_print_error($db);
+}
+
+print " | \n";
+print '';
+
+$sql = "SELECT bc.rowid,".$db->pdate("bc.date_bordereau")." as db, bc.amount,bc.number,";
$sql.= " bc.statut, ba.label, ba.rowid as bid";
$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
$sql.= ",".MAIN_DB_PREFIX."bank_account as ba";
@@ -64,10 +96,9 @@ $resql = $db->query($sql);
if ($resql)
{
- $i = 0;
-
print '";
-}
-else
-{
- dolibarr_print_error($db);
-}
-
-print " | \n";
-print '';
-
-$page=$_GET["page"];
-$sortorder=$_GET["sortorder"];
-$sortfield=$_GET["sortfield"];
-
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="p.rowid";
-
-$sql = "SELECT b.amount,b.emetteur,".$db->pdate("b.dateo")." as date,";
-$sql.= " c.code as paiement_code,";
-$sql.= " ba.rowid as bid, ba.label";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as c";
-$sql.= ",".MAIN_DB_PREFIX."bank as b";
-$sql.= ",".MAIN_DB_PREFIX."bank_account as ba";
-$sql.= " WHERE c.code = 'CHQ' AND c.code = b.fk_type AND b.fk_bordereau = 0 AND b.fk_account = ba.rowid";
-$sql.= " AND b.amount > 0";
-//$sql .= " ORDER BY $sortfield $sortorder";
-$sql .= $db->plimit( $limit+1 ,$offset);
-//print "$sql";
-
-$resql = $db->query($sql);
-
-if ($resql)
-{
- $num = $db->num_rows($resql);
- $i = 0;
-
- $paramlist=($_GET["orphelins"]?"&orphelins=1":"");
-
- print '';
- print '';
- print '| '.$langs->trans("Date")." | \n";
- print ''.$langs->trans("Account")." | \n";
- print ''.$langs->trans("Amount")." | \n";
- print ''.$langs->trans("CheckTransmitter")." | \n";
-
- print " \n";
-
- $var=true;
- while ($i < min($num,$limit))
- {
- $objp = $db->fetch_object($resql);
- $var=!$var;
- print "";
- print '| '.dolibarr_print_date($objp->date).' | ';
-
- if ($objp->bid) print ''.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'';
- else print ' ';
- print ' | ';
- print ''.price($objp->amount).' | ';
- print ''.$objp->emetteur.' | ';
- print ' ';
- $i++;
}
print " ";
+ $db->free($resql);
}
else
{
diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php
index 1a3180635e5..c69598b9851 100644
--- a/htdocs/compta/paiement/cheque/liste.php
+++ b/htdocs/compta/paiement/cheque/liste.php
@@ -110,7 +110,9 @@ if ($resql)
$objp = $db->fetch_object($resql);
$var=!$var;
print " |