WIP

htdocs/core/class/html.form.class.php

@@ -1705,6 +1705,8 @@ class Form
 	 *    Return HTML code of the SELECT of list of all contacts (for a third party or all).
 	 *  This also set the number of contacts found into $this->num
 	 *
+	 * @since 9.0 Add afterSelectContactOptions hook
+	 *
 	 * @param int $socid Id ot third party or 0 for all or -1 for empty list
 	 * @param array|int $selected Array of ID of pre-selected contact id
 	 * @param string $htmlname Name of HTML field ('none' for a not editable field)
@@ -1722,8 +1724,6 @@ class Form
 	 * @param bool $multiple add [] in the name of element and add 'multiple' attribut
 	 * @param integer $disableifempty Set tag 'disabled' on select if there is no choice
 	 * @return     int|string                    <0 if KO, HTML with select string if OK.
-	 * @since 9.0 Add afterSelectContactOptions hook
-	 *
 	 */
 	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
 	{
@@ -6079,8 +6079,8 @@ class Form
 	 *
 	 * @param string $selected preselected currency code
 	 * @param string $htmlname name of HTML select list
-	 * @return    void
 	 * @deprecated
+	 * @return    void
 	 */
 	public function select_currency($selected = '', $htmlname = 'currency_id')
 	{
@@ -10076,8 +10076,7 @@ class Form
 	 * @param User $usertofilter User object to use for filtering
 	 * @return int                    Nbr of project if OK, <0 if KO
 	 */
-	public
+	public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
-	function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
 	{
 		global $user, $conf, $langs;
 
@@ -10206,7 +10205,7 @@ class Form
 
 			$this->db->free($resql);
 		} else {
-			dol_print_error($this->db->lasterror);
+			dol_print_error($this->db);
 		}
 	}
 
@@ -10223,8 +10222,7 @@ class Form
 	 * @param string $morecss More css added to the select component
 	 * @return int                    Nbr of project if OK, <0 if KO
 	 */
-	public
+	public function selectInvoiceRec($selected = '', $htmlname = 'facrecid', $maxlength = 24, $option_only = 0, $show_empty = '1', $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500')
-	function selectInvoiceRec($selected = '', $htmlname = 'facrecid', $maxlength = 24, $option_only = 0, $show_empty = '1', $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500')
 	{
 		global $user, $conf, $langs;
 
@@ -10315,8 +10313,7 @@ class Form
 	 * @param string $search_component_params_hidden String with $search_component_params criterias
 	 * @return    string                                              HTML component for advanced search
 	 */
-	public
+	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array(), $search_component_params_hidden = '')
-	function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array(), $search_component_params_hidden = '')
 	{
 		global $langs;
 
@@ -10403,8 +10400,7 @@ class Form
 	 * @param int $addjscombo Add js combobox
 	 * @return  string                HTML select string
 	 */
-	public
+	public function selectModelMail($prefix, $modelType = '', $default = 0, $addjscombo = 0)
-	function selectModelMail($prefix, $modelType = '', $default = 0, $addjscombo = 0)
 	{
 		global $langs, $user;
 
@@ -10452,8 +10448,7 @@ class Form
 	 * @param string $dol_openinpopup If the button are shown in a context of a page shown inside a popup, we put here the string name of popup.
 	 * @return    string                        Html code with the buttons
 	 */
-	public
+	public function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = 0, $morecss = '', $dol_openinpopup = '')
-	function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = 0, $morecss = '', $dol_openinpopup = '')
 	{
 		global $langs;
 

htdocs/core/class/html.formprojet.class.php

@@ -56,6 +56,7 @@ class FormProjets
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
 	/**
 	 *    Output a combo list with projects qualified for a third party / user
 	 *
@@ -124,6 +125,7 @@ class FormProjets
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
 	/**
 	 * Returns an array with projects qualified for a third party
 	 *
@@ -508,6 +510,7 @@ class FormProjets
 
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
 	/**
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
@@ -756,7 +759,6 @@ class FormProjets
 	 * @param int $selectedLineId Id invoice line preselected
 	 * @param string $htmlNameInvoiceId Name of HTML select for Invoice
 	 * @param int $htmlNameInvoiceLineId Name of HTML select for Invoice Line
-	 * @param int $option_only Return only html options lines without the select tag
 	 * @param string $morecss More css added to the select component
 	 * @param array $filters Array of filters
 	 * @return int                    Nbr of project if OK, <0 if KO
@@ -852,7 +854,6 @@ class FormProjets
 					$labeltoshow .= $obj->label; // Invoice ref
 					$labeltoshow .= dol_trunc($obj->description, 25); // Invoice ref
 
-
 					$out .= '<option value="' . $obj->rowid . '" ';
 					if (!empty($selectedInvoiceId) && $selectedLineId == $obj->rowid) {
 						$out .= ' selected ';