From c235d4ec4ff642f2c5e70e19421651d328b14637 Mon Sep 17 00:00:00 2001 From: David Pareja Rodriguez Date: Fri, 1 Sep 2023 11:48:16 +0200 Subject: [PATCH 1/4] Remove unnecessary queries --- .../accountancy/journal/purchasesjournal.php | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 1170a20b969..794239c90f2 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -182,6 +182,7 @@ if ($result) { $tabrctva = array(); $tabrclocaltax1 = array(); $tabrclocaltax2 = array(); + $vatdata_cache = array(); $num = $db->num_rows($result); @@ -208,7 +209,13 @@ if ($result) { } } - $vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0); + $tax_id = $obj->tva_tx . ($obj->vat_src_code ? ' (' . $obj->vat_src_code . ')' : ''); + if (array_key_exists($tax_id, $vatdata_cache)) { + $vatdata = $vatdata_cache[$tax_id]; + } else { + $vatdata = getTaxesFromId($tax_id, $mysoc, $mysoc, 0); + $vatdata_cache[$tax_id] = $vatdata; + } $compta_tva = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); $compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); $compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva); @@ -320,6 +327,8 @@ if ($result) { $errorforinvoice = array(); +/* +// Old way, 1 query for each invoice // Loop in invoices to detect lines with not binding lines foreach ($tabfac as $key => $val) { // Loop on each invoice $sql = "SELECT COUNT(fd.rowid) as nb"; @@ -336,6 +345,30 @@ foreach ($tabfac as $key => $val) { // Loop on each invoice dol_print_error($db); } } +*/ +// New way, single query, load all unbound lines +$sql = " +SELECT + fk_facture_fourn, + COUNT(fd.rowid) as nb +FROM + llx_facture_fourn_det as fd +WHERE + fd.product_type <= 2 + AND fd.fk_code_ventilation <= 0 + AND fd.total_ttc <> 0 +GROUP BY fk_facture_fourn +"; +$resql = $db->query($sql); + +$num = $db->num_rows($result); +$i = 0; +while ($i < $num) { + $obj = $db->fetch_object($resql); + if ($obj->nb > 0) { + $errorforinvoice[$obj->fk_facture_fourn] = 'somelinesarenotbound'; + } +} //var_dump($errorforinvoice);exit; From a1fe51b6138be61d74431acfc589e515d136967a Mon Sep 17 00:00:00 2001 From: David Pareja Rodriguez Date: Fri, 1 Sep 2023 12:13:08 +0200 Subject: [PATCH 2/4] Missing counter increase --- htdocs/accountancy/journal/purchasesjournal.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 794239c90f2..41d663aa0ae 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -368,6 +368,7 @@ while ($i < $num) { if ($obj->nb > 0) { $errorforinvoice[$obj->fk_facture_fourn] = 'somelinesarenotbound'; } + $i++; } //var_dump($errorforinvoice);exit; From d6c2fb9d9b0259457c041d4b2dbcc2384bd1ff49 Mon Sep 17 00:00:00 2001 From: David Pareja Rodriguez Date: Fri, 1 Sep 2023 13:19:04 +0200 Subject: [PATCH 3/4] Fix using wrong variable on num_rows --- htdocs/accountancy/journal/purchasesjournal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 41d663aa0ae..07b558dd541 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -361,7 +361,7 @@ GROUP BY fk_facture_fourn "; $resql = $db->query($sql); -$num = $db->num_rows($result); +$num = $db->num_rows($resql); $i = 0; while ($i < $num) { $obj = $db->fetch_object($resql); From 246f381a078506fa8ed106ea2fc543aac9f4be3d Mon Sep 17 00:00:00 2001 From: David Pareja Rodriguez Date: Mon, 4 Sep 2023 08:23:16 +0200 Subject: [PATCH 4/4] Requested changes --- htdocs/accountancy/journal/purchasesjournal.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 07b558dd541..01f66dac48d 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -325,6 +325,12 @@ if ($result) { dol_print_error($db); } +// Check for too many invoices first. +if (count($tabfac) > 10000) { // Global config in htdocs/admin/const.php??? + $error++; + setEventMessages("TooManyInvoicesToProcessPleaseUseAMoreSelectiveFilter", null, 'errors'); +} + $errorforinvoice = array(); /* @@ -357,6 +363,7 @@ WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0 AND fd.total_ttc <> 0 + AND fk_facture_fourn IN (".$db->sanitize(join(",", array_keys($tabfac))).") GROUP BY fk_facture_fourn "; $resql = $db->query($sql);