Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Author: eldy

htdocs/expedition/class/expedition.class.php

@@ -2949,6 +2949,11 @@ public function setClosed()
 			return 0;
 		}
 
+		// We need to validate shipping before closing it
+		if ($this->status == self::STATUS_DRAFT) {
+			$this->valid($user);
+		}
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET fk_statut = ".self::STATUS_CLOSED;

htdocs/expensereport/class/expensereportstats.class.php

@@ -2,8 +2,9 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (c) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024       Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2026       Charlene Benke      <charlemen@free.fr>
  *
  * 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
@@ -65,7 +66,7 @@ class ExpenseReportStats extends Stats
 	/**
 	 * @var string
 	 */
-	private $datetouse = 'date_valid';
+	private $datetouse = 'date_debut';
 
 
 	/**

htdocs/public/webportal/css/form-input-special.css

@@ -121,3 +121,15 @@
 input.inputhour, input.inputminute, .maxwidthdate  {
 	max-width: 110px;
 }
+
+/* Text area with array option */
+.text-area-multi-input-add-group {
+	display:flex; gap:0.5rem;
+}
+.text-area-multi-input-add-group select {
+	flex: 1 1 auto;
+	min-width: 0;
+}
+.text-area-multi-input-add-group :where(button, input[type="button"]) {
+	max-width: 250px;
+}

htdocs/webportal/class/html.formwebportal.class.php

@@ -1283,12 +1283,13 @@ public function inputHtml($htmlName, $value, $morecss = '', $moreparam = '')
 	public function inputText($htmlName, $value, $morecss = '', $moreparam = '', $options = array())
 	{
 		global $langs;
-
 		$out = '';
 		if (!empty($options)) {
 			// If the textarea field has a list of arrayofkeyval into its definition, we suggest a combo with possible values to fill the textarea.
+			$out .= '<div class="text-area-multi-input-add-group" >';
 			$out .= $this->selectarray($htmlName . "_multiinput", $options, '', 1, 0, 0, $moreparam, 0, 0, 0, '', "flat maxwidthonphone" . $morecss);
 			$out .= '<input id="' . $htmlName . '_multiinputadd" type="button" class="button" value="' . $langs->trans("Add") . '">';
+			$out .= '</div>';
 			$out .= "<script>";
 			$out .= '
 					function handlemultiinputdisabling(htmlname){
@@ -1338,7 +1339,7 @@ function handlemultiinputdisabling(htmlname){
 		}
 
 		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-		$doleditor = new DolEditor($htmlName, (string) $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+		$doleditor = new DolEditor($htmlName, (string) $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5);
 		$out .= (string) $doleditor->Create(1, '', true, '', '', $moreparam, $morecss);
 
 		return $out;