diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 39c0366816d..c0a849b0b6b 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1572,7 +1572,7 @@ class CommonObject if (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)) { - if (empty($line->fk_parent_line)) $object->hooks[$line->special_code]->printOriginObjectLine($this,$line,$i); + if (empty($line->fk_parent_line)) $object->hooks[$line->special_code]->printOriginObjectLine($this,$line,$var,$i); } else { @@ -1657,10 +1657,10 @@ class CommonObject $this->tpl['description'] = ' '; } - $this->tpl['vat_rate'] = vatrate($line->tva_tx); + $this->tpl['vat_rate'] = vatrate($line->tva_tx, true); $this->tpl['price'] = price($line->subprice); $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' '; - $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? $line->remise_percent.'%' : ' '; + $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : ' '; include(DOL_DOCUMENT_ROOT.'/core/tpl/originproductline.tpl.php'); } diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php index db2136bbde1..75e6dacc0c1 100644 --- a/htdocs/core/tpl/originproductline.tpl.php +++ b/htdocs/core/tpl/originproductline.tpl.php @@ -23,7 +23,7 @@