2.4.4 no Longer Displays 0.00 Sales Invoices in customer_inquiry.php. Fixed. $Braath...
[fa-stable.git] / sales / includes / db / cust_trans_db.inc
index b91a279558873c141331c55c30c21a5222c9ae57..888181ebae9b811a4b04c863364e5a488d8879ad 100644 (file)
@@ -1,47 +1,24 @@
 <?php
-//------------------------------------------------------------------------------
-//     Retreive parent document number(s) for given transaction
-//
-function get_parent_trans($trans_type, $trans_no) {
-
-       $sql = 'SELECT trans_link FROM
-                       '.TB_PREF.'debtor_trans WHERE
-                       (trans_no=' .$trans_no. ' AND type='.$trans_type.' AND trans_link!=0)';
-
-       $result = db_query($sql, 'Parent document numbers cannot be retrieved');
-
-       if (db_num_rows($result)) {
-               $link = db_fetch($result);
-               return array($link['trans_link']);
-       }
-       if ($trans_type!=10) return 0;  // this is credit note with no parent invoice
-       // invoice: find batch invoice parent trans.
-       $sql = 'SELECT trans_no FROM
-                       '.TB_PREF.'debtor_trans WHERE
-                       (trans_link='.$trans_no.' AND type='. get_parent_type($trans_type) .')';
-
-       $result = db_query($sql, 'Delivery links cannot be retrieved');
-
-       $delivery = array();
-       if(db_num_rows($result)>0) {
-               while($link = db_fetch($result)) {
-                       $delivery[] = $link['trans_no'];
-               }
-       }
-       return count($delivery) ? $delivery : 0;
-}
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //----------------------------------------------------------------------------------------
 // Mark changes in debtor_trans_details
 //
 function update_customer_trans_version($type, $versions) {
 
        $sql= 'UPDATE '.TB_PREF. 'debtor_trans SET version=version+1
-                       WHERE type='.$type. ' AND (';
+                       WHERE type='.db_escape($type).' AND (';
 
        foreach ($versions as $trans_no=>$version)
-               $where[] =      '(trans_no='.$trans_no.
-                       ' AND version='.$version.')';
+               $where[] =      '(trans_no='.db_escape($trans_no).' AND version='.$version.')';
 
                $sql .= implode(' OR ', $where) .')';
 
@@ -58,10 +35,10 @@ function get_customer_trans_version($type, $trans_no) {
                $trans_no = array( $trans_no );
 
        $sql= 'SELECT trans_no, version FROM '.TB_PREF. 'debtor_trans
-                       WHERE type='.$type.' AND (';
+                       WHERE type='.db_escape($type).' AND (';
 
        foreach ($trans_no as $key=>$trans)
-               $trans_no[$key] =       'trans_no='.$trans_no[$key];
+               $trans_no[$key] =       'trans_no='.db_escape($trans_no[$key]);
 
        $sql .= implode(' OR ', $trans_no) . ')';
 
@@ -78,21 +55,27 @@ function get_customer_trans_version($type, $trans_no) {
 // date_ is display date (non-sql)
 function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
        $date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
-       $sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
-       $AllocAmt=0)
+       $sales_type=0, $order_no=0, $ship_via=0, $due_date="",
+       $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null, $tax_included=0, $prep_amount=0)
 {
-
+       $new = $trans_no==0;
        $curr = get_customer_currency($debtor_no);
-       $rate = get_exchange_rate_from_home_currency($curr, $date_);
+       if ($rate == 0)
+               $rate = get_exchange_rate_from_home_currency($curr, $date_);
 
        $SQLDate = date2sql($date_);
        if ($due_date == "")
-               $SQLDueDate = "000-00-00";
+               $SQLDueDate = "0000-00-00";
        else
                $SQLDueDate = date2sql($due_date);
+       
+       if ($trans_type == ST_BANKPAYMENT)
+               $Total = -$Total;
 
-       if ($trans_no==0) {
-       $trans_no = get_next_trans_no($trans_type);
+    if ($new || !exists_customer_trans($trans_type, $trans_no))
+    {
+        if ($new)
+        $trans_no = get_next_trans_no($trans_type);
 
        $sql = "INSERT INTO ".TB_PREF."debtor_trans (
                trans_no, type,
@@ -101,138 +84,147 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                reference, tpe,
                order_, ov_amount, ov_discount,
                ov_gst, ov_freight, ov_freight_tax,
-               rate, ship_via, alloc, trans_link
-               ) VALUES ($trans_no, $trans_type,
+               rate, ship_via, alloc,
+               dimension_id, dimension2_id, payment_terms, tax_included, prep_amount
+               ) VALUES (".db_escape($trans_no).", ".db_escape($trans_type).",
                ".db_escape($debtor_no).", ".db_escape($BranchNo).",
                '$SQLDate', '$SQLDueDate', ".db_escape($reference).",
-               ".db_escape($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
+               ".db_escape($sales_type).", ".db_escape($order_no).", $Total, ".db_escape($discount).", $Tax,
                ".db_escape($Freight).",
-               $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).")";
+               $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt,
+               ".db_escape($dimension_id).", ".db_escape($dimension2_id).", "
+               .db_escape($payment_terms, true).", "
+               .db_escape($tax_included).", ".db_escape($prep_amount).")";
        } else {        // may be optional argument should stay unchanged ?
        $sql = "UPDATE ".TB_PREF."debtor_trans SET
                debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
                tran_date='$SQLDate', due_date='$SQLDueDate',
-               reference=".db_escape($reference).", tpe=".db_escape($sales_type).", order_=$order_no,
+               reference=".db_escape($reference).", tpe=".db_escape($sales_type).", order_=".db_escape($order_no).",
                ov_amount=$Total, ov_discount=".db_escape($discount).", ov_gst=$Tax,
                ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
-               ship_via=".db_escape($ship_via).", alloc=$AllocAmt, trans_link=$trans_link
-               WHERE trans_no=$trans_no AND type=$trans_type";
+               ship_via=".db_escape($ship_via).", alloc=$AllocAmt,
+               dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
+               payment_terms=".db_escape($payment_terms, true).",
+               tax_included=".db_escape($tax_included).",
+               prep_amount =".db_escape($prep_amount)."
+               WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
        }
        db_query($sql, "The debtor transaction record could not be inserted");
 
+       if ($trans_type != ST_JOURNAL) // skip for journal entries
+               add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
+
        return $trans_no;
 }
-
 //----------------------------------------------------------------------------------------
 
-function get_customer_trans($trans_id, $trans_type)
+function get_customer_trans($trans_id, $trans_type, $customer_id=null)
 {
-       $sql = "SELECT ".TB_PREF."debtor_trans.*,
-               ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
-               ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email AS email2,
-               ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.tax_id, ".TB_PREF."debtors_master.payment_terms ";
+       global $SysPrefs;
+
+       $sql = "SELECT trans.*,"
+               ."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
+               ."cust.name AS DebtorName, cust.address, "
+               ."cust.curr_code, "
+               ."cust.tax_id,
+               trans.prep_amount>0 as prepaid,"
+               ."com.memo_";
 
-       if ($trans_type == systypes::cust_payment()) {
+       if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
-               $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
-                       ".TB_PREF."bank_trans_types.name AS BankTransType ";
+               $sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
+                       ".TB_PREF."bank_accounts.account_type AS BankTransType,
+                       ".TB_PREF."bank_accounts.bank_curr_code,
+                       ".TB_PREF."bank_trans.amount as bank_amount";
        }
 
-       if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
+       if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
                // it's an invoice so also get the shipper and salestype
                $sql .= ", ".TB_PREF."shippers.shipper_name, "
                .TB_PREF."sales_types.sales_type, "
                .TB_PREF."sales_types.tax_included, "
-               .TB_PREF."cust_branch.*, "
-               .TB_PREF."debtors_master.discount, "
+               ."branch.*, "
+               ."cust.discount, "
                .TB_PREF."tax_groups.name AS tax_group_name, "
                .TB_PREF."tax_groups.id AS tax_group_id ";
        }
 
+       if ($trans_type == ST_JOURNAL) {
+               $sql .= ", branch.*";
+       }
 
-       $sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
+       $sql .= " FROM ".TB_PREF."debtor_trans trans
+                                       LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
+                                       LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, 
+                                       ".TB_PREF."debtors_master cust";
 
-       if ($trans_type == systypes::cust_payment()) {
+       if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
-               $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types ";
+               $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
        }
 
-       if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
+       if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
                // it's an invoice so also get the shipper, salestypes
-               $sql .= ", ".TB_PREF."shippers, ".TB_PREF."sales_types, ".TB_PREF."cust_branch, ".TB_PREF."tax_groups ";
+               $sql .= ", ".TB_PREF."sales_types, "
+               .TB_PREF."cust_branch branch, "
+               .TB_PREF."tax_groups ";
        }
 
-       $sql .= " WHERE ".TB_PREF."debtor_trans.trans_no=$trans_id
-               AND ".TB_PREF."debtor_trans.type=$trans_type
-               AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
+       if ($trans_type == ST_JOURNAL) {
+               $sql .= ", ".TB_PREF."cust_branch branch ";
+       }
+
+       $sql .= " WHERE trans.trans_no=".db_escape($trans_id)."
+               AND trans.type=".db_escape($trans_type)."
+               AND trans.debtor_no=cust.debtor_no";
+
+       if (isset($customer_id))
+               $sql .= " AND trans.debtor_no=".db_escape($customer_id);
 
-       if ($trans_type == systypes::cust_payment()) {
+       if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
-               $sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_id
+               $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
                        AND ".TB_PREF."bank_trans.type=$trans_type
-                       AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
-                       AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act ";
+                       AND ".TB_PREF."bank_trans.amount != 0
+                       AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
        }
-       if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
+       if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
                // it's an invoice so also get the shipper
-               $sql .= " AND ".TB_PREF."shippers.shipper_id=".TB_PREF."debtor_trans.ship_via
-                       AND ".TB_PREF."sales_types.id = ".TB_PREF."debtor_trans.tpe
-                       AND ".TB_PREF."cust_branch.branch_code = ".TB_PREF."debtor_trans.branch_code
-                       AND ".TB_PREF."cust_branch.tax_group_id = ".TB_PREF."tax_groups.id ";
+               $sql .= " AND ".TB_PREF."sales_types.id = trans.tpe
+                       AND branch.branch_code = trans.branch_code
+                       AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
+       }
+       if ($trans_type == ST_JOURNAL) {
+               $sql .= " AND branch.branch_code = trans.branch_code ";
        }
 
        $result = db_query($sql, "Cannot retreive a debtor transaction");
 
        if (db_num_rows($result) == 0) {
                // can't return nothing
+               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($SysPrefs->go_debug)
+                       display_backtrace();
                display_db_error("duplicate debtor transactions found for given params", $sql, true);
                exit;
        }
 
-       //return db_fetch($result);
        $row = db_fetch($result);
-       $row['email'] = $row['email2'];
        return $row;
 }
 
 //----------------------------------------------------------------------------------------
 
-function get_customer_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null)
-{
-       $sql = "SELECT ".TB_PREF."debtor_trans.*,
-               ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
-               ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address,
-               ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtor_trans.version ";
-
-       if ($extra_fields)
-               $sql .= ", $extra_fields ";
-
-       $sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
-       if ($extra_tables)
-               $sql .= ",$extra_tables ";
-
-       $sql .= " WHERE ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
-
-       if ($extra_conditions)
-               $sql .= " AND $extra_conditions ";
-
-       $sql .= " ORDER BY trans_no";
-
-       return db_query($sql, "Cannot retreive debtor transactions");
-}
-
-//----------------------------------------------------------------------------------------
-
 function exists_customer_trans($type, $type_no)
 {
-       $sql = "SELECT trans_no FROM ".TB_PREF."debtor_trans WHERE type=$type
-               AND trans_no=$type_no";
+       $sql = "SELECT trans_no FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)."
+               AND trans_no=".db_escape($type_no);
 
        $result = db_query($sql, "Cannot retreive a debtor transaction");
 
@@ -245,7 +237,7 @@ function exists_customer_trans($type, $type_no)
 
 function get_customer_trans_order($type, $type_no)
 {
-       $sql = "SELECT order_ FROM ".TB_PREF."debtor_trans WHERE type=$type AND trans_no=$type_no";
+       $sql = "SELECT order_ FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 
        $result = db_query($sql, "The debtor transaction could not be queried");
 
@@ -258,11 +250,14 @@ function get_customer_trans_order($type, $type_no)
 
 function get_customer_details_from_trans($type, $type_no)
 {
-       $sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."debtors_master.curr_code, ".TB_PREF."cust_branch.br_name
-               FROM ".TB_PREF."debtors_master,".TB_PREF."cust_branch,".TB_PREF."debtor_trans
-               WHERE ".TB_PREF."debtor_trans.type=$type AND ".TB_PREF."debtor_trans.trans_no=$type_no
-               AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
-               AND     ".TB_PREF."cust_branch.branch_code = ".TB_PREF."debtor_trans.branch_code";
+       $sql = "SELECT debtor.name, debtor.curr_code, branch.br_name
+               FROM "
+                       .TB_PREF."debtors_master debtor,"
+                       .TB_PREF."cust_branch branch,"
+                       .TB_PREF."debtor_trans trans
+               WHERE trans.type=".db_escape($type)." AND trans.trans_no=".db_escape($type_no)."
+               AND debtor.debtor_no = trans.debtor_no
+               AND     branch.branch_code = trans.branch_code";
 
        $result = db_query($sql, "could not get customer details from trans");
        return db_fetch($result);
@@ -274,38 +269,193 @@ function void_customer_trans($type, $type_no)
 {
        // clear all values and mark as void
        $sql = "UPDATE ".TB_PREF."debtor_trans SET ov_amount=0, ov_discount=0, ov_gst=0, ov_freight=0,
-               ov_freight_tax=0, alloc=0, version=version+1 WHERE type=$type AND trans_no=$type_no";
+               ov_freight_tax=0, alloc=0, prep_amount=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 
        db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
 }
 
 //----------------------------------------------------------------------------------------
 
+function clear_customer_trans($type, $type_no)
+{
+       // Delete
+       $sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+
+       db_query($sql, "could not clear debtor transactions for type=$type and trans_no=$type_no");
+}
+//----------------------------------------------------------------------------------------
+
 function post_void_customer_trans($type, $type_no)
 {
        switch ($type) {
-               case 10 :
-               case 11 :
+               case ST_SALESINVOICE :
+               case ST_CUSTCREDIT   :
                        void_sales_invoice($type, $type_no);
                        break;
-               case 13 :
+               case ST_CUSTDELIVERY :
                        void_sales_delivery($type, $type_no);
                        break;
-               case 12 :
+               case ST_CUSTPAYMENT :
                        void_customer_payment($type, $type_no);
                        break;
        }
 }
 
 //----------------------------------------------------------------------------------------
-
-function get_customer_trans_link($type, $type_no)
+function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT, $show_voided = 0)
 {
-       $row = db_query("SELECT trans_link from ".TB_PREF."debtor_trans
-               WHERE type=$type AND trans_no=$type_no",
-               "could not get transaction link for type=$type and trans_no=$type_no");
-       return $row[0];
+    $date_after = date2sql($from);
+    $date_to = date2sql($to);
+
+       $sql = "SELECT 
+               trans.type, 
+               trans.trans_no, 
+               trans.order_, 
+               trans.reference,
+               trans.tran_date, 
+               trans.due_date, 
+               debtor.name, 
+               branch.br_name,
+               debtor.curr_code,
+               IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight 
+                       + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount,"
+//     if ($filter != ALL_TEXT)
+//             $sql .= "@bal := @bal+IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), ";
+
+//     else
+//             $sql .= "IF(trans.type=".ST_CUSTDELIVERY.",'', IF(trans.type=".ST_SALESINVOICE." OR trans.type=".ST_BANKPAYMENT.",@bal := @bal+
+//                     (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), @bal := @bal-
+//                     (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , ";
+               . "IF(trans.type IN(".implode(',',  array(ST_CUSTCREDIT,ST_CUSTPAYMENT,ST_BANKDEPOSIT))."), -1, 1)
+                               *(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight 
+                       + trans.ov_freight_tax + trans.ov_discount)-trans.alloc) Balance, 
+               debtor.debtor_no,";
+
+               $sql .= "trans.alloc AS Allocated,
+               ((trans.type = ".ST_SALESINVOICE." || trans.type = ".ST_JOURNAL.")
+                       AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
+               Sum(line.quantity-line.qty_done) AS Outstanding,
+               Sum(line.qty_done) AS HasChild,
+               prep_amount
+               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
+                       LEFT JOIN ".TB_PREF."voided as v
+                               ON trans.trans_no=v.id AND trans.type=v.type
+                        LEFT JOIN ".TB_PREF."audit_trail as audit ON (trans.type=audit.type AND trans.trans_no=audit.trans_no)
+                        LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id)
+                       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"; // exclude voided transactions and self-balancing (journal) transactions:
+    if (!$show_voided)         
+               $sql .= " AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
+
+       if ($filter == '2')
+               $sql .= " AND ABS(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)-trans.alloc)>"
+                       .FLOAT_COMP_DELTA;
+       else {
+               $sql .= " AND trans.tran_date >= '$date_after'
+                       AND trans.tran_date <= '$date_to'";
+       }
+
+       if ($cust_id != ALL_TEXT)
+               $sql .= " AND trans.debtor_no = ".db_escape($cust_id);
+
+       if ($filter != ALL_TEXT)
+       {
+               if ($filter == '1')
+               {
+                       $sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
+               }
+               elseif ($filter == '2')
+               {
+                       $sql .= " AND (trans.type <> ".ST_CUSTDELIVERY.") ";
+               }
+               elseif ($filter == '3')
+               {
+                       $sql .= " AND (trans.type = " . ST_CUSTPAYMENT 
+                                       ." OR trans.type = ".ST_BANKDEPOSIT." OR trans.type = ".ST_BANKPAYMENT.") ";
+               }
+               elseif ($filter == '4')
+               {
+                       $sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
+               }
+               elseif ($filter == '5')
+               {
+                       $sql .= " AND trans.type = ".ST_CUSTDELIVERY." ";
+               }
+
+       if ($filter == '2')
+       {
+               $today =  date2sql(Today());
+               $sql .= " AND trans.due_date < '$today'
+                               AND (trans.ov_amount + trans.ov_gst + trans.ov_freight_tax + 
+                               trans.ov_freight + trans.ov_discount - trans.alloc > 0) ";
+       }
+       }
+
+       $sql .= " GROUP BY trans.trans_no, trans.type";
+
+       return $sql;
 }
-//----------------------------------------------------------------------------------------
 
-?>
\ No newline at end of file
+function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item, $location, $delivery, $outstanding=false)
+{
+       $sql = "SELECT trans.trans_no,
+                       debtor.name,
+                       branch.branch_code,
+                       branch.br_name,
+                       sorder.deliver_to,
+                       trans.reference,
+                       sorder.customer_ref,
+                       trans.tran_date,
+                       trans.due_date,
+                       (ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue,
+                       debtor.curr_code,
+                       Sum(line.quantity-line.qty_done) AND sorder.prep_amount=0 AS Outstanding,
+                       Sum(line.qty_done) AS Done
+               FROM "
+                .TB_PREF."sales_orders as sorder, "
+                .TB_PREF."debtor_trans as trans, "
+                .TB_PREF."debtor_trans_details as line, "
+                .TB_PREF."debtors_master as debtor, "
+                .TB_PREF."cust_branch as branch
+                       WHERE
+                       sorder.order_no = trans.order_ AND
+                       trans.debtor_no = debtor.debtor_no
+                               AND trans.type = ".ST_CUSTDELIVERY."
+                               AND line.debtor_trans_no = trans.trans_no
+                               AND line.debtor_trans_type = trans.type
+                               AND trans.branch_code = branch.branch_code
+                               AND trans.debtor_no = branch.debtor_no ";
+
+       if ($outstanding == true) {
+                $sql .= " AND line.qty_done < line.quantity ";
+       }
+
+       //figure out the sql required from the inputs available
+       if ($delivery)
+       {
+               $sql .= " AND trans.trans_no LIKE ".db_escape('%' . $delivery . '%');
+               $sql .= " GROUP BY trans.trans_no";
+       }
+       else
+       {
+               $sql .= " AND trans.tran_date >= '".date2sql($from)."'";
+               $sql .= " AND trans.tran_date <= '".date2sql($to)."'";
+
+               if ($stock_item != ALL_TEXT)
+                       $sql .= " AND line.stock_id=".db_escape($stock_item)." ";
+
+               if ($location != ALL_TEXT)
+                       $sql .= " AND sorder.from_stk_loc = ".db_escape($location)." ";
+
+               if ($customer_id != ALL_TEXT)
+                       $sql .= " AND trans.debtor_no = ".db_escape($customer_id);
+
+               $sql .= " GROUP BY trans.trans_no ";
+
+       } //end no delivery number selected
+       return $sql;
+}