diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 1dd6f0a0f12..76e15127098 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -555,14 +555,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '
'.$langs->trans('MulticurrencyAmountTTC').' | ';
print ''.$langs->trans('MulticurrencyAlreadyPaid').' | ';
print ''.$langs->trans('MulticurrencyRemainderToPay').' | ';
+ print ''.$langs->trans('MulticurrencyPaymentAmount').' | ';
}
print ''.$langs->trans('AmountTTC').' | ';
print ''.$langs->trans('AlreadyPaid').' | ';
print ''.$langs->trans('RemainderToPay').' | ';
print ''.$langs->trans('PaymentAmount').' | ';
- if (!empty($conf->multicurrency->enabled)) {
- print ''.$langs->trans('MulticurrencyPaymentAmount').' | ';
- }
print '';
$total = 0;
@@ -657,6 +655,24 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print price($sign * $multicurrency_remaintopay);
}
print '';
+
+ print '';
+ // Add remind multicurrency amount
+ $namef = 'multicurrency_amount_'.$objp->facid;
+ $nameRemain = 'multicurrency_remain_'.$objp->facid;
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+ if ($action != 'add_paiement') {
+ if (!empty($conf->use_javascript_ajax)) {
+ print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+ }
+ print '';
+ print '';
+ } else {
+ print '';
+ print '';
+ }
+ }
+ print " | ";
}
print ''.price($sign * $objp->total_ttc).' | ';
@@ -690,29 +706,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
print "";
- // Multicurrency Price
- if (!empty($conf->multicurrency->enabled)) {
- print '';
-
- // Add remind multicurrency amount
- $namef = 'multicurrency_amount_'.$objp->facid;
- $nameRemain = 'multicurrency_remain_'.$objp->facid;
-
- if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
- if ($action != 'add_paiement') {
- if (!empty($conf->use_javascript_ajax)) {
- print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
- }
- print '';
- print '';
- } else {
- print '';
- print '';
- }
- }
- print " | ";
- }
-
print "\n";
$total += $objp->total_ht;
$total_ttc += $objp->total_ttc;
@@ -730,6 +723,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print ' | ';
print ' | ';
print ' | ';
+ print ' | ';
}
print ''.price($sign * $total_ttc).' | ';
print ''.price($sign * $totalrecu);
@@ -742,9 +736,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print ' | ';
print ''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).' | ';
print ' | '; // Autofilled
- if (!empty($conf->multicurrency->enabled)) {
- print ' | ';
- }
print "\n";
}
print "\n";