Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v23

Browse Source
This commit is contained in:
Laurent Destailleur
2025-11-21 19:11:32 +01:00
parent 70b3ca43da
commit 424484a4c3
26 changed files with 110 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/tools/listevents.php
View File

@@ -494,9 +494,9 @@ if ($result) {
$userstatic->email = $obj->email; $userstatic->email = $obj->email;
if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) { if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright"'); print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright"');
} elseif ($userstatic->admin) { } elseif ($userstatic->admin) {
print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright"'); print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright"');
} }
//print $userstatic->getLoginUrl(-1); //print $userstatic->getLoginUrl(-1);

3
htdocs/core/lib/functions.lib.php
View File

@@ -5684,6 +5684,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
'accounting_account' => 'infobox-bank_account', 'accounting_account' => 'infobox-bank_account',
'accountline' => 'infobox-bank_account', 'accountline' => 'infobox-bank_account',
'accountancy' => 'infobox-bank_account', 'accountancy' => 'infobox-bank_account',
'admin'=> 'opacitymedium',
'asset' => 'infobox-bank_account', 'asset' => 'infobox-bank_account',
'bank_account' => 'infobox-bank_account', 'bank_account' => 'infobox-bank_account',
'bill' => 'infobox-commande', 'bill' => 'infobox-commande',
@@ -5922,6 +5923,7 @@ function getImgPictoConv($mode = 'fa')
'add' => 'plus-circle', 'add' => 'plus-circle',
'address' => 'address-book', 'address' => 'address-book',
'ai' => 'magic', 'ai' => 'magic',
'admin' => 'star',
'asset' => 'money-check-alt', 'asset' => 'money-check-alt',
'autofill' => 'fill', 'autofill' => 'fill',
'back' => 'arrow-left', 'back' => 'arrow-left',
@@ -5999,6 +6001,7 @@ function getImgPictoConv($mode = 'fa')
'group' => 'users', 'group' => 'users',
'movement' => 'people-carry', 'movement' => 'people-carry',
'sign-out' => 'sign-out-alt', 'sign-out' => 'sign-out-alt',
'superadmin' => 'star',
'switch_off' => 'toggle-off', 'switch_off' => 'toggle-off',
'switch_off_grey' => 'toggle-off', 'switch_off_grey' => 'toggle-off',
'switch_off_warning' => 'toggle-off', 'switch_off_warning' => 'toggle-off',

4
htdocs/hrm/skill_tab.php
View File

@@ -467,9 +467,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$addadmin = ''; $addadmin = '';
if (property_exists($object, 'admin')) { if (property_exists($object, 'admin')) {
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
} }
print showValueWithClipboardCPButton(!empty($object->login) ? $object->login : '').$addadmin; print showValueWithClipboardCPButton(!empty($object->login) ? $object->login : '').$addadmin;

36
htdocs/install/check.php
View File

