- $sql = "SELECT *,
- (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) AS TotalAmount,
- IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",t.alloc * -1, t.alloc) AS Allocated,
- ((t.type = ".ST_SALESINVOICE.") AND t.due_date < '$to') AS OverDue
- FROM ".TB_PREF."debtor_trans t
- WHERE t.tran_date >= '$from'
- AND t.tran_date <= '$to'
- AND t.debtor_no = ".db_escape($debtorno)."
- AND t.type <> ".ST_CUSTDELIVERY."
- ORDER BY t.tran_date";
+ $allocated_from =
+ "(SELECT trans_type_from as trans_type, trans_no_from as trans_no, date_alloc, sum(amt) amount
+ FROM ".TB_PREF."cust_allocations alloc
+ WHERE person_id=".db_escape($debtorno)."
+ AND date_alloc <= '$to'
+ GROUP BY trans_type_from, trans_no_from) alloc_from";
+ $allocated_to =
+ "(SELECT trans_type_to as trans_type, trans_no_to as trans_no, date_alloc, sum(amt) amount
+ FROM ".TB_PREF."cust_allocations alloc
+ WHERE person_id=".db_escape($debtorno)."
+ AND date_alloc <= '$to'
+ GROUP BY trans_type_to, trans_no_to) alloc_to";
+
+ $sql = "SELECT trans.*,
+ 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
+ LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id
+ LEFT JOIN $allocated_from ON alloc_from.trans_type = trans.type AND alloc_from.trans_no = trans.trans_no
+ LEFT JOIN $allocated_to ON alloc_to.trans_type = trans.type AND alloc_to.trans_no = trans.trans_no