lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: avoid to show warning in some cases

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-11 01:23:00 +02:00
parent 92a4000e73
commit 7c1d955f6c
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/compta/facture/prelevement.php
View File

@ -206,6 +206,34 @@ if ($object->id > 0) {
$head = facture_prepare_head($object);
}
$numopen = 0;
$pending = 0;
$numclosed = 0;
// How many Direct debit or Credit transfer open requests ?
$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
$sql .= " , pfd.date_traite as date_traite";
$sql .= " , pfd.amount";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
if ($type == 'bank-transfer') {
$sql .= " WHERE fk_facture_fourn = ".((int) $object->id);
} else {
$sql .= " WHERE fk_facture = ".((int) $object->id);
}
$sql .= " AND pfd.traite = 0";
$sql .= " AND pfd.ext_payment_id IS NULL";
$sql .= " ORDER BY pfd.date_demande DESC";
$result_sql = $db->query($sql);
if ($result_sql) {
$num = $db->num_rows($result_sql);
$numopen = $num;
} else {
dol_print_error($db);
}
print dol_get_fiche_head($head, 'standingorders', $title, -1, ($type == 'bank-transfer' ? 'supplier_invoice' : 'bill'));
// Invoice content
@ -481,7 +509,9 @@ if ($object->id > 0) {
print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
}
} else {
print img_warning($langs->trans("NoDefaultIBANFound"));
if ($numopen || ($type == 'bank-transfer' && $object->mode_reglement_code == 'PRE') || ($type != 'bank-transfer' && $object->mode_reglement_code == 'VIR')) {
print img_warning($langs->trans("NoDefaultIBANFound"));
}
}
print '</td></tr>';
@ -565,34 +595,6 @@ if ($object->id > 0) {
print dol_get_fiche_end();
$numopen = 0;
$pending = 0;
$numclosed = 0;
// How many Direct debit opened requests ?
$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
$sql .= " , pfd.date_traite as date_traite";
$sql .= " , pfd.amount";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
if ($type == 'bank-transfer') {
$sql .= " WHERE fk_facture_fourn = ".((int) $object->id);
} else {
$sql .= " WHERE fk_facture = ".((int) $object->id);
}
$sql .= " AND pfd.traite = 0";
$sql .= " AND pfd.ext_payment_id IS NULL";
$sql .= " ORDER BY pfd.date_demande DESC";
$result_sql = $db->query($sql);
if ($result_sql) {
$num = $db->num_rows($result_sql);
$numopen = $num;
} else {
dol_print_error($db);
}
// For which amount ?
$sql = "SELECT SUM(pfd.amount) as amount";