Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r73289 -r75010 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 73289) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 75010) @@ -84,6 +84,8 @@ Do ..VerwerkGalimberti() } ElseIf Klant = "K||4451" { Do ..VerwerkGroupNivelles() + } ElseIf Klant = "K||40835" { + Do ..VerwerkHMPC() } ElseIf Klant = "K||4875" { Do ..VerwerkHaefeleBelgie() } ElseIf Klant = "K||35697" { @@ -473,6 +475,12 @@ + +1 +1 + + + 1 1 Index: APPS/VKP/VerzendWijze/DueOutProductieBepaler.cls.xml =================================================================== diff -u -r72495 -r75010 --- APPS/VKP/VerzendWijze/DueOutProductieBepaler.cls.xml (.../DueOutProductieBepaler.cls.xml) (revision 72495) +++ APPS/VKP/VerzendWijze/DueOutProductieBepaler.cls.xml (.../DueOutProductieBepaler.cls.xml) (revision 75010) @@ -58,14 +58,15 @@ #dim DueOutProductieTime As %Time = "" #dim Categorie As APPS.Halux.common.enu.Categorie = ..GeefCategorie(ProductNummer) #dim IsKlantOIC As %Boolean = (KlantNummer = ..LegacyPartijAPI.GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).OIC())) + #dim IsKlantHMPC As %Boolean = (KlantNummer = ..LegacyPartijAPI.GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).HMPC())) If (Categorie = ##class(APPS.Halux.common.enu.Categorie).Mat()) { Set DueOutProductieTime = ..DueOutProductieBepaler.GeefDueOutProductieTime(ProductieDatum) } Else { #dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopAPI.GeefKlant(..LegacyPartijAPI.GeefKlantPartijID(KlantNummer)) #dim KlantOrderInstellingen As DOM.VKP.KlantOrderInstellingen = Klant.GeefKlantOrderInstellingen() - If IsKlantOIC { + If (IsKlantOIC || IsKlantHMPC) { Set DueOutProductieTime = $$INTTIME^vhLib.DataTypes("09:00") } ElseIf ..IsPersonalityVoorWegwerppallet(Klant, OrderID) { Set DueOutProductieTime = $$INTTIME^vhLib.DataTypes("16:00") Index: vhUnitTest/APPS/VKP/VerzendWijze/DueOutProductieBepaler/Test.cls.xml =================================================================== diff -u -r72495 -r75010 --- vhUnitTest/APPS/VKP/VerzendWijze/DueOutProductieBepaler/Test.cls.xml (.../Test.cls.xml) (revision 72495) +++ vhUnitTest/APPS/VKP/VerzendWijze/DueOutProductieBepaler/Test.cls.xml (.../Test.cls.xml) (revision 75010) @@ -13,6 +13,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",KlantNummer).DanReturn("DummyPartijID") Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() Do KlantOrderInstellingenMock.VerwachtMethodCall("MoetOpWegwerppallet").DanReturn($$$False) @@ -58,6 +59,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID","DummyKlantNummer").DanReturn("DummyPartijID") Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() Do KlantOrderInstellingenMock.VerwachtMethodCall("MoetOpWegwerppallet").DanReturn($$$True) @@ -122,6 +124,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",KlantNummer).DanReturn("K||"_KlantNummer) Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() @@ -165,6 +168,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",KlantNummer).DanReturn("K||"_KlantNummer) Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() @@ -208,6 +212,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",KlantNummer).DanReturn("K||"_KlantNummer) Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() @@ -251,6 +256,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",KlantNummer).DanReturn("K||"_KlantNummer) Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() @@ -289,6 +295,7 @@ Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID",KlantNummer).DanReturn("DummyPartijID") Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||26329").DanReturn($$$False) + Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID","K||40835").DanReturn($$$False) Set KlantOrderInstellingenMock = ##class(vhTest.Mock.DOM.VKP.KlantOrderInstellingen).%New() Do KlantOrderInstellingenMock.VerwachtMethodCall("MoetOpWegwerppallet").DanReturn($$$False) Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r73289 -r75010 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 73289) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 75010) @@ -261,6 +261,13 @@ 1 + +%String +"K||40835" +1 +1 + + %String "K||4875" Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r73291 -r75010 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 73291) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 75010) @@ -7,7 +7,7 @@ TECH.Enumeration -,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||35830,K||39481,K||39580 +,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||35830,K||39481,K||39580,K||40835 @@ -845,6 +845,13 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String