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

…evelop
Dolibarr · Dec 23, 2024 · b70ecee · b70ecee
2 parents 0695f34 + 327da1a
commit b70ecee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
@@ -16908,18 +16908,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/core/tpl/objectline_view.tpl.php
 
-		-
-			message: '#^Variable \$action might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/core/tpl/objectline_view.tpl.php
-
-		-
-			message: '#^Variable \$i might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../htdocs/core/tpl/objectline_view.tpl.php
-
 		-
 			message: '#^Variable \$objp might not be defined\.$#'
 			identifier: variable.undefined

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
@@ -52,6 +52,8 @@
  * @var Translate $langs
  * @var User $user
  *
+ * @var string $action
+ * @var int $i
  * @var 0|1 $forceall
  * @var int $num
  * @var 0|1 $senderissupplier