From 490690013b7bb161ee2295b89cb18e1a88cae2af Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 28 Apr 2023 17:49:54 +0200 Subject: [PATCH] Rerun of Supplier Inquiry Aging. Optimizing. --- purchasing/includes/db/suppliers_db.inc | 8 ++++---- reporting/rep202.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc index c3a16d21..7c97b1c1 100644 --- a/purchasing/includes/db/suppliers_db.inc +++ b/purchasing/includes/db/suppliers_db.inc @@ -95,9 +95,9 @@ function get_supplier_details($supplier_id, $to=null, $all=true) if ($all) $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)"; else - $value = "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"; + $value = "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), + (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc), + (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))"; $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, @@ -119,7 +119,7 @@ function get_supplier_details($supplier_id, $to=null, $all=true) supp.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND supp.supplier_id = $supplier_id "; if (!$all) - $sql .= "AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc > ".FLOAT_COMP_DELTA." "; + $sql .= "AND $value <> 0 "; $sql .= "GROUP BY supp.supp_name, ".TB_PREF."payment_terms.terms, diff --git a/reporting/rep202.php b/reporting/rep202.php index 0e122ab4..e35e7ba0 100644 --- a/reporting/rep202.php +++ b/reporting/rep202.php @@ -39,9 +39,9 @@ function get_invoices($supplier_id, $to, $all=true) if ($all) $value = "(trans.ov_amount + trans.ov_gst + trans.ov_discount)"; else - $value = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT.", - (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc), - (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))"; + $value = "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), + (trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc), + (trans.ov_amount + trans.ov_gst + trans.ov_discount + trans.alloc))"; $due = "IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_SUPPCREDIT.",trans.due_date,trans.tran_date)"; $sql = "SELECT trans.type, trans.reference, @@ -59,7 +59,7 @@ function get_invoices($supplier_id, $to, $all=true) AND trans.tran_date <= '$todate' AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) > ".FLOAT_COMP_DELTA; if (!$all) - $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc > ".FLOAT_COMP_DELTA; + $sql .= "AND $value <> 0 "; $sql .= " ORDER BY trans.tran_date"; -- 2.30.2