X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=888181ebae9b811a4b04c863364e5a488d8879ad;hp=74ff8f01f051f9ee2de1abde8943b3f794aaebba;hb=5d8f36d15260bfd9215315935af86b7d96065489;hpb=ca3af895c069979d693a98c49255a48664061cd4 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)>"