From 08f410f7ea1c8ddf35b540d852aa1fa2fd42293d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 15 Apr 2026 21:19:45 +0200
Subject: [PATCH] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/quickmemo/admin/memo_extrafields.php |  6 ++----
 htdocs/quickmemo/admin/setup.php            | 11 ++++-------
 htdocs/quickmemo/interface.php              | 12 ++++++------
 htdocs/quickmemo/memo_list.php              |  1 -
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/htdocs/quickmemo/admin/memo_extrafields.php b/htdocs/quickmemo/admin/memo_extrafields.php
index d2594a1227b..6fd8da713e3 100644
--- a/htdocs/quickmemo/admin/memo_extrafields.php
+++ b/htdocs/quickmemo/admin/memo_extrafields.php
@@ -30,10 +30,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once '../lib/quickmemo.lib.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -41,6 +37,8 @@ require_once '../lib/quickmemo.lib.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once '../lib/quickmemo.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('quickmemo', 'admin'));
diff --git a/htdocs/quickmemo/admin/setup.php b/htdocs/quickmemo/admin/setup.php
index bcd784e808c..dbbeb8cd3f0 100644
--- a/htdocs/quickmemo/admin/setup.php
+++ b/htdocs/quickmemo/admin/setup.php
@@ -26,13 +26,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
-require_once __DIR__ . '/../lib/quickmemo.lib.php';
-require_once __DIR__ . '/../class/memo.class.php';
-//require_once "../class/myclass.class.php";
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -40,6 +33,10 @@ require_once __DIR__ . '/../class/memo.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once __DIR__ . '/../lib/quickmemo.lib.php';
+require_once __DIR__ . '/../class/memo.class.php';
+//require_once "../class/myclass.class.php";
 
 // Translations
 $langs->loadLangs(array("admin", "quickmemo"));
diff --git a/htdocs/quickmemo/interface.php b/htdocs/quickmemo/interface.php
index 735567cbd72..2c37152d0d0 100644
--- a/htdocs/quickmemo/interface.php
+++ b/htdocs/quickmemo/interface.php
@@ -39,7 +39,12 @@ if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);
 
 // Load Dolibarr environment
 require '../main.inc.php';
-
+/**
+ * @var DoliDB $db
+ * @var User $user
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ */
 // Load required classes
 require_once DOL_DOCUMENT_ROOT . '/core/class/jsonResponse.class.php';
 require_once __DIR__ . '/class/memo.class.php';
@@ -47,11 +52,6 @@ if (!class_exists('Validate')) {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/validate.class.php';
 }
 
-global $langs, $db, $hookmanager, $user, $mysoc;
-/**
- * @var DoliDB $db
- */
-
 // Initialize hooks for the interface
 $hookmanager->initHooks(['quickmemoInterface']);
 
diff --git a/htdocs/quickmemo/memo_list.php b/htdocs/quickmemo/memo_list.php
index bd4b73dd146..648dd3de952 100644
--- a/htdocs/quickmemo/memo_list.php
+++ b/htdocs/quickmemo/memo_list.php
@@ -47,7 +47,6 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-
 /**
  * The main.inc.php has been included so the following variable are now defined:
  * @var Conf $conf