Current credit display implemented.

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

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index 972d552a04ba3f0fb9644df3d13de32e01032561..b0fae283637a4ccf5cae54c73cd8595b1dd01c4a 100644 (file)
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -85,68 +85,37 @@ function get_supplier_details($supplier_id, $to=null)
        $past2 = 2 * $past1;
        // removed - supp_trans.alloc from all summations
 
-    $value = "(".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)";
-       $due = "IF (".TB_PREF."supp_trans.type=".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type=".ST_SUPPCREDIT.",".TB_PREF."supp_trans.due_date,".TB_PREF."supp_trans.tran_date)";
-    $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.curr_code, ".TB_PREF."payment_terms.terms,
+    $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)";
+       $due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)";
+    $sql = "SELECT supp.supp_name, supp.curr_code, ".TB_PREF."payment_terms.terms,
 
-               Sum($value) AS Balance,
+               Sum(IFNULL($value,0)) 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
+               Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $past2,$value,0)) AS Overdue2,
+               supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
+                       * (ov_amount + ov_gst + ov_discount),0)) as cur_credit,
+               supp.tax_group_id
 
-               FROM ".TB_PREF."suppliers,
-                        ".TB_PREF."payment_terms,
-                        ".TB_PREF."supp_trans
+               FROM ".TB_PREF."suppliers supp
+                        LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id AND trans.tran_date <= '$todate',
+                        ".TB_PREF."payment_terms
 
                WHERE
-                        ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
-                        AND ".TB_PREF."suppliers.supplier_id = $supplier_id
-                        AND ".TB_PREF."supp_trans.tran_date <= '$todate'
-                        AND ".TB_PREF."suppliers.supplier_id = ".TB_PREF."supp_trans.supplier_id
+                        supp.payment_terms = ".TB_PREF."payment_terms.terms_indicator
+                        AND supp.supplier_id = $supplier_id
 
                GROUP BY
-                         ".TB_PREF."suppliers.supp_name,
+                         supp.supp_name,
                          ".TB_PREF."payment_terms.terms,
                          ".TB_PREF."payment_terms.days_before_due,
                          ".TB_PREF."payment_terms.day_in_following_month";
 
     $result = db_query($sql,"The customer details could not be retrieved");
-
-    if (db_num_rows($result) == 0)
-    {
-
-       /*Because there is no balance - so just retrieve the header information about the customer - the choice is do one query to get the balance and transactions for those customers who have a balance and two queries for those who don't have a balance OR always do two queries - I opted for the former */
-
-       $nil_balance = true;
-
-       $sql = "SELECT ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.supplier_id,  ".TB_PREF."payment_terms.terms
-                       FROM ".TB_PREF."suppliers,
-                                ".TB_PREF."payment_terms
-                       WHERE
-                                ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
-                                AND ".TB_PREF."suppliers.supplier_id = ".db_escape($supplier_id);
-
-       $result = db_query($sql,"The customer details could not be retrieved");
-
-    }
-    else
-    {
-       $nil_balance = false;
-    }
-
     $supp = db_fetch($result);
 
-    if ($nil_balance == true)
-    {
-       $supp["Balance"] = 0;
-       $supp["Due"] = 0;
-       $supp["Overdue1"] = 0;
-       $supp["Overdue2"] = 0;
-    }
-
     return $supp;
-
 }
 
 function get_supplier($supplier_id)
@@ -188,4 +157,11 @@ function get_supplier_contacts($supplier_id, $action=null)
        return $results;
 }
 
+function get_current_supp_credit($supplier_id)
+{
+       $suppdet = get_supplier_details($supplier_id);
+       return $suppdet['cur_credit'];
+
+}
+
 ?>
\ No newline at end of file