Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur
2024-06-22 01:18:10 +02:00
parent b45a322d25
commit 2d87289be7
7 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
htdocs/comm/action/peruser.php
View File

@@ -834,28 +834,12 @@ while ($currentdaytoshow < $lastdaytoshow) {
echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
if ($canedit && $mode == 'show_peruser') {
// Filter on hours
print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">'.$langs->trans("Hours").'</span>';
print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
if (empty($conf->dol_use_jmobile)) {
print ' - ';
} else {
print '</div><div class="ui-block-b">';
}
print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
if (empty($conf->dol_use_jmobile)) {
print ' '.$langs->trans("H");
}
print '</div></div>';
print '<br>';
// Filter on days
print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">'.$langs->trans("DaysOfWeek").'</span>';
print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">';
print img_picto('', 'clock', 'class="fawidth30 inline-block marginleftonly"');
print $langs->trans("DaysOfWeek").'</span>';
print "\n";
print '<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
if (empty($conf->dol_use_jmobile)) {
print ' - ';
@@ -887,7 +871,27 @@ while ($currentdaytoshow < $lastdaytoshow) {
echo "</tr>\n";
echo '<tr class="liste_titre">';
echo '<td></td>';
echo '<td>';
// Filter on hours
print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">';
print img_picto('', 'clock', 'class="fawidth30 inline-block marginleftonly"');
print $langs->trans("Hours").'</span>';
print "\n";
print '<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
if (empty($conf->dol_use_jmobile)) {
print ' - ';
} else {
print '</div><div class="ui-block-b">';
}
print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
if (empty($conf->dol_use_jmobile)) {
print ' '.$langs->trans("H");
}
print '</div></div>';
echo '</td>';
$i = 0;
while ($i < 7) {
if (($i + 1) < $begin_d || ($i + 1) > $end_d) {
@@ -997,9 +1001,12 @@ while ($currentdaytoshow < $lastdaytoshow) {
//if ($username->login != 'admin') continue;
$var = !$var;
echo "<tr>";
echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">';
print '<span class="paddingrightimp">';
print $username->getNomUrl(-1, '', 0, 0, 20, 1, '', 'paddingleft');
print '</span>';
print '</td>';
$tmpday = $sav;

2
htdocs/core/lib/agenda.lib.php
View File

@@ -156,7 +156,7 @@ function print_actions_filter(
if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) {
// Status
print '<div class="divsearchfield">';
print img_picto($langs->trans("Status"), 'setup', 'class="pictofixedwidth inline-block"');
print img_picto($langs->trans("Status"), 'status', 'class="pictofixedwidth inline-block"');
$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
print '</div>';
}

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

@@ -4890,7 +4890,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
'technic', 'ticket',
'error', 'warning',
'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss',
'shapes', 'skill', 'square', 'sort-numeric-down', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
'shapes', 'skill', 'square', 'sort-numeric-down', 'status', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
'terminal', 'tick', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda', 'trip',
'uncheck', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
'conferenceorbooth', 'eventorganization',
@@ -4943,8 +4943,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
'resize' => 'crop', 'supplier_order' => 'dol-order_supplier', 'supplier_proposal' => 'file-signature',
'refresh' => 'redo', 'region' => 'map-marked', 'replacement' => 'exchange-alt', 'resource' => 'laptop-house', 'recurring' => 'history',
'service' => 'concierge-bell',
'skill' => 'shapes', 'state' => 'map-marked-alt', 'security' => 'key', 'salary' => 'wallet', 'shipment' => 'dolly', 'stock' => 'box-open', 'stats' => 'chart-bar', 'split' => 'code-branch', 'stripe' => 'stripe-s',
'supplier' => 'building',
'skill' => 'shapes', 'state' => 'map-marked-alt', 'security' => 'key', 'salary' => 'wallet', 'shipment' => 'dolly', 'stock' => 'box-open', 'stats' => 'chart-bar', 'split' => 'code-branch',
'status' => 'stop-circle',
'stripe' => 'stripe-s', 'supplier' => 'building',
'technic' => 'cogs', 'tick' => 'check', 'timespent' => 'clock', 'title_setup' => 'tools', 'title_accountancy' => 'money-check-alt', 'title_bank' => 'university', 'title_hrm' => 'umbrella-beach',
'title_agenda' => 'calendar-alt',
'uncheck' => 'times', 'uparrow' => 'share', 'url' => 'external-link-alt', 'vat' => 'money-check-alt', 'vcard' => 'arrow-alt-circle-down',

10
htdocs/takepos/css/pos.css.php
View File

@@ -450,10 +450,8 @@ div.paymentbordline
padding-right: 8px;
}
tr.selected, tr.selected td {
/* font-weight: bold; */
background-color: rgb(240,230,210) !important;
background-color: var(--colorbacklinepairchecked) !important;
}
.order td {
color: green;
@@ -597,6 +595,12 @@ div.description_content {
border-radius: 5px;
}
.login_block_other.takepos {
margin-top: 5px;
}
div#moreinfo, div#infowarehouse {
color: #aaa;
padding: 0 8px 0 8px;

2
htdocs/takepos/index.php
View File

@@ -1175,7 +1175,7 @@ if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
$reshook = $hookmanager->executeHooks('takepos_login_block_other');
if ($reshook == 0) { //Search method
?>
<div class="login_block_other">
<div class="login_block_other takepos">
<input type="text" id="search" name="search" class="input-nobottom" onkeyup="Search2('<?php echo dol_escape_js($keyCodeForEnter); ?>', null);" placeholder="<?php echo dol_escape_htmltag($langs->trans("Search")); ?>" autofocus>
<a onclick="ClearSearch(false);" class="nohover"><span class="fa fa-backspace"></span></a>
<a href="<?php echo DOL_URL_ROOT.'/'; ?>" target="backoffice" rel="opener"><!-- we need rel="opener" here, we are on same domain and we need to be able to reuse this tab several times -->

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

@@ -5417,7 +5417,7 @@ if (getDolGlobalString('THEME_DARKMODEENABLED')) {
/* ============================================================================== */
/* Calendar */
/* Calendar picker */
/* ============================================================================== */
.ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
@@ -5429,6 +5429,9 @@ html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button
img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
select.ui-datepicker-year {
margin-left: 2px !important;
}
.ui-datepicker-trigger {
vertical-align: middle;
cursor: pointer;
@@ -5986,9 +5989,14 @@ A.none, A.none:active, A.none:visited, A.none:hover {
/* Style to overwrites JQuery styles */
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {
border: 1px solid #888;
/* border: 1px solid #888; */
background: var(--colorbacktitle1);
color: unset;
font-weight: bold;
}
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover {
background: #007fff !important;
color: #ffffff !important;
}
.ui-menu .ui-menu-item a {

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

@@ -5431,7 +5431,7 @@ div.ui-tooltip.mytooltip {
/* ============================================================================== */
/* Calendar */
/* Calendar picker */
/* ============================================================================== */
.ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
@@ -5443,6 +5443,9 @@ html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button
img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
select.ui-datepicker-year {
margin-left: 2px !important;
}
.ui-datepicker-trigger {
vertical-align: middle;
cursor: pointer;
@@ -5998,9 +6001,14 @@ A.none, A.none:active, A.none:visited, A.none:hover {
/* Style to overwrites JQuery styles */
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {
border: 1px solid #888;
/* border: 1px solid #888; */
background: rgb(<?php echo $colorbacktitle1; ?>);
color: unset;
font-weight: bold;
}
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover {
background: #007fff !important;
color: #ffffff !important;
}
.ui-menu .ui-menu-item a {