From 69fae5a6790c0e476cc7dd0822dc6fd05dc873cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Jan 2020 22:26:37 +0100 Subject: [PATCH] Fix search on accounting account when option to padd 0 is on. --- htdocs/accountancy/admin/account.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php index 38a0c89e4d6..333efefbc9d 100644 --- a/htdocs/accountancy/admin/account.php +++ b/htdocs/accountancy/admin/account.php @@ -215,9 +215,22 @@ if (strlen(trim($search_account))) { } } } + //var_dump($search_account); exit; if ($search_account_tmp) { - if ($weremovedsomezero) $sql .= " AND aa.account_number LIKE '%".$search_account_tmp."'"; + if ($weremovedsomezero) { + $search_account_tmp_clean = $search_account_tmp; + $search_account_clean = $search_account; + $startchar = '%'; + if (strpos($search_account_tmp, '^') === 0) + { + $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); } }