Index: BL/Flow/Offerte/Parser/beHAFELE.cls.xml
===================================================================
diff -u -r734 -r901
--- BL/Flow/Offerte/Parser/beHAFELE.cls.xml	(.../beHAFELE.cls.xml)	(revision 734)
+++ BL/Flow/Offerte/Parser/beHAFELE.cls.xml	(.../beHAFELE.cls.xml)	(revision 901)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:00:51">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-21 10:20:11">
 <Class name="BL.Flow.Offerte.Parser.beHAFELE">
+<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AbstractParserXML</Super>
-<TimeChanged>61775,36968.771638</TimeChanged>
+<TimeChanged>62143,37271.644487</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="XLSTHafele">
@@ -37,18 +38,18 @@
 Aanvullen van identnr met eerste cijfer</Description>
 <FormalSpec>IDNr,StartList</FormalSpec>
 <Implementation><![CDATA[
-	Set StartList=$G(StartList,"09812345")
-	Set IDNr=$P(IDNr," ")
-	Set:$TR(IDNr,". ")?8N&&$D(^KPR2($TR(IDNr,". ")_" ")) Result=IDNr
+	Set IDNr=$$$UCase($P(IDNr," "))
+	Set:($$IsValidIdentNr^PRODUKT2(IDNr))&&$D(^KPR2($TR(IDNr,". ")_" ")) Result=IDNr   ; [IDENT WV]  test was voorheen:  ($TR(IDNr,". ")?8N) 
 	
-	Quit:$TR(IDNr,". ")'?7N "" ; Verschillend van 7 cijfers
+	Quit:$TR(IDNr,". ")'?1(7N) "" ; Verschillend van 7 cijfers
 
+	Set StartList=$G(StartList,"09812345")   ; [IDENT WV]  StartList moet uitgebreid worden, indien ook moet gezocht worden naar "A."-identnummers 
 	For FirstPos=1:1:$L(StartList) Quit:$L($G(Result))  Do  
 	. Set First=$E(StartList,FirstPos)
 	. Set:$D(^KPR2(First_$TR(IDNr,". ")_" ")) Result=First_$S(IDNr[".":".",1:"")_IDNr
 	Quit $G(Result)
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1669955406"/>
+<Checksum value="374912491"/>
 </Export>