Contact CRUD class.

[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 f9b77aa5c3885c84357965ff66e82c7c698c6101..770c73edaac9eb758ce5d856db93b03738f60fd7 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -88,7 +88,7 @@ function get_customer_trans_version($type, $trans_no) {
 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, $rate=0, $dimension_id=0, $dimension2_id=0)
+       $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null)
 {
        $new = $trans_no==0;
        $curr = get_customer_currency($debtor_no);
@@ -115,14 +115,15 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                order_, ov_amount, ov_discount,
                ov_gst, ov_freight, ov_freight_tax,
                rate, ship_via, alloc, trans_link,
-               dimension_id, dimension2_id
+               dimension_id, dimension2_id, payment_terms
                ) VALUES ($trans_no, ".db_escape($trans_type).",
                ".db_escape($debtor_no).", ".db_escape($BranchNo).",
                '$SQLDate', '$SQLDueDate', ".db_escape($reference).",
                ".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).",
-               ".db_escape($dimension_id).", ".db_escape($dimension2_id).")";
+               ".db_escape($dimension_id).", ".db_escape($dimension2_id).", "
+               .db_escape($payment_terms).")";
        } 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).",
@@ -131,7 +132,8 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                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,
-               dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id)."
+               dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
+               payment_terms=".db_escape($payment_terms)."
                WHERE trans_no=$trans_no AND type=".db_escape($trans_type);
        }
        db_query($sql, "The debtor transaction record could not be inserted");
@@ -145,10 +147,11 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 
 function get_customer_trans($trans_id, $trans_type)
 {
-       $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 ";
+       $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 ";
 
        if ($trans_type == ST_CUSTPAYMENT) {
                // it's a payment so also get the bank account
@@ -161,14 +164,13 @@ function get_customer_trans($trans_id, $trans_type)
                $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 ";
        }
 
-
-       $sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
+       $sql .= " FROM ".TB_PREF."debtor_trans trans, ".TB_PREF."debtors_master cust";
 
        if ($trans_type == ST_CUSTPAYMENT) {
                // it's a payment so also get the bank account
@@ -177,12 +179,15 @@ function get_customer_trans($trans_id, $trans_type)
 
        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."shippers, "
+               .TB_PREF."sales_types, "
+               .TB_PREF."cust_branch branch, "
+               .TB_PREF."tax_groups ";
        }
 
-       $sql .= " WHERE ".TB_PREF."debtor_trans.trans_no=".db_escape($trans_id)."
-               AND ".TB_PREF."debtor_trans.type=".db_escape($trans_type)."
-               AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
+       $sql .= " WHERE trans.trans_no=".db_escape($trans_id)."
+               AND trans.type=".db_escape($trans_type)."
+               AND trans.debtor_no=cust.debtor_no";
 
        if ($trans_type == ST_CUSTPAYMENT) {
                // it's a payment so also get the bank account
@@ -192,10 +197,10 @@ function get_customer_trans($trans_id, $trans_type)
        }
        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."shippers.shipper_id=trans.ship_via
+                       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 ";
        }
 
        $result = db_query($sql, "Cannot retreive a debtor transaction");
@@ -212,9 +217,7 @@ function get_customer_trans($trans_id, $trans_type)
                exit;
        }
 
-       //return db_fetch($result);
        $row = db_fetch($result);
-       $row['email'] = $row['email2'];
        return $row;
 }
 
@@ -380,7 +383,7 @@ function get_sql_for_customer_inquiry()
        return $sql;
 }
 
-function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item)
+function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null)
 {
        $sql = "SELECT trans.trans_no,
                        debtor.name,