Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur 2024-11-04 14:59:22 +01:00
parent 7e6a41bbd9
commit 560da768b3
5 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/customreports.php
View File

@ -552,8 +552,8 @@ if (is_array($search_groupby) && count($search_groupby)) {
$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
}
}
//var_dump($object->fields);
setEventMessages($langs->trans("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings');
//var_dump($labeloffield);
setEventMessages($langs->transnoentitiesnoconv("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings');
$search_groupby = array();
}
@ -599,7 +599,7 @@ if (!defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
$newarrayoftype[$tmpkey]['label'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']);
}
print '<div class="liste_titre liste_titre_bydiv liste_titre_bydiv_inlineblock centpercent">';
print '<div class="liste_titre liste_titre_bydiv liste_titre_bydiv_inlineblock liste_titre_bydiv_nothingafter centpercent">';
// Select object
print '<div class="divadvancedsearchfield center floatnone">';
@ -1237,12 +1237,13 @@ if ($mode == 'graph') {
}
}
print '</div>';
if ($sql && !defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) {
// Show admin info
print '<br>'.info_admin($langs->trans("SQLUsedForExport").':<br> '.$sql, 0, 0, '1', '', 'TechnicalInformation');
}
print '<div>';
if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
print dol_get_fiche_end();

4
htdocs/core/menus/standard/eldy.lib.php
View File

@ -2431,7 +2431,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
*/
function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
{
global $user, $conf, $langs;
global $user, $langs;
if ($mainmenu == 'tools') {
if (empty($user->socid)) { // limit to internal users
@ -2464,6 +2464,8 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'lire'));
//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->hasRight('export', 'lire'));
}
$newmenu->add("/core/customreports.php?leftmenu=customreports", $langs->trans("CustomReports"), 0, 1, '', $mainmenu, 'customreports', 0, '', '', '', img_picto('', 'graph', 'class="paddingright pictofixedwidth"'));
}
}

2
htdocs/langs/en_US/main.lang
View File

@ -1329,6 +1329,6 @@ IsAfter=Is after
IsOnOrBefore=Is on or before
IsOnOrAfter=Is on or after
addToFilter=Add to filter
FilterAssistance=Filter Assistance
FilterAssistance=Filter editor
Operator=Operator
AllFieldsRequired=All fields are required.

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

@ -4308,6 +4308,13 @@ div.liste_titre_bydiv {
border-top-left-radius: <?php echo $borderradius; ?>px;
border-top-right-radius: <?php echo $borderradius; ?>px;
}
div.liste_titre_bydiv_nothingafter {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
border-bottom-right-radius: <?php echo $borderradius; ?>px;
border-bottom-width: 1px;
border-bottom-color: var(--colortopbordertitle1);
border-bottom-style: solid;
}
table.liste tr:last-child td:first-child,
table.liste tr:last-child th:first-child {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
@ -5258,7 +5265,7 @@ img.boxhandle, img.boxclose {
.search-component-assistance {
display: none;
position: absolute;
background: var(--colorbacktitle1);
background: var(--colorbackbody);
border-width: 1px 1px 2px;
border-style: solid;
border-color: rgb(204, 204, 204);
@ -5268,6 +5275,7 @@ img.boxhandle, img.boxclose {
z-index: 1000;
top: 208.933px;
left: 352.683px;
min-width: 600px
}
.search-component-assistance .assistance-title {
font-size: 15px;

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

@ -813,7 +813,7 @@ select.flat, form.flat select, .pageplusone {
select.flat, form.flat select, .divadvancedsearchfieldcompinput {
height: 2em;
}
input.pageplusone, .divadvancedsearchfieldcompinput {
input.pageplusone {
padding-bottom: 4px;
padding-top: 4px;
margin-right: 4px;
@ -4372,20 +4372,24 @@ table.noborder.cal_month {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
border-bottom-right-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:first-child,
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:first-child {
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child td:first-child,
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child th:first-child,
table.tagtable.liste:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child td:first-child,
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.trfirstline td:first-child {
border-top-left-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:last-child,
table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child {
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child td:last-child,
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child th:last-child,
table.tagtable.liste:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child th:last-child,
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.trfirstline td:last-child {
border-top-right-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr:last-child td:first-child,
table.noborder:not(.paymenttable, .margintable) tr:last-child th:first-child {
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child td:first-child,
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child th:first-child {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
}
table.noborder:not(.paymenttable, .margintable) tr:last-child td:last-child,
table.noborder:not(.paymenttable, .margintable) tr:last-child th:last-child {
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child td:last-child,
table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child th:last-child {
border-bottom-right-radius: <?php echo $borderradius; ?>px;
}
table.noborder thead tr:last-child td:first-child,
@ -4417,6 +4421,13 @@ div.liste_titre_bydiv {
border-top-left-radius: <?php echo $borderradius; ?>px;
border-top-right-radius: <?php echo $borderradius; ?>px;
}
div.liste_titre_bydiv_nothingafter {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
border-bottom-right-radius: <?php echo $borderradius; ?>px;
border-bottom-width: 1px;
border-bottom-color: var(--colortopbordertitle1);
border-bottom-style: solid;
}
table.liste tr:last-child td:first-child,
table.liste tr:last-child th:first-child {
border-bottom-left-radius: <?php echo $borderradius; ?>px;
@ -4838,12 +4849,6 @@ div.liste_titre_bydiv {
box-shadow: none;
width: calc(100% - 2px); /* -2px because the width for table class="tagtable" under this is cal(100% - 2px) so it is aligned. */
}
/*
div.liste_titre_bydiv_inlineblock {
display: inline-block;
width: 100%;
}
*/
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
{
@ -5261,7 +5266,7 @@ img.boxhandle, img.boxclose {
.search-component-assistance {
display: none;
position: absolute;
background: var(--colorbacktitle1);
background: var(--colorbackbody);
border-width: 1px 1px 2px;
border-style: solid;
border-color: rgb(204, 204, 204);
@ -5271,6 +5276,7 @@ img.boxhandle, img.boxclose {
z-index: 1000;
top: 208.933px;
left: 352.683px;
min-width: 600px
}
.search-component-assistance .assistance-title {
font-size: 15px;
@ -8367,6 +8373,10 @@ table.jPicker {
font-size: small;
width: 122px;
}
.search-component-assistance {
min-width: 300px;
}
}
@media only screen and (max-width: 1024px)
@ -8378,6 +8388,9 @@ table.jPicker {
div#ecm-layout-center {
width: 100%;
}
.search-component-assistance {
min-width: 400px;
}
}
.menuhider {