vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse source 
develop
This commit is contained in:
Laurent Destailleur 2026-04-15 21:19:45 +02:00
parent fd49e3f006
commit 08f410f7ea
4 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/quickmemo/admin/memo_extrafields.php
View file

@ -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'));

11
htdocs/quickmemo/admin/setup.php
View file

@ -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"));

12
htdocs/quickmemo/interface.php
View file

@ -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']);

1
htdocs/quickmemo/memo_list.php
View file

@ -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