Index: Prod/GAMeta/Item/tmpDev2.mac.rou
===================================================================
diff -u -r910 -r1596
--- Prod/GAMeta/Item/tmpDev2.mac.rou	(.../tmpDev2.mac.rou)	(revision 910)
+++ Prod/GAMeta/Item/tmpDev2.mac.rou	(.../tmpDev2.mac.rou)	(revision 1596)
@@ -39,7 +39,9 @@
  New PRNr,Prod
  Do XMLBuildArrayInvers(DItem)
  Do xmlwPRBasis
- Do TAGWRITE^XMLWRITE(DevObj,"DIMHF",DItem.Get("DimHF"),$$$Attrib("unit",$$$ProptPR(PRNr,"HFEenheid")),$$$AttribInvers("DimHF"))
+ If 'DItem.Autos.IsDefined("FabrTekst") {
+	 Do TAGWRITE^XMLWRITE(DevObj,"DIMHF",DItem.Get("DimHF"),$$$Attrib("unit",$$$ProptPR(PRNr,"HFEenheid")),$$$AttribInvers("DimHF"))
+ }
  Do WRITELN^XMLWRITE(DevObj)
  Do XMLAddTags
  Quit
@@ -62,7 +64,7 @@
  Set SortKey=$P(pdlGroepSort,$$$Delim,2)   ; _DItem.Get("PRNr")   ; _(DItem.Code)
  Do TAGWRITE^XMLWRITE(DevObj,"GROEP",XMLGroep,$$$Attrib("OMS",$$$UCase(XMLGroep)))
  Do:(blnWithSort)&&($L(SortKey)) TAGWRITE^XMLWRITE(DevObj,"SORT",SortKey)
- Quit
+ Quit 
  
 XMLWriteExtra   ; Parameters: DItem,DevObj,ParamKey
    ;d WL^vhDBG("XMLWriteExtra : "_ParamKey_" - "_DItem)
@@ -71,14 +73,28 @@
  
 XMLFabrTekst(ParamKey)
  Quit:('DItem.Autos.IsDefined(ParamKey))
- New lbTekst
+ New lbTekst,Qty,DimHF,Unit
  Set lbTekst=DItem.EvalTemplAuto(ParamKey)
  Quit:(lbTekst="")
  If $$$IsList(lbTekst) Do
  . Do XMLFabrGroepAndSortTags(DevObj,$LG(lbTekst,1),1)
  . Do TAGWRITE^XMLWRITE(DevObj,"LANGTEKST",$LG(lbTekst,2))
- . Do:($LD(lbTekst,3)) TAGWRITE^XMLWRITE(DevObj,"DIMHF",$LI(lbTekst,3),$$$AttribInvers("DimHF"))
- . Do:($LD(lbTekst,4)) TAGWRITE^XMLWRITE(DevObj,"QTY",$LI(lbTekst,4),$$$AttribInvers("Qty"))
+ . Do:($LD(lbTekst,3)) 
+ . . Set DimHF=$LI(lbTekst,3)
+ . . If DimHF?.E1(1"mm") Do
+ . . . Set Unit="mm"   ; is nog hard-coded
+ . . . Set DimHF=$$$Replace(DimHF,Unit,"")
+ . . . Do TAGWRITE^XMLWRITE(DevObj,"DIMHF",DimHF,$$$Attrib("unit",Unit),$$$AttribInvers("DimHF"))   ; waarde en unit zijn opgesplitst in val en attribute 
+ . . Else  Do
+ . . . Do TAGWRITE^XMLWRITE(DevObj,"DIMHF",DimHF,$$$AttribInvers("DimHF"))
+ . Do:($LD(lbTekst,4)) 
+ . . Set Qty=$LI(lbTekst,4)
+ . . If Qty?.E1(1"st") Do
+ . . . Set Unit="st"   ; is nog hard-coded 
+ . . . Set Qty=$$$Replace(Qty,Unit,"")
+ . . . Do TAGWRITE^XMLWRITE(DevObj,"QTY",Qty,$$$Attrib("unit",Unit),$$$AttribInvers("Qty"))   ; waarde en unit zijn opgesplitst in val en attribute 
+ . . Else  Do
+ . . . Do TAGWRITE^XMLWRITE(DevObj,"QTY",Qty,$$$AttribInvers("Qty"))
  . Do:($LD(lbTekst,5)) TAGWRITE^XMLWRITE(DevObj,"MAGAZIJN",$LI(lbTekst,5))
  . Do:($LD(lbTekst,6)) TAGWRITE^XMLWRITE(DevObj,"KORTTEKST",$LI(lbTekst,6))
  Else  Do
@@ -101,6 +117,7 @@
 #define IsValidPR(%v)   (%v?2.6N)
  New KMVal       
  If DItem.Autos.IsDefined("FabrTekst") Do  Quit
+ . Set PRNr=DItem.Get("PRNr")
  . Do XMLFabrTekst("FabrTekst")
  ; Else 
  Do XMLFabrGroep