From 192c58cc217a8cd8950c3fe983884a9d72f5746d Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 2 Jun 2019 18:29:32 +0200 Subject: [PATCH] Wrong Presentation of supp balance in forms. @JimmyC --- purchasing/includes/db/invoice_db.inc | 3 +-- purchasing/includes/db/po_db.inc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index c4e4c1c9..16050242 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -19,8 +19,7 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id) $sql = "SELECT supp.supp_name, terms.terms, terms.days_before_due, supp.dimension_id, supp.dimension2_id, terms.day_in_following_month, supp.tax_included, supp.tax_group_id, tax_group.name AS tax_group_name, - supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) - * (ov_amount + ov_gst + ov_discount),0)) as cur_credit + supp.credit_limit - Sum((ov_amount + ov_gst + ov_discount)) as cur_credit FROM ".TB_PREF."suppliers supp LEFT JOIN " .TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, " .TB_PREF."payment_terms terms, " diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc index a82eb9a5..0afbe162 100644 --- a/purchasing/includes/db/po_db.inc +++ b/purchasing/includes/db/po_db.inc @@ -14,8 +14,7 @@ function get_supplier_details_to_order(&$order, $supplier_id) { $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, dimension_id, dimension2_id, - supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) - * (ov_amount + ov_gst + ov_discount),0)) as cur_credit, + supp.credit_limit - Sum((ov_amount + ov_gst + ov_discount)) as cur_credit, terms.terms, terms.days_before_due, terms.day_in_following_month FROM ".TB_PREF."suppliers supp LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id -- 2.30.2