if($to)
$to = date2sql($to);
$sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0),
- -abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,";
+ -abs(IF(t.prep_amount, t.prep_amount, t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)), 0)) AS charges,";
$sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0),
abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,";
$sql .= "SUM(IF(t.type != ".ST_SALESINVOICE." AND NOT(t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.")), t.alloc * -1, t.alloc)) AS Allocated,";
$sql .= "SUM(IF(t.type = ".ST_SALESINVOICE." OR (t.type IN (".ST_JOURNAL." , ".ST_BANKPAYMENT.") AND t.ov_amount>0), 1, -1) *
- (abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) - abs(t.alloc))) AS OutStanding
+ (IF(t.prep_amount, t.prep_amount, abs(t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)) - abs(t.alloc))) AS OutStanding
FROM ".TB_PREF."debtor_trans t
WHERE t.debtor_no = ".db_escape($debtorno)
." AND t.type <> ".ST_CUSTDELIVERY;
GROUP BY trans_type_to, trans_no_to) alloc_to";
$sql = "SELECT trans.*,
- (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount,
+ IF(trans.prep_amount, trans.prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)
+ AS TotalAmount,
IFNULL(alloc_from.amount, alloc_to.amount) AS Allocated,
((trans.type = ".ST_SALESINVOICE.") AND trans.due_date < '$to') AS OverDue
FROM ".TB_PREF."debtor_trans trans
$cols = array(0, 95, 140, 200, 250, 320, 385, 450, 515);
- $headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Charges'), _('Credits'),
+ $headers = array(_('Trans Type'), _('#'), _('Date'), _('Due Date'), _('Debits'), _('Credits'),
_('Allocated'), _('Outstanding'));
if ($show_balance)
$rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
$bal = get_open_balance($myrow['debtor_no'], $from);
$init = array();
- $bal['charges'] = isset($bal['charges']) ? $bal['charges'] : 0;
- $bal['credits'] = isset($bal['credits']) ? $bal['credits'] : 0;
- $bal['Allocated'] = isset($bal['Allocated']) ? $bal['Allocated'] : 0;
- $bal['OutStanding'] = isset($bal['OutStanding']) ? $bal['OutStanding'] : 0;
- $init[0] = round2(abs($bal['charges']*$rate), $dec);
- $init[1] = round2(Abs($bal['credits']*$rate), $dec);
- $init[2] = round2($bal['Allocated']*$rate, $dec);
+
+ $init[0] = round2(($bal != false ? abs($bal['charges']) : 0)*$rate, $dec);
+ $init[1] = round2(($bal != false ? abs($bal['credits']) : 0)*$rate, $dec);
+ $init[2] = round2(($bal != false ? $bal['Allocated'] : 0)*$rate, $dec);
if ($show_balance)
{
$init[3] = $init[0] - $init[1];
$accumulate += $init[3];
}
else
- $init[3] = round2($bal['OutStanding']*$rate, $dec);
+ $init[3] = round2(($bal != false ? $bal['OutStanding'] : 0)*$rate, $dec);
$res = get_transactions($myrow['debtor_no'], $from, $to);
if ($no_zeros && db_num_rows($res) == 0) continue;
}
else
{
- $item[1] = round2(Abs($trans['TotalAmount']) * $rate, $dec);
+ $item[1] = round2(abs($trans['TotalAmount']) * $rate, $dec);
$rep->AmountCol(5, 6, $item[1], $dec);
$accumulate -= $item[1];
$item[2] = round2($trans['Allocated'] * $rate, $dec) * -1;