Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r34271 -r34334
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34271)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34334)
@@ -61,6 +61,30 @@
 	quit "nl-be"
 ]]></Implementation>
 </Method>
+
+<Method name="FormatEnterpriseNumber">
+<FormalSpec>BTWNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:$$$Not($$$StartsWith(BTWNr,"BE")) ""
+	quit:BTWNr="" ""
+	quit:(+$extract(BTWNr,3,*))=0 "BE 0000.000.097"
+	quit "BTW "_$extract(BTWNr,1,2)_" "_$extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
+]]></Implementation>
+</Method>
+
+<Method name="FormatVATNum">
+<FormalSpec>BTWNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:BTWNr="" ""
+	quit:BTWNr="GEEN" ""
+	quit:BTWNr="G" ""
+	quit:$$$StartsWith(BTWNr,"BE") ""
+	quit:+$extract(BTWNr,3,*)=0 ""
+	quit $extract(BTWNr,3,*)
+]]></Implementation>
+</Method>
 </Class>