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

Correct stickler

Browse Source
This commit is contained in:
Nicolas 2021-02-24 15:57:33 +01:00
parent 49c0967a3e
commit 589c757fbf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/takepos/invoice.php
View File

@ -1121,7 +1121,7 @@ print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilep
print '<div class="div-table-responsive-no-min invoice">';
print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
if(!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<tr><td colspan="5">'.$sectionwithinvoicelink.'</td></tr>'; }
if (!empty($conf->global->TAKEPOS_SHOW_HT)) { print '<tr><td colspan="5">'.$sectionwithinvoicelink.'</td></tr>'; }
else{
print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
}
@ -1158,7 +1158,7 @@ if ($_SESSION["basiclayout"] != 1)
{
print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if($conf->global->TAKEPOS_SHOW_HT) {
if ($conf->global->TAKEPOS_SHOW_HT) {
print '<td class="linecolht right nowraponall">';
print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
// In phone version only show when it is invoice page
@ -1394,7 +1394,7 @@ if ($placeid > 0)
}
$htmlforlines .= '</td>';
if($conf->global->TAKEPOS_SHOW_HT) {
if ($conf->global->TAKEPOS_SHOW_HT) {
$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
$htmlforlines .= price($line->total_ht, 1, '', 1, -1, -1, $conf->currency);
if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
@ -1424,13 +1424,13 @@ if ($placeid > 0)
}
} else {
print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td>';
if(!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
if (!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
print '</tr>';
}
} else { // No invoice generated yet
print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td>';
if(!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
if (!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
print '</tr>';
}

4
htdocs/takepos/receipt.php
View File

@ -140,7 +140,7 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
<th class="center"><?php print $langs->trans("Label"); ?></th>
<th class="right"><?php print $langs->trans("Qty"); ?></th>
<th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>
<?php if(!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)){ ?>
<?php if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
<th class="right"><?php if ($gift != 1) print $langs->trans("TotalHT"); ?></th>
<?php } ?>
<th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>
@ -159,7 +159,7 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
<td class="right"><?php echo $line->qty; ?></td>
<td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
<?php
if(!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)){ ?>
if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
<td class="right"><?php if ($gift != 1) echo price($line->total_ht, 1); ?></td>
<?php
}