Index: APPS/Halux/PPS/Activiteit/impl/TAOR/common/LadeOnderdeelInfoBepaler.cls.xml =================================================================== diff -u -r62512 -r64328 --- APPS/Halux/PPS/Activiteit/impl/TAOR/common/LadeOnderdeelInfoBepaler.cls.xml (.../LadeOnderdeelInfoBepaler.cls.xml) (revision 62512) +++ APPS/Halux/PPS/Activiteit/impl/TAOR/common/LadeOnderdeelInfoBepaler.cls.xml (.../LadeOnderdeelInfoBepaler.cls.xml) (revision 64328) @@ -115,12 +115,12 @@ } } - Set BodemInfo = BodemInfo_")" - If (IsKoppelingAanwezig && IsGemonteerdeLade && IsDiepteVerstellingAanwezig) { - Set BodemInfo = BodemInfo_$$$DiepteVerstellingAanwezig + Set BodemInfo = BodemInfo_"+"_$$$DiepteVerstellingAanwezig } + Set BodemInfo = BodemInfo_")" + Quit BodemInfo ]]> Index: vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/LadeOnderdeelInfoBepaler/Test.cls.xml =================================================================== diff -u -r64275 -r64328 --- vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/LadeOnderdeelInfoBepaler/Test.cls.xml (.../Test.cls.xml) (revision 64275) +++ vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/LadeOnderdeelInfoBepaler/Test.cls.xml (.../Test.cls.xml) (revision 64328) @@ -82,7 +82,7 @@ Do HalffabItemsBoomStub.IndienMethodCall("BevatRol",..Enum.Rol.DiepteVerstelling).DanReturn($$$True) Do ProductStub.IndienMethodCall("GeefIngegevenKenmerken").DanReturn(TAORKenmerken) - Do $$$AssertEquals(..LadeOnderdeelInfoBepaler.Bepaal(BodemStub, ProductStub), "BOD(DRE)DV") + Do $$$AssertEquals(..LadeOnderdeelInfoBepaler.Bepaal(BodemStub, ProductStub), "BOD(DRE+DV)") ]]> @@ -94,8 +94,8 @@ Do ..AssertBodemInfo(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.V1, $$$False, "BOD(SCH:B)") Do ..AssertBodemInfo(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.Probox, $$$False, "BOD(SCH:B)") - Do ..AssertBodemInfoMetDiepteVerstelling(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.V1, $$$True, "BOD(SCH:B+M)DV") - Do ..AssertBodemInfoMetDiepteVerstelling(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.Probox, $$$True, "BOD(SCH:B+M)DV") + Do ..AssertBodemInfoMetDiepteVerstelling(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.V1, $$$True, "BOD(SCH:B+M+DV)") + Do ..AssertBodemInfoMetDiepteVerstelling(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.Probox, $$$True, "BOD(SCH:B+M+DV)") Do ..AssertBodemInfoMetDiepteVerstelling(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.V1, $$$False, "BOD(SCH:B)") Do ..AssertBodemInfoMetDiepteVerstelling(..Enum.KoppelingType.Schroef, ..Enum.VerpakkingType.Probox, $$$False, "BOD(SCH:B)")