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

Debug v13

Browse Source
This commit is contained in:
Laurent Destailleur 2021-01-04 15:32:18 +01:00
parent ef76c067e0
commit 7141fa315e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/paiement.php
View File

@ -710,10 +710,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Price // Price
print '<td class="right">'.price($sign * $objp->total_ttc).'</td>'; print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
// Received or paid back // Received + already paid
print '<td class="right">'.price($sign * $paiement); print '<td class="right">'.price($sign * $paiement);
if ($creditnotes) print '+'.price($creditnotes); if ($creditnotes) print '<span class="opacitymedium">+'.price($creditnotes).'</span>';
if ($deposits) print '+'.price($deposits); if ($deposits) print '<span class="opacitymedium">+'.price($deposits).'</span>';
print '</td>'; print '</td>';
// Remain to take or to pay back // Remain to take or to pay back

8
htdocs/core/tpl/object_discounts.tpl.php
View File

@ -62,7 +62,11 @@ if ($absolute_discount > 0) {
$text .= ' ('.$addabsolutediscount.')'; $text .= ' ('.$addabsolutediscount.')';
} }
if ($isNewObject) {
print '<br>'.$text;
} else {
print '<div class="inline-block clearboth">'.$text.'</div>'; print '<div class="inline-block clearboth">'.$text.'</div>';
}
} else { } else {
// Discount available of type fixed amount (not credit note) // Discount available of type fixed amount (not credit note)
$more = '('.$addabsolutediscount.')'; $more = '('.$addabsolutediscount.')';
@ -85,7 +89,11 @@ if ($absolute_creditnote > 0) {
$text .= '('.$addabsolutediscount.')'; $text .= '('.$addabsolutediscount.')';
} }
if ($isNewObject) {
print '<br>'.$text;
} else {
print '<div class="inline-block clearboth">'.$text.'</div>'; print '<div class="inline-block clearboth">'.$text.'</div>';
}
} else { // We can add a credit note on a down payment or standard invoice or situation invoice } else { // We can add a credit note on a down payment or standard invoice or situation invoice
// There is credit notes discounts available // There is credit notes discounts available
$more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : ''; $more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';