Improved journal trans: added currency support, tax and source document date. Allowed...

[fa-stable.git] / sales / includes / db / cust_trans_db.inc

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 65db5a75377e89f93d53c334c0686b0d7c0c39ff..dfca4cc813a4ac45bcc3559d8084f522e7c30f91 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -300,6 +300,7 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                debtor.name, 
                branch.br_name,
                debtor.curr_code,
+               debtor.debtor_no,
                (trans.ov_amount + trans.ov_gst + trans.ov_freight 
                        + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount, "; 
        if ($filter != ALL_TEXT)
@@ -312,17 +313,21 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                $sql .= "trans.alloc AS Allocated,
                ((trans.type = ".ST_SALESINVOICE.")
                        AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
-               Sum(line.quantity-line.qty_done) AS Outstanding
+               Sum(line.quantity-line.qty_done) AS Outstanding,
+               Sum(line.qty_done) AS HasChild
                FROM "
                        .TB_PREF."debtor_trans as trans
                        LEFT JOIN ".TB_PREF."debtor_trans_details as line
-                               ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type,"
-                       .TB_PREF."debtors_master as debtor, "
-                       .TB_PREF."cust_branch as branch
+                               ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type
+                       LEFT JOIN ".TB_PREF."voided as v
+                               ON trans.trans_no=v.id AND trans.type=v.type
+                       LEFT JOIN ".TB_PREF."cust_branch as branch ON trans.branch_code=branch.branch_code,"
+                       .TB_PREF."debtors_master as debtor
                WHERE debtor.debtor_no = trans.debtor_no
                        AND trans.tran_date >= '$date_after'
                        AND trans.tran_date <= '$date_to'
-                       AND trans.branch_code = branch.branch_code";
+                       AND trans.branch_code = branch.branch_code
+                       AND ISNULL(v.date_)";
 
        if ($cust_id != ALL_TEXT)
                $sql .= " AND trans.debtor_no = ".db_escape($cust_id);