diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 4f92b9766ea..0096ba9a285 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -634,7 +634,7 @@ if (empty($reshook)) { exit; } } else { - $errmesg = $object->error; + setEventMessages($object->error, null, 'errors'); } } diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 59c2b373d1a..029c5b5f223 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -84,7 +84,7 @@ if ($action == 'validate' && $user->rights->deplacement->creer) { } } } elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) { - $result = $object->delete($id); + $result = $object->delete($user); if ($result >= 0) { header("Location: index.php"); exit; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 857d1d6aea9..fb4f9eb17d4 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -1,4 +1,6 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2009-2012 Regis Houssin @@ -310,13 +312,15 @@ class Deplacement extends CommonObject /** * Delete record * - * @param int $id Id of record to delete + * @param User $user USer that Delete * @return int <0 if KO, >0 if OK */ - public function delete($id) + public function delete($user) { $this->db->begin(); + $id = $this->id; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."deplacement WHERE rowid = ".((int) $id); dol_syslog(get_class($this)."::delete", LOG_DEBUG); diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php index c42612afda8..5c659344465 100644 --- a/htdocs/core/class/evalmath.class.php +++ b/htdocs/core/class/evalmath.class.php @@ -372,7 +372,7 @@ class EvalMath /** * Evaluate postfix notation * - * @param string $tokens An array of expression to evaluate ('operators'). The operand are into ->stack. + * @param array $tokens Expression * @param array $vars Array * @return string Output */ diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3f8205f899e..2a109fb0f5c 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4784,7 +4784,7 @@ class Form * @param int $outputmode 0=HTML select string, 1=Array * @param int $include [=0] Removed or 1=Keep only * @param string $morecss More CSS - * @return string + * @return string|array * @see select_categories() */ public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '') diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 614b3134e5c..4c22ede0b59 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3091,7 +3091,10 @@ a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { margin: 1px 1px 1px 6px; } span.vsmenudisabled, font.vsmenudisabled { - font-family: ; text-align: ; color: #aaa; + font-family: ; + text-align: ; + color: #aaa; + white-space: nowrap; } a.vsmenu:link, a.vsmenu:visited { color: var(--colortextbackvmenu); diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index aaee7e13f8a..8b288cdf307 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3055,6 +3055,7 @@ span.vsmenudisabled, font.vsmenudisabled { text-align: ; font-weight: normal; color: #aaa; + white-space: nowrap; } a.vsmenu:link, a.vsmenu:visited { color: var(--colortextbackvmenu); @@ -7293,20 +7294,20 @@ div.clipboardCPValue.hidewithsize { .a-mesure, .a-mesure-disabled { text-align: center; } - - + + .underbanner.underbanner-before-box { border-bottom: none; } - + div.divButAction { margin-bottom: 0.5em; } - + div#card-errors { max-width: unset; } - + #dolpaymenttable { padding: 5px; }