diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index a03fd03ffef..83393a52cb6 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -710,10 +710,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Price print ''.price($sign * $objp->total_ttc).''; - // Received or paid back + // Received + already paid print ''.price($sign * $paiement); - if ($creditnotes) print '+'.price($creditnotes); - if ($deposits) print '+'.price($deposits); + if ($creditnotes) print '+'.price($creditnotes).''; + if ($deposits) print '+'.price($deposits).''; print ''; // Remain to take or to pay back diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php index 7bc98d12278..293ea333682 100644 --- a/htdocs/core/tpl/object_discounts.tpl.php +++ b/htdocs/core/tpl/object_discounts.tpl.php @@ -62,7 +62,11 @@ if ($absolute_discount > 0) { $text .= ' ('.$addabsolutediscount.')'; } - print '
'.$text.'
'; + if ($isNewObject) { + print '
'.$text; + } else { + print '
'.$text.'
'; + } } else { // Discount available of type fixed amount (not credit note) $more = '('.$addabsolutediscount.')'; @@ -85,7 +89,11 @@ if ($absolute_creditnote > 0) { $text .= '('.$addabsolutediscount.')'; } - print '
'.$text.'
'; + if ($isNewObject) { + print '
'.$text; + } else { + print '
'.$text.'
'; + } } else { // We can add a credit note on a down payment or standard invoice or situation invoice // There is credit notes discounts available $more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';