Index: DCTRANSP.mac.rou =================================================================== diff -u -r38346 -r52861 --- DCTRANSP.mac.rou (.../DCTRANSP.mac.rou) (revision 38346) +++ DCTRANSP.mac.rou (.../DCTRANSP.mac.rou) (revision 52861) @@ -33,7 +33,7 @@ ; Afdruk body BODY New %J,B,I,R,T,BCount,GroepNr,KLNr,Naam,ToeNaam,Adres,PostNr,Woonpl,Land,Munt,SortKey,KlTaal,VrachtKost - New Gewicht,Rembours,KlantOpm,ORDNr,BONNr,FANr,PROFNr,ContactType,ContactRef,Paletten,Collo,LangGoed,KPaletten + New Gewicht,Rembours,KlantOpm,ORDNr,BONNr,FANr,PROFNr,ContactType,ContactRef,Paletten,Collo,LangGoed,KPaletten,BPaletten New lbKenAnk,KenAnk,ObjKenAnk,IRef,Referenties,FSepLin,LSepLine Set %J=$$%J^vhRtn1() Do SortBody(%J,TranspNr) @@ -60,8 +60,9 @@ . Set Collo=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","C")) . Set LangGoed=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","L")) . Set KPaletten=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","P")) + . Set BPaletten=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","B")) . Set KlantOpm(1)=$$TXT("VrachtK")_": "_^RES("TRANSPORT","PI","VRACHTKOST","D",$S(VrachtKost="":"NV",1:VrachtKost),Taal)_"~" - . If 'Paletten,'Collo,'LangGoed,'KPaletten + . If 'Paletten,'Collo,'LangGoed,'KPaletten,'BPaletten . Else Do . . Set KlantOpm(1)=KlantOpm(1)_$$TXT("VVolume")_":~" . . If Paletten Set KlantOpm(1)=KlantOpm(1)_Paletten_" "_$$TXT($S(Paletten=1:"Palet",1:"Paletten"))_", " @@ -71,6 +72,7 @@ . . . Set KlantOpm(1)=KlantOpm(1)_$S($L($P(LangGoed,D,2)):" "_$$TXT("Van")_" "_$P(LangGoed,D,2)_" "_$$TXT("Meter"),1:"") . . . Set KlantOpm(1)=KlantOpm(1)_", " . . If KPaletten Set KlantOpm(1)=KlantOpm(1)_KPaletten_" "_$$TXT($S(Paletten=1:"KPalet",1:"KPaletten"))_", " + . . If BPaletten Set KlantOpm(1)=KlantOpm(1)_BPaletten_" "_$$TXT($S(Paletten=1:"BPalet",1:"BPaletten"))_", " . . Set $E(KlantOpm(1),$L(KlantOpm(1))-1,$L(KlantOpm(1)))=".~" . Set KlantOpm(1)=KlantOpm(1)_$G(^TRANSP("D",TranspNr,"D",GroepNr,"T")) . Set R=$G(^TRANSP("D",TranspNr,"D",GroepNr,"A")) @@ -398,6 +400,8 @@ TPaletten ;Europalletten\Euro-palettes\Euro-Paletten\Euro Pallets TKPalet ;klein pallet\petite palette\kleine palette\small pallet TKPaletten ;kleine palletten\petites palettes\kleine Paletten\small pallets +TBPalet ;Buitenmaatse pallet\Buitenmaatse pallet\Buitenmaatse pallet\Buitenmaatse pallet +TBPaletten ;Buitenmaatse palletten\Buitenmaatse palletten\Buitenmaatse palletten\Buitenmaatse palletten TCollie ;collie\collis\Pakette\Packet TCollo ;collo\collis\Pakette\Packets TLangGoed ;langgoed\langgoed\langgoed\langgoed