@@ -448,8 +448,8 @@ if (!file_exists($conffile)) {
// Show title // Show title
if (getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || getDolGlobalString('MAIN_VERSION_LAST_INSTALL')) { if (getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || getDolGlobalString('MAIN_VERSION_LAST_INSTALL')) {
print $langs->trans("VersionLastUpgrade").' <b><span class="okinversed">'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE', getDolGlobalString('MAIN_VERSION_LAST_INSTALL')).'</span></b> &nbsp; - &nbsp; '; print $langs->trans("VersionLastUpgrade").' <b><span class="badge-text badge-secondary okinversed">'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE', getDolGlobalString('MAIN_VERSION_LAST_INSTALL')).'</span></b> &nbsp; - &nbsp; ';
print $langs->trans("VersionProgram").' <b><span class="okinversed">'.DOL_VERSION.'</span></b>'; print $langs->trans("VersionProgram").' <b><span class="badge-text badge-secondary okinversed">'.DOL_VERSION.'</span></b>';
//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired")); //print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
print '<br>'; print '<br>';
print '<br>'; print '<br>';
@@ -472,18 +472,20 @@ if (!file_exists($conffile)) {
// Show line of first install choice // Show line of first install choice
$choice = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n"; $choice = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n";
$choice .= '<td class="nowrap center"><b>'.$langs->trans("FreshInstall").'</b>'; $choice .= '<td class="nowrap center firstcolumn"><b>'.$langs->trans("FreshInstall").'</b>';
$choice .= '</td>'; $choice .= '</td>';
$choice .= '<td class="listofchoicesdesc">'; $choice .= '<td class="listofchoicesdesc">';
$choice .= $langs->trans("FreshInstallDesc"); $choice .= $langs->trans("FreshInstallDesc");
if (empty($dolibarr_main_db_host)) { // This means install process was not run if (empty($dolibarr_main_db_host)) { // This means install process was not run
$choice .= '<br>'; $choice .= '<br>';
//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
$choice .= '<div class="center"><div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div></div>'; $choice .= '<div class="><br>';
$choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
$choice .= '</div>';
} }
$choice .= '</td>'; $choice .= '</td>';
$choice .= '<td class="center">'; $choice .= '<td class="center lastcolumn">';
if ($allowinstall) { if ($allowinstall) {
$choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>'; $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
} else { } else {
@@ -535,8 +537,6 @@ if (!file_exists($conffile)) {
$count = 0; $count = 0;
foreach ($migrationscript as $migarray) { foreach ($migrationscript as $migarray) {
$choice = '';
$count++; $count++;
$recommended_choice = false; $recommended_choice = false;
$version = DOL_VERSION; $version = DOL_VERSION;
@@ -568,16 +568,18 @@ if (!file_exists($conffile)) {
} }
} }
$choice = '';
$choice .= "\n".'<!-- choice '.$count.' -->'."\n"; $choice .= "\n".'<!-- choice '.$count.' -->'."\n";
$choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>'; $choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>';
$choice .= '<td class="nowrap center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>'; $choice .= '<td class="nowrap center firstcolumn"><span class="opacitymedium">'.$langs->trans("Upgrade").'</span><br><b>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
$choice .= '<td class="listofchoicesdesc">'; $choice .= '<td class="listofchoicesdesc">';
$choice .= $langs->trans("UpgradeDesc"); $choice .= $langs->trans("UpgradeDesc");
if ($recommended_choice) { if ($recommended_choice) {
$choice .= '<br>'; $choice .= '<br>';
//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
$choice .= '<div class="center">'; $choice .= '<div class=""><br>';
$choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>'; $choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
if ($count < count($migarray)) { // There are other choices after if ($count < count($migarray)) { // There are other choices after
print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION); print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
@@ -586,7 +588,7 @@ if (!file_exists($conffile)) {
} }
$choice .= '</td>'; $choice .= '</td>';
$choice .= '<td class="center">'; $choice .= '<td class="center lastcolumn">';
if ($allowupgrade) { if ($allowupgrade) {
$disabled = false; $disabled = false;
if ($foundrecommandedchoice == 2) { if ($foundrecommandedchoice == 2) {
@@ -598,7 +600,15 @@ if (!file_exists($conffile)) {
if ($disabled) { if ($disabled) {
$choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>'; $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
} else { } else {
$choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>'; $choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'"';
if ($recommended_choice) {
$choice .= ' title="'.dol_string_nohtmltag($langs->trans("InstallChoiceSuggested")).'"';
} else {
$choice .= ' title="'.dol_string_nohtmltag($langs->trans("MigrationAlreadyDone")).'"';
}
$choice .= '>';
$choice .= $langs->trans("Start");
$choice .= '</a>';
} }
} else { } else {
$choice .= $langs->trans("NotAvailable"); $choice .= $langs->trans("NotAvailable");
@@ -606,7 +616,7 @@ if (!file_exists($conffile)) {
$choice .= '</td>'; $choice .= '</td>';
$choice .= '</tr>'."\n"; $choice .= '</tr>'."\n";
if ($allowupgrade) { if ($allowupgrade && $recommended_choice) {
$available_choices[$count] = $choice; $available_choices[$count] = $choice;
} else { } else {
$notavailable_choices[$count] = $choice; $notavailable_choices[$count] = $choice;
@@ -636,7 +646,7 @@ if (!file_exists($conffile)) {
print '<div id="navail_choices" style="display:none">'; print '<div id="navail_choices" style="display:none">';
print "<br>\n"; print "<br>\n";
print '<table width="100%" class="listofchoices">'; print '<table class="centpercent listofchoices">';
foreach ($notavailable_choices as $choice) { foreach ($notavailable_choices as $choice) {
print $choice; print $choice;
} }

23
htdocs/install/default.css
View File

@@ -437,14 +437,14 @@ a.button:hover {
} }
.suggestedchoice { .suggestedchoice {
color: rgba(70, 3, 62, 0.6) !important; /* color: rgba(70, 3, 62, 0.6) !important;
/* background-color: rgba(70, 3, 62, 0.3); */ /* background-color: rgba(70, 3, 62, 0.3); */
padding: 2px 4px; padding: 2px 0px 2px 0px;
border-radius: 4px; border-radius: 4px;
/* white-space: nowrap; */ /* white-space: nowrap; */
} }
.choiceselected { .choiceselected {
background-color: #f4f6f4; /* background-color: #f4f6f4; */
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: top left; background-position: top left;
} }
@@ -477,6 +477,23 @@ img.pictofixedwidth {
} }
.badge-secondary, .tabs .badge {
color: #fff !important;
background-color: #aaaabb !important;
}
.badge-text {
padding: 3px;
padding-left: 5px;
padding-right: 5px;
border-radius: 5px;
}
td.firstcolumn {
width: 150px;
}
td.lastcolumn {
width: 150px;
}
/* Force values for small screen 570 */ /* Force values for small screen 570 */
@media only screen and (max-width: 570px) @media only screen and (max-width: 570px)

5
htdocs/langs/en_US/install.lang
View File

@@ -203,8 +203,8 @@ MigrationReloadModule=Reload module %s
MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
MigrationImportOrExportProfiles=Migration of import or export profiles (%s) MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
MigrationHolidayPath=Migration of file paths for holidays MigrationHolidayPath=Migration of file paths for holidays
ShowNotAvailableOptions=Show unavailable options ShowNotAvailableOptions=Show unavailable or not recommended options
HideNotAvailableOptions=Hide unavailable options HideNotAvailableOptions=Hide unavailable or not recommended options
ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved. ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
YouTryInstallDisabledByDirLock=The install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br> YouTryInstallDisabledByDirLock=The install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
YouTryInstallDisabledByFileLock=The install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br> YouTryInstallDisabledByFileLock=The install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
@@ -223,3 +223,4 @@ InvoiceExportModelsMigration=Migrate invoice export models
MigrationApiRestTokens=Migrate user's API keys to llx_oauth_token MigrationApiRestTokens=Migrate user's API keys to llx_oauth_token
MigratedTokens=%s token(s) migrated MigratedTokens=%s token(s) migrated
InitAHMACKeyForBlockedLog=Init the BLOCKEDLOG_HMAC_KEY constant for new encryption of Unalterable Log module InitAHMACKeyForBlockedLog=Init the BLOCKEDLOG_HMAC_KEY constant for new encryption of Unalterable Log module
MigrationAlreadyDone=This migration appears to have already been completed.

4
htdocs/theme/eldy/global.inc.php
View File

@@ -5504,7 +5504,7 @@ img.boxhandle, img.boxclose {
transition: color 0.4s; transition: color 0.4s;
} }
.star:hover, .star.active { .star:hover, .star.active {
color: <?php echo $badgeWarning ?>; color: var(--butactionbg);
} }
.search-component-assistance { .search-component-assistance {
@@ -7295,7 +7295,7 @@ div.dataTables_length select {
/* Select2 */ /* Select2 */
/* ============================================================================== */ /* ============================================================================== */
.heightofcombo { .heightofcombo:not(.pageplusone) {
height: 28px; height: 28px;
} }
.select2-container .select2-selection--single { .select2-container .select2-selection--single {

9
htdocs/theme/md/dropdown.inc.php
View File

@@ -304,14 +304,17 @@ a.top-menu-dropdown-link {
.dropdown-menu > .user-body, .dropdown-body{ .dropdown-menu > .user-body, .dropdown-body{
padding: 15px; /* padding: 15px; */
border-bottom: 1px solid #f4f4f4; border-bottom: 1px solid #f4f4f4;
border-top: 1px solid #f0f0f0; border-top: 1px solid #f0f0f0;
white-space: normal; white-space: normal;
} }
#top-bookmark-search-nothing-found {
padding: 15px;
display: block;
}
.dropdown-menu > .bookmark-body, .dropdown-body{ .dropdown-menu > .bookmark-body, .dropdown-body{
padding: 10px 0;
overflow-y: auto; overflow-y: auto;
max-height: 60vh ; /* fallback for browsers without support for calc() */ max-height: 60vh ; /* fallback for browsers without support for calc() */
max-height: calc(90vh - 110px) ; max-height: calc(90vh - 110px) ;
@@ -368,6 +371,8 @@ a.dropdown-item {
text-align: start; text-align: start;
} }
.dropdown-item.bookmark-item { .dropdown-item.bookmark-item {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 14px; padding-left: 14px;
padding-right: 14px; padding-right: 14px;
} }

4
htdocs/theme/md/style.css.php
View File

@@ -3993,7 +3993,7 @@ div.blockvmenusearch, div.blockvmenubookmarks
text-decoration: none; text-decoration: none;
padding-left: 5px; padding-left: 5px;
padding-right: 1px; padding-right: 1px;
padding-top: 3px; padding-top: 8px;
padding-bottom: 3px; padding-bottom: 3px;
margin: 1px 0px 2px 0px; margin: 1px 0px 2px 0px;
background: var(--colorbackvmenu1); background: var(--colorbackvmenu1);
@@ -5432,7 +5432,7 @@ img.boxhandle, img.boxclose {
transition: color 0.4s; transition: color 0.4s;
} }
.star:hover, .star.active { .star:hover, .star.active {
color: <?php echo $badgeWarning ?>; color: var(--butactionbg);
} }
.search-component-assistance { .search-component-assistance {

4
htdocs/user/agenda_extsites.php
View File

@@ -209,9 +209,9 @@ if (!empty($object->ldap_sid) && $object->status == 0) {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';

4
htdocs/user/api_token/card.php
View File

@@ -304,9 +304,9 @@ if ($action == 'create') {
$addadmin = ''; $addadmin = '';
if (property_exists($object, 'admin')) { if (property_exists($object, 'admin')) {
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;

4
htdocs/user/bank.php
View File

@@ -396,9 +396,9 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
$addadmin = ''; $addadmin = '';
if (property_exists($object, 'admin')) { if (property_exists($object, 'admin')) {
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;

8
htdocs/user/card.php
View File

@@ -1676,9 +1676,9 @@ if ($action == 'create' || $action == 'adduserldap') {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';
@@ -1801,7 +1801,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm'); print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : ''); print($object->thm != '' ? '<span class="amount">'.price($object->thm, 0, $langs, 1, -1, -1, $conf->currency).'</span>' : '');
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
@@ -1811,7 +1811,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm'); print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : ''); print($object->tjm != '' ? '<span class="amount">'.price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency).'</span>' : '');
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }

4
htdocs/user/class/user.class.php
View File

@@ -3390,9 +3390,9 @@ class User extends CommonObject
$return .= '<div class="info-box-content">'; $return .= '<div class="info-box-content">';
$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0, '', 0, 0, 24, 0, '', 'valignmiddle') : $this->ref); $return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0, '', 0, 0, 24, 0, '', 'valignmiddle') : $this->ref);
if (isModEnabled('multicompany') && $this->admin && !$this->entity) { if (isModEnabled('multicompany') && $this->admin && !$this->entity) {
$return .= img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"'); $return .= img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
} elseif ($this->admin) { } elseif ($this->admin) {
$return .= img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"'); $return .= img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
} }
$return .= '</span>'; $return .= '</span>';
if ($selected >= 0) { if ($selected >= 0) {

4
htdocs/user/document.php
View File

@@ -196,9 +196,9 @@ if ($object->id && $upload_dir !== null) {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';

6
htdocs/user/group/card.php
View File

@@ -349,7 +349,7 @@ if ($action == 'create') {
print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
print '<td class="valeur">'.dol_escape_htmltag($object->name); print '<td class="valeur">'.dol_escape_htmltag($object->name);
if (empty($object->entity)) { if (empty($object->entity)) {
print img_picto($langs->trans("GlobalGroup"), 'redstar'); print img_picto($langs->trans("GlobalGroup"), 'superadmin');
} }
print "</td></tr>\n"; print "</td></tr>\n";
} }
@@ -467,9 +467,9 @@ if ($action == 'create') {
print '<td class="tdoverflowmax150">'; print '<td class="tdoverflowmax150">';
print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login'); print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
if (isModEnabled('multicompany') && $useringroup->admin && empty($useringroup->entity)) { if (isModEnabled('multicompany') && $useringroup->admin && empty($useringroup->entity)) {
print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"'); print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
} elseif ($useringroup->admin) { } elseif ($useringroup->admin) {
print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"'); print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
} }
print '</td>'; print '</td>';
print '<td>'.$useringroup->lastname.'</td>'; print '<td>'.$useringroup->lastname.'</td>';

2
htdocs/user/group/ldap.php
View File

@@ -123,7 +123,7 @@ if (isModEnabled('multicompany')) {
print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
print '<td class="valeur">'.$object->name; print '<td class="valeur">'.$object->name;
if (!$object->entity) { if (!$object->entity) {
print img_picto($langs->trans("GlobalGroup"), 'redstar'); print img_picto($langs->trans("GlobalGroup"), 'superadmin');
} }
print "</td></tr>\n"; print "</td></tr>\n";
} }

2
htdocs/user/group/list.php
View File

@@ -469,7 +469,7 @@ while ($i < $imaxinloop) {
print '<td class="tdoverflowmax200">'; print '<td class="tdoverflowmax200">';
print $object->getNomUrl(1); print $object->getNomUrl(1);
if (isModEnabled('multicompany') && !$obj->entity) { if (isModEnabled('multicompany') && !$obj->entity) {
print img_picto($langs->trans("GlobalGroup"), 'redstar'); print img_picto($langs->trans("GlobalGroup"), 'superadmin');
} }
print "</td>"; print "</td>";
if (!$i) { if (!$i) {

2
htdocs/user/group/perms.php
View File

@@ -239,7 +239,7 @@ if ($object->id > 0) {
print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
print '<td class="valeur">'.dol_escape_htmltag($object->name); print '<td class="valeur">'.dol_escape_htmltag($object->name);
if (empty($object->entity)) { if (empty($object->entity)) {
print img_picto($langs->trans("GlobalGroup"), 'redstar'); print img_picto($langs->trans("GlobalGroup"), 'superadmin');
} }
print "</td></tr>\n"; print "</td></tr>\n";
} }

8
htdocs/user/hierarchy.php
View File

@@ -176,9 +176,9 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
$li = $userstatic->getNomUrl(-1, '', 0, 1); $li = $userstatic->getNomUrl(-1, '', 0, 1);
if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) { if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
$li .= img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"'); $li .= img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
} elseif ($userstatic->admin) { } elseif ($userstatic->admin) {
$li .= img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"'); $li .= img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
} }
$li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>'; $li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>';
@@ -233,9 +233,9 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
$li = '<span class="opacitymedium">'; $li = '<span class="opacitymedium">';
$li .= $userstatic->getNomUrl(-1, '', 0, 1); $li .= $userstatic->getNomUrl(-1, '', 0, 1);
if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) { if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar'); $li .= img_picto($langs->trans("SuperAdministrator"), 'superadmin');
} elseif ($userstatic->admin) { } elseif ($userstatic->admin) {
$li .= img_picto($langs->trans("Administrator"), 'star'); $li .= img_picto($langs->trans("Administrator"), 'admin');
} }
$li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>'; $li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>';
$li .= ' - <span class="opacitymedium">'.$langs->trans("ExcludedByFilter").'</span>'; $li .= ' - <span class="opacitymedium">'.$langs->trans("ExcludedByFilter").'</span>';

6
htdocs/user/home.php
View File

@@ -189,9 +189,9 @@ if ($resql) {
$lastcreatedbox .= '<td class="nowraponall tdoverflowmax150">'; $lastcreatedbox .= '<td class="nowraponall tdoverflowmax150">';
$lastcreatedbox .= $fuserstatic->getNomUrl(-1); $lastcreatedbox .= $fuserstatic->getNomUrl(-1);
if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) { if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
$lastcreatedbox .= img_picto($langs->trans("SuperAdministratorDesc"), 'redstar'); $lastcreatedbox .= img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin');
} elseif ($obj->admin) { } elseif ($obj->admin) {
$lastcreatedbox .= img_picto($langs->trans("AdministratorDesc"), 'star'); $lastcreatedbox .= img_picto($langs->trans("AdministratorDesc"), 'admin');
} }
$lastcreatedbox .= "</td>"; $lastcreatedbox .= "</td>";
$lastcreatedbox .= '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.dol_escape_htmltag($obj->login).'</td>'; $lastcreatedbox .= '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.dol_escape_htmltag($obj->login).'</td>';
@@ -287,7 +287,7 @@ if ($permissiontoreadgroup) {
$lastgroupbox .= '<td>'; $lastgroupbox .= '<td>';
$lastgroupbox .= $grouptemp->getNomUrl(1); $lastgroupbox .= $grouptemp->getNomUrl(1);
if (!$obj->entity) { if (!$obj->entity) {
$lastgroupbox .= img_picto($langs->trans("GlobalGroup"), 'redstar'); $lastgroupbox .= img_picto($langs->trans("GlobalGroup"), 'superadmin');
} }
$lastgroupbox .= "</td>"; $lastgroupbox .= "</td>";
if (isModEnabled('multicompany') && is_object($mc)) { if (isModEnabled('multicompany') && is_object($mc)) {

8
htdocs/user/list.php
View File

@@ -1120,9 +1120,9 @@ while ($i < $imaxinloop) {
print '<td class="nowraponall tdoverflowmax150">'; print '<td class="nowraponall tdoverflowmax150">';
print $li; print $li;
if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) { if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"'); print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
} elseif ($obj->admin) { } elseif ($obj->admin) {
print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"'); print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
} }
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
@@ -1194,9 +1194,9 @@ while ($i < $imaxinloop) {
$user2->statut = $obj->status2; $user2->statut = $obj->status2;
$user2->status = $obj->status2; $user2->status = $obj->status2;
if (isModEnabled('multicompany') && $obj->admin2 && !$obj->entity2) { if (isModEnabled('multicompany') && $obj->admin2 && !$obj->entity2) {
print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright"'); print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright"');
} elseif ($obj->admin2) { } elseif ($obj->admin2) {
print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright"'); print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright"');
} }
print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1); print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
} }

4
htdocs/user/note.php
View File

@@ -134,9 +134,9 @@ if ($id) {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';

4
htdocs/user/notify/card.php
View File

@@ -195,9 +195,9 @@ if ($result > 0) {
$addadmin = ''; $addadmin = '';
if (property_exists($object, 'admin')) { if (property_exists($object, 'admin')) {
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;

17
htdocs/user/param_ihm.php
View File

@@ -27,11 +27,6 @@
// Load Dolibarr environment // Load Dolibarr environment
require '../main.inc.php'; require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
/** /**
* @var Conf $conf * @var Conf $conf
* @var DoliDB $db * @var DoliDB $db
@@ -39,6 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
* @var Translate $langs * @var Translate $langs
* @var User $user * @var User $user
*/ */
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
// Load translation files required by page // Load translation files required by page
$langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members')); $langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members'));
@@ -357,9 +356,9 @@ if ($action == 'edit') {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';
@@ -524,9 +523,9 @@ if ($action == 'edit') {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';

6
htdocs/user/perms.php
View File

@@ -379,9 +379,9 @@ if (!empty($object->ldap_sid) && $object->status == 0) {
print '<td>'; print '<td>';
$addadmin = ''; $addadmin = '';
if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
} elseif (!empty($object->admin)) { } elseif (!empty($object->admin)) {
$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
} }
print showValueWithClipboardCPButton($object->login).$addadmin; print showValueWithClipboardCPButton($object->login).$addadmin;
print '</td>'; print '</td>';
@@ -657,7 +657,7 @@ foreach ($arrayofpermission as $i => $obj) {
print '<!-- perm is a perm allowed to any admin -->'; print '<!-- perm is a perm allowed to any admin -->';
if ($caneditperms) { if ($caneditperms) {
print '<td class="center nowrap">'; print '<td class="center nowrap">';
print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="paddingleft valignmiddle"'); print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="paddingleft valignmiddle"');
print '</td>'; print '</td>';
} else { } else {
print '<td class="center nowrap">'; print '<td class="center nowrap">';