NEW : hide remise_except unit price on invoice lines (#37066)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
parent
2905b6096e
commit
d75499d076
1 changed files with 13 additions and 4 deletions
|
|
@ -409,10 +409,19 @@ print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')'
|
|||
print $tooltiponpriceend;
|
||||
?></td>
|
||||
|
||||
<td class="linecoluht nowraponall right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>
|
||||
<td class="linecoluht nowraponall right">
|
||||
<?php
|
||||
$coldisplay++;
|
||||
if (empty($line->fk_remise_except)) print price($sign * $line->subprice);
|
||||
?>
|
||||
</td>
|
||||
|
||||
<?php if (isModEnabled("multicurrency") && $this->multicurrency_code && $this->multicurrency_code != $conf->currency) { ?>
|
||||
<td class="linecoluht_currency nowraponall right"><?php $coldisplay++; ?><?php print price($sign * $line->multicurrency_subprice); ?></td>
|
||||
<td class="linecoluht_currency nowraponall right">
|
||||
<?php $coldisplay++;
|
||||
if (empty($line->fk_remise_except)) print price($sign * $line->multicurrency_subprice);
|
||||
?>
|
||||
</td>
|
||||
<?php }
|
||||
|
||||
if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?>
|
||||
|
|
@ -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
|
||||
?></td>
|
||||
<?php }
|
||||
|
||||
|
|
@ -438,7 +447,7 @@ if (isModEnabled("multicurrency") && $this->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
|
||||
?></td>
|
||||
<?php } ?>
|
||||
<td class="linecolqty nowraponall right"><?php $coldisplay++; ?>
|
||||
|
|
|
|||
Loading…
Reference in a new issue