From 3bb1a2387b829d6dd2e4f1cc1db9c9ca2e9b0956 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 28 Aug 2022 13:42:27 +0200 Subject: [PATCH] FIX php8 compatibility --- htdocs/comm/remx.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index db1cc06c504..a47a865fc45 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -424,12 +424,12 @@ if ($socid > 0) { print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; print ''.$langs->trans("AmountHT").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountHT").''; } print ''.$langs->trans("VATRate").''; print ''.$langs->trans("AmountTTC").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountTTC").''; } print ''.$langs->trans("DiscountOfferedBy").''; @@ -474,12 +474,12 @@ if ($socid > 0) { } print ''.$langs->trans("NotConsumed").''; print ''.price($obj->amount_ht).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ht).''; } print ''.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).''; print ''.price($obj->amount_ttc).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ttc).''; } print ''; @@ -503,7 +503,7 @@ if ($socid > 0) { } } else { $colspan = 8; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { $colspan += 2; } print ''.$langs->trans("None").''; @@ -562,12 +562,12 @@ if ($socid > 0) { print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; print ''.$langs->trans("AmountHT").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountHT").''; } print ''.$langs->trans("VATRate").''; print ''.$langs->trans("AmountTTC").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountTTC").''; } print ''.$langs->trans("DiscountOfferedBy").''; @@ -612,12 +612,12 @@ if ($socid > 0) { } print ''.$langs->trans("NotConsumed").''; print ''.price($obj->amount_ht).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ht).''; } print ''.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).''; print ''.price($obj->amount_ttc).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ttc).''; } print ''; @@ -641,7 +641,7 @@ if ($socid > 0) { } } else { $colspan = 8; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { $colspan += 2; } print ''.$langs->trans("None").''; @@ -735,12 +735,12 @@ if ($socid > 0) { print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; print ''.$langs->trans("AmountHT").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountHT").''; } print ''.$langs->trans("VATRate").''; print ''.$langs->trans("AmountTTC").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountTTC").''; } print ''.$langs->trans("Author").''; @@ -808,12 +808,12 @@ if ($socid > 0) { } print ''; print ''.price($obj->amount_ht).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ht).''; } print ''.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).''; print ''.price($obj->amount_ttc).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ttc).''; } print ''; @@ -825,7 +825,7 @@ if ($socid > 0) { } } else { $colspan = 8; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { $colspan += 2; } print ''.$langs->trans("None").''; @@ -896,12 +896,12 @@ if ($socid > 0) { print ''.$langs->trans("ReasonDiscount").''; print ''.$langs->trans("ConsumedBy").''; print ''.$langs->trans("AmountHT").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountHT").''; } print ''.$langs->trans("VATRate").''; print ''.$langs->trans("AmountTTC").''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.$langs->trans("MulticurrencyAmountTTC").''; } print ''.$langs->trans("Author").''; @@ -969,12 +969,12 @@ if ($socid > 0) { } print ''; print ''.price($obj->amount_ht).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ht).''; } print ''.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).''; print ''.price($obj->amount_ttc).''; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { print ''.price($obj->multicurrency_amount_ttc).''; } print ''; @@ -986,7 +986,7 @@ if ($socid > 0) { } } else { $colspan = 8; - if (!empty($conf->multicurrency->enabled)) { + if (isModEnabled('multicompany')) { $colspan += 2; } print ''.$langs->trans("None").'';