From e52ddc0181af8dc8e417e042223d0e137f52bf72 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 15 Jul 2025 11:43:29 +0200
Subject: [PATCH] Fix display on page treasury accounting (#34741)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Clean code

* Comment

* PHPStan > Update baseline (#34734)

Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>

* FIX: we should ensure Commande::$lines array contains OrderLine objects (#34727)

* Uniformize position of button with other page & remove useless column

* Remove useless column

* FIX Fiscal year - Translation error on status

* Revert "FIX Fiscal year - Translation error on status"

This reverts commit a6f96ac0a9bece0f7d2182229ed7e6c744460fdd.

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Lucas Marcouiller <45882981+Hystepik@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dolibot <dolibarr-bot@users.noreply.github.com>
Co-authored-by: Noé Cendrier <81741011+altairis-noe@users.noreply.github.com>
---
 dev/build/phpstan/phpstan-baseline.neon         | 6 ------
 htdocs/accountancy/journal/treasuryjournal.php  | 3 +--
 htdocs/core/class/html.formaccounting.class.php | 1 -
 htdocs/core/lib/geturl.lib.php                  | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon
index d1ffd383538..74d995243e1 100644
--- a/dev/build/phpstan/phpstan-baseline.neon
+++ b/dev/build/phpstan/phpstan-baseline.neon
@@ -9060,12 +9060,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/core/customreports.php
 
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
-			count: 1
-			path: ../../../htdocs/core/customreports.php
-
 		-
 			message: '#^Variable \$page might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/htdocs/accountancy/journal/treasuryjournal.php b/htdocs/accountancy/journal/treasuryjournal.php
index c3a1cf26cf9..f7c0bc0762a 100644
--- a/htdocs/accountancy/journal/treasuryjournal.php
+++ b/htdocs/accountancy/journal/treasuryjournal.php
@@ -1402,7 +1402,7 @@ if (empty($action) || $action == 'view') {
 		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 
-	print '<div class="tabsAction tabsActionNoBottom">';
+	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 
 	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL')) {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
@@ -1441,7 +1441,6 @@ if (empty($action) || $action == 'view') {
 	print '<div class="div-table-responsive">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print "<td></td>";
 	print "<td>".$langs->trans("Date")."</td>";
 	print "<td>".$langs->trans("Piece").' ('.$langs->trans("ObjectsRef").')</td>';
 	print "<td>".$langs->trans("AccountAccounting")."</td>";
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 5ece55be81c..93900c30ae0 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -666,7 +666,6 @@ class FormAccounting extends Form
 	public static function printJournalLine($langs, $date, $ref, $accountAccounting, $labelOperation, $paymentMode, $amount)
 	{
 		$out = '<tr class="oddeven">';
-		$out .= '<td></td>';
 		$out .= '<td>'.$date.'</td>';
 		$out .= '<td>'.$ref.'</td>';
 		// Ledger account
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 83563401120..80c7af69f50 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -66,7 +66,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	 print $nvpStr;
 	 exit;*/
 	curl_setopt($ch, CURLOPT_VERBOSE, 1);
-	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
+	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');	// set the Dolibarr user agent name
 
 	// We use @ here because this may return warning if safe mode is on or open_basedir is on (following location is forbidden when safe mode is on).
 	// We force value to false so we will manage redirection ourself later.