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

Debug v20

Browse source
This commit is contained in:
Laurent Destailleur 2024-06-19 18:21:19 +02:00
parent c178760709
commit 411fdaeaff
5 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/admin/index.php
View file

@ -105,15 +105,13 @@ print '<br>';
print '<section class="setupsection">';
// Define $nbmodulesnotautoenabled - TODO This code is at different places
$nbmodulesnotautoenabled = count($conf->modules);
if (in_array('fckeditor', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('export', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('import', $conf->modules)) {
$nbmodulesnotautoenabled--;
$listofmodulesautoenabled = array('agenda', 'fckeditor', 'export', 'import');
foreach ($listofmodulesautoenabled as $moduleautoenable) {
if (in_array($moduleautoenable, $conf->modules)) {
$nbmodulesnotautoenabled--;
}
}
// Show info setup module

14
htdocs/admin/modules.php
View file

@ -567,15 +567,13 @@ asort($orders);
$nbofactivatedmodules = count($conf->modules);
// Define $nbmodulesnotautoenabled - TODO This code is at different places
$nbmodulesnotautoenabled = count($conf->modules);
if (in_array('fckeditor', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('export', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('import', $conf->modules)) {
$nbmodulesnotautoenabled--;
$listofmodulesautoenabled = array('agenda', 'fckeditor', 'export', 'import');
foreach ($listofmodulesautoenabled as $moduleautoenable) {
if (in_array($moduleautoenable, $conf->modules)) {
$nbmodulesnotautoenabled--;
}
}
print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');

2
htdocs/core/lib/admin.lib.php
View file

@ -727,7 +727,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
*/
function modules_prepare_head($nbofactivatedmodules, $nboftotalmodules, $nbmodulesnotautoenabled)
{
global $langs, $conf, $user, $form;
global $langs, $form;
$desc = $langs->trans("ModulesDesc", '{picto}');
$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);

14
htdocs/core/menus/standard/eldy.lib.php
View file

@ -1126,15 +1126,13 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-tools fa-fw paddingright pictofixedwidth"></i>');
if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
// Define $nbmodulesnotautoenabled - TODO This code is at different places
$nbmodulesnotautoenabled = count($conf->modules);
if (in_array('fckeditor', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('export', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('import', $conf->modules)) {
$nbmodulesnotautoenabled--;
$listofmodulesautoenabled = array('agenda', 'fckeditor', 'export', 'import');
foreach ($listofmodulesautoenabled as $moduleautoenable) {
if (in_array($moduleautoenable, $conf->modules)) {
$nbmodulesnotautoenabled--;
}
}
// Load translation files required by the page

14
htdocs/index.php
View file

@ -43,15 +43,13 @@ $hookmanager->initHooks(array('index'));
* Actions
*/
// Define $nbmodulesnotautoenabled - TODO This code is at different places
$nbmodulesnotautoenabled = count($conf->modules);
if (in_array('fckeditor', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('export', $conf->modules)) {
$nbmodulesnotautoenabled--;
}
if (in_array('import', $conf->modules)) {
$nbmodulesnotautoenabled--;
$listofmodulesautoenabled = array('agenda', 'fckeditor', 'export', 'import');
foreach ($listofmodulesautoenabled as $moduleautoenable) {
if (in_array($moduleautoenable, $conf->modules)) {
$nbmodulesnotautoenabled--;
}
}
// Check if company name is defined (first install)