This commit is contained in:
Laurent Destailleur 2026-04-24 14:39:42 +02:00
parent a1dd9b5f40
commit 1cf60fd200
2 changed files with 18 additions and 9 deletions

View file

@ -1277,14 +1277,15 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
print $formproject->selectOpportunityStatus('opp_status', (string) $object->opp_status, 1, 0, 0, 0, 'minwidth150 inline-block valignmiddle', 1, 1);
// Opportunity probability
print ' <input class="width50 right" type="text" id="opp_percent" name="opp_percent" title="'.dol_escape_htmltag($langs->trans("OpportunityProbability")).'" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : '')).'"> %';
print ' <input class="width50 right valignmiddle" type="text" id="opp_percent" name="opp_percent" title="'.dol_escape_htmltag($langs->trans("OpportunityProbability")).'" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : '')).'"> %';
print '<span id="oldopppercent" class="opacitymedium"></span>';
print '</div>';
print '<div id="divtocloseproject" class="inline-block valign clearboth paddingtop" style="display: none;">';
print '<input type="checkbox" id="inputcloseproject" name="closeproject" class="valignmiddle" />';
print '<label for="inputcloseproject" class="opacitymedium valignmiddle">';
print $form->textwithpicto($langs->trans("AlsoCloseAProject"), $langs->trans("AlsoCloseAProjectTooltip")).'</label>';
print $form->textwithpicto($langs->trans("AlsoCloseAProject"), $langs->trans("AlsoCloseAProjectTooltip"));
print '</label>';
print ' </div>';
print '</td>';
@ -1292,16 +1293,16 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
// Opportunity amount
print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
print '<td><input class="width75 right" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'">';
print $langs->getCurrencySymbol($conf->currency);
print '<td><input class="width75 right marginright2" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'">';
print '<span class="opacitymedium">'.$langs->getCurrencySymbol($conf->currency).'</span>';
print '</td>';
print '</tr>';
}
// Budget
print '<tr><td>'.$langs->trans("Budget").'</td>';
print '<td><input class="width75 right" type="text" name="budget_amount" value="'.(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ? price2num($object->budget_amount) : '')).'">';
print $langs->getCurrencySymbol($conf->currency);
print '<td><input class="width75 right marginright2" type="text" name="budget_amount" value="'.(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ? price2num($object->budget_amount) : '')).'">';
print '<span class="opacitymedium">'.$langs->getCurrencySymbol($conf->currency).'</span>';
print '</td>';
print '</tr>';

View file

@ -589,9 +589,11 @@ input:focus:not(.input-icon-user, .input-icon-password, .input-icon-security):no
select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single,
.select2-container--focus span.selection span.select2-selection:not(.noborderfocus):not(.massactionselect) {
<?php if (getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
border: 1px solid #666 !important;
border: 1px solid var(--inputbordercolor) !important;
<?php } else { ?>
border-bottom: 1px solid #666;
border-bottom: 1px solid var(--inputbordercolor) !important;
border-bottom-left-radius: 0 !important;
border-bottom-right-radius: 0 !important;
<?php } ?>
}
@ -7421,11 +7423,15 @@ li.select2-selection__choice {
.select2-container .select2-selection--multiple {
min-height: 28px !important;
}
.select2-container--default .select2-selection--multiple {
border<?php echo getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
}
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
.select2-container--default .select2-selection--multiple .select2-selection__choice {
/* border: 1px solid #e4e4e4; */
border: none;
}
<?php } ?>
.blockvmenusearch .select2-container--default .select2-selection--single
{
@ -7512,6 +7518,7 @@ li.select2-selection__choice {
border-radius: 0;
box-shadow: none !important;
}
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
.select2-container--default.select2-container--focus .select2-selection--multiple {
border-top: none;
border-left: none;
@ -7525,6 +7532,7 @@ li.select2-selection__choice {
border-radius: 0 !important;
line-height: normal;
}
<?php } ?>
.select2-container--default .select2-selection--multiple .select2-selection__rendered {
line-height: 1.4em;
}