Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
eldy committed Mar 15, 2019
2 parents d31b632 + ff1fc4f commit d2c7fe3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions htdocs/contrat/card.php
Original file line number Diff line number Diff line change
Expand Up @@ -1911,21 +1911,21 @@
// Si pas encore active
if (! $objp->date_debut_reelle) {
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");
}
// Si active et en cours
if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
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
if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
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 $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;
print '</td>';
Expand Down

0 comments on commit d2c7fe3

Please sign in to comment.