From 10e0f6f2abaef058a41ea407fd0879ec6ba2f321 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Jun 2024 15:08:16 +0200 Subject: [PATCH] Debug v20 - popup of combo go out of screen --- htdocs/core/class/html.formexpensereport.class.php | 12 +++++++----- htdocs/expensereport/list.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php index 2f6faab8363..4e64a9356c1 100644 --- a/htdocs/core/class/html.formexpensereport.class.php +++ b/htdocs/core/class/html.formexpensereport.class.php @@ -57,15 +57,16 @@ class FormExpenseReport * @param string $htmlname Name of HTML select * @param int $useempty 1=Add empty line * @param int $useshortlabel Use short labels + * @param string $morecss More CSS * @return string HTML select with status */ - public function selectExpensereportStatus($selected = 0, $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0) + public function selectExpensereportStatus($selected = 0, $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0, $morecss = '') { global $langs; $tmpep = new ExpenseReport($this->db); - $html = ''; if ($useempty) { $html.=''; } @@ -82,9 +83,10 @@ class FormExpenseReport $html .= $langs->trans($val); $html .= ''; } - $html .= ''; - $html .= ajax_combobox($htmlname); - print $html; + $html .= ''."\n"; + + $html .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', ($useempty < 0 ? (string) $useempty : '-1'), $morecss); + return $html; } diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 1bc15aa0020..59f03517777 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -681,7 +681,7 @@ if (!empty($arrayfields['d.tms']['checked'])) { // Status if (!empty($arrayfields['d.fk_statut']['checked'])) { print ''; - $formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1); + print $formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1, 'search_status width100 onrightofpage'); print ''; } // Action column