From 0a331b526576c37f93ed96a5169e03f3ffebd667 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Mon, 30 Jan 2017 12:20:59 +0000
Subject: [PATCH] FSN#39262 Verwijderde facturen negeren bij contracten

svn path=/Website/branches/v2016.3/; revision=32608
---
 APPL/CNT/cnt_contract.asp      | 3 ++-
 APPL/CNT/cnt_factuurschema.asp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/APPL/CNT/cnt_contract.asp b/APPL/CNT/cnt_contract.asp
index cfb9b64cc1..8fd6db5644 100644
--- a/APPL/CNT/cnt_contract.asp
+++ b/APPL/CNT/cnt_contract.asp
@@ -263,7 +263,8 @@ if (cnt_key > 0)
       var invoiceExist = false;
       var sql = "SELECT 'x'"
               + " FROM fin_factuur"
-              + " WHERE cnt_contract_key =" + cnt_key ;
+              + " WHERE fin_factuur_verwijder IS NULL"
+              + "   AND cnt_contract_key =" + cnt_key ;
       var oRs = Oracle.Execute( sql );
       if(!oRs.eof){
            invoiceExist = true;;
diff --git a/APPL/CNT/cnt_factuurschema.asp b/APPL/CNT/cnt_factuurschema.asp
index b437a631b3..f5c77b17ec 100644
--- a/APPL/CNT/cnt_factuurschema.asp
+++ b/APPL/CNT/cnt_factuurschema.asp
@@ -24,6 +24,7 @@ var sqltotal = "SELECT SUM (fin_factuur_totaal)"
              + "  FROM fin_factuur f"
              + " WHERE f.fin_factuur_boekmaand  = cnt_factuurschema.cnt_factuurschema_boekmaand"
              + "   AND f.cnt_contract_key = cnt_factuurschema.cnt_contract_key"
+             + "   AND f.fin_factuur_verwijder IS NULL"
 
 this_model.includes.schedule.model.fields["fintotal"] =
     { dbs: "fintotal",