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 fd52d9ce1e1b7d508f17fe32ba4f34f618015279..dfca4cc813a4ac45bcc3559d8084f522e7c30f91 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -119,7 +119,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 
 function get_customer_trans($trans_id, $trans_type)
 {
-       global $go_debug;
+       global $SysPrefs;
 
        $sql = "SELECT trans.*,"
                ."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
@@ -188,14 +188,14 @@ function get_customer_trans($trans_id, $trans_type)
 
        if (db_num_rows($result) == 0) {
                // can't return nothing
-               if($go_debug)
+               if ($SysPrefs->go_debug)
                        display_backtrace();
                display_db_error("no debtor trans found for given params", $sql, true);
                exit;
        }
        if (db_num_rows($result) > 1) {
                // can't return multiple
-               if($go_debug)
+               if($SysPrefs->go_debug)
                        display_backtrace();
                display_db_error("duplicate debtor transactions found for given params", $sql, true);
                exit;
@@ -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);
@@ -401,7 +406,7 @@ function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item
        //figure out the sql required from the inputs available
        if ($delivery)
        {
-               $sql .= " AND trans.trans_no LIKE %".db_escape($delivery);
+               $sql .= " AND trans.trans_no LIKE ".db_escape('%' . $delivery . '%');
                $sql .= " GROUP BY trans.trans_no";
        }
        else
@@ -409,7 +414,7 @@ function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item
                $sql .= " AND trans.tran_date >= '".date2sql($from)."'";
                $sql .= " AND trans.tran_date <= '".date2sql($to)."'";
 
-               if ($stock_item)
+               if ($stock_item != ALL_TEXT)
                        $sql .= " AND line.stock_id=".db_escape($stock_item)." ";
 
                if ($location != ALL_TEXT)
@@ -423,4 +428,3 @@ function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item
        } //end no delivery number selected
        return $sql;
 }
-?>
\ No newline at end of file