fix sql ticket list (Dolibarr#32080)

* fix sql ticket list * fix sql ticket list * fix phpstan * fix * fix
nateogroup-antoine · Nov 28, 2024 · 286c3d1 · 286c3d1
1 parent 76d4a87
commit 286c3d1
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 216 deletions.
diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
@@ -228,12 +228,6 @@ parameters:
 			count: 4
 			path: ../../htdocs/accountancy/bookkeeping/export.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: ../../htdocs/accountancy/bookkeeping/list.php
-
 		-
 			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
@@ -252,12 +246,6 @@ parameters:
 			count: 3
 			path: ../../htdocs/accountancy/bookkeeping/list.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: ../../htdocs/accountancy/bookkeeping/listbyaccount.php
-
 		-
 			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
@@ -4572,12 +4560,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/comm/propal/class/propal.class.php
 
-		-
-			message: '#^Property CommonObject\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/comm/propal/class/propal.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$ref \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -4974,12 +4956,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/commande/class/commande.class.php
 
-		-
-			message: '#^Property CommonObject\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/commande/class/commande.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$ref \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -6174,12 +6150,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/compta/facture/class/facture.class.php
 
-		-
-			message: '#^Property CommonObject\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 3
-			path: ../../htdocs/compta/facture/class/facture.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$ref \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -19368,12 +19338,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/expedition/class/expedition.class.php
 
-		-
-			message: '#^Property Expedition\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/expedition/class/expedition.class.php
-
 		-
 			message: '#^Property Expedition\:\:\$ref_customer \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -20742,12 +20706,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/fourn/class/fournisseur.commande.class.php
 
-		-
-			message: '#^Property CommonObject\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/fourn/class/fournisseur.commande.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$ref_ext \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -20982,12 +20940,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/fourn/class/fournisseur.facture.class.php
 
-		-
-			message: '#^Property CommonObject\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/fourn/class/fournisseur.facture.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$ref_ext \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -28758,12 +28710,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/projet/list.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: ../../htdocs/projet/list.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -30654,12 +30600,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/reception/class/reception.class.php
 
-		-
-			message: '#^Property Reception\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/reception/class/reception.class.php
-
 		-
 			message: '#^Property Reception\:\:\$ref_supplier \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -31914,12 +31854,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/salaries/payments.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 1
-			path: ../../htdocs/salaries/payments.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -32334,12 +32268,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/societe/class/companybankaccount.class.php
 
-		-
-			message: '#^Property CompanyBankAccount\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/societe/class/companybankaccount.class.php
-
 		-
 			message: '#^Call to function method_exists\(\) with \$this\(Societe\) and ''getLibStatut'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -33738,18 +33666,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/ticket/class/ticket.class.php
 
-		-
-			message: '#^Property CommonObject\:\:\$entity \(int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../htdocs/ticket/class/ticket.class.php
-
-		-
-			message: '#^Property CommonObject\:\:\$model_pdf \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../htdocs/ticket/class/ticket.class.php
-
 		-
 			message: '#^Property CommonObject\:\:\$ref \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -33960,18 +33876,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/ticket/index.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 3
-			path: ../../htdocs/ticket/list.php
-
-		-
-			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: ../../htdocs/ticket/list.php
-
 		-
 			message: '#^If condition is always false\.$#'
 			identifier: if.alwaysFalse
@@ -34320,12 +34224,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/user/home.php
 
-		-
-			message: '#^Negated boolean expression is always true\.$#'
-			identifier: booleanNot.alwaysTrue
-			count: 2
-			path: ../../htdocs/user/list.php
-
 		-
 			message: '#^Offset ''u\.salary'' on array\{u\.salary\: \(float\|int\)\} in isset\(\) always exists and is not nullable\.$#'
 			identifier: isset.offset

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
@@ -495,6 +495,8 @@
 	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->hasRight('societe', 'creer');
 	$uploaddir = $conf->societe->dir_output;
+
+	global $error;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->hasRight('accounting', 'mouvements', 'supprimer')) {

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -459,6 +459,8 @@
 	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->hasRight('societe', 'creer');
 	$uploaddir = $conf->societe->dir_output;
+
+	global $error;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->hasRight('accounting', 'mouvements', 'supprimer')) {

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
@@ -947,6 +947,7 @@ public function create($user, $notrigger = 0)
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
 		}
+		// setEntity will set entity with the right value if empty or change it for the right value if multicompany module is active
 		$this->entity = setEntity($this);
 
 		dol_syslog(get_class($this)."::create user=".$user->id);

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
@@ -59,6 +59,7 @@
  * @var string $objectclass
  * @var string $uploaddir
  * @var string $confirm
+ * @var int $error
  */
 '
 @phan-var-force ?string $permissiontoread

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -546,7 +546,7 @@ abstract class CommonObject
 	public $multicurrency_total_localtax2;	// not in database
 
 	/**
-	 * @var string
+	 * @var ?string
 	 * @see SetDocModel()
 	 */
 	public $model_pdf;

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
@@ -136,11 +136,6 @@ class Expedition extends CommonObject
 	 */
 	public $billed;
 
-	/**
-	 * @var string name of pdf model
-	 */
-	public $model_pdf;
-
 	/**
 	 * @var int|string
 	 */

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
@@ -445,6 +445,8 @@
 	$permissiontodelete = $user->hasRight('projet', 'supprimer');
 	$permissiontoadd = $user->hasRight('projet', 'creer');
 	$uploaddir = $conf->project->dir_output;
+
+	global $error;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Close records

diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
@@ -99,10 +99,6 @@ class Reception extends CommonObject
 	 * @var int<0,1>
 	 */
 	public $billed;
-	/**
-	 * @var string
-	 */
-	public $model_pdf;
 
 	/**
 	 * @var int|float

diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
@@ -214,6 +214,8 @@
 	$objectclass = 'PaymentSalary';
 	$objectlabel = 'SalariesPayments';
 	$uploaddir = $conf->salaries->dir_output;
+
+	global $error;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Validate records

diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
@@ -329,12 +329,6 @@ class CompanyBankAccount extends Account
 	 */
 	public $datem;
 
-	/**
-	 * @var string
-	 * @see SetDocModel()
-	 */
-	public $model_pdf;
-
 	/**
 	 * @var string TRIGGER_PREFIX  Dolibarr 16.0 and above use the prefix to prevent the creation of inconsistently
 	 *                             named triggers

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
@@ -480,9 +480,11 @@
 	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->hasRight("societe", "creer");
 	$uploaddir = $conf->societe->dir_output;
+
+	global $error;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-	if ($action == 'setstcomm' && $permissiontoadd) {
+	if (!$error && $action == 'setstcomm' && $permissiontoadd) {
 		$object = new Client($db);
 		$result = $object->fetch(GETPOST('stcommsocid'));
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcomm');

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
@@ -510,7 +510,8 @@ public function create($user, $notrigger = 0)
 		$result = $this->verify();
 
 		if ($result >= 0) {
-			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+			// setEntity will set entity with the right value if empty or change it for the right value if multicompany module is active
+			$this->entity = setEntity($this);
 
 			// Insert request
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."ticket(";