From 82ac5b3ea25a98f4de5b6cabce314c121a9dc2fd Mon Sep 17 00:00:00 2001
From: ldestailleur <eldy@destailleur.fr>
Date: Mon, 25 Aug 2025 20:12:20 +0200
Subject: [PATCH] Clean code

---
 htdocs/compta/localtax/clients.php | 32 +++++++++++++++---------------
 htdocs/public/stripe/ipn.php       |  3 ++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index c4946dafa5d..d618072cc3b 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -241,8 +241,8 @@ if ($calc == 0 || $calc == 2) {
 		$totalamount = 0;
 		$i = 1;
 		foreach ($coll_list as $coll_obj) {
-			if (($min == 0 || ($min > 0 && $coll_obj->amount > $min)) && ($local == 1 ? $coll_obj->localtax1 : $coll_obj->localtax2) != 0) {
-				$intra = str_replace($find, $replace, $coll_obj->tva_intra);
+			if (($min == 0 || ($min > 0 && $coll_obj['totalht'] > $min)) && ($local == 1 ? $coll_obj['localtax1'] : $coll_obj['localtax2']) != 0) {
+				$intra = str_replace($find, $replace, $coll_obj['tva_intra']);
 				if (empty($intra)) {
 					if ($coll_obj->assuj == '1') {
 						$intra = $langs->trans('Unknown');
@@ -252,16 +252,16 @@ if ($calc == 0 || $calc == 2) {
 				}
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$i."</td>";
-				$company_static->id = $coll_obj->socid;
-				$company_static->name = $coll_obj->name;
+				$company_static->id = $coll_obj['company_id'];
+				$company_static->name = $coll_obj['company_name'];
 				print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
 				$find = array(' ', '.');
 				$replace = array('', '');
 				print '<td class="nowrap">'.$intra.'</td>';
-				print '<td class="nowrap right">'.price($coll_obj->amount).'</td>';
-				print '<td class="nowrap right">'.price($local == 1 ? $coll_obj->localtax1 : $coll_obj->localtax2).'</td>';
-				$totalamount += $coll_obj->amount;
-				$total += ($local == 1 ? $coll_obj->localtax1 : $coll_obj->localtax2);
+				print '<td class="nowrap right">'.price($coll_obj['total_ht']).'</td>';
+				print '<td class="nowrap right">'.price($local == 1 ? $coll_obj['localtax1'] : $coll_obj['localtax2']).'</td>';
+				$totalamount += $coll_obj['total_ht'];
+				$total += ($local == 1 ? $coll_obj['localtax1'] : $coll_obj['localtax2']);
 				print "</tr>\n";
 				$i++;
 			}
@@ -306,10 +306,10 @@ if ($calc == 0 || $calc == 1) {
 		$totalamount = 0;
 		$i = 1;
 		foreach ($coll_list as $coll_obj) {
-			if (($min == 0 || ($min > 0 && $coll_obj->amount > $min)) && ($local == 1 ? $coll_obj->localtax1 : $coll_obj->localtax2) != 0) {
+			if (($min == 0 || ($min > 0 && $coll_obj['total_ht'] > $min)) && ($local == 1 ? $coll_obj['localtax1'] : $coll_obj['localtax2']) != 0) {
 				$intra = str_replace($find, $replace, $coll_obj->tva_intra);
 				if (empty($intra)) {
-					if ($coll_obj->assuj == '1') {
+					if ($coll_obj['assuj'] == '1') {
 						$intra = $langs->trans('Unknown');
 					} else {
 						$intra = '';
@@ -317,16 +317,16 @@ if ($calc == 0 || $calc == 1) {
 				}
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$i."</td>";
-				$company_static->id = $coll_obj->socid;
-				$company_static->name = $coll_obj->name;
+				$company_static->id = $coll_obj['company_id'];
+				$company_static->name = $coll_obj['company_name'];
 				print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
 				$find = array(' ', '.');
 				$replace = array('', '');
 				print '<td class="nowrap">'.$intra."</td>";
-				print '<td class="nowrap right">'.price($coll_obj->amount).'</td>';
-				print '<td class="nowrap right">'.price($local == 1 ? $coll_obj->localtax1 : $coll_obj->localtax2).'</td>';
-				$totalamount += $coll_obj->amount;
-				$total += ($local == 1 ? $coll_obj->localtax1 : $coll_obj->localtax2);
+				print '<td class="nowrap right">'.price($coll_obj['total_ht']).'</td>';
+				print '<td class="nowrap right">'.price($local == 1 ? $coll_obj['localtax1'] : $coll_obj['localtax2']).'</td>';
+				$totalamount += $coll_obj['total_ht'];
+				$total += ($local == 1 ? $coll_obj['localtax1'] : $coll_obj['localtax2']);
 				print "</tr>\n";
 				$i++;
 			}
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 6aae57116b6..b8d0a4e96be 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -476,6 +476,7 @@ if ($event->type == 'payout.created' && getDolGlobalString('STRIPE_AUTO_RECORD_P
 			// For this case, payment on invoice (not yet recorded) must be done and direct debit order must be closed.
 
 			$paiement = new Paiement($db);
+
 			$paiement->datepaye = $now;
 			$paiement->date = $now;
 			if ($currencyCodeType == $conf->currency) {
@@ -869,7 +870,7 @@ if ($event->type == 'payout.created' && getDolGlobalString('STRIPE_AUTO_RECORD_P
 	dol_syslog("object = ".var_export($event->data, true));
 	dol_syslog("object = ".var_export($event->data, true), LOG_DEBUG, 0, '_payment');
 } elseif ($event->type == 'charge.dispute.funds_withdrawn') {
-	// When a dispute/withdraw to cancel a SEPA payment is done
+	// When a dispute/withdraw to cancel a payment (card or SEPA) is done
 	dol_syslog("object = ".var_export($event->data, true));
 	dol_syslog("object = ".var_export($event->data, true), LOG_DEBUG, 0, '_payment');