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

Update list.php

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-10-15 20:11:15 +02:00
committed by GitHub
parent d2eeb9e749
commit ccd9da99f4
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/comm/action/list.php
View File

@@ -239,7 +239,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
$sql = "SELECT"; $sql = "SELECT";
if ($usergroup > 0) $sql.=" DISTINCT"; if ($usergroup > 0) $sql.=" DISTINCT";
$sql.= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,"; $sql.= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
$sql.= " a.id, a.label, a.note, a.datep as dp, a.datep2 as dp2,"; $sql.= " a.id, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
$sql.= ' a.fk_user_author,a.fk_user_action,'; $sql.= ' a.fk_user_author,a.fk_user_action,';
$sql.= " a.fk_contact, a.note, a.percent as percent,"; $sql.= " a.fk_contact, a.note, a.percent as percent,";
$sql.= " a.fk_element, a.elementtype, a.datec, a.tms as datem,"; $sql.= " a.fk_element, a.elementtype, a.datec, a.tms as datem,";
@@ -548,6 +548,7 @@ if ($resql)
$actionstatic->type_label=$obj->type_label; $actionstatic->type_label=$obj->type_label;
$actionstatic->type_picto=$obj->type_picto; $actionstatic->type_picto=$obj->type_picto;
$actionstatic->label=$obj->label; $actionstatic->label=$obj->label;
$actionstatic->location = $obj->location;
$actionstatic->note=dol_htmlentitiesbr($obj->note); $actionstatic->note=dol_htmlentitiesbr($obj->note);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
@@ -609,11 +610,11 @@ if ($resql)
print $form->textwithtooltip(dol_trunc($text, 40), $actionstatic->note); print $form->textwithtooltip(dol_trunc($text, 40), $actionstatic->note);
print '</td>'; print '</td>';
} }
$formatToUse = $obj->fulldayevent?'day':'dayhour';
// Start date // Start date
if (! empty($arrayfields['a.datep']['checked'])) { if (! empty($arrayfields['a.datep']['checked'])) {
print '<td align="center">'; print '<td align="center">';
print dol_print_date($db->jdate($obj->dp), "dayhour"); print dol_print_date($db->jdate($obj->dp), $formatToUse);
$late=0; $late=0;
if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1; if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1; if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
@@ -626,7 +627,7 @@ if ($resql)
// End date // End date
if (! empty($arrayfields['a.datep2']['checked'])) { if (! empty($arrayfields['a.datep2']['checked'])) {
print '<td align="center">'; print '<td align="center">';
print dol_print_date($db->jdate($obj->dp2), "dayhour"); print dol_print_date($db->jdate($obj->dp2), $formatToUse);
print '</td>'; print '</td>';
} }