diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index b5c74877ff6..c06b7ca908b 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -409,10 +409,19 @@ print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')'
print $tooltiponpriceend;
?>
-
subprice); ?> |
+
+ fk_remise_except)) print price($sign * $line->subprice);
+ ?>
+ |
multicurrency_code && $this->multicurrency_code != $conf->currency) { ?>
- multicurrency_subprice); ?> |
+
+ fk_remise_except)) print price($sign * $line->multicurrency_subprice);
+ ?>
+ |
@@ -424,7 +433,7 @@ if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH
if (!$upinctax) {
$multicurrency_upinctax = price2num($line->multicurrency_subprice * (1 + ($line->tva_tx / 100)), 'MU'); // one tax
}
- print (isset($upinctax) ? price($sign * $upinctax) : price($sign * $line->subprice)); // if upinctax can't be known, we show subprice excl ta
+ if (empty($line->fk_remise_except)) print (isset($upinctax) ? price($sign * $upinctax) : price($sign * $line->subprice)); // if upinctax can't be known, we show subprice excl ta
?>
multicurrency_code && $this->multicu
if (!$multicurrency_upinctax) {
$multicurrency_upinctax = price2num($line->multicurrency_subprice * (1 + ($line->tva_tx / 100)), 'MU'); // one tax
}
- print (isset($multicurrency_upinctax) ? price($sign * $multicurrency_upinctax) : price($sign * $line->multicurrency_subprice)); // if upinctax can't be known, we show subprice excl ta
+ if (empty($line->fk_remise_except)) print (isset($multicurrency_upinctax) ? price($sign * $multicurrency_upinctax) : price($sign * $line->multicurrency_subprice)); // if upinctax can't be known, we show subprice excl ta
?>
|