Index: DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml =================================================================== diff -u -r67227 -r68634 --- DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 67227) +++ DOM/common/VanHoeckeOfAnderePersonalityVisitor.cls.xml (.../VanHoeckeOfAnderePersonalityVisitor.cls.xml) (revision 68634) @@ -259,6 +259,12 @@ + + +MartensPersonality:DOM.common.MartensPersonality + + Index: DOM/common/enu/Personality.cls.xml =================================================================== diff -u -r67227 -r68634 --- DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 67227) +++ DOM/common/enu/Personality.cls.xml (.../Personality.cls.xml) (revision 68634) @@ -6,11 +6,11 @@ TECH.Enumeration -,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH,HaefeleNO +,VanHoecke,VanHoeckeVoorHalux,SFS,Dupont,Kisch,Destil,HaefeleBE,VanRaemdonck,Noteborn,Daro,Hein,HaefeleNL,Seefelder,BeslagDesign,Demo,Zweygart,Galimberti,Pavanello,Ferexpert,Beslagteknikk,BiemarBois,CampeTonny,Rini,Furnifit,YachtSupplier,DSGroup,DeBisschop,DeceuninckDeforce,Pierard,JBarth,HaefeleDE,Kleiner,Layer,HahleOy,HaefeleSE,HaefeleFI,HaefeleIT,HaefeleAT,OPO,HaefeleFR,HaefeleDK,HaefeleCH,HaefeleNO,Martens -,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45 +,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46 @@ -333,6 +333,13 @@ ]]> + +1 +DOM.common.enu.Personality + + + 1 ValueToBeIgnored...:TECH.String Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r67227 -r68634 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 67227) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 68634) @@ -84,6 +84,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleCH()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNO()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OPO()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Martens()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: DOM/common/enu/Personality/Verwerker.cls.xml =================================================================== diff -u -r67227 -r68634 --- DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 67227) +++ DOM/common/enu/Personality/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68634) @@ -74,6 +74,8 @@ Do ..VerwerkKleiner() } ElseIf Personality = "35" { Do ..VerwerkLayer() + } ElseIf Personality = "46" { + Do ..VerwerkMartens() } ElseIf Personality = "9" { Do ..VerwerkNoteborn() } ElseIf Personality = "41" { @@ -291,6 +293,12 @@ + +1 +1 + + + 1 1 Index: DOM/common/enu/Personality/AutoComplete.cls.xml =================================================================== diff -u -r67227 -r68634 --- DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 67227) +++ DOM/common/enu/Personality/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 68634) @@ -226,6 +226,13 @@ 1 + +%String +"46" +1 +1 + + %String "9" Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r67594 -r68634 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 67594) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68634) @@ -144,6 +144,8 @@ Do ..VerwerkLenssenProduktie() } ElseIf Klant = "K||6819" { Do ..VerwerkLijstPrijsKlant() + } ElseIf Klant = "K||32383" { + Do ..VerwerkMartens() } ElseIf Klant = "K||2999" { Do ..VerwerkMeubelBeslagHolland() } ElseIf Klant = "K||3145" { @@ -637,6 +639,12 @@ + +1 +1 + + + 1 1 Index: vhDeploy/Deploy20220802xMartensPersonalityAanmaken.cls.xml =================================================================== diff -u --- vhDeploy/Deploy20220802xMartensPersonalityAanmaken.cls.xml (revision 0) +++ vhDeploy/Deploy20220802xMartensPersonalityAanmaken.cls.xml (revision 68634) @@ -0,0 +1,28 @@ + + + +vhDeploy.Deploy + + +%String +46 + + + +%String +Aanmaken van Personality voor Martens Hout (ID = 46) + + + +1 + + + + + + Index: APPS/EC/enu/WebShopVerwerker.cls.xml =================================================================== diff -u -r68449 -r68634 --- APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 68449) +++ APPS/EC/enu/WebShopVerwerker.cls.xml (.../WebShopVerwerker.cls.xml) (revision 68634) @@ -6,11 +6,11 @@ TECH.Enumeration -;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO;MAHO +;VHEPN;SFS;LMC;MBHO;HFLB;DUPO;KISCH;HELMY;HEIN;HFLE;RAEM;DARO;SEEF;BEDE;ZWEY;GALI;PAVA;FERE;BETE;BIBO;JBAR;CAMP;RINI;FURN;YSPL;DSGR;DBSP;DCDF;PIER;HFLD;KLNR;LAYR;HAHL;HFLSE;HFLFI;HFLIT;HFLAT;OPO;HFLFR;HFLDK;HFLCH;HFLNO;MART -;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland;HaefeleNoorwegen;MartensHout +;VHEPN;SFS;OptimaPack;MeubelBeslagHolland;HaefeleBelgie;Dupont;Kisch;Destil;Hein;HaefeleNederland;VanRaemdonck;Daro;Seefelder;BeslagDesign;Zweygart;Galimberti;Pavanello;Ferexpert;Beslagteknikk;BiemarBois;JBarth;CampeTonny;Rini;Furnifit;YachtSupplier;DSGroup;DeBisschop;DeceuninckDeforce;Pierard;HaefeleDuitsland;Kleiner;Layer;HahleOy;HaefeleZweden;HaefeleFinland;HaefeleItalie;HaefeleOostenrijk;OPO;HaefeleFrankrijk;HaefeleDenemarken;HaefeleZwitserland;HaefeleNoorwegen;Martens @@ -307,10 +307,10 @@ ]]> - + 1 APPS.EC.enu.WebShopVerwerker - Index: PRGACNTs.inc.rou =================================================================== diff -u -r68449 -r68634 --- PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 68449) +++ PRGACNTs.inc.rou (.../PRGACNTs.inc.rou) (revision 68634) @@ -143,7 +143,7 @@ #define HafeleDKKey "z#7D6:yZ^/VwS!zZ" #define HafeleCHKey "#&TmAKfSZ3.c]xq)" #define HafeleNOKey "`sb$+)z6u4Yn9qJ/" - #define MartensHoutKey "9X73W$ta#aTnAFFU" + #define MartensKey "9X73W$ta#aTnAFFU" ; Toegang voor OptimaFIX page : beperkt via controle op IP-adres ; !!! Te compileren in routines : Index: APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml =================================================================== diff -u -r68449 -r68634 --- APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68449) +++ APPS/EC/enu/WebShopVerwerker/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 68634) @@ -72,8 +72,8 @@ Do ..VerwerkKleiner() } ElseIf WebShopVerwerker = "LAYR" { Do ..VerwerkLayer() - } ElseIf WebShopVerwerker = "MAHO" { - Do ..VerwerkMartensHout() + } ElseIf WebShopVerwerker = "MART" { + Do ..VerwerkMartens() } ElseIf WebShopVerwerker = "MBHO" { Do ..VerwerkMeubelBeslagHolland() } ElseIf WebShopVerwerker = "OPO" { @@ -285,7 +285,7 @@ - + 1 1 Index: cspBasis/TBX/Lib.mac.rou =================================================================== diff -u -r68449 -r68634 --- cspBasis/TBX/Lib.mac.rou (.../Lib.mac.rou) (revision 68449) +++ cspBasis/TBX/Lib.mac.rou (.../Lib.mac.rou) (revision 68634) @@ -167,7 +167,7 @@ Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleDenemarken() $$$HafeleDKKey Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleZwitserland() $$$HafeleCHKey Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).HaefeleNoorwegen() $$$HafeleNOKey - Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).MartensHout() $$$MartensHoutKey + Quit:DomeinVerwerker=##class(APPS.EC.enu.WebShopVerwerker).Martens() $$$MartensKey Quit "DummyKey" Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r67594 -r68634 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 67594) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 68634) @@ -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||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 @@ -789,6 +789,13 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml =================================================================== diff -u -r68449 -r68634 --- APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 68449) +++ APPS/EC/enu/WebShopVerwerker/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 68634) @@ -219,9 +219,9 @@ 1 - + %String -"MAHO" +"MART" 1 1 Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r67227 -r68634 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 67227) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 68634) @@ -82,6 +82,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleCH()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNO()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OPO()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Martens()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r67227 -r68634 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 67227) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 68634) @@ -85,6 +85,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleCH()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleNO()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OPO()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Martens()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: DOM/VKP/enu/Klant/AutoComplete.cls.xml =================================================================== diff -u -r67594 -r68634 --- DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 67594) +++ DOM/VKP/enu/Klant/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 68634) @@ -471,6 +471,13 @@ 1 + +%String +"K||32383" +1 +1 + + %String "K||2999" Index: DOM/common/MartensPersonality.cls.xml =================================================================== diff -u --- DOM/common/MartensPersonality.cls.xml (revision 0) +++ DOM/common/MartensPersonality.cls.xml (revision 68634) @@ -0,0 +1,57 @@ + + + +persistent +1 +DOM.common.impl.HandelPersonality + + +1 +DOM.common.impl.Personality + + + + +Visitor:DOM.common.PersonalityVisitor + + + + +DOM.enu.Taal + + + + +DOM.common.LeverancierPersonalityData + + + + +%Boolean + + + + +%String + + + + +%String + + + + +%Library.CacheStorage + + + + +