{
$sql = "SELECT ".TB_PREF."debtor_trans.*,
(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
- ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) AS Total,
+ ".TB_PREF."debtor_trans.ov_freight_tax) AS Total,
+ ".TB_PREF."debtor_trans.ov_discount,
".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.debtor_ref,
".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.payment_terms, "
.TB_PREF."debtors_master.tax_id AS tax_id,
$myrow = get_receipt($j, $i);
if (!$myrow)
continue;
+ if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+ continue;
+ }
$res = get_bank_trans($j, $i);
$baccount = db_fetch($res);
$params['bankaccount'] = $baccount['bank_act'];
$rep->TextColLines(1, 5, $memo, -2);
}
- $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+ $rep->row = $rep->bottomMargin + (16 * $rep->lineHeight);
$rep->TextCol(3, 6, _("Total Allocated"), -2);
$rep->AmountCol(6, 7, $total_allocated, $dec, -2);
$rep->NewLine();
$rep->TextCol(3, 6, _("Left to Allocate"), -2);
- $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+ $rep->AmountCol(6, 7, $myrow['Total'] + $myrow['ov_discount'] - $total_allocated, $dec, -2);
+ if (floatcmp($myrow['ov_discount'], 0))
+ {
+ $rep->NewLine();
+ $rep->TextCol(3, 6, _("Discount"), - 2);
+ $rep->AmountCol(6, 7, -$myrow['ov_discount'], $dec, -2);
+ }
$rep->NewLine();
$rep->Font('bold');
$rep->TextCol(3, 6, _("TOTAL RECEIPT"), - 2);
$rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
$words = price_in_words($myrow['Total'], ST_CUSTPAYMENT);
if ($words != "")
{