Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX|Fix # class name of MarginRate tag #31774

Merged
merged 2 commits into from
Nov 12, 2024
Merged

FIX|Fix # class name of MarginRate tag #31774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db9cb7
FIX tpl object line because the was twice marginclass2 on col margin …
atm-corentin Nov 12, 2024
477d2ad
Merge branch 'develop' into FIX_html_classNameError_on_MarkRates_on_d…
eldy Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion htdocs/core/tpl/objectline_create.tpl.php
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading