Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMoederVanSopr/500816.xml =================================================================== diff -u -r49577 -r49591 --- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMoederVanSopr/500816.xml (.../500816.xml) (revision 49577) +++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestMoederVanSopr/500816.xml (.../500816.xml) (revision 49591) @@ -23,14 +23,16 @@ DummyRequestMessageId Set AVENTOS HS,HK en HL -frontbevestigingen, kleur:Vernikkeld +frontbevestigingen +kleur:Vernikkeld nl-be 20S4200 FRO-B S2 NI DummyRequestMessageId Set AVENTOS HS,HK et HL -attaches-façade, couleur:Nickelé +attaches-façade +couleur:Nickelé fr 20S4200 FRO-B S2 NI @@ -41,7 +43,8 @@ DummyRequestMessageId - , Farbe:Vernickelt + +Farbe:Vernickelt de 20S4200 FRO-B S2 NI Index: vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler/Test.cls.xml =================================================================== diff -u -r49579 -r49591 --- vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler/Test.cls.xml (.../Test.cls.xml) (revision 49579) +++ vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler/Test.cls.xml (.../Test.cls.xml) (revision 49591) @@ -14,7 +14,7 @@ #dim RandomKleur As %String = "RandomKleur" #dim RandomKleurLabel As %String = "RandomKleurLabel" - Do ..AssertDescription(RandomKleur, RandomKleurLabel, RandomVertaling, RandomVertaling _ ", " _ RandomKleurLabel _ ":" _ RandomKleur) + Do ..AssertDescription(RandomKleur, RandomKleurLabel, RandomVertaling, RandomVertaling _ $$$CRLF _ RandomKleurLabel _ ":" _ RandomKleur) Do ..AssertDescription("", RandomKleurLabel, RandomVertaling, RandomVertaling) ]]> @@ -39,7 +39,7 @@ #dim DescriptionBepaler As WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler.DescriptionBepaler = ##class(WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler.DescriptionBepaler).%New(ProductTypeApiMock) #dim Description As %String = DescriptionBepaler.GeefDescription(ProductMock, RandomTaal) - Do $$$AssertEquals(Description, RandomIdentNummer _ ", " _ $$$CRLF _ RandomLangtekst) + Do $$$AssertEquals(Description, RandomIdentNummer _ $$$CRLF _ RandomLangtekst) Do ProductMock.Verifieer() Do ProductTypeApiMock.Verifieer() Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml =================================================================== diff -u -r49579 -r49591 --- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml (.../1561072.xml) (revision 49579) +++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentZijkant/1561072.xml (.../1561072.xml) (revision 49591) @@ -92,7 +92,7 @@ DummyRequestMessageId - 9.610.721.15, + 9.610.721.15 TA'OR BOX zijkant links Hoogte: F NL: 550mm @@ -102,7 +102,7 @@ DummyRequestMessageId - 9.610.721.15, + 9.610.721.15 TA'OR BOX côté gauche Hauteur: F NL: 550mm @@ -112,7 +112,7 @@ DummyRequestMessageId - 9.610.721.15, + 9.610.721.15 TA'OR BOX side left Height: F NL: 550mm @@ -122,7 +122,7 @@ DummyRequestMessageId - 9.610.721.15, + 9.610.721.15 TA'OR BOX Zarge links Höhe: F NL: 550mm Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestCubic/823131.xml =================================================================== diff -u -r49577 -r49591 --- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestCubic/823131.xml (.../823131.xml) (revision 49577) +++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestCubic/823131.xml (.../823131.xml) (revision 49591) @@ -36,28 +36,32 @@ DummyRequestMessageId CubiFer -Aluminium 62 x 72 x 150mm, kleur:Aluminium look +Aluminium 62 x 72 x 150mm +kleur:Aluminium look nl-be TA.AMAL072 CUBIFER AL DummyRequestMessageId CubiFer -Aluminium 62 x 72 x 150mm, couleur:Finition Alu +Aluminium 62 x 72 x 150mm +couleur:Finition Alu fr TA.AMAL072 CUBIFER AL DummyRequestMessageId CubiFer -Aluminium 62 x 72 x 150mm, colour:Aluminium look +Aluminium 62 x 72 x 150mm +colour:Aluminium look en-us TA.AMAL072 CUBIFER AL DummyRequestMessageId CubiFer -Aluminium 62 x 72 x 150mm, Farbe:Alu look +Aluminium 62 x 72 x 150mm +Farbe:Alu look de TA.AMAL072 CUBIFER AL Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml =================================================================== diff -u -r49579 -r49591 --- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml (.../1561083.xml) (revision 49579) +++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestLosseComponentRug/1561083.xml (.../1561083.xml) (revision 49591) @@ -64,41 +64,45 @@ DummyRequestMessageId - 9.610.836.15, + 9.610.836.15 TA'OR BOX rug Hoogte: F Interne breedte: 1166mm -Lengte rug: 1135mm, kleur:Natuur Notenhout +Lengte rug: 1135mm +kleur:Natuur Notenhout nl-be TRF.1166 NNRUCKWNNV5 NN DummyRequestMessageId - 9.610.836.15, + 9.610.836.15 TA'OR BOX dos Hauteur: F Largeur intérieure: 1166mm -Longueur dos: 1135mm, couleur:Noyer Naturel +Longueur dos: 1135mm +couleur:Noyer Naturel fr TRF.1166 NNRUCKWNNV5 NN DummyRequestMessageId - 9.610.836.15, + 9.610.836.15 TA'OR BOX back Height: F Internal width: 1166mm -Length back: 1135mm, colour:Natural Walnut +Length back: 1135mm +colour:Natural Walnut en-us TRF.1166 NNRUCKWNNV5 NN DummyRequestMessageId - 9.610.836.15, + 9.610.836.15 TA'OR BOX Rückwand Höhe: F Lichte Weite: 1166mm -Länge Rückwand: 1135mm, Farbe:Nussbaum Natur +Länge Rückwand: 1135mm +Farbe:Nussbaum Natur de TRF.1166 NNRUCKWNNV5 NN Index: vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml =================================================================== diff -u -r49577 -r49591 --- vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml (.../794542.xml) (revision 49577) +++ vhTestFiles/IntegratieTests/WSimpl.AX.CalculatedProduct/TestAantalNul/794542.xml (.../794542.xml) (revision 49591) @@ -52,15 +52,17 @@ DummyRequestMessageId TANDEMBOX plus Verdeelstuk hoog -voor voorraadlades, corpus 90, grijs, kleur:Grijs Metallic +voor voorraadlades, corpus 90, grijs +kleur:Grijs Metallic nl-be OL.VLIV90GRVOORR PL WA/G DummyRequestMessageId TANDEMBOX plus Pièce de séparation -pour tiroir à provisions, C = 90, gris, couleur:Gris Métallisé +pour tiroir à provisions, C = 90, gris +couleur:Gris Métallisé fr OL.VLIV90GRVOORR PL WA/G Index: WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler.cls.xml =================================================================== diff -u -r49579 -r49591 --- WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler.cls.xml (.../DescriptionBepaler.cls.xml) (revision 49579) +++ WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler.cls.xml (.../DescriptionBepaler.cls.xml) (revision 49591) @@ -36,15 +36,15 @@ #dim Description As %String = "" If (..ProductTypeApi.IsTaxLosseComponentenProduct(Product.GeefID())) { - Set Description = Product.GeefIdentNr() _ ", " _ $$$CRLF + Set Description = Product.GeefIdentNr() _ $$$CRLF } Set Description = Description _ Product.GeefLangtekst(Taal, $$$False) #dim KleurLabel As %String = ..Vertaler.GeefVertaling("Kleur", Taal) #dim Kleur As %String = Product.GeefKleurOmschrijving(Taal) If $$$Not(Kleur = "") { - Set Description = Description _ ", " _ KleurLabel _ ":" _ Kleur + Set Description = Description _ $$$CRLF _ KleurLabel _ ":" _ Kleur } Quit Description