diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index e5615aa66ba..2fc860cb116 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -592,7 +592,7 @@ if ($id > 0)
if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) {
print " ".img_warning();
}
- print '
'.dol_print_date($db->jdate($objp->dp),'day')." | \n";
+ print ''.dol_print_date($db->jdate($objp->dp),'day')." | \n";
print ''.price($objp->total_ht).' | ';
print ''.$propal_static->LibStatut($objp->fk_statut,5).' | ';
$i++;
@@ -673,7 +673,7 @@ if ($id > 0)
$commande_static->total_tva = $objp->total_tva;
$commande_static->total_ttc = $objp->total_ttc;
print $commande_static->getNomUrl(1);
- print ''.dol_print_date($db->jdate($objp->dc),'day')." | \n";
+ print ''.dol_print_date($db->jdate($objp->dc),'day')." | \n";
print ''.price($objp->total_ht).' | ';
print ''.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).' | ';
$i++;
@@ -737,7 +737,7 @@ if ($id > 0)
print $sendingstatic->getNomUrl(1);
print '';
if ($objp->date_creation > 0) {
- print ''.dol_print_date($db->jdate($objp->date_creation),'day').' | ';
+ print ''.dol_print_date($db->jdate($objp->date_creation),'day').' | ';
} else {
print '!!! | ';
}
@@ -797,8 +797,8 @@ if ($id > 0)
print $contrat->getNomUrl(1,12);
print "\n";
print ''.dol_trunc($objp->refsup,12)." | \n";
- print ''.dol_print_date($db->jdate($objp->dc),'day')." | \n";
- print ''.dol_print_date($db->jdate($objp->dcon),'day')." | \n";
+ print ''.dol_print_date($db->jdate($objp->dc),'day')." | \n";
+ print ''.dol_print_date($db->jdate($objp->dcon),'day')." | \n";
print ' | ';
print '';
$contrat->fetch_lines();
@@ -855,9 +855,9 @@ if ($id > 0)
print " | ";
print '| '.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.' | '."\n";
- //print ''.dol_print_date($db->jdate($objp->startdate)).' | '."\n";
- print ''.convertSecondToTime($objp->duration).' | '."\n";
- print ''.$fichinter_static->getLibStatut(5).' | '."\n";
+ //print ''.dol_print_date($db->jdate($objp->startdate)).' | '."\n";
+ print ''.convertSecondToTime($objp->duration).' | '."\n";
+ print ''.$fichinter_static->getLibStatut(5).' | '."\n";
print '
';
$var=!$var;
$i++;
@@ -907,7 +907,7 @@ if ($id > 0)
$tableaushown=1;
print '';
- print '| '.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllBills").' '.$num.' | ';
+ print ' | ';
print ' ';
@@ -929,15 +929,24 @@ if ($id > 0)
print '';
if ($objp->df > 0)
{
- print ''.dol_print_date($db->jdate($objp->df),'day').' | ';
+ print ''.dol_print_date($db->jdate($objp->df),'day').' | ';
}
else
{
print '!!! | ';
}
- print ''.price($objp->total_ht).' | ';
+ print '';
+ print price($objp->total_ht);
+ print ' | ';
- print ''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).' | ';
+ if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
+ {
+ print '';
+ print price($objp->total_ttc);
+ print ' | ';
+ }
+
+ print ''.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).' | ';
print "\n";
$i++;
}
|