Merge branch 'FIX_jointure_cabyprod' of github.com:atm-quentin/dolibarr into FIX_jointure_cabyprod
This commit is contained in:
commit
2a4f6882c5
@ -266,7 +266,6 @@ if ($modecompta == 'CREANCES-DETTES')
|
|||||||
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 .= "))";
|
$sql .= "))";
|
||||||
|
|
||||||
}
|
}
|
||||||
if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
|
if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
|
||||||
$sql .= " AND f.entity IN (".getEntity('invoice').")";
|
$sql .= " AND f.entity IN (".getEntity('invoice').")";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user