X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppliers_db.inc;h=d02353babcfd7459e755765040e6f44d2331e4a5;hb=22486f7826944e00937e7ccceab1a927c94d8f6a;hp=e0f8078ea51e1bd0c5a3963cb72eb1cb4b266190;hpb=107a22ab168c1102f3f534a22cd5b8290331f17d;p=fa-stable.git diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc index e0f8078e..d02353ba 100644 --- a/purchasing/includes/db/suppliers_db.inc +++ b/purchasing/includes/db/suppliers_db.inc @@ -84,9 +84,8 @@ function get_supplier_details($supplier_id, $to=null, $all=true) $todate = date("Y-m-d"); else $todate = date2sql($to); - $current = 1; - $past1 = get_company_pref('past_due_days') + $current; - $past2 = 2 * $past1 + $current; + $past1 = get_company_pref('past_due_days'); + $past2 = 2 * $past1; // removed - supp_trans.alloc from all summations if ($all) @@ -100,9 +99,9 @@ function get_supplier_details($supplier_id, $to=null, $all=true) Sum(IFNULL($value,0)) AS Balance, - Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) >= $current,$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)) > 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, 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