diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 18a24245071..cefb55f2f42 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -78,13 +78,13 @@ print '
| '.$langs->trans("Statistics").'
print ' |
|---|
| '.$langs->trans("NbOfInvoiceToPayByBankTransfer").' | ';
print '';
print '';
-print $bprev->NbFactureAPrelever();
+print $bprev->nbOfInvoiceToPay('credit-transfer');
print '';
print ' |
';
print '| '.$langs->trans("AmountToWithdraw").' | ';
print '';
-print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
+print price($bprev->SommeAPrelever('credit-transfer'), '', '', 1, -1, -1, 'auto');
print ' |
';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 62188f1c7fc..a923f66c699 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -687,17 +687,21 @@ class BonPrelevement extends CommonObject
/**
* Returns amount of withdrawal
*
- * @return double Total amount
+ * @param string $mode 'direct-debit' or 'credit-transfer'
+ * @return double db->error());
+
+ return -1;
}
}
+ /**
+ * Get number of invoices waiting for payment
+ *
+ * @param string $mode 'direct-debit' or 'credit-transfer'
+ * @return int NbFactureAPrelever($mode);
+ }
+
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Get number of invoices to withdrawal
- * TODO delete params banque and agence when not necesary
*
- * @param int $banque dolibarr mysoc bank
- * @param int $agence dolibarr mysoc agence
+ * @param string $mode 'direct-debit' or 'credit-transfer'
* @return int global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
{
$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
}
- $sql .= " AND f.rowid = pfd.fk_facture";
+ if ($mode == 'credit-transfer') {
+ $sql .= " AND f.rowid = pfd.fk_facture_fourn";
+ } else {
+ $sql .= " AND f.rowid = pfd.fk_facture";
+ }
$sql .= " AND pfd.traite = 0";
$sql .= " AND f.total_ttc > 0";
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 06ae8f7c794..d94864e8358 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -142,10 +142,8 @@ print load_fiche_titre($title);
dol_fiche_head();
$nb = $bprev->NbFactureAPrelever();
-$nb1 = $bprev->NbFactureAPrelever(1);
-$nb11 = $bprev->NbFactureAPrelever(1, 1);
$pricetowithdraw = $bprev->SommeAPrelever();
-if ($nb < 0 || $nb1 < 0 || $nb11 < 0)
+if ($nb < 0)
{
dol_print_error($bprev->error);
}
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 5e1905e3a59..eaec6d92f16 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -78,13 +78,13 @@ print '| '.$langs->trans("Statistics").'
print ' |
|---|
| '.$langs->trans("NbOfInvoiceToWithdraw").' | ';
print '';
print '';
-print $bprev->NbFactureAPrelever();
+print $bprev->nbOfInvoiceToPay('direct-debit');
print '';
print ' |
';
print '| '.$langs->trans("AmountToWithdraw").' | ';
print '';
-print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
+print price($bprev->SommeAPrelever('direct-debit'), '', '', 1, -1, -1, 'auto');
print ' |
';