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

Change variable to pos_change

Browse Source
This commit is contained in:
andreubisquerra 2020-08-23 22:29:55 +02:00 committed by GitHub
parent 8f933c324a
commit 915aa56a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/takepos/receipt.php
View File

@ -183,7 +183,7 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
</tr> </tr>
<?php <?php
if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) { if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
$sql = "SELECT p.takepos_change as takepos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,"; $sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
$sql .= " cp.code"; $sql .= " cp.code";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p"; $sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
@ -202,18 +202,18 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
echo '</td>'; echo '</td>';
echo '<td class="right">'; echo '<td class="right">';
$amount_payment=($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount; $amount_payment=($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->takepos_change; // Show amount with excess received if is cash payment if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency); echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency);
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
if ($row->code == "LIQ" && $row->takepos_change>0) // Print change only in cash payments if ($row->code == "LIQ" && $row->pos_change>0) // Print change only in cash payments
{ {
echo '<tr>'; echo '<tr>';
echo '<td class="right">'; echo '<td class="right">';
echo $langs->trans("Change"); echo $langs->trans("Change");
echo '</td>'; echo '</td>';
echo '<td class="right">'; echo '<td class="right">';
echo price($row->takepos_change, 1, '', 1, - 1, - 1, $conf->currency); echo price($row->pos_change, 1, '', 1, - 1, - 1, $conf->currency);
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }