From c67461bb385c9c6866a0a2dd84edd9629bf67dee Mon Sep 17 00:00:00 2001
From: thibdrev <thibault.drevet@gmail.com>
Date: Tue, 20 Feb 2024 15:02:05 +0100
Subject: [PATCH] qual: phpstan for
 htdocs/salaries/class/paymentsalary.class.php (#28291)

* qual: phpstan for htdocs/salaries/class/paymentsalary.class.php

htdocs/salaries/class/paymentsalary.class.php	205	Property PaymentSalary::$amount (float) does not accept string.

htdocs/salaries/class/paymentsalary.class.php	292	Property PaymentSalary::$amount (float) does not accept string.

htdocs/salaries/class/paymentsalary.class.php	389	Property PaymentSalary::$amount (float) does not accept string.

htdocs/salaries/class/paymentsalary.class.php	565	Property PaymentSalary::$datec (int) does not accept string.

* Update paymentsalary.class.php - apply price2num() on $totalamount before testing if $totalamount==0

* typo
---
 htdocs/salaries/class/paymentsalary.class.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 297a2865f06..7c27aa44b28 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -202,7 +202,7 @@ class PaymentSalary extends CommonObject
 			$this->fk_salary = (int) $this->fk_salary;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
@@ -228,13 +228,13 @@ class PaymentSalary extends CommonObject
 
 		$totalamount = 0;
 		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
-			$newvalue = price2num($value, 'MT');
+			$newvalue = (float) price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
 		}
-		$totalamount = price2num($totalamount);
 
 		// Check parameters
+		$totalamount = (float) price2num($totalamount, 'MT'); // this is to ensure the following test is no biaised by a potential float equal to 0.0000000000001
 		if ($totalamount == 0) {
 			return -1;
 		} // On accepte les montants negatifs pour les rejets de prelevement mais pas null
@@ -246,14 +246,13 @@ class PaymentSalary extends CommonObject
 			// Insert array of amounts
 			foreach ($this->amounts as $key => $amount) {
 				$salary_id = $key;
-				$amount = price2num($amount);
 				if (is_numeric($amount) && !empty($amount)) {
 					// We can have n payments for 1 salary but we can't have 1 payments for n salaries (for invoices link is n-n, not for salaries).
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (entity, fk_salary, datec, datep, amount,";
 					$sql .= " fk_typepayment, num_payment, note, fk_user_author, fk_bank)";
 					$sql .= " VALUES (".((int) $conf->entity).", ".((int) $salary_id).", '".$this->db->idate($now)."',";
 					$sql .= " '".$this->db->idate($this->datep)."',";
-					$sql .= " ".price2num($amount).",";
+					$sql .= " ".((float) $amount).",";
 					$sql .= " ".((int) $this->fk_typepayment).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".((int) $user->id).",";
 					$sql .= " 0)";
 
@@ -386,7 +385,7 @@ class PaymentSalary extends CommonObject
 			$this->fk_salary = (int) $this->fk_salary;
 		}
 		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
+			$this->amount = (float) $this->amount;
 		}
 		if (isset($this->fk_typepayment)) {
 			$this->fk_typepayment = (int) $this->fk_typepayment;
@@ -564,7 +563,7 @@ class PaymentSalary extends CommonObject
 		$this->fk_salary = 0;
 		$this->datec = '';
 		$this->tms = dol_now();
-		$this->datepaye = '';
+		$this->datepaye = dol_now();
 		$this->amount = 0.0;
 		$this->fk_typepayment = 0;
 		$this->num_payment = '';