Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX tpl object line because the was twice marginclass2 on col margin rates but also on mark rates (#31774)

Browse Source 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
atm-corentin 2024-11-12 13:48:12 +01:00 committed by GitHub
parent 3720b748b1
commit 3bd2aa1921
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ if ($nolinesbefore) {
echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
}
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
echo '<td class="margininfos linecolmark1 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
}
}
} ?>

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

@ -191,7 +191,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) {
print '</th>';
}
if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) {
print '<th class="linecolmargin2 margininfos right width75">'.$langs->trans('MarkRate').'</th>';
print '<th class="linecolmark1 margininfos right width75">'.$langs->trans('MarkRate').'</th>';
}
}

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

@ -454,7 +454,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) {
<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print(($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>
<?php }
if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) {?>
<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
<td class="linecolmark1 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
<?php }
}