Index: BL/Legacy/EWPR.cls.xml
===================================================================
diff -u -r73476 -r73921
--- BL/Legacy/EWPR.cls.xml	(.../EWPR.cls.xml)	(revision 73476)
+++ BL/Legacy/EWPR.cls.xml	(.../EWPR.cls.xml)	(revision 73921)
@@ -42,12 +42,12 @@
 	#Dim SqlString as %String = "declare @product as char(16) = '"_ @Ref@("PRNR") _"' " _ $$$CRLF
 	set SqlString = SqlString _ "declare @ident_nr as char(11) ='"_ @Ref@("IDNR") _"' " _ $$$CRLF
 	set SqlString = SqlString _ "declare @korttekst as char(25)='"_ @Ref@("KORTTEKST") _"' " _ $$$CRLF
-	set SqlString = SqlString _ "declare @omschrijving_ned as char(255) ='"_ @Ref@("OMSCHRIJFNED") _"' " _ $$$CRLF
+	set SqlString = SqlString _ "declare @omschrijving_ned as char(255) ='"_ ##class(TECH.StringUtils).Replace( @Ref@("OMSCHRIJFNED") ,"'","''") _"' " _ $$$CRLF
 	set SqlString = SqlString _ "declare @omschrijving_frans as char(255) = '"_ @Ref@("OMSCHRIJFFRANS") _"' " _ $$$CRLF
 	set SqlString = SqlString _ "declare @lev_nr as int = "_ @Ref@("LEVNR") _" " _ $$$CRLF
 	set SqlString = SqlString _ "declare @lev_naam as char(40) = '"_ @Ref@("LEVNM") _"' " _ $$$CRLF
 	set SqlString = SqlString _ "declare @lev_ref as char(45) = '"_ @Ref@("LEVREF") _"' " _ $$$CRLF
-	set SqlString = SqlString _ "declare @lev_omschrijving as char(255)= '"_ @Ref@("LEVREFOMS") _"' " _ $$$CRLF
+	set SqlString = SqlString _ "declare @lev_omschrijving as char(255)= '"_ ##class(TECH.StringUtils).Replace( @Ref@("LEVREFOMS") ,"'","''") _"' " _ $$$CRLF
 	set SqlString = SqlString _ "declare @telbaar as float = "_ @Ref@("TELBAAR") _"  " _ $$$CRLF 
 	set SqlString = SqlString _ "declare @aankoopprijs as float = "_ @Ref@("AKP") _"  " _ $$$CRLF
 	set SqlString = SqlString _ "declare @GVP as int = "_ +@Ref@("AANTALGVP") _" " _ $$$CRLF ;-> 0
@@ -244,7 +244,7 @@
 	set SqlString = SqlString _ "      ,[extra_float_4] " _ $$$CRLF
 	set SqlString = SqlString _ "      ,[extra_float_5] " _ $$$CRLF
 	set SqlString = SqlString _ "      ,[ts] ) " _ $$$CRLF
-	set SqlString = SqlString _ "	select top 3  " _ $$$CRLF
+	set SqlString = SqlString _ "	select " _ $$$CRLF
 	set SqlString = SqlString _ "		left(@product + space(16),16), " _ $$$CRLF
 	set SqlString = SqlString _ "		mag.magazijn, " _ $$$CRLF
 	set SqlString = SqlString _ "		'0000000000', " _ $$$CRLF
@@ -267,8 +267,7 @@
 	set SqlString = SqlString _ "		left(@sorteersleutel + SPACE(20),20)," _ $$$CRLF
 	set SqlString = SqlString _ "		'                    ', '                    ','                    ','                    ','                    ','                    ','                    ', " _ $$$CRLF
 	set SqlString = SqlString _ "		0,0,0,0,0,null " _ $$$CRLF
-	set SqlString = SqlString _ "	from product " _ $$$CRLF
-	set SqlString = SqlString _ "	join magazijnen mag on 1 = 1 " _ $$$CRLF
+	set SqlString = SqlString _ "	from magazijnen mag " _ $$$CRLF
 	set SqlString = SqlString _ "	where 0 = (select count(*) from product where product = LEFT(@product + space(16),16)) " _ $$$CRLF
 	set SqlString = SqlString _ ";"
  
@@ -283,7 +282,7 @@
 	set SqlString = SqlString _ "     ,[extra_char_1] = left(@ident_nr + space(20),20) " _ $$$CRLF
 	set SqlString = SqlString _ "     ,[extra_char_3] = left(@sorteersleutel + SPACE(20),20) " _ $$$CRLF
 	set SqlString = SqlString _ "where product = LEFT(@product + space(16),16)  " _ $$$CRLF
- 
+
     try
     {
     	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(rs.Prepare(SqlString,,SqlConnection))