diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index 2f61bcd8349..148231a66ca 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -5124,12 +5124,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/compta/bank/various_payment/document.php
 
-		-
-			message: '#^Variable \$morehtmlright might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/compta/bank/various_payment/document.php
-
 		-
 			message: '#^Right side of && is always false\.$#'
 			identifier: booleanAnd.rightAlwaysFalse
@@ -10716,12 +10710,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/lib/ajax.lib.php
 
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
-			count: 2
-			path: ../../../htdocs/core/lib/company.lib.php
-
 		-
 			message: '#^Left side of && is always true\.$#'
 			identifier: booleanAnd.leftAlwaysTrue
@@ -25728,12 +25716,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/societe/ajax/ajaxcompanies.php
 
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/societe/ajax/company.php
-
 		-
 			message: '#^Variable \$formfile might not be defined\.$#'
 			identifier: variable.undefined
@@ -25818,12 +25800,6 @@ parameters:
 			count: 3
 			path: ../../../htdocs/societe/card.php
 
-		-
-			message: '#^Variable \$messagetoshow might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/checkvat/checkVatPopup.php
-
 		-
 			message: '#^Property Contact\:\:\$no_email \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -26124,48 +26100,18 @@ parameters:
 			count: 1
 			path: ../../../htdocs/societe/consumption.php
 
-		-
-			message: '#^Variable \$dateprint might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/consumption.php
-
-		-
-			message: '#^Variable \$doc_number might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/consumption.php
-
-		-
-			message: '#^Variable \$documentstatic might not be defined\.$#'
-			identifier: variable.undefined
-			count: 14
-			path: ../../../htdocs/societe/consumption.php
-
 		-
 			message: '#^Variable \$newlang in empty\(\) always exists and is always falsy\.$#'
 			identifier: empty.variable
 			count: 1
 			path: ../../../htdocs/societe/consumption.php
 
-		-
-			message: '#^Variable \$num might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/consumption.php
-
 		-
 			message: '#^Variable \$sql might not be defined\.$#'
 			identifier: variable.undefined
 			count: 1
 			path: ../../../htdocs/societe/consumption.php
 
-		-
-			message: '#^Variable \$tables_from might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/consumption.php
-
 		-
 			message: '#^Variable \$where might not be defined\.$#'
 			identifier: variable.undefined
@@ -26178,12 +26124,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/societe/document.php
 
-		-
-			message: '#^Variable \$newcardbutton might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/list.php
-
 		-
 			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
@@ -26235,7 +26175,7 @@ parameters:
 		-
 			message: '#^Variable \$rib might not be defined\.$#'
 			identifier: variable.undefined
-			count: 3
+			count: 2
 			path: ../../../htdocs/societe/paymentmodes.php
 
 		-