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

Debug v15

Browse Source
This commit is contained in:
Laurent Destailleur
2022-01-05 14:04:02 +01:00
parent 5b8d6e60e4
commit 2aa3d60997
8 changed files with 91 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/adherents/card.php
View File

@@ -1090,15 +1090,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Pro phone
print '<tr><td>'.$langs->trans("PhonePro").'</td>';
print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" size="20" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $soc->phone).'"></td></tr>';
print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').'<input type="text" name="phone" size="20" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $soc->phone).'"></td></tr>';
// Personal phone
print '<tr><td>'.$langs->trans("PhonePerso").'</td>';
print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone_perso" size="20" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').'<input type="text" name="phone_perso" size="20" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
// Mobile phone
print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
print '<td>'.img_picto('', 'object_phoning_mobile').' <input type="text" name="phone_mobile" size="20" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
print '<td>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').'<input type="text" name="phone_mobile" size="20" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) {
@@ -1286,11 +1286,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// EMail
print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED ? '<span class="fieldrequired">' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '</span>' : '').'</td>';
print '<td>'.img_picto('', 'object_email').' <input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET("member_email") ? GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
print '<td>'.img_picto('', 'object_email', 'class="pictofixedwidth"').'<input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET("member_email") ? GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
// Website
print '<tr><td>'.$form->editfieldkey('Web', 'member_url', GETPOST('member_url', 'alpha'), $object, 0).'</td>';
print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ?GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
print '<td>'.img_picto('', 'globe', 'class="pictofixedwidth"').'<input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ?GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
// Address
print '<tr><td>'.$langs->trans("Address").'</td><td>';

4
htdocs/core/class/commonobject.class.php
View File

@@ -7786,7 +7786,8 @@ abstract class CommonObject
}
}
$out .= $extrafields->showSeparator($key, $this, ($colspan + 1), $display_type);
// if colspan=0 or 1, the second column is not extended, so the separator must be on 2 columns
$out .= $extrafields->showSeparator($key, $this, ($colspan ? $colspan + 1 : 2), $display_type);
} else {
$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
$csstyle = '';
@@ -7885,6 +7886,7 @@ abstract class CommonObject
$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
if ($display_type == 'card') {
// a first td column was already output (and may be another on before if MAIN_VIEW_LINE_NUMBER set), so this td is the next one
$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').' class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
} elseif ($display_type == 'line') {
$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').' style="display: inline-block" class="'.$this->element.'_extras_'.$key.'">';

2
htdocs/core/class/conf.class.php
View File

@@ -890,7 +890,7 @@ class Conf
}
if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) {
$this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
$this->global->THEME_HIDE_BORDER_ON_INPUT = 1;
}
// Save inconsistent option

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

@@ -5020,7 +5020,6 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($cpt == $page) {
$pagelist .= '<li class="pagination"><input type="text" class="width25 center pageplusone" name="pageplusone" value="'.($page + 1).'"></li>';
$pagelist .= '/';
//if (($cpt + 1) < $nbpages) $pagelist .= '/';
}
} else {
if ($cpt == $page) {
@@ -5043,9 +5042,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
}
} else {
//var_dump($page.' '.$cpt.' '.$nbpages);
//if (($page + 1) < $nbpages) {
$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
//}
$pagelist .= '<li class="pagination paginationlastpage"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
}
} else {
$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";

2
htdocs/paybox/admin/paybox.php
View File

@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$servicename = 'PayBox';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal'));
$langs->loadLangs(array('admin', 'other', 'paybox', 'paypal', 'stripe'));
if (!$user->admin) {
accessforbidden();

2
htdocs/product/stock/stockatdate.php
View File

@@ -598,7 +598,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '</tr>';
print '</tr>'."\n";
}
$i++;
}

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

