- $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_discount)
- AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
- ((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
- AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue
- FROM ".TB_PREF."debtor_trans
- WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
- AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
- ORDER BY ".TB_PREF."debtor_trans.tran_date";
+ $sql = "SELECT trans.type,
+ trans.trans_no,
+ trans.order_,
+ trans.reference,
+ trans.tran_date,
+ trans.due_date,
+ IF(prep_amount, prep_amount, ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount,
+ alloc AS Allocated,
+ ((trans.type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
+ FROM ".TB_PREF."debtor_trans trans
+ LEFT JOIN ".TB_PREF."voided as v
+ ON trans.trans_no=v.id AND trans.type=v.type
+ WHERE tran_date <= '$date' AND debtor_no = ".db_escape($debtorno)."
+ AND trans.type <> ".ST_CUSTDELIVERY." AND ISNULL(v.date_)
+ AND ABS(ABS(ov_amount) + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
+
+ if (!$show_also_allocated)
+ $sql .= " AND ABS(IF(prep_amount, prep_amount, ABS(ov_amount) + ov_gst + ov_freight + ov_freight_tax + ov_discount) - alloc) > ". FLOAT_COMP_DELTA;
+ $sql .= " ORDER BY tran_date";