diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 72e764322b4..ae53dd2f173 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -142,7 +142,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
} else {
print $form->select_produits(GETPOSTINT('idprod'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, getDolGlobalInt('PRODUIT_LIMIT_SIZE'), 0, $statustoshow, 2, '', 1, array(), 0, '1', 0, 'maxwidth500 widthcentpercentminusx', 0, '', GETPOSTINT('combinations'), 1);
}
- $urltocreateproduct = DOL_URL_ROOT.'/product/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
+ $urltocreateproduct = DOL_URL_ROOT.'/product/card.php?action=create'.(($filtertype == 1) ? '&leftmenu=service&type=1' : '&leftmenu=product&type=0').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
print '';
echo '';
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 4a6133a54a7..47e6b2c04c0 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -1,9 +1,9 @@
- * Copyright (C) 2019 Alexandre Spangaro
+ * Copyright (C) 2015 Charlie BENKE
+ * Copyright (C) 2019 Alexandre Spangaro
* Copyright (C) 2021 Gauthier VERDOL
- * Copyright (C) 2023 Frédéric France
+ * Copyright (C) 2023-2024 Frédéric France
* Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
* Returns an array with the tabs for the "salaries" section
* It loads tabs from modules looking for the entity salaries
*
- * @param Paiement $object Current salaries object
+ * @param Salary $object Current salaries object
* @return array Tabs for the salaries section
*/
function salaries_prepare_head($object)
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 6dedf4f6ebd..dcc64cb67db 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -273,7 +273,7 @@ class Delivery extends CommonObject
* Create a line
*
* @param int $origin_id Id of order
- * @param string $qty Quantity
+ * @param float $qty Quantity
* @param int $fk_product Id of predefined product
* @param string $description Description
* @param array $array_options Array options
@@ -637,8 +637,6 @@ class Delivery extends CommonObject
*/
public function addline($origin_id, $qty, $array_options = [])
{
- global $conf;
-
$num = count($this->lines);
$line = new DeliveryLine($this->db);
@@ -763,8 +761,8 @@ class Delivery extends CommonObject
$datas = [];
- $datas['picto'] = img_picto('', $this->picto).' '.$langs->trans("ShowReceiving").':
';
- $datas['picto'] .= ''.$langs->trans("Status").': '.$this->ref;
+ $datas['picto'] = img_picto('', $this->picto, '', 0, 0, 0, '', 'paddingrightonly').' '.$langs->trans("ShowReceiving").':
';
+ $datas['ref'] = ''.$langs->trans("Ref").': '.$this->ref;
return $datas;
}
diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php
index a2733f878b4..e3c85b76ca4 100644
--- a/htdocs/salaries/virement_request.php
+++ b/htdocs/salaries/virement_request.php
@@ -1,9 +1,10 @@
- * Copyright (C) 2015 Charlie BENKE
- * Copyright (C) 2017-2019 Alexandre Spangaro
+/* Copyright (C) 2005-2015 Laurent Destailleur
+ * Copyright (C) 2015 Charlie BENKE
+ * Copyright (C) 2017-2019 Alexandre Spangaro
* Copyright (C) 2021 Gauthier VERDOL
- * Copyright (C) 2024 MDW
+ * Copyright (C) 2024 MDW
+ * 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
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index ad0b9ecb33b..a0a27d6606b 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -94,7 +94,6 @@ parameters:
- '#(?:F(?:acture(?:(?:Fournisseur)?Rec::addline\(\))|ichinterRec::addLineRec\(\))|dolMd2Html|setEventMessages) expects string\|null,#'
- '#::printStdColumnContent\(\) expects string, float(\|(int|array)(\<.*\>)?)* given.#'
- '#::HTML2OpenIDServer\(\) expects string, array given.#'
- - '#create_line\(\) expects string, float given.#'
- '# dol_stringtotime expects string, DateTime given.#'
- '#expects string, bool\|mysqli_result\|resource given.#'
- '#( |::)((multi)?selectarray)\(\) expects array#'
@@ -112,7 +111,6 @@ parameters:
- '#(?:ldap_(?:(?:ad|bin)d|delete|err(?:no|or)|first_entry|get_(?:(?:attribut|entri)es|(?:optio|values_le)n)|mod_(?:add|del|replace)|rename|set_option|unbind)) expects LDAP\\Connection#'
- '#(?:MultiCurrencies::_cleanObjectDatasRate\(\)) expects MultiCurrency#'
- '# (?:pdf_(?:(?:eagle_proforma::drawTotalTable|muscadet::_tableau_tot)\(\))) expects Facture#'
- - '# (?:salaries_prepare_head) expects Paiement#'
- '# (?:pg_(?:affected_rows|f(?:etch_(?:array|object|row)|ree_result)|num_rows)) expects PgSql\\Result#'
- '# (?:Holiday::getNextNumRef\(\)|get_localtax|pdf_pagefoot|societe_prepare_head) expects Societe#'
- '# (?:Common(?:DocGenerator::get(?:(?:ExtrafieldsInHtml|_substitutionarray_lines)\(\))|Object::printO(?:(?:bject|rigin)Line\(\)))) expects CommonObjectLine#'