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

Merge pull request #10845 from OPEN-DSI/fix-contrat-card-date

Browse Source 
Fix dol_print_date error for real dates in cotract card
This commit is contained in:
Laurent Destailleur 2019-03-15 10:50:34 +01:00 committed by GitHub
commit ff1fc4fb59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/contrat/card.php
View File

@ -1911,21 +1911,21 @@ else
// Si pas encore active // Si pas encore active
if (! $objp->date_debut_reelle) { if (! $objp->date_debut_reelle) {
print $langs->trans("DateStartReal").': '; print $langs->trans("DateStartReal").': ';
if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle, 'day'); if ($objp->date_debut_reelle) print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
else print $langs->trans("ContractStatusNotRunning"); else print $langs->trans("ContractStatusNotRunning");
} }
// Si active et en cours // Si active et en cours
if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) { if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': '; print $langs->trans("DateStartReal").': ';
print dol_print_date($objp->date_debut_reelle, 'day'); print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
} }
// Si desactive // Si desactive
if ($objp->date_debut_reelle && $objp->date_fin_reelle) { if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': '; print $langs->trans("DateStartReal").': ';
print dol_print_date($objp->date_debut_reelle, 'day'); print dol_print_date($db->jdate($objp->date_debut_reelle), 'day');
print '  -  '; print '  -  ';
print $langs->trans("DateEndReal").': '; print $langs->trans("DateEndReal").': ';
print dol_print_date($objp->date_fin_reelle, 'day'); print dol_print_date($db->jdate($objp->date_fin_reelle), 'day');
} }
if (! empty($objp->comment)) print "  -  ".$objp->comment; if (! empty($objp->comment)) print "  -  ".$objp->comment;
print '</td>'; print '</td>';