From 3b0a43f59b2f549093e1e685cb3bc75e3ef16ca0 Mon Sep 17 00:00:00 2001
From: Peter Feij <peter.feij@aareon.nl>
Date: Thu, 8 Oct 2015 09:21:36 +0000
Subject: [PATCH] FSN#34036 de aanpassing was dus niet compatible, gecorrigeerd

svn path=/Database/trunk/; revision=26589
---
 FAC/FAC_PAC.SRC | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/FAC/FAC_PAC.SRC b/FAC/FAC_PAC.SRC
index 501b8dcf..7844d812 100644
--- a/FAC/FAC_PAC.SRC
+++ b/FAC/FAC_PAC.SRC
@@ -2288,7 +2288,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
    BEGIN
        -- The flags are for compatibility mostly. Flags 2 and 4 cannot be combined (useless)
        -- flags: 0=default,  1=view has xemail and xmobile, 2=use fac.notifytracking instead of fac.putnotification(srtprio)
-       --        4=view has attachments
+       --        4=view has attachments, 8=view has xsender
        -- Kijk of de extra kolommen xemail en xmobile in de view zitten, dan gebruiken we die ook
 
        IF BITAND(pflags, 2) = 2 -- Alleen sender, text, code en xkey verplicht (met xkey zoals in fac_tracking zou komen)
@@ -2297,11 +2297,26 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                'SELECT sender, NULL receiver, text, code, fac_srtnotificatie_key, NULL key, xkey, NULL xsender, NULL xemail, NULL xmobile, NULL attachments'
                || ' FROM fac_srtnotificatie, ' || pviewname
                || ' WHERE code = fac_srtnotificatie_code';
-       ELSIF BITAND(pflags, 5) = 5  /* 4+1 */
+       ELSIF BITAND(pflags, 13) = 13  /* 8+4+1 */
        THEN
            OPEN messages FOR
                'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, attachments FROM '
                || pviewname;
+       ELSIF BITAND(pflags, 9) = 9  /* 8+1 */
+       THEN
+           OPEN messages FOR
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, NULL attachments FROM '
+               || pviewname;
+       ELSIF BITAND(pflags, 8) = 8
+       THEN
+           OPEN messages FOR
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, NULL xemail, NULL xmobile, NULL attachments FROM '
+               || pviewname;
+       ELSIF BITAND(pflags, 5) = 5  /* 4+1 */
+       THEN
+           OPEN messages FOR
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, xemail, xmobile, attachments FROM '
+               || pviewname;
        ELSIF BITAND(pflags, 4) = 4
        THEN
            OPEN messages FOR
@@ -2310,7 +2325,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
        ELSIF BITAND(pflags, 1) = 1
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, NULL attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, xemail, xmobile, NULL attachments FROM '
                || pviewname;
        ELSE -- BITAND(pflags, 1) = 0
            OPEN messages FOR