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

Merge pull request #20576 from atm-gauthier/fix_td_identification

Browse Source 
FIX : originproductline array td identification
This commit is contained in:
Laurent Destailleur 2022-04-07 11:34:17 +02:00 committed by GitHub
commit 9bf6fc41d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4805,18 +4805,18 @@ abstract class CommonObject
global $langs, $hookmanager, $conf, $form; global $langs, $hookmanager, $conf, $form;
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Ref').'</td>'; print '<td class="linecolref">'.$langs->trans('Ref').'</td>';
print '<td>'.$langs->trans('Description').'</td>'; print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
print '<td class="right">'.$langs->trans('VATRate').'</td>'; print '<td class="linecolvat right">'.$langs->trans('VATRate').'</td>';
print '<td class="right">'.$langs->trans('PriceUHT').'</td>'; print '<td class="linecoluht right">'.$langs->trans('PriceUHT').'</td>';
if (!empty($conf->multicurrency->enabled)) { if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>'; print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>';
} }
print '<td class="right">'.$langs->trans('Qty').'</td>'; print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
print '<td class="left">'.$langs->trans('Unit').'</td>'; print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
} }
print '<td class="right">'.$langs->trans('ReductionShort').'</td>'; print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';
print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>'; print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
print '</tr>'; print '</tr>';
$i = 0; $i = 0;

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

@ -26,21 +26,21 @@ if (empty($conf) || !is_object($conf)) {
<!-- BEGIN PHP TEMPLATE originproductline.tpl.php --> <!-- BEGIN PHP TEMPLATE originproductline.tpl.php -->
<?php <?php
print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">'; print '<tr data-id="'.$this->tpl['id'].'" class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
print '<td>'.$this->tpl['label'].'</td>'; print '<td class="linecolref">'.$this->tpl['label'].'</td>';
print '<td>'.$this->tpl['description'].'</td>'; print '<td class="linecoldescription">'.$this->tpl['description'].'</td>';
print '<td class="right">'.$this->tpl['vat_rate'].'</td>'; print '<td class="linecolvat right">'.$this->tpl['vat_rate'].'</td>';
print '<td class="right">'.$this->tpl['price'].'</td>'; print '<td class="linecoluht right">'.$this->tpl['price'].'</td>';
if (!empty($conf->multicurrency->enabled)) { if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>'; print '<td class="linecoluht_currency right">'.$this->tpl['multicurrency_price'].'</td>';
} }
print '<td class="right">'.$this->tpl['qty'].'</td>'; print '<td class="linecolqty right">'.$this->tpl['qty'].'</td>';
if (!empty($conf->global->PRODUCT_USE_UNITS)) { if (!empty($conf->global->PRODUCT_USE_UNITS)) {
print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>'; print '<td class="linecoluseunit left">'.$langs->trans($this->tpl['unit']).'</td>';
} }
print '<td class="right">'.$this->tpl['remise_percent'].'</td>'; print '<td class="linecoldiscount right">'.$this->tpl['remise_percent'].'</td>';
$selected = 1; $selected = 1;
if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) { if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) {