SVRZ#32152 SVRZ - ##OPDRKEY## in puo_subjectprefixmld zonder prefix

svn path=/Database/trunk/; revision=40541

BES/BES_PAC.SRC

@@ -2098,10 +2098,11 @@ AS
       -- We support substitution of placeholders in the messages
       -- ##KEY##    = bes_bestelopdr_id
       -- ##KEYN##   = voorloop+bes_bestelopdr_id
-      IF instr2 (s, '$') > 0
+      IF (instr2 (s, '#') > 0 AND instr2 (s, '$') > 0)
       THEN
          f := SUBSTR( s, INSTR2( s, '$$')+2);
-         s := SUBSTR( s, 1, INSTR2( s, '$$')-1);
+         f := SUBSTR( f, 1, INSTR2( f, '##')-1);
+         s := REPLACE( s, '$$'||f, '');
          IF f is not null
          THEN
             BEGIN
@@ -2146,7 +2147,7 @@ AS
                s1 := lopdrid;
             END IF;
             --
-            s := REPLACE (s, '##KEYN##',  s1||':'||to_number(d)||':'||to_number(d2));
+            s := REPLACE (s, '##KEYN##',  s1);
          END IF;
       END IF;