Added missing field for bank charges in bank_trans, rewritten bank transaction views...

[fa-stable.git] / purchasing / includes / db / supp_trans_db.inc

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index d5dc75193d5dfe5b23c56d10026fb4efc55ba52f..4a76ed11b61fec8d818c647cfa1fd5168c10dd9e 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -14,7 +14,7 @@
 //     FIXME - this should be revised for transaction update case.
 //
 function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference,
-       $amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0)
+       $amount, $amount_tax, $discount, $rate=0, $included=0)
 {
        $new = $trans_no==0;
        $date = date2sql($date_);
@@ -39,14 +39,24 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
                ".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount)
                .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).")";
 
-       if ($err_msg == "")
-               $err_msg = "Cannot insert a supplier transaction record";
-
-       db_query($sql, $err_msg);
+       db_query($sql, "Cannot insert a supplier transaction record");
        add_audit_trail($type, $trans_no, $date_);
 
        return $trans_no;
 }
+/*
+       Helper for final supplier trans header summaries update.
+*/
+function update_supp_trans_sums($trans_type, $trans_no, $amount, $tax, $discount=0)
+{
+       $sql = "UPDATE ".TB_PREF."supp_trans 
+               SET     ov_amount=".db_escape($amount).",
+                       ov_gst=".db_escape($tax).",
+                       ov_discount=".db_escape($discount)."
+               WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
+
+       return db_query($sql, "Cannot update supplier transaction summaries");
+}
 
 //-------------------------------------------------------------------------------------------------------------
 
@@ -59,7 +69,7 @@ function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
        {
                // it's a payment so also get the bank account
                $sql .= ", account.bank_name, account.bank_account_name, account.bank_curr_code,
-                       account.account_type AS BankTransType, bank_trans.amount AS bank_amount,
+                       account.account_type AS BankTransType, bank_trans.amount AS bank_amount, bank_trans.charge AS bank_charge,
                        bank_trans.ref ";
        }
 
@@ -224,33 +234,43 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        trans.tran_date, 
                trans.due_date,
                supplier.curr_code, 
-       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
+       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount,
+
+       IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
+       OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+               (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc) Balance,
                trans.alloc AS Allocated,
                ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
        (ABS(trans.ov_amount + trans.ov_gst  + trans.ov_discount) - trans.alloc <= ".FLOAT_COMP_DELTA.") AS Settled
        FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier
        WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.tran_date >= '$date_after'
-       AND trans.tran_date <= '$date_to'
                AND trans.ov_amount != 0";      // exclude voided transactions
 
        $sql2 = "SELECT ".ST_SUPPRECEIVE." as type, 
                trans.id as trans_no,
                trans.reference, 
                supplier.supp_name, 
-               po.requisition_no AS supp_reference,
+               po.supp_reference,
        delivery_date as tran_date, 
                '' as due_date,
                supplier.curr_code, 
+               0 as Balance, 
        '' AS TotalAmount,
                '' AS Allocated,
                0 as OverDue,
        1 as Settled
        FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier, ".TB_PREF."purch_orders as po
        WHERE supplier.supplier_id = trans.supplier_id
-       AND trans.purch_order_no = po.order_no
-       AND trans.delivery_date >= '$date_after'
-       AND trans.delivery_date <= '$date_to'";
+       AND trans.purch_order_no = po.order_no";
+
+       if ($filter == '2')
+               $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc>".FLOAT_COMP_DELTA;
+       else {
+               $sql .= " AND trans.tran_date >= '$date_after'
+                       AND trans.tran_date <= '$date_to'";
+               $sql2 .= " AND trans.delivery_date >= '$date_after'
+            AND trans.delivery_date <= '$date_to'";
+       }
 
        if ($supplier_id != ALL_TEXT) {
                $sql .= " AND trans.supplier_id = ".db_escape($supplier_id);
@@ -260,7 +280,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
        {
                        $sql = $sql2;
        } 
-       elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
+       elseif (!isset($filter) || $filter == ALL_TEXT) {
                $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
        }
 
@@ -270,10 +290,6 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                {
                        $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
                } 
-               elseif (($filter == '2')) 
-               {
-                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
-               } 
                elseif ($filter == '3') 
                {
                        $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";