Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml =================================================================== diff -u -r36238 -r37632 --- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml (.../InschuifElementValidator.cls.xml) (revision 36238) +++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator.cls.xml (.../InschuifElementValidator.cls.xml) (revision 37632) @@ -19,8 +19,8 @@ Do Exceptions.Insert(Exception) } - If (((Product.ZijwandVerhogingType="NoGallery")&&($$$HasLength(Product.ZijwandVerhogingMateriaal) || $$$HasLength(Product.ZijwandVerhogingKleur))) || - ($$$Not(Product.ZijwandVerhogingType="NoGallery")&&($$$Not($$$HasLength(Product.ZijwandVerhogingMateriaal) && $$$HasLength(Product.ZijwandVerhogingKleur))))){ + If ((((Product.ZijwandVerhogingType="NoGallery")||(Product.ZijwandVerhogingType="SimpleGallery"))&&($$$HasLength(Product.ZijwandVerhogingMateriaal) || $$$HasLength(Product.ZijwandVerhogingKleur))) || + ($$$Not((Product.ZijwandVerhogingType="NoGallery")||(Product.ZijwandVerhogingType="SimpleGallery"))&&($$$Not($$$HasLength(Product.ZijwandVerhogingMateriaal) && $$$HasLength(Product.ZijwandVerhogingKleur))))){ Set Exception = ##class(TECH.ObjectUtils.ObjectConverterCombinationException).%New() Do Exception.AddCombination($classname(Product),"ZijwandVerhogingType",Product.ZijwandVerhogingType) Do Exception.AddCombination($classname(Product),"ZijwandVerhogingMateriaal",Product.ZijwandVerhogingMateriaal) Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml =================================================================== diff -u -r36239 -r37632 --- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml (.../Test.cls.xml) (revision 36239) +++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/InschuifElementValidator/Test.cls.xml (.../Test.cls.xml) (revision 37632) @@ -9,7 +9,7 @@ Set Product.RugHoogte = "C" Set Product.ZijwandVerhogingMateriaal = ##class(DOM.PM.enu.TBXZijwandVerhogingMateriaal).Glas() Set Product.ZijwandVerhogingKleur = ##class(DOM.PM.enu.TBXZijwandVerhogingKleur).FloatHelder8mm() - Set Product.ZijwandVerhogingType = "SimpleGallery" + Set Product.ZijwandVerhogingType = "DesignElement" Set Exceptions = ##class(TECH.ExceptionList).%New() Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.InschuifElementValidator).%New() @@ -95,7 +95,7 @@ ]]> - +