diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9c1cd3cb6bdc1..4d44a4b6fec08 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3370,7 +3370,7 @@ function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0
print '
'.$langs->trans('PriceUHT').' | ';
// Multicurrency
- if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | ';
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | ';
if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').' | ';
@@ -3409,7 +3409,7 @@ function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0
print ''.$langs->trans('TotalHTShort').' | ';
// Multicurrency
- if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' | ';
+ if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' | ';
if ($outputalsopricetotalwithtax) print ''.$langs->trans('TotalTTCShort').' | ';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 1deef2e24125b..f14af2b838fc1 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -65,7 +65,7 @@
trans('VAT'); ?> |
trans('PriceUHT'); ?> |
- multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { $colspan++;?>
+ multicurrency->enabled)) { $colspan++;?>
trans('PriceUHTCurrency'); ?> |
@@ -266,7 +266,7 @@
">
- multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { $colspan++;?>
+ multicurrency->enabled)) { $colspan++;?>
">
|
@@ -402,7 +402,7 @@
}
}
- if (!empty($conf->multicurrency->enabled) && $object->multicurrency_code != $conf->currency) $colspan+=2;
+ if (!empty($conf->multicurrency->enabled)) $colspan+=2;
if (! empty($usemargins))
{
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 80d8c617c444f..d982516bd6720 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -122,7 +122,7 @@
if ($this->situation_counter > 1) print ' readonly';
print '>';
- if (!empty($conf->multicurrency->enabled) && $object->multicurrency_code != $conf->currency) {
+ if (!empty($conf->multicurrency->enabled)) {
$colspan++;
print ' | ';
}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 984af537ea986..0a20c2679a1a8 100755
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -138,7 +138,7 @@
subprice); ?> |
- multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { ?>
+ multicurrency->enabled)) { ?>
multicurrency_subprice); ?> |
@@ -204,7 +204,7 @@
trans('Option'); ?> |
total_ht); ?> |
- multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { ?>
+ multicurrency->enabled)) { ?>
multicurrency_total_ht); ?> |