Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #25618 from Daviid-P/remove_unnecessary_queries_from_bonprelevement_class_php

Browse Source 
Removed classes instantiations and fetch to avoid multiple DB queries per invoice
This commit is contained in:
Laurent Destailleur
2023-09-04 15:09:41 +02:00
committed by GitHub
parent 29a9c7f5de 916030b8f1
commit aadf9b34e4
2 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@@ -730,25 +730,25 @@ class BonPrelevement extends CommonObject
// phpcs:enable
global $conf;
$sql = "SELECT sum(pfd.amount) as nb";
$sql = "SELECT sum(pd.amount) as nb";
if ($mode != 'bank-transfer') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
} else {
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
}
$sql .= " ".MAIN_DB_PREFIX."prelevement_demande as pfd";
$sql .= " ".MAIN_DB_PREFIX."prelevement_demande as pd";
$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
}
if ($mode != 'bank-transfer') {
$sql .= " AND f.rowid = pfd.fk_facture";
$sql .= " AND f.rowid = pd.fk_facture";
} else {
$sql .= " AND f.rowid = pfd.fk_facture_fourn";
$sql .= " AND f.rowid = pd.fk_facture_fourn";
}
$sql .= " AND f.paye = 0";
$sql .= " AND pfd.traite = 0";
$sql .= " AND pfd.ext_payment_id IS NULL";
$sql .= " AND pd.traite = 0";
$sql .= " AND pd.ext_payment_id IS NULL";
$sql .= " AND f.total_ttc > 0";
$resql = $this->db->query($sql);
@@ -796,18 +796,18 @@ class BonPrelevement extends CommonObject
} else {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
}
$sql .= ", ".MAIN_DB_PREFIX."prelevement_demande as pfd";
$sql .= ", ".MAIN_DB_PREFIX."prelevement_demande as pd";
$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
}
if ($type == 'bank-transfer') {
$sql .= " AND f.rowid = pfd.fk_facture_fourn";
$sql .= " AND f.rowid = pd.fk_facture_fourn";
} else {
$sql .= " AND f.rowid = pfd.fk_facture";
$sql .= " AND f.rowid = pd.fk_facture";
}
$sql .= " AND pfd.traite = 0";
$sql .= " AND pfd.ext_payment_id IS NULL";
$sql .= " AND pd.traite = 0";
$sql .= " AND pd.ext_payment_id IS NULL";
$sql .= " AND f.total_ttc > 0";
dol_syslog(get_class($this)."::NbFactureAPrelever");
@@ -891,31 +891,29 @@ class BonPrelevement extends CommonObject
$factures_errors = array();
if (!$error) {
$sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc";
$sql = "SELECT f.rowid, pd.rowid as pfdrowid, f.fk_soc";
$sql .= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
$sql .= ", pfd.amount";
$sql .= ", s.nom as name";
$sql .= ", f.ref, sr.bic, sr.iban_prefix, sr.frstrecur";
if ($type != 'bank-transfer') {
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "prelevement_demande as pd ON f.rowid = pd.fk_facture";
} else {
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "prelevement_demande as pd ON f.rowid = pd.fk_facture_fourn";
}
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
$sql .= ", ".MAIN_DB_PREFIX."prelevement_demande as pfd";
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_rib as sr ON s.rowid = sr.fk_soc AND sr.default_rib = 1";
$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
if ($type != 'bank-transfer') {
$sql .= " AND f.rowid = pfd.fk_facture";
} else {
$sql .= " AND f.rowid = pfd.fk_facture_fourn";
}
$sql .= " AND s.rowid = f.fk_soc";
$sql .= " AND f.fk_statut = 1"; // Invoice validated
$sql .= " AND f.paye = 0";
$sql .= " AND pfd.traite = 0";
$sql .= " AND pd.traite = 0";
$sql .= " AND f.total_ttc > 0";
$sql .= " AND pfd.ext_payment_id IS NULL";
$sql .= " AND pd.ext_payment_id IS NULL";
$sql .= " AND sr.type = 'bank' ";
if ($did > 0) {
$sql .= " AND pfd.rowid = ".((int) $did);
$sql .= " AND pd.rowid = ".((int) $did);
}
dol_syslog(__METHOD__." Read invoices,", LOG_DEBUG);
@@ -953,6 +951,7 @@ class BonPrelevement extends CommonObject
if (count($factures) > 0) {
foreach ($factures as $key => $fac) {
/*
if ($type != 'bank-transfer') {
$tmpinvoice = new Facture($this->db);
} else {
@@ -960,36 +959,51 @@ class BonPrelevement extends CommonObject
}
$resfetch = $tmpinvoice->fetch($fac[0]);
if ($resfetch >= 0) { // Field 0 of $fac is rowid of invoice
if ($soc->fetch($tmpinvoice->socid) >= 0) {
$bac = new CompanyBankAccount($this->db);
$bac->fetch(0, $soc->id);
*/
// Check if $fac[8] s.nom is null
if ($fac[8] != null) {
//$bac = new CompanyBankAccount($this->db);
//$bac->fetch(0, $soc->id);
if ($type != 'bank-transfer') {
if ($format == 'FRST' && $bac->frstrecur != 'FRST') {
if ($format == 'FRST' && $fac[12] != 'FRST') {
continue;
}
if ($format == 'RCUR' && $bac->frstrecur != 'RCUR') {
if ($format == 'RCUR' && $fac[12] != 'RCUR') {
continue;
}
}
if ($bac->verif() >= 1) {
$verif = checkSwiftForAccount(null, $fac[10]);
if ($verif) {
$verif = checkIbanForAccount(null, $fac[11]);
}
if ($verif) {
$factures_prev[$i] = $fac;
/* second array necessary for BonPrelevement */
$factures_prev_id[$i] = $fac[0];
$i++;
//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
} else {
dol_syslog(__METHOD__." Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$tmpinvoice->socid." ".$soc->name, LOG_WARNING);
$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$tmpinvoice->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$tmpinvoice->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
if ($type != 'bank-transfer') {
$invoice_url = "<a href='".DOL_URL_ROOT.'/compta/facture/card.php?facid='.$fac[0]."'>".$fac[9]."</a>";
} else {
$invoice_url = "<a href='".DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$fac[0]."'>".$fac[9]."</a>";
}
dol_syslog(__METHOD__ . " Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() " . $fac->fk_soc . " " . $soc->name, LOG_WARNING);
$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $soc->getNomUrl(0);
$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice " . $invoice_url . " for thirdparty " . $soc->getNomUrl(0);
}
} else {
dol_syslog(__METHOD__." Check BAN Failed to read company", LOG_WARNING);
dol_syslog(__METHOD__ . " Check BAN Failed to read company", LOG_WARNING);
}
/*
} else {
dol_syslog(__METHOD__." Check BAN Failed to read invoice", LOG_WARNING);
}
*/
}
} else {
dol_syslog(__METHOD__." Check BAN No invoice to process", LOG_WARNING);
@@ -1099,21 +1113,25 @@ class BonPrelevement extends CommonObject
}
if (!$error) {
/*
if ($type != 'bank-transfer') {
$fact = new Facture($this->db);
} else {
$fact = new FactureFournisseur($this->db);
}
*/
// Add lines for the bon
if (count($factures_prev) > 0) {
foreach ($factures_prev as $fac) { // Add a link in database for each invoice
// Fetch invoice
/*
$result = $fact->fetch($fac[0]);
if ($result < 0) {
$this->error = 'ERRORBONPRELEVEMENT Failed to load invoice with id '.$fac[0];
break;
}
*/
/*
* Add standing order. This add record into llx_prelevement_lignes and llx_prelevement
@@ -1127,6 +1145,10 @@ class BonPrelevement extends CommonObject
* $fac[6] : cle rib
* $fac[7] : amount
* $fac[8] : client nom
* $fac[9] : Invoice ref
* $fac[10] : BIC
* $fac[11] : IBAN
* $fac[12] : frstrcur
*/
$ri = $this->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6], $type);
if ($ri <> 0) {

17
htdocs/core/lib/bank.lib.php
View File

@@ -276,9 +276,13 @@ function various_payment_prepare_head($object)
* @param Account $account A bank account
* @return boolean True if informations are valid, false otherwise
*/
function checkSwiftForAccount($account)
function checkSwiftForAccount(Account $account = null, $swift = null)
{
$swift = $account->bic;
if ($account == null && $swift == null) {
return false;
} elseif ($swift == null) {
$swift = $account->bic;
}
if (preg_match("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) {
return true;
} else {
@@ -292,12 +296,15 @@ function checkSwiftForAccount($account)
* @param Account $account A bank account
* @return boolean True if informations are valid, false otherwise
*/
function checkIbanForAccount(Account $account)
function checkIbanForAccount(Account $account = null, $ibantocheck = null)
{
if ($account == null && $ibantocheck == null) {
return false;
} elseif ($ibantocheck == null) {
$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix); // iban or iban_prefix for backward compatibility
}
require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix); // iban or iban_prefix for backward compatibility
$iban = new PHP_IBAN\IBAN($ibantocheck);
$check = $iban->Verify();