lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Close date not visible in service list

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-20 09:45:49 +02:00
parent 5f43ff3609
commit 5794e38c54
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/contrat/services_list.php
View File

@ -204,6 +204,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk
$sql.= " cd.date_ouverture_prevue,"; $sql.= " cd.date_ouverture_prevue,";
$sql.= " cd.date_ouverture,"; $sql.= " cd.date_ouverture,";
$sql.= " cd.date_fin_validite,"; $sql.= " cd.date_fin_validite,";
$sql.= " cd.date_cloture,";
$sql.= " cd.qty,"; $sql.= " cd.qty,";
$sql.= " cd.total_ht,"; $sql.= " cd.total_ht,";
$sql.= " cd.total_tva,"; $sql.= " cd.total_tva,";
@ -632,7 +633,7 @@ while ($i < min($num,$limit))
if (! empty($arrayfields['cd.date_ouverture_prevue']['checked'])) if (! empty($arrayfields['cd.date_ouverture_prevue']['checked']))
{ {
print '<td align="center">'; print '<td align="center">';
print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue)):'&nbsp;'); print ($obj->date_ouverture_prevue?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour'):'&nbsp;');
if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0) if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0)
print ' '.img_picto($langs->trans("Late"),"warning"); print ' '.img_picto($langs->trans("Late"),"warning");
else print '&nbsp;&nbsp;&nbsp;&nbsp;'; else print '&nbsp;&nbsp;&nbsp;&nbsp;';
@ -641,13 +642,13 @@ while ($i < min($num,$limit))
} }
if (! empty($arrayfields['cd.date_ouverture']['checked'])) if (! empty($arrayfields['cd.date_ouverture']['checked']))
{ {
print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture)):'&nbsp;').'</td>'; print '<td align="center">'.($obj->date_ouverture?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour'):'&nbsp;').'</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
// End date // End date
if (! empty($arrayfields['cd.date_fin_validite']['checked'])) if (! empty($arrayfields['cd.date_fin_validite']['checked']))
{ {
print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite)):'&nbsp;'); print '<td align="center">'.($obj->date_fin_validite?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour'):'&nbsp;');
if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5) if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5)
{ {
$warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24; $warning_delay=$conf->contrat->services->expires->warning_delay / 3600 / 24;
@ -658,9 +659,10 @@ while ($i < min($num,$limit))
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
// Close date (real end date)
if (! empty($arrayfields['cd.date_cloture']['checked'])) if (! empty($arrayfields['cd.date_cloture']['checked']))
{ {
print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture)).'</td>'; print '<td align="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }