Supplier Inquiry/Customer Inquiry: removed inconsistency in unsettled/overdue transac...

[fa-stable.git] / sales / includes / db / customers_db.inc

diff --git a/sales/includes/db/customers_db.inc b/sales/includes/db/customers_db.inc
index bc1dcbd90f4cf93214570a9bce83f4176773fb4d..675e1b736c6e589cce25403e049e9bc72586e769 100644 (file)
--- a/sales/includes/db/customers_db.inc
+++ b/sales/includes/db/customers_db.inc
@@ -60,6 +60,9 @@ function delete_customer($customer_id)
        commit_transaction();
 }
 
+/*
+       This function probably should be renamed to get_customer_summary
+*/
 function get_customer_details($customer_id, $to=null, $all=true)
 {
 
@@ -79,7 +82,7 @@ function get_customer_details($customer_id, $to=null, $all=true)
        $due = "IF (trans.type=".ST_SALESINVOICE.", trans.due_date, trans.tran_date)";
     $sql = "SELECT debtor.name, debtor.curr_code, terms.terms, debtor.credit_limit,
                        credit_status.dissallow_invoices, credit_status.reason_description,
-                               Sum(IFNULL($value,0)) AS Balance,
+                               Sum($value) AS Balance,
                                Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > 0,$value,0)) AS Due,
                                Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $past1,$value,0)) AS Overdue1,
                                Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $past2,$value,0)) AS Overdue2
@@ -89,8 +92,10 @@ function get_customer_details($customer_id, $to=null, $all=true)
                                 .TB_PREF."credit_status credit_status
                        WHERE
                                        debtor.payment_terms = terms.terms_indicator
-                               AND debtor.credit_status = credit_status.id
-                               AND debtor.debtor_no = ".db_escape($customer_id);
+                               AND debtor.credit_status = credit_status.id";
+        if ($customer_id)
+               $sql .= " AND debtor.debtor_no = ".db_escape($customer_id);
+
        if (!$all)
                $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - trans.alloc) > ".FLOAT_COMP_DELTA;
        $sql .= " GROUP BY