From 8e257a3a8cc27663e851fe7eca7a91cc94ef76cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 31 Dec 2025 01:16:37 +0100 Subject: [PATCH 1/3] Debug v23 --- htdocs/compta/bank/graph.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 974b7151794..5b2835ff5de 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -71,9 +71,7 @@ $error = 0; */ $now = dol_now(); -$nowlasthour = dol_get_last_hour($now); - -$form = new Form($db); +$nowlasthourmidday = dol_get_last_hour($now) + 1 + (12 * 3600); // +1 to get next day at 00:00:00. We add 12 hours to be at midday. $datetime = dol_now(); $year = dol_print_date($datetime, "%Y"); @@ -221,7 +219,7 @@ if ($result < 0) { $dataall = array(); while ($xmonth == $month) { $subtotal += (isset($amounts[$textdate]) ? $amounts[$textdate] : 0); - if ($day > $nowlasthour) { + if ($day > $nowlasthourmidday) { $datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph } else { $datas[$i] = $solde + $subtotal; @@ -369,7 +367,7 @@ if ($result < 0) { $i = 0; while ($xyear == $year && $day <= $datetime) { $subtotal += (isset($amounts[$textdate]) ? $amounts[$textdate] : 0); - if ($day > $nowlasthour) { + if ($day > $nowlasthourmidday) { $datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph } else { $datas[$i] = $solde + $subtotal; From 285360f67c74fc43bcf238b546a10b83e4a6d578 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 31 Dec 2025 01:30:20 +0100 Subject: [PATCH 2/3] Debug v23 --- htdocs/compta/bank/graph.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 5b2835ff5de..a0eaea450a8 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -230,6 +230,7 @@ if ($result < 0) { $labels[$i] = $xday; $day += 86400; + //$textdate = strftime("%Y%m%d", $day); $textdate = dol_print_date($day, "%Y%m%d"); $xyear = substr($textdate, 0, 4); @@ -365,25 +366,22 @@ if ($result < 0) { $xday = substr($textdate, 6, 2); $i = 0; - while ($xyear == $year && $day <= $datetime) { + while ($xyear == $year && $day <= $nowlasthourmidday) { $subtotal += (isset($amounts[$textdate]) ? $amounts[$textdate] : 0); - if ($day > $nowlasthourmidday) { - $datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph - } else { - $datas[$i] = $solde + $subtotal; - } + + $datas[$i] = $solde + $subtotal; + $datamin[$i] = $object->min_desired; $dataall[$i] = $object->min_allowed; - /*if ($xday == '15') // Set only some label for jflot - { - $labels[$i] = dol_print_date($day, "%b"); - }*/ + $labels[$i] = dol_print_date($day, "%Y%m"); + $day += 86400; - //$textdate = strftime("%Y%m%d", $day); + $textdate = dol_print_date($day, "%Y%m%d"); $xyear = substr($textdate, 0, 4); $xday = substr($textdate, 6, 2); + $i++; } From 70306848126a9e6478355764d96114d18bb574fd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 31 Dec 2025 14:40:26 +0100 Subject: [PATCH 3/3] Debug v23 --- htdocs/theme/eldy/dropdown.inc.php | 2 ++ htdocs/theme/eldy/global.inc.php | 3 +++ 2 files changed, 5 insertions(+) diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index 9159bdd7adb..15b0b70fc17 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -235,6 +235,8 @@ div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::af div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-quickadd-dropdown { line-height: 46px; + + margin-top: -2px; } a.top-menu-dropdown-link { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 3b7f16c7b45..24ebd664781 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1667,6 +1667,9 @@ select.flat.selectlimit { border-bottom: 1px solid var(--inputbordercolor); border-bottom-left-radius: 0; border-bottom-right-radius: 0; + padding-bottom: 4px; + padding-top: 4px; + height: 28px; } .nomarginleft { margin-: 0px !important;