- $sql = "SELECT *,
- (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) AS TotalAmount, alloc AS Allocated,
- ((type = ".ST_SALESINVOICE.") AND due_date < '$date') AS OverDue
- FROM ".TB_PREF."debtor_trans
- WHERE tran_date <= '$date' AND debtor_no = ".db_escape($debtorno)."
- AND type <> ".ST_CUSTDELIVERY."
- AND ABS(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
-
- if (!$show_also_allocated)
+ $sql = "SELECT trans.type,
+ trans.trans_no,
+ trans.order_,
+ trans.reference,
+ trans.tran_date,
+ trans.due_date,
+ (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(ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount) > ". FLOAT_COMP_DELTA;
+
+ if (!$show_also_allocated)