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

keep where but remove join

Browse Source
This commit is contained in:
Quentin VIAL-GOUTEYRON 2021-06-07 10:05:24 +02:00
parent b8b30a9af6
commit 80af5e2216
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/stats/cabyprodserv.php
View File

@ -231,8 +231,6 @@ if ($modecompta == 'CREANCES-DETTES')
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
if ($selected_cat === -2) { // Without any category if ($selected_cat === -2) { // Without any category
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
} elseif ($selected_cat) { // Into a specific category
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON (cp.fk_product = p.rowid) INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON (cp.fk_categorie = c.rowid)";
} }
$sql .= " WHERE l.fk_facture = f.rowid"; $sql .= " WHERE l.fk_facture = f.rowid";
$sql .= " AND f.fk_statut in (1,2)"; $sql .= " AND f.fk_statut in (1,2)";
@ -263,10 +261,13 @@ if ($modecompta == 'CREANCES-DETTES')
} }
} }
$sql .= " AND (p.rowid IN ";
$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
$sql .= " AND "; $sql .= " AND ";
if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")"; if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
else $sql .= "cp.fk_categorie = ".$selected_cat; else $sql .= "cp.fk_categorie = ".$selected_cat;
$sql .= "))";
} }
if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc; if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;