Update card.php
This commit is contained in:
parent
bafe22ff77
commit
11497d4bf0
@ -5071,7 +5071,7 @@ if ($action == 'create') {
|
|||||||
}
|
}
|
||||||
print '</span>';
|
print '</span>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
|
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td> </td></tr>';
|
||||||
|
|
||||||
// Remainder to pay Multicurrency
|
// Remainder to pay Multicurrency
|
||||||
if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
|
if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
|
||||||
@ -5084,11 +5084,9 @@ if ($action == 'create') {
|
|||||||
}
|
}
|
||||||
print '</span>';
|
print '</span>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td>';
|
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td><td> </td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<td class="nowrap"> </td></tr>';
|
|
||||||
|
|
||||||
// Retained warranty : usualy use on construction industry
|
// Retained warranty : usualy use on construction industry
|
||||||
if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
|
if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
|
||||||
// Billed - retained warranty
|
// Billed - retained warranty
|
||||||
@ -5127,7 +5125,7 @@ if ($action == 'create') {
|
|||||||
print ' ('.$langs->trans('ExcessPaid').')';
|
print ' ('.$langs->trans('ExcessPaid').')';
|
||||||
}
|
}
|
||||||
print ' :</td>';
|
print ' :</td>';
|
||||||
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
|
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td><td> </td></tr>';
|
||||||
|
|
||||||
// Remainder to pay back Multicurrency
|
// Remainder to pay back Multicurrency
|
||||||
if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
|
if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
|
||||||
@ -5140,11 +5138,9 @@ if ($action == 'create') {
|
|||||||
}
|
}
|
||||||
print '</span>';
|
print '</span>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($sign * $object->multicurrency_tx * $resteapayeraffiche, 'MT')).'</td>';
|
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($sign * $object->multicurrency_tx * $resteapayeraffiche, 'MT')).'</td><td> </td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<td class="nowrap"> </td></tr>';
|
|
||||||
|
|
||||||
// Sold credit note
|
// Sold credit note
|
||||||
// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('TotalTTC').' :</td>';
|
// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('TotalTTC').' :</td>';
|
||||||
// print '<td class="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($sign *
|
// print '<td class="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($sign *
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user