diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index ecd7e1cecda..2c8c8d32334 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -629,19 +629,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Date
print '| '.dol_print_date($db->jdate($objp->df),'day')." | \n";
- // currency
+ // Currency
print ''.$objp->multicurrency_code." | \n";
// Multicurrency Price
if (!empty($conf->multicurrency->enabled))
{
print '';
- if ($objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
print ' | ';
// Multicurrency Price
print '';
- if ($objp->multicurrency_code != $conf->currency)
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
{
print price($sign * $multicurrency_payment);
if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
@@ -651,7 +651,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Multicurrency Price
print ' | ';
- if ($objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
print ' | ';
}
@@ -698,17 +698,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$namef = 'multicurrency_amount_'.$objp->facid;
$nameRemain = 'multicurrency_remain_'.$objp->facid;
- if ($action != 'add_paiement')
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
{
- 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 '';
+ 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 "";
}
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index ce5b3fc4645..6ac62419422 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -419,13 +419,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print ''.$langs->trans('Invoice').' | ';
print ''.$langs->trans('RefSupplier').' | ';
print ''.$langs->trans('Date').' | ';
- print ''.$langs->trans('AmountTTC').' | ';
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('Currency').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAmountTTC').' | ';
- print ''.$langs->trans('AlreadyPaid').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAlreadyPaid').' | ';
- print ''.$langs->trans('RemainderToPay').' | ';
if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyRemainderToPay').' | ';
- print ''.$langs->trans('PaymentAmount').' | ';
+ 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 '';
@@ -453,21 +454,41 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
print '!!! | ';
}
+
+ // Currency
+ print ''.$objp->multicurrency_code." | \n";
+
+ // Multicurrency
+ if (!empty($conf->multicurrency->enabled))
+ {
+ print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+ {
+ print price($objp->multicurrency_total_ttc);
+ }
+ print ' | ';
+
+ print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+ {
+ print price($objp->multicurrency_am);
+ }
+ print ' | ';
+
+ print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+ {
+ print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
+ }
+ print ' | ';
+ }
+
print ''.price($objp->total_ttc).' | ';
- // Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.price($objp->multicurrency_total_ttc).' | ';
-
print ''.price($objp->am).' | ';
- // Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.price($objp->multicurrency_am).' | ';
-
print ''.price($objp->total_ttc - $objp->am).' | ';
- // Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.price($objp->multicurrency_total_ttc - $objp->multicurrency_am).' | ';
-
print '';
$namef = 'amount_'.$objp->facid;
if (!empty($conf->use_javascript_ajax))
@@ -479,10 +500,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if (!empty($conf->multicurrency->enabled))
{
print ' | ';
- $namef = 'multicurrency_amount_'.$objp->facid;
- if (!empty($conf->use_javascript_ajax))
- print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->multicurrency_total_ttc - $objp->multicurrency_am)."'");
- print '';
+ if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+ {
+ $namef = 'multicurrency_amount_'.$objp->facid;
+ if (!empty($conf->use_javascript_ajax))
+ print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->multicurrency_total_ttc - $objp->multicurrency_am)."'");
+ print '';
+ }
print " | ";
}
@@ -496,7 +520,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
// Print total
print '';
- print '| '.$langs->trans('TotalTTC').': | ';
+ print ''.$langs->trans('TotalTTC').': | ';
print ''.price($total_ttc).' | ';
if (!empty($conf->multicurrency->enabled)) print ' | ';
print ''.price($totalrecu).' | ';