Merge branch 'master' of github.com:akaunting/akaunting
This commit is contained in:
commit
831864f29a
@ -114,7 +114,7 @@ class SearchString extends Component
|
||||
protected function getFilterName($column, $options)
|
||||
{
|
||||
$column = last(explode('.', $column));
|
||||
|
||||
|
||||
if (strpos($column, '_id') !== false) {
|
||||
$column = str_replace('_id', '', $column);
|
||||
} else if (strpos($column, '_code') !== false) {
|
||||
@ -122,7 +122,7 @@ class SearchString extends Component
|
||||
}
|
||||
|
||||
if (! empty($options['translation']) && ! isset($options['boolean'])) {
|
||||
return $options['translation'];
|
||||
return $this->findTranslation($options['translation']);
|
||||
}
|
||||
|
||||
if (!empty($options['key'])) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user