From: garyhgohoos <gary@xtuple.com>
Date: Mon, 21 Jul 2014 18:31:17 +0000 (-0400)
Subject: Issue #24199:exclude when gltrans_deleted
X-Git-Tag: v4.6.0~13^2
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=693167a3efe83ac37096ff40ab497084010b2686;p=xtuple

Issue #24199:exclude when gltrans_deleted
---

diff --git a/foundation-database/public/tables/metasql/bankrec-clearedbalance.mql b/foundation-database/public/tables/metasql/bankrec-clearedbalance.mql
index d251cd206..c643759c1 100644
--- a/foundation-database/public/tables/metasql/bankrec-clearedbalance.mql
+++ b/foundation-database/public/tables/metasql/bankrec-clearedbalance.mql
@@ -16,6 +16,7 @@ SELECT (COALESCE(SUM(amount),0.0) + <? value("begBal") ?>) AS cleared_amount,
             AND (bankrecitem_source_id=gltrans_id)
             AND (bankrecitem_bankrec_id=<? value("bankrecid") ?>)
             AND (bankrecitem_cleared)
+            AND (NOT gltrans_deleted)
             AND (NOT gltrans_rec)
             AND (bankaccnt_id=<? value("bankaccntid") ?>) ) 
           UNION ALL
diff --git a/foundation-database/public/tables/metasql/bankrecHistory-reconciled.mql b/foundation-database/public/tables/metasql/bankrecHistory-reconciled.mql
index e6db42dd1..7fd754bab 100644
--- a/foundation-database/public/tables/metasql/bankrecHistory-reconciled.mql
+++ b/foundation-database/public/tables/metasql/bankrecHistory-reconciled.mql
@@ -36,7 +36,8 @@ SELECT gltrans_id, gltrans_date, formatDate(gltrans_date) AS f_date,
     JOIN bankaccnt ON (bankaccnt_id=bankrec_bankaccnt_id)
  WHERE ((bankrecitem_bankrec_id=<? value("bankrec_id") ?>)
    AND (bankrecitem_source='GL')
-   AND (bankrecitem_source_id=gltrans_id) ) 
+   AND (bankrecitem_source_id=gltrans_id)
+   AND (NOT gltrans_deleted) ) 
 
 UNION