2
0
forked from Wavyzz/dolibarr

Merge pull request #22281 from atm-lena/16.0_FIX_getunitFromCode_AddFilterType

Function getUnitFromCode : add filter by type of unit
This commit is contained in:
Laurent Destailleur
2022-09-25 14:19:33 +02:00
committed by GitHub
2 changed files with 8 additions and 4 deletions

View File

@@ -8508,7 +8508,7 @@ function dol_osencode($str)
* @return int <0 if KO, Id of code if OK
* @see $langs->getLabelFromKey
*/
function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)
function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '')
{
global $cache_codes;
@@ -8530,6 +8530,9 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
if (!empty($entityfilter)) {
$sql .= " AND entity IN (".getEntity($tablename).")";
}
if ($filters) {
$sql .= $filters;
}
$resql = $db->query($sql);
if ($resql) {