Skip to content

Commit

Permalink
FIX tpl object line because the was twice marginclass2 on col margin …
Browse files Browse the repository at this point in the history
…rates but also on mark rates (#31774)

Co-authored-by: Laurent Destailleur <[email protected]>
  • Loading branch information
atm-corentin and eldy authored Nov 12, 2024
1 parent 3720b74 commit 3bd2aa1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/tpl/objectline_create.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
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>';
}
}
} ?>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/tpl/objectline_title.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
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>';
}
}

Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/tpl/objectline_view.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
<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 }
}

Expand Down

0 comments on commit 3bd2aa1

Please sign in to comment.