diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4d44a4b6fec..9c1cd3cb6bd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3370,7 +3370,7 @@ abstract class CommonObject
print '
'.$langs->trans('PriceUHT').' | ';
// Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | ';
+ if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | ';
if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').' | ';
@@ -3409,7 +3409,7 @@ abstract class CommonObject
print ''.$langs->trans('TotalHTShort').' | ';
// Multicurrency
- if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' | ';
+ if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) 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 f14af2b838f..1deef2e2412 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -65,7 +65,7 @@ if ($nolinesbefore) {
trans('VAT'); ?> |
trans('PriceUHT'); ?> |
- multicurrency->enabled)) { $colspan++;?>
+ multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { $colspan++;?>
trans('PriceUHTCurrency'); ?> |
@@ -266,7 +266,7 @@ else {
">
- multicurrency->enabled)) { $colspan++;?>
+ multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { $colspan++;?>
">
|
@@ -402,7 +402,7 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
}
}
- if (!empty($conf->multicurrency->enabled)) $colspan+=2;
+ if (!empty($conf->multicurrency->enabled) && $object->multicurrency_code != $conf->currency) $colspan+=2;
if (! empty($usemargins))
{
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d982516bd67..80d8c617c44 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -122,7 +122,7 @@ $coldisplay=-1; // We remove first td
if ($this->situation_counter > 1) print ' readonly';
print '>';
- if (!empty($conf->multicurrency->enabled)) {
+ if (!empty($conf->multicurrency->enabled) && $object->multicurrency_code != $conf->currency) {
$colspan++;
print ' | ';
}
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 0a20c2679a1..984af537ea9 100755
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -138,7 +138,7 @@ if (empty($usemargins)) $usemargins=0;
subprice); ?> |
- multicurrency->enabled)) { ?>
+ multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { ?>
multicurrency_subprice); ?> |
@@ -204,7 +204,7 @@ if (empty($usemargins)) $usemargins=0;
trans('Option'); ?> |
total_ht); ?> |
- multicurrency->enabled)) { ?>
+ multicurrency->enabled) && $object->multicurrency_code != $conf->currency) { ?>
multicurrency_total_ht); ?> |