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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-21 22:39:30 +01:00
commit d329c4ad38
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/accountancy/admin/account.php
View File

@ -218,12 +218,21 @@ if (strlen(trim($search_account))) {
} }
} }
} }
//var_dump($search_account); exit; //var_dump($search_account); exit;
if ($search_account_tmp) { if ($search_account_tmp) {
if ($weremovedsomezero) { if ($weremovedsomezero) {
$search_account_tmp_clean = $search_account_tmp;
$search_account_clean = $search_account;
$startchar = '%'; $startchar = '%';
if (strpos('^', $search_account_tmp) === 0) $startchar = ''; if (strpos($search_account_tmp, '^') === 0)
else $sql .= " AND aa.account_number LIKE '".$startchar.$search_account_tmp."'"; {
$startchar = '';
$search_account_tmp_clean = preg_replace('/^\^/', '', $search_account_tmp);
$search_account_clean = preg_replace('/^\^/', '', $search_account);
}
$sql .= " AND (aa.account_number LIKE '".$startchar.$search_account_tmp_clean."'";
$sql .= " OR aa.account_number LIKE '".$startchar.$search_account_clean."%')";
} }
else $sql .= natural_search("aa.account_number", $search_account_tmp); else $sql .= natural_search("aa.account_number", $search_account_tmp);
} }