diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 496faa13be4..a2786da6d82 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2164,13 +2164,13 @@ else
}
// Already payed
- print '
| '.$langs->trans('AlreadyPayed').' : | '.price($totalpaye).' | '.$langs->trans('Currency'.$conf->monnaie).' |
';
+ print '| '.$langs->trans('AlreadyPayed').' : | '.price($totalpaye).' | '.$langs->trans('Currency'.$conf->monnaie).' |
';
- // Facturé
+ // Billed
print '| '.$langs->trans("Billed").' : | '.price($fac->total_ttc).' | '.$langs->trans('Currency'.$conf->monnaie).' |
';
$resteapayeraffiche=$resteapayer;
- // Boucle sur chaque facture avoir appliquee
+ // Loop on each credit note applied
$sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";
$sql.= " re.description, re.fk_facture_source, re.fk_facture_source";
$sql.= " FROM ".MAIN_DB_PREFIX ."societe_remise_except as re";
@@ -2239,7 +2239,7 @@ else
else print $langs->trans('ExcessReceived');
print ' :';
print ''.price($resteapayeraffiche).' | ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' | ';
+ print ''.$langs->trans('Currency'.$conf->monnaie).' | ';
}
else
{
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4fb065a6e9a..f88c67e079b 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -372,26 +372,31 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P
$objp = $db->fetch_object($resql);
$var=!$var;
- print '';
-
- print '| ';
$facturestatic->ref=$objp->facnumber;
$facturestatic->id=$objp->facid;
$facturestatic->type=$objp->type;
+
+ $creditnote=$facturestatic->getSommeCreditNote();
+
+ print ' |
';
+
+ print '| ';
print $facturestatic->getNomUrl(1,'');
print " | \n";
// Date
- print ''.dolibarr_print_date($objp->df)." | \n";
+ print ''.dolibarr_print_date($objp->df,'day')." | \n";
// Prix
print ''.price($objp->total_ttc).' | ';
// Recu
- print ''.price($objp->am).' | ';
+ print ''.price($objp->am);
+ if ($creditnote) print '+'.price($creditnote);
+ print ' | ';
// Reste a payer
- print ''.price($objp->total_ttc - $objp->am).' | ';
+ print ''.price($objp->total_ttc - $objp->am - $creditnote).' | ';
// Montant
print '';
|