diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 37b23c03724..7a494113090 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -585,11 +585,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (!empty($conf->multicurrency->enabled)) print '
'.$langs->trans('MulticurrencyAmountTTC').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyalreadypayedlabel.' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyremaindertopay.' | ';
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyPaymentAmount').' | ';
print ''.$langs->trans('AmountTTC').' | ';
print ''.$alreadypayedlabel.' | ';
print ''.$remaindertopay.' | ';
print ''.$langs->trans('PaymentAmount').' | ';
- if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyPaymentAmount').' | ';
print ' | ';
print "\n";
@@ -659,6 +659,29 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '';
if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) 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 " | ";
}
// Price
@@ -695,33 +718,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 " | ";
- }
-
// Warning
print '';
//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]." ";
@@ -754,6 +750,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (!empty($conf->multicurrency->enabled)) print ' | | ';
if (!empty($conf->multicurrency->enabled)) print ' | ';
if (!empty($conf->multicurrency->enabled)) print ' | ';
+ if (!empty($conf->multicurrency->enabled)) print ' | ';
print ''.price($sign * $total_ttc).' | ';
print ''.price($sign * $totalrecu);
if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
@@ -761,7 +758,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 ' | ';
print "\n";
}