diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 564122f3137..30b884d288c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1514,7 +1514,7 @@ if ($action == 'create') {
print '
'.$langs->trans("ServiceNb", $cursorline).' | ';
print ''.$langs->trans("VAT").' | ';
print ''.$langs->trans("PriceUHT").' | ';
- //if (!empty($conf->multicurrency->enabled)) {
+ //if (isModEnabled("multicurrency")) {
// print ''.$langs->trans("PriceUHTCurrency").' | ';
//}
print ''.$langs->trans("Qty").' | ';
@@ -1575,7 +1575,7 @@ if ($action == 'create') {
// Price
print ''.($objp->subprice != '' ? price($objp->subprice) : '')." | \n";
// Price multicurrency
- /*if (!empty($conf->multicurrency->enabled)) {
+ /*if (isModEnabled("multicurrency")) {
print ''.price($objp->multicurrency_subprice).' | ';
}*/
// Quantity
@@ -1718,7 +1718,7 @@ if ($action == 'create') {
print ' | ';
// Price multicurrency
- /*if (!empty($conf->multicurrency->enabled)) {
+ /*if (isModEnabled("multicurrency")) {
print ''.price($objp->multicurrency_subprice).' | ';
}*/
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4aeed158dc5..8be014b8959 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2013 Regis Houssin
* Copyright (C) 2010-2020 Juanjo Menent
* Copyright (C) 2012-2013 Christophe Battarel
- * Copyright (C) 2011-2019 Philippe Grand
+ * Copyright (C) 2011-2022 Philippe Grand
* Copyright (C) 2012-2015 Marcos García
* Copyright (C) 2012-2015 Raphaël Doursenaud
* Copyright (C) 2012 Cedric Salvador
@@ -5086,7 +5086,7 @@ abstract class CommonObject
print ''.$langs->trans('Description').' | ';
print ''.$langs->trans('VATRate').' | ';
print ''.$langs->trans('PriceUHT').' | ';
- if (!empty($conf->multicurrency->enabled)) {
+ if (isModEnabled("multicurrency")) {
print ''.$langs->trans('PriceUHTCurrency').' | ';
}
print ''.$langs->trans('Qty').' | ';
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 49dccc2d0fa..b76ad8c7a47 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -830,7 +830,7 @@ class dolReceiptPrinter extends Printer
$row = $this->db->fetch_object($resql);
$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;
$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
- $amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+ $amount_payment = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
if ($row->code == "LIQ") {
$amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4efea43b044..3b0c2250c49 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1868,7 +1868,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
}
if (empty($reshook)) {
if (empty($hidedetails) || $hidedetails > 1) {
- $subprice = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
+ $subprice = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
$result .= price($sign * $subprice, 0, $outputlangs);
}
}
@@ -2253,7 +2253,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
if ($object->lines[$i]->special_code == 3) {
$result .= $outputlangs->transnoentities("Option");
} elseif (empty($hidedetails) || $hidedetails > 1) {
- $total_ht = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+ $total_ht = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
if (!empty($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0) {
// TODO Remove this. The total should be saved correctly in database instead of being modified here.
$prev_progress = 0;
@@ -2309,7 +2309,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
if ($object->lines[$i]->special_code == 3) {
$result .= $outputlangs->transnoentities("Option");
} elseif (empty($hidedetails) || $hidedetails > 1) {
- $total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
+ $total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
if ($object->lines[$i]->situation_percent > 0) {
// TODO Remove this. The total should be saved correctly in database instead of being modified here.
$prev_progress = 0;