diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 125bb04a30e..7b1eb01c1a2 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2024 Frédéric France * * 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 @@ -184,7 +185,7 @@ class FormAdmin * @param string $htmlname Name of html select * @param array $dirmenuarray Array of directories to scan * @param string $moreattrib More attributes on html select tag - * @return integer|null + * @return integer|void */ public function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '') { diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 520a7ecc1f1..d98127a6e59 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -7,7 +7,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2014 Raphaël Doursenaud * Copyright (C) 2018 Josep Lluís Amador - * Copyright (C) 2019-2022 Frédéric France + * Copyright (C) 2019-2024 Frédéric France * * 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 @@ -335,7 +335,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it /** - * @var string[] List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule') + * @var array List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule') + * Another example : array('always'=>array("modBanque", "modFacture", "modProduct", "modCategorie"), 'FR'=>array('modBlockedLog')); * @see $requiredby */ public $depends; diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php index 0aeb300a666..5d7b262f22e 100644 --- a/htdocs/reception/class/reception.class.php +++ b/htdocs/reception/class/reception.class.php @@ -922,7 +922,7 @@ class Reception extends CommonObject $this->ref = trim($this->ref); } if (isset($this->entity)) { - $this->entity = trim($this->entity); + $this->entity = (int) $this->entity; } if (isset($this->ref_supplier)) { $this->ref_supplier = trim($this->ref_supplier); @@ -931,10 +931,10 @@ class Reception extends CommonObject $this->socid = trim($this->socid); } if (isset($this->fk_user_author)) { - $this->fk_user_author = trim($this->fk_user_author); + $this->fk_user_author = (int) $this->fk_user_author; } if (isset($this->fk_user_valid)) { - $this->fk_user_valid = trim($this->fk_user_valid); + $this->fk_user_valid = (int) $this->fk_user_valid; } if (isset($this->shipping_method_id)) { $this->shipping_method_id = (int) $this->shipping_method_id;