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

Fix margin rates and mark rates are 2 different columns

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-17 19:39:56 +02:00
parent 099b2da2dc
commit b318ccb2af
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -296,7 +296,8 @@ $coldisplay++;
echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>'; echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
} }
$coldisplay++; $coldisplay++;
} elseif (!empty($conf->global->DISPLAY_MARK_RATES)) { }
if (!empty($conf->global->DISPLAY_MARK_RATES)) {
$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx)); $mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
// if credit note, dont allow to modify margin // if credit note, dont allow to modify margin
if ($line->subprice < 0) { if ($line->subprice < 0) {