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

Merge branch '12.0_NEW_column_total_ht_to_array_products_on_document_creation_card' into NEW/Add_column_Total_HT_to_products_array_on_document_creation_card

Browse Source
This commit is contained in:
Gauthier PC portable 024 2022-04-07 09:50:37 +02:00
commit dfaf985634
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4948,6 +4948,7 @@ abstract class CommonObject
print '<td class="left">'.$langs->trans('Unit').'</td>';
}
print '<td class="right">'.$langs->trans('ReductionShort').'</td>';
print '<td class="right">'.$langs->trans('TotalHT').'</td>';
print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
print '</tr>';
$i = 0;
@ -5078,6 +5079,7 @@ abstract class CommonObject
}
$this->tpl['price'] = price($line->subprice);
$this->tpl['total_ht'] = price($line->total_ht);
$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
if (!empty($conf->global->PRODUCT_USE_UNITS)) {

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

@ -41,6 +41,7 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
}
print '<td class="right">'.$this->tpl['remise_percent'].'</td>';
print '<td class="right">'.$this->tpl['total_ht'].'</td>';
$selected = 1;
if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) {