0003954: RB not correct in Customer Transactions Inquiry. Removed RB from customer...

[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 d6eddbe090934c43625f725935df0c2a09eb279e..52fce9e2df8d243ae24eb4c281bb28061e506a98 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -250,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=".db_escape($type)." AND ".TB_PREF."debtor_trans.trans_no=".db_escape($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);
@@ -315,33 +318,36 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                branch.br_name,
                debtor.curr_code,
                debtor.debtor_no,
-               (trans.ov_amount + trans.ov_gst + trans.ov_freight 
+               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+(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), ";
+//     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))) , ";
                $sql .= "trans.alloc AS Allocated,
-               ((trans.type = ".ST_SALESINVOICE.")
+               ((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
+               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
                        AND trans.tran_date >= '$date_after'
-                       AND trans.tran_date <= '$date_to'
-                       AND trans.branch_code = branch.branch_code
-                       AND ISNULL(v.date_)";
+                       AND trans.tran_date <= '$date_to'"
+                       // exclude voided transactions and self-balancing (journal) transactions:
+       . " AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
 
        if ($cust_id != ALL_TEXT)
                $sql .= " AND trans.debtor_no = ".db_escape($cust_id);
@@ -378,6 +384,7 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                                trans.ov_freight + trans.ov_discount - trans.alloc > 0) ";
        }
        }
+
        $sql .= " GROUP BY trans.trans_no, trans.type";
 
        return $sql;