diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 54e64ccc769..81a1692c6a3 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -65,7 +65,7 @@ if (empty($inputalsopricewithtax)) {
}
// Define colspan for the button 'Add'
$colspan = 3; // Columns: total ht + col edit + col delete
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
$colspan++; //Add column for Total (currency) if required
}
if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
@@ -119,7 +119,7 @@ if ($nolinesbefore) {
?>
trans('VAT'); ?> |
trans('PriceUHT'); ?> |
- multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
+ multicurrency_code != $conf->currency) { ?>
trans('PriceUHTCurrency'); ?> |
@@ -399,7 +399,7 @@ if ($nolinesbefore) {
multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+ if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
$coldisplay++;
?>
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index b2974ffbbfc..d755c3996a8 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -70,7 +70,7 @@ if (!empty($inputalsopricewithtax)) {
if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
$colspan++; // With this, there is a column move button
}
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
$colspan += 2;
}
if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
@@ -214,7 +214,7 @@ $coldisplay++;
}
print '> | ';
- if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+ if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
$coldisplay++;
print ' | ';
}
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 79d4ebeae11..9646d8ce88f 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -88,7 +88,7 @@ print '';
print ''.$langs->trans('PriceUHT').' | ';
// Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | ';
}
@@ -152,7 +152,7 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) {
print ''.$langs->trans('TotalHTShort').' | ';
// Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' | ';
}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index b660bd89d93..fc1e74f1ac4 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -282,7 +282,7 @@ print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')'
subprice); ?> |
-multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
+multicurrency_code != $conf->currency) { ?>
multicurrency_subprice); ?> |
special_code == 3) { ?>
print '';
}
print '';
- if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+ if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
print ''.price($sign * $line->multicurrency_total_ht).' | ';
$coldisplay++;
}
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 25c799ffbfd..090ba834ba1 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -32,7 +32,7 @@ print ''.$this->tpl['label'].' | ';
print ''.$this->tpl['description'].' | ';
print ''.$this->tpl['vat_rate'].' | ';
print ''.$this->tpl['price'].' | ';
-if (!empty($conf->multicurrency->enabled)) {
+if (isModEnabled("multicurrency")) {
print ''.$this->tpl['multicurrency_price'].' | ';
}
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 0be623ab6bf..aef309b90b5 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -558,7 +558,7 @@ if ($id > 0 || !empty($ref)) {
print '';
- if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+ if (isModEnabled("multicurrency") && ($object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
print '| '.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).' | ';
print ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 1c83726f7e6..97d3bfaaf7d 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -998,7 +998,7 @@ if ($action == 'create') {
print '
| ' . $langs->trans('AmountTTC') . ' | ' . price($objectsrc->total_ttc) . " |
";
- if (!empty($conf->multicurrency->enabled))
+ if (isModEnabled("multicurrency"))
{
print '| ' . $langs->trans('MulticurrencyAmountHT') . ' | ' . price($objectsrc->multicurrency_total_ht) . ' |
';
print '| ' . $langs->trans('MulticurrencyAmountVAT') . ' | ' . price($objectsrc->multicurrency_total_tva) . " |
";