Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v21

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-17 03:57:13 +02:00
parent e8f1c47424
commit 3ef895d8c4
4 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
htdocs/comm/action/card.php
View File

@@ -1292,7 +1292,7 @@ if ($action == 'create') {
print dol_get_fiche_head();
print '<table class="border centpercent">';
print '<table class="border centpercent nobottom">';
// Type of event
if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -1310,12 +1310,41 @@ if ($action == 'create') {
// Full day
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td>';
print '<td class="valignmiddle height30"><input class="valignmiddle" type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'><label for="fullday" class="valignmiddle small">'.$langs->trans("EventOnFullDay").'</label>';
print '</td></tr>';
$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
if (GETPOST('datep', 'alpha', 1)) {
$datep = dol_stringtotime(GETPOST('datep', 'alpha', 1), 'tzuserrel');
}
$datef = ($datef ? $datef : $object->datef);
if (GETPOST('datef', 'alpha', 1)) {
$datef = dol_stringtotime(GETPOST('datef', 'alpha', 1), 'tzuserrel');
}
if (empty($datef) && !empty($datep)) {
if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || (!getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT') || getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT') == '-1')) {
$datef = dol_time_plus_duree($datep, getDolGlobalInt('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS', 1), 'h');
}
}
// Date start
print '<tr><td class="nowrap">';
print '</td><td>';
if (GETPOST("afaire") == 1) {
print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo"
} else {
print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
}
print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span><br class="showonsmartphone"> ';
print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
print '</td></tr>';
print '<tr><td></td><td>';
// Recurring event
$userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0);
if ($userepeatevent) {
// Repeat
print ' &nbsp; &nbsp; &nbsp; &nbsp; <div class="opacitymedium inline-block small">';
//print ' &nbsp; &nbsp; &nbsp; &nbsp; ';
print '<div class="opacitymedium inline-block small">';
print img_picto($langs->trans("Recurrence"), 'recurring', 'style="margin-left: 6px" class="paddingright2"');
print '<input type="hidden" name="recurid" value="'.(empty($object->recurid) ? '' : $object->recurid).'">';
@@ -1395,33 +1424,6 @@ if ($action == 'create') {
print '</div>';
//print '</td></tr>';
}
print '</td></tr>';
$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
if (GETPOST('datep', 'alpha', 1)) {
$datep = dol_stringtotime(GETPOST('datep', 'alpha', 1), 'tzuserrel');
}
$datef = ($datef ? $datef : $object->datef);
if (GETPOST('datef', 'alpha', 1)) {
$datef = dol_stringtotime(GETPOST('datef', 'alpha', 1), 'tzuserrel');
}
if (empty($datef) && !empty($datep)) {
if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || (!getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT') || getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT') == '-1')) {
$datef = dol_time_plus_duree($datep, getDolGlobalInt('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS', 1), 'h');
}
}
// Date start
print '<tr><td class="nowrap">';
print '</td><td>';
if (GETPOST("afaire") == 1) {
print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo"
} else {
print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
}
print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span><br class="showonsmartphone"> ';
print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
print '</td></tr>';
print '<tr><td class="">&nbsp;</td><td></td></tr>';
@@ -1517,7 +1519,7 @@ if ($action == 'create') {
print '<br><hr><br>';
print '<table class="border centpercent">';
print '<table class="border centpercent nobottom">';
if (isModEnabled("societe")) {
// Related company
@@ -1534,7 +1536,7 @@ if ($action == 'create') {
if (!empty($user->socid)) {
print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company($user->socid, 'socid', '', 1, 1, 0, $events, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
} else {
print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company('', 'socid', '', $langs->trans('SelectThirdParty'), 1, 0, $events, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
}
}
print '</td></tr>';

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

@@ -2569,7 +2569,7 @@ class Form
$out .= '<li>';
$resourcestatic->fetch($value['id']);
$out .= $resourcestatic->getNomUrl(-1);
if ($nbassignetoresource > 1 && $action != 'view') {
if ($nbassignetoresource >= 1 && $action != 'view') {
$out .= ' <input type="image" style="border: 0px;" src="' . img_picto($langs->trans("Remove"), 'delete', '', 0, 1) . '" value="' . $resourcestatic->id . '" class="removedassigned reposition" id="removedassignedresource_' . $resourcestatic->id . '" name="removedassignedresource_' . $resourcestatic->id . '">';
}
// Show my availability

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

@@ -2760,7 +2760,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
}
if (!$notab || $notab == -1 || $notab == -2 || $notab == -3 || $notab == -4) {
$out .= "\n".'<div id="dragDropAreaTabBar" class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ((($notab == -3 || $notab == -4) ? ' noborderbottom' : '').($notab == -3 ? ' tabBarWithBottom' : ''))));
$out .= "\n".'<div id="dragDropAreaTabBar" class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ((($notab == -3 || $notab == -4) ? ' noborderbottom' : '').($notab == -4 ? '' : ' tabBarWithBottom'))));
$out .= '">'."\n";
}
if (!empty($dragdropfile)) {

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

@@ -4259,7 +4259,7 @@ div.tabBar div.fichehalfright table.noborder:not(.margintable):not(.paymenttable
border-bottom: 1px solid var(--colortopbordertitle1);
}
*/
div.tabBar table.border>tbody>tr:last-of-type>td {
div.tabBar table:not(.nobottom).border>tbody>tr:last-of-type>td {
border-bottom-width: 1px;
border-bottom-color: var(--colortopbordertitle1);
border-bottom-style: solid;