Index: DCTRANSP.mac.rou =================================================================== diff -u -r52861 -r66246 --- DCTRANSP.mac.rou (.../DCTRANSP.mac.rou) (revision 52861) +++ DCTRANSP.mac.rou (.../DCTRANSP.mac.rou) (revision 66246) @@ -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,BPaletten + New Gewicht,Rembours,KlantOpm,ORDNr,BONNr,FANr,PROFNr,ContactType,ContactRef,Paletten,Collo,LangGoed,KPaletten,BPaletten,WPaletten New lbKenAnk,KenAnk,ObjKenAnk,IRef,Referenties,FSepLin,LSepLine Set %J=$$%J^vhRtn1() Do SortBody(%J,TranspNr) @@ -57,15 +57,17 @@ . Set I=I+1,$P(B(I),D)=$E(PostNr_$S($L(PostNr):" ",1:"")_Woonpl,1,25)_"`"_(5-VFax) . Set:Land'="BE" I=I+1,$P(B(I),D)=$E($$LAND^vhRtn1(Land,2,KlTaal),1,25)_"`"_(5-VFax) . Set Paletten=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","E")) + . Set WPaletten=$G(^TRANSP("D",TranspNr,"D",GroepNr,"Q","W")) . 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,'BPaletten + . If 'Paletten,'Collo,'LangGoed,'KPaletten,'BPaletten,'WPaletten . Else Do . . Set KlantOpm(1)=KlantOpm(1)_$$TXT("VVolume")_":~" . . If Paletten Set KlantOpm(1)=KlantOpm(1)_Paletten_" "_$$TXT($S(Paletten=1:"Palet",1:"Paletten"))_", " + . . If WPaletten Set KlantOpm(1)=KlantOpm(1)_WPaletten_" "_$$TXT($S(WPaletten=1:"WPalet",1:"WPaletten"))_", " . . If Collo Set KlantOpm(1)=KlantOpm(1)_Collo_" "_$$TXT($S(Collo=1:"Collie",1:"Collo"))_", " . . Do:LangGoed . . . Set KlantOpm(1)=KlantOpm(1)_$$TXT("LangGoed")_" "_$P(LangGoed,D) @@ -398,6 +400,8 @@ TVVolume ;Voorzien volume\Volume pr�vu\Vorgeschenes volume\Foreseen volume TPalet ;Europallet\Europalette\Euro-Palette\Euro Pallet TPaletten ;Europalletten\Euro-palettes\Euro-Paletten\Euro Pallets +TWPalet ;Wegwerppallet\Palette jetable\Einwegpalette\Disposable Pallet +TWPaletten ;Wegwerppalletten\Palettes jetables\Einwegpaletten\Disposable 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