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

Update list.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-10-26 13:28:06 +02:00 committed by GitHub
parent 7fee355fba
commit d6045cdb78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/fourn/facture/list.php
View File

@ -11,7 +11,7 @@
* Copyright (C) 2015-2016 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2015-2016 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2017 Josep Lluís Amador <joseplluis@lliuretic.cat> * Copyright (C) 2017 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com> * Copyright (C) 2018 Charlene Benke <charlie@patas-monkey.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -375,12 +375,13 @@ if (! $search_all)
$sql.= " state.code_departement, state.nom,"; $sql.= " state.code_departement, state.nom,";
$sql.= ' country.code,'; $sql.= ' country.code,';
$sql.= " p.rowid, p.ref, p.title"; $sql.= " p.rowid, p.ref, p.title";
if (! empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) //prevent error with sql_mode=only_full_group_by foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
{ //prevent error with sql_mode=only_full_group_by
$sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key : ''); $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key : '');
} }
} }
}
else else
{ {
$sql.= natural_search(array_keys($fieldstosearchall), $search_all); $sql.= natural_search(array_keys($fieldstosearchall), $search_all);