Index: PRKLEUR.mac.rou =================================================================== diff -u -r31098 -r48224 --- PRKLEUR.mac.rou (.../PRKLEUR.mac.rou) (revision 31098) +++ PRKLEUR.mac.rou (.../PRKLEUR.mac.rou) (revision 48224) @@ -93,7 +93,7 @@ New I,KortTxt,Kode,Kleur New:PRNr?4.7N B Set Taal=$G(Taal,"N") If PRNr For I=0:1 Quit:'$D(^KPR(PRNr,I)) Set B(I+1)=^KPR(PRNr,I) - Set KortTxt=$P(B(1),D),Kode=$E(KortTxt,22,25) + Set KortTxt=$P(B(1),"\"),Kode=$E(KortTxt,22,25) Set:$L(Kode) Kleur=$G(^KCOL(Kode_" ",Taal)) Quit $G(Kleur) ; Index: vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductDixfConverter/Test.cls.xml =================================================================== diff -u -r47903 -r48224 --- vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductDixfConverter/Test.cls.xml (.../Test.cls.xml) (revision 47903) +++ vhUnitTest/AX/Uitgaand/PM/Product/impl/ProductDixfConverter/Test.cls.xml (.../Test.cls.xml) (revision 48224) @@ -508,8 +508,9 @@ AX.Uitgaand.PM.Product.impl.Product Index: AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml =================================================================== diff -u -r47903 -r48224 --- AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml (.../ProductDixfConverter.cls.xml) (revision 47903) +++ AX/Uitgaand/PM/Product/impl/ProductDixfConverter.cls.xml (.../ProductDixfConverter.cls.xml) (revision 48224) @@ -31,7 +31,7 @@ Set AxProduct.ADUCertClaimLevel = $$$If(..IsBasisProductFilter.IsValid(Product),"",..BepaalADUCertClaimLevel(Product)) Set AxProduct.DisplayProductNumber = Product.Basis.IdentNummer Set AxProduct.EcoResProductDimensionGroupName = $$$If(..IsBasisProductFilter.IsValid(Product),"Con","") - Set AxProduct.EcoResProductTranslationDescription = $Translate(Product.Tekst.GetOmschrijving("N"," "),";",",") + Set AxProduct.EcoResProductTranslationDescription = ..GeefEcoResProductTranslationDescription(Product) Set AxProduct.EcoResProductTranslationLanguageId = "nl-be" Set AxProduct.EcoResProductTranslationName = Product.Basis.KortTekst Set AxProduct.EcoResStorageDimensionGroupName = "WMS" @@ -99,6 +99,21 @@ Quit ADUCertClaimLevel ]]> + + +Product:AX.Uitgaand.PM.Product.impl.Product +1 +%String + + Index: Prod/ProductTekst.cls.xml =================================================================== diff -u -r37689 -r48224 --- Prod/ProductTekst.cls.xml (.../ProductTekst.cls.xml) (revision 37689) +++ Prod/ProductTekst.cls.xml (.../ProductTekst.cls.xml) (revision 48224) @@ -1328,6 +1328,13 @@ ]]> + +Taal:%String="N" +%String + + + %CacheSQLStorage ^Prod.ProductBasisS