From 5d8f36d15260bfd9215315935af86b7d96065489 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 30 Aug 2018 09:03:06 +0200 Subject: [PATCH] 2.4.4 no Longer Displays 0.00 Sales Invoices in customer_inquiry.php. Fixed. $Braath Waate. --- sales/includes/db/cust_trans_db.inc | 7 ++++--- sales/inquiry/customer_inquiry.php | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc index 74ff8f01..888181eb 100644 --- a/sales/includes/db/cust_trans_db.inc +++ b/sales/includes/db/cust_trans_db.inc @@ -302,7 +302,7 @@ function post_void_customer_trans($type, $type_no) } //---------------------------------------------------------------------------------------- -function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT) +function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT, $show_voided = 0) { $date_after = date2sql($from); $date_to = date2sql($to); @@ -347,8 +347,9 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id) LEFT JOIN ".TB_PREF."cust_branch as branch ON trans.branch_code=branch.branch_code," .TB_PREF."debtors_master as debtor - WHERE debtor.debtor_no = trans.debtor_no" // exclude voided transactions and self-balancing (journal) transactions: - ." AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0"; + WHERE debtor.debtor_no = trans.debtor_no"; // exclude voided transactions and self-balancing (journal) transactions: + if (!$show_voided) + $sql .= " AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0"; if ($filter == '2') $sql .= " AND ABS(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)-trans.alloc)>" diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index feede0bd..eb98d3da 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -160,6 +160,7 @@ if ($_POST['filterType'] != '2') date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days()); date_cells(_("To:"), 'TransToDate', '', null); } +check_cells(_("Zero values"), 'show_voided'); submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); @@ -184,7 +185,7 @@ if (get_post('RefreshInquiry') || list_updated('filterType')) } //------------------------------------------------------------------------------------------------ $sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'), - get_post('customer_id'), get_post('filterType')); + get_post('customer_id'), get_post('filterType'), check_value('show_voided')); //------------------------------------------------------------------------------------------------ //db_query("set @bal:=0"); -- 2.30.2