lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2011-04-10 06:10:42 +00:00
parent 582d4d21b7
commit be28754feb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@ -1572,7 +1572,7 @@ class CommonObject
if (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)) 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 else
{ {
@ -1657,10 +1657,10 @@ class CommonObject
$this->tpl['description'] = ' '; $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['price'] = price($line->subprice);
$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' '; $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'); include(DOL_DOCUMENT_ROOT.'/core/tpl/originproductline.tpl.php');
} }

2
htdocs/core/tpl/originproductline.tpl.php
View File

@ -23,7 +23,7 @@
<tr <?php echo $bc[$var]; ?>> <tr <?php echo $bc[$var]; ?>>
<td><?php echo $this->tpl['label']; ?></td> <td><?php echo $this->tpl['label']; ?></td>
<td><?php echo $this->tpl['description']; ?></td> <td><?php echo $this->tpl['description']; ?></td>
<td align="right"><?php echo $this->tpl['vat_rate']; ?>%</td> <td align="right"><?php echo $this->tpl['vat_rate']; ?></td>
<td align="right"><?php echo $this->tpl['price']; ?></td> <td align="right"><?php echo $this->tpl['price']; ?></td>
<td align="right"><?php echo $this->tpl['qty']; ?></td> <td align="right"><?php echo $this->tpl['qty']; ?></td>
<td align="right"><?php echo $this->tpl['remise_percent']; ?></td> <td align="right"><?php echo $this->tpl['remise_percent']; ?></td>