From 9f7f263f791abd0c460519e52d6fd363aa7f7c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Oct 2019 21:49:36 +0200 Subject: [PATCH 1/3] fix broken search --- htdocs/core/lib/company.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 084c543a8c2..0018a5b6b76 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1047,9 +1047,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '') print ''; if (in_array($key, array('statut'))){ print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status); - }else{ - $fieldName = substr($key, 2); - print sprintf('', $fieldName, dol_escape_htmltag($search[$key])); + } else { + print ''; } print ''; } From 453ae05030a905129c3cb066a9994c946f5c5d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Oct 2019 22:09:50 +0200 Subject: [PATCH 2/3] Update company.lib.php --- htdocs/core/lib/company.lib.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 0018a5b6b76..14546227ff4 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -223,7 +223,7 @@ function societe_prepare_head(Societe $object) else { dol_print_error($db); } - +$key //if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...'; // No way to know exact number $head[$h][0] = DOL_URL_ROOT .'/societe/paymentmodes.php?socid='.$object->id; @@ -243,7 +243,7 @@ function societe_prepare_head(Societe $object) $sql.= " FROM ".MAIN_DB_PREFIX."societe_account as n"; $sql.= " WHERE fk_soc = ".$object->id.' AND fk_website > 0'; $resql=$db->query($sql); - if ($resql) + if ($resql)$key { $num = $db->num_rows($resql); $i = 0; @@ -951,7 +951,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '') { $queryName = 'search_'.substr($key, 2); if (GETPOST($queryName, 'alpha')){ - $search[$key]=GETPOST($queryName, 'alpha'); + $search[substr($key, 2)]=GETPOST($queryName, 'alpha'); } } $search_array_options=$extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_'); From 6d117a501a28f8a457ab431415778c7cdf58827a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Oct 2019 22:11:27 +0200 Subject: [PATCH 3/3] Update company.lib.php --- htdocs/core/lib/company.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 14546227ff4..6d8e396c361 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -223,7 +223,7 @@ function societe_prepare_head(Societe $object) else { dol_print_error($db); } -$key + //if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...'; // No way to know exact number $head[$h][0] = DOL_URL_ROOT .'/societe/paymentmodes.php?socid='.$object->id; @@ -243,7 +243,7 @@ $key $sql.= " FROM ".MAIN_DB_PREFIX."societe_account as n"; $sql.= " WHERE fk_soc = ".$object->id.' AND fk_website > 0'; $resql=$db->query($sql); - if ($resql)$key + if ($resql) { $num = $db->num_rows($resql); $i = 0;