From 76c39a86a03eda2952e0b296ca6cc6df24fb9e60 Mon Sep 17 00:00:00 2001 From: henrynopo Date: Mon, 16 Aug 2021 09:44:09 +0800 Subject: [PATCH 1/2] Supplier Invoice - Multicurrency remainder to pay Added multicurrency remainder to be paid. --- htdocs/fourn/facture/card.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 6b67d0a2dcf..5d6a5c0dea2 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -3237,6 +3237,17 @@ if ($action == 'create') { print ''; print ''; print ''.price($resteapayeraffiche).''; + + // Remainder to pay Multicurrency + if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) { + print ''; + print ''; + print $langs->trans('MulticurrencyRemainderToPay'); + print ''; + print ''; + print ''.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).''; + } + print ' '; } else // Credit note { From ee65860b270304f814827547cd913e99d1c7ab79 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 16 Aug 2021 01:45:33 +0000 Subject: [PATCH 2/2] Fixing style errors. --- htdocs/fourn/facture/card.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 5d6a5c0dea2..b39041542eb 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -3237,17 +3237,17 @@ if ($action == 'create') { print ''; print ''; print ''.price($resteapayeraffiche).''; - + // Remainder to pay Multicurrency - if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) { - print ''; - print ''; - print $langs->trans('MulticurrencyRemainderToPay'); - print ''; - print ''; - print ''.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).''; - } - + if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) { + print ''; + print ''; + print $langs->trans('MulticurrencyRemainderToPay'); + print ''; + print ''; + print ''.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).''; + } + print ' '; } else // Credit note {