Merge pull request #14933 from ptibogxiv/patch-386

FIX php error in takepos
This commit is contained in:
Laurent Destailleur 2020-10-06 09:57:40 +02:00 committed by GitHub
commit 48ed3f5783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -865,12 +865,12 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
</div> </div>
<!-- Modal multicurrency box --> <!-- Modal multicurrency box -->
if (!empty($conf->multicurrency->enabled)){ <?php if (!empty($conf->multicurrency->enabled)) { ?>
<div id="ModalCurrency" class="modal"> <div id="ModalCurrency" class="modal">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<span class="close" href="#" onclick="document.getElementById('ModalCurrency').style.display = 'none';">&times;</span> <span class="close" href="#" onclick="document.getElementById('ModalCurrency').style.display = 'none';">&times;</span>
<h3><?php print $langs->trans("SetMultiCurrencyCode");?></h3> <h3><?php print $langs->trans("SetMultiCurrencyCode"); ?></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<?php <?php
@ -882,12 +882,11 @@ if (!empty($conf->multicurrency->enabled)){
while ($obj = $db->fetch_object($resql)) while ($obj = $db->fetch_object($resql))
print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>'; print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';
} }
?> ?>
</div> </div>
</div> </div>
</div> </div>
} <?php } ?>
<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>"> <div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">