Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 03:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v23

Browse Source
This commit is contained in:
Laurent Destailleur
2026-01-02 18:31:48 +01:00
parent 5eed4e6d2e
commit fdbebb089a
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formactions.class.php
View File

@@ -303,6 +303,7 @@ class FormActions
$tmpb = dol_getdate($actioncomm->datef);
if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
// The same day
print '<div class="center inline-block dateheight">';
if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes']) {
print dol_print_date($actioncomm->datep, 'dayreduceformat', 'tzuserrel');
print '<br><span class="small opacitymedium">';
@@ -315,6 +316,7 @@ class FormActions
print dol_print_date($actioncomm->datep, 'hourreduceformat', 'tzuserrel');
print '</span>';
}
print '</div>';
} else {
// Not the same day
print '<div class="center inline-block">';

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

@@ -654,6 +654,10 @@ span.userimg.notfirst, div.userimg.notfirst {
div.userimg.notfirst {
display: block-inline;
}
.center.inline-block.dateheight {
line-height: 1.2em;
}
/* Used by timesheets */
span.timesheetalreadyrecorded input {

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

@@ -832,6 +832,9 @@ span.userimg.notfirst, div.userimg.notfirst {
div.userimg.notfirst {
display: block-inline;
}
.center.inline-block.dateheight {
line-height: 1.2em;
}
/* Used by timesheets */
span.timesheetalreadyrecorded input {

4
htdocs/user/card.php
View File

@@ -2103,7 +2103,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print $langs->trans("APIKeys");
print '</a>';*/
print '<div class="left inline-block">';
$s = '<!-- MAIN_SECURITY_ALLOW_TOTP --><span class="fa fa-pen valignmiddle btnTitle-icon"></span>';
$s = '<!-- API_IN_TOKEN_TABLE --><span class="fa fa-pen valignmiddle btnTitle-icon"></span>';
print dolButtonToOpenUrlInDialogPopup('openpopuptoaddapitoken', $langs->transnoentitiesnoconv("APIKeys"), $s, '/user/api_token/list.php?id='.$object->id.'&token='.newToken());
print '</div>';
print '</div>';
@@ -2113,7 +2113,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print showValueWithClipboardCPButton($object->api_key, 1, $langs->transnoentities("Hidden")); // TODO Add an option to also reveal the hash, not only copy paste
print '</span>';
}
if (getDolGlobalString('API_ENABLE_COUNT_CALLS') || !empty($dolibarr_api_count_always_enabled)) {
if ($object->api_key && (getDolGlobalString('API_ENABLE_COUNT_CALLS') || !empty($dolibarr_api_count_always_enabled))) {
print ' &nbsp; <span class="badge badge-info" title="'.$langs->trans("TotalAPICall").'">';
print getDolUserInt('API_COUNT_CALL');
print '</span>';