@@ -33,7 +33,7 @@
--colortopbordertitle1: rgb(<?php print $colortopbordertitle1; ?>);
--listetotal: #888888;
--inputbackgroundcolor: #FFF;
--inputbordercolor: rgba(0,0,0,.2);
--inputbordercolor: rgba(0,0,0,.15);
--tooltipbgcolor: <?php print $toolTipBgColor; ?>;
--tooltipfontcolor : <?php print $toolTipFontColor; ?>;
--oddevencolor: #202020;
@@ -144,11 +144,6 @@ tr.liste_titre th.liste_titre:not(.maxwidthsearch), tr.liste_titre td.liste_titr
input {
font-size: unset;
}
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
background-color: var(--inputbackgroundcolor);
color: var(--colortext);
border-radius: 2px;
}
select.vmenusearchselectcombo {
background-color: unset;
}
@@ -172,6 +167,33 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
.liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when],
.liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth],
select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth,
input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
border: none;
}
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
color: var(--colortext);
border-radius: 3px;
font-family: <?php print $fontlist ?>;
outline: none;
margin: 0px 0px 0px 0px;
background-color: var(--inputbackgroundcolor);
}
.liste_titre input, .liste_titre select {
border: none;
border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
/* padding: 5px; */
}
.pageplusone,
div.tabBar input, div.tabBar input.flat, div.tabBar textarea, div.tabBar textarea.flat, div.tabBar form.flat select, div.tabBar select, div.tabBar select.flat, div.tabBar .dataTables_length label select
{
border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
<?php $conf->global->THEME_ADD_BACKGROUND_ON_INPUT = 1; if (!empty($conf->global->THEME_ADD_BACKGROUND_ON_INPUT)) { ?>
background-color: #f8f8fa;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
<?php } ?>
}
input[name=duration_value], input[name=durationhour]
{
margin-right: 4px !important;
@@ -182,24 +204,11 @@ input[type=submit], input[type=submit]:hover {
input[type=checkbox], input[type=radio] {
margin: 0 3px 0 3px;
}
input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
border: none;
}
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-family: <?php print $fontlist ?>;
outline: none;
margin: 0px 0px 0px 0px;
border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
}
input {
line-height: 1.3em;
padding: 4px;
padding-left: 5px;
}
.liste_titre input {
padding: 5px;
}
select {
padding-top: 5px;
padding-right: 4px;
@@ -243,11 +252,14 @@ input:invalid, select:invalid, input.--error , select.--error {
.field-error-icon { color: #ea1212; !important; }
/* Focus definitions must be after standard definition */
textarea:focus {
div.tabBar textarea:focus {
border: 1px solid #aaa !important;
}
input:focus, select:focus {
border-bottom: 1px solid #666;
input:focus:not(.select2-search__field), select:focus, .select2-container--open .select2-selection--single {
/* div.tabBar input:focus, div.tabBar select:focus { */
border-bottom: 1px solid #666 !important;
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
}
textarea.cke_source:focus
{
@@ -258,10 +270,10 @@ div#cke_dp_desc {
}
textarea {
border-radius: 0;
border-top:solid 1px rgba(0,0,0,.2);
border-left:solid 1px rgba(0,0,0,.2);
border-right:solid 1px rgba(0,0,0,.2);
border-bottom:solid 1px rgba(0,0,0,.2);
border-top: solid 1px var(--inputbordercolor);
border-left: solid 1px var(--inputbordercolor);
border-right: solid 1px var(--inputbordercolor);
border-bottom: solid 1px var(--inputbordercolor);
padding:4px;
margin-left:0px;
@@ -403,6 +415,10 @@ select.flat, form.flat select, .pageplusone {
input.pageplusone {
padding-bottom: 4px;
padding-top: 4px;
margin-right: 4px;
}
.paginationlastpage a {
padding-left: 8px;
}
.saturatemedium {
@@ -465,12 +481,12 @@ input.removedfile {
input[type=file] {
background-color: transparent;
box-shadow: none;
<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
<?php if (!empty($conf->global->THEME_HIDE_BORDER_ON_INPUT)) { ?>
border-top: none;
border-left: none;
border-right: none;
<?php } ?>
border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=radio] { background-color: transparent; border: none; box-shadow: none; }
@@ -994,7 +1010,7 @@ div.divsearchfield {
padding-bottom: 3px;
padding-left: 10px;
padding-right: 10px;
border-bottom: solid 1px rgba(0,0,0,.2);
border-bottom: solid 1px var(--inputbordercolor);
height: 24px;
}
.search_component_searchtext {
@@ -5818,7 +5834,7 @@ span#select2-taskid-container[title^='--'] {
}
span.select2.select2-container.select2-container--default {
<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
<?php if (!empty($conf->global->THEME_HIDE_BORDER_ON_INPUT)) { ?>
border-left: none;
border-top: none;
border-right: none;
@@ -5843,6 +5859,8 @@ input.select2-input {
}
.select2-container--focus span.select2-selection.select2-selection--single {
border-bottom: 1px solid #666 !important;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.blockvmenusearch .select2-container--default .select2-selection--single,
@@ -5907,29 +5925,35 @@ input.select2-input {
.select2-container--default .select2-selection--single
{
outline: none;
<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
<?php if (!empty($conf->global->THEME_HIDE_BORDER_ON_INPUT)) { ?>
border-top: none;
border-left: none;
border-right: none;
<?php } ?>
border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
-webkit-box-shadow: none !important;
box-shadow: none !important;
border-radius: 0 !important;
border-radius: 3px;
}
.select2-container--focus .select2-container--default .select2-selection--single {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.select2-container--default.select2-container--focus .select2-selection--multiple {
border-top: none;
border-left: none;
border-right: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.select2-container--default .select2-selection--multiple {
border-bottom: solid 1px var(--inputbordercolor);
border-top: none;
border-left: none;
border-right: none;
border-radius: 0 !important;
border-radius: 3px;
background: var(--inputbackgroundcolor);
line-height: normal;
}
@@ -5947,7 +5971,7 @@ input.select2-input {
border-top: none !important;
border-left: none !important;
border-right: none !important;
border-bottom: solid 1px rgba(0,0,0,.2) !important;
border-bottom: solid 1px var(--inputbordercolor) !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
border-radius: 0 !important;
@@ -6196,14 +6220,17 @@ span.noborderoncategories {
cursor: default;
border: none;
border-bottom: solid 1px rgba(0,0,0,.2);
border-bottom: solid 1px var(--inputbordercolor);
padding: 5px;
padding-left: 2px;
height: 17px;
border-radius: 3px;
}
.multi-select-button:focus {
outline: none;
border-bottom: 1px solid #666;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.multi-select-button:after {
@@ -6227,7 +6254,10 @@ span.noborderoncategories {
.multi-select-menuitem {
clear: both;
float: left;
padding-left: 5px
padding-left: 5px;
}
label.multi-select-menuitem {
line-height: 24px;
}

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

@@ -417,7 +417,7 @@ select#date_startday, select#date_startmonth, select#date_endday, select#date_en
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
font-family: <?php print $fontlist ?>;
border: none;
border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px rgba(0,0,0,.2);
border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
outline: none;
margin: 0px 0px 0px 0px;
}
@@ -465,10 +465,10 @@ input.short {
textarea {
border-radius: 0;
border-top:solid 1px rgba(0,0,0,.1);
border-left:solid 1px rgba(0,0,0,.1);
border-right:solid 1px rgba(0,0,0,.1);
border-bottom:solid 1px rgba(0,0,0,.2);
border-top:solid 1px var(--inputbordercolor);
border-left:solid 1px var(--inputbordercolor);
border-right:solid 1px var(--inputbordercolor);
border-bottom:solid 1px var(--inputbordercolor);
background-color: #FFF;
padding:4px;
@@ -6099,6 +6099,9 @@ span.noborderoncategories {
float: left;
padding-left: 5px
}
label.multi-select-menuitem {
line-height: 24px;
}
/* ============================================================================== */