Index: accept/integratietest/tax/tax-sifon-lade-enkele-uitsparing.txt =================================================================== diff -u -r887 -r931 --- accept/integratietest/tax/tax-sifon-lade-enkele-uitsparing.txt (.../tax-sifon-lade-enkele-uitsparing.txt) (revision 887) +++ accept/integratietest/tax/tax-sifon-lade-enkele-uitsparing.txt (.../tax-sifon-lade-enkele-uitsparing.txt) (revision 931) @@ -18,7 +18,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Berekendewaarden.Internebreedte", - "Value": "674" + "Value": "694" }, { "__type": "NameValue:#VHServices", @@ -33,7 +33,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Kenmerken.Corpusbreedte", - "Value": "674" + "Value": "694" }, { "__type": "NameValue:#VHServices", @@ -263,7 +263,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Kenmerken.Uitsparingdata.Y.Breedte", - "Value": "195" + "Value": "215" }, { "__type": "NameValue:#VHServices", @@ -353,15 +353,10 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Isgeldig", - "Value": "false" + "Value": "true" }, { "__type": "NameValue:#VHServices", - "Name": "Data.Lijn.Ongeldigewaarden[1]", - "Value": "Ui.Kenmerken.Uitsparingdata.Y.Breedterugdeel: RangeSet" - }, - { - "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Referentie", "Value": "" }, @@ -378,7 +373,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[1].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -408,7 +403,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[1].Infodiverse[1]", - "Value": "Sifonlade diepte-uitsparing: 250mm (205/274/195)" + "Value": "Sifonlade diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", @@ -493,7 +488,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[2].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -523,7 +518,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[2].Infodiverse[1]", - "Value": "Tiroir siphon diepte-uitsparing: 250mm (205/274/195)" + "Value": "Tiroir siphon diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", @@ -608,7 +603,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[3].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -638,7 +633,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[3].Infodiverse[1]", - "Value": "Låda anpassad för vattenlås diepte-uitsparing: 250mm (205/274/195)" + "Value": "Låda anpassad för vattenlås diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", @@ -723,7 +718,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[4].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -753,7 +748,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[4].Infodiverse[1]", - "Value": "Skuff med vannlås diepte-uitsparing: 250mm (205/274/195)" + "Value": "Skuff med vannlås diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", @@ -838,7 +833,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[5].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -868,7 +863,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[5].Infodiverse[1]", - "Value": "Siphon drawer diepte-uitsparing: 250mm (205/274/195)" + "Value": "Siphon drawer diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", @@ -953,7 +948,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[6].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -983,7 +978,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[6].Infodiverse[1]", - "Value": "Cassetto per sifone diepte-uitsparing: 250mm (205/274/195)" + "Value": "Cassetto per sifone diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", @@ -1068,7 +1063,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[7].Corpusbreedte", - "Value": "674 mm" + "Value": "694 mm" }, { "__type": "NameValue:#VHServices", @@ -1098,7 +1093,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[7].Infodiverse[1]", - "Value": "Schubkasten Siphon diepte-uitsparing: 250mm (205/274/195)" + "Value": "Schubkasten Siphon diepte-uitsparing: 250mm (205/274/215)" }, { "__type": "NameValue:#VHServices", Index: accept/integratietest/input/description-list.json =================================================================== diff -u -r893 -r931 --- accept/integratietest/input/description-list.json (.../description-list.json) (revision 893) +++ accept/integratietest/input/description-list.json (.../description-list.json) (revision 931) @@ -21,6 +21,7 @@ {"Id":"tax-lade-veel-extras", "Description":"TAX lade met veel extra's", "Source":"tax/tax-lade-veel-extras.json", "ModelId":"tax-configurator"}, {"Id":"tax-lade-niet-meeleveren", "Description":"TAX lade met niet meeleveren", "Source":"tax/tax-lade-niet-meeleveren.json", "ModelId":"tax-configurator"}, {"Id":"tax-lade-extern", "Description":"TAX extern", "Source":"tax/tax-extern.json", "ModelId":"tax-configurator"}, + {"Id":"tax-edi-sifon-lade", "Description":"TAX edi sifon lade", "Source":"tax/tax-edi-sifon-lade.json", "ModelId":"tax-configurator"}, {"Id":"tbx-standaard-lade", "Description":"TBX standaard lade", "Source":"tbx/tbx-standaard-lade.json", "ModelId":"tbx-configurator"}, {"Id":"tbx-standaard-binnenlade", "Description":"TBX standaard binnenlade", "Source":"tbx/tbx-standaard-binnenlade.json", "ModelId":"tbx-configurator"}, Index: accept/integratietest/input/tax/tax-sifon-lade-enkele-uitsparing.json =================================================================== diff -u -r886 -r931 --- accept/integratietest/input/tax/tax-sifon-lade-enkele-uitsparing.json (.../tax-sifon-lade-enkele-uitsparing.json) (revision 886) +++ accept/integratietest/input/tax/tax-sifon-lade-enkele-uitsparing.json (.../tax-sifon-lade-enkele-uitsparing.json) (revision 931) @@ -3,7 +3,7 @@ "NameValues":[ {"Name":"Config.Token", "Value":"128eababb1a1596e3c130b0e0fd5be820334a01a16bf777d1c5439fcfa861e16"}, {"Name":"Data.Kenmerken.Bodemkleur", "Value":"W"}, - {"Name":"Data.Kenmerken.Corpusbreedte", "Value":"674"}, + {"Name":"Data.Kenmerken.Corpusbreedte", "Value":"694"}, {"Name":"Data.Kenmerken.Corpuswanddikte", "Value":"0"}, {"Name":"Data.Kenmerken.Draagkracht", "Value":"40"}, {"Name":"Data.Kenmerken.Frontbevestiging", "Value":"E"}, @@ -34,7 +34,7 @@ {"Name":"Data.Kenmerken.UitsparingData.X.Breedte", "Value":"205"}, {"Name":"Data.Kenmerken.UitsparingData.X.Hoogte", "Value":"M"}, {"Name":"Data.Kenmerken.UitsparingData.X.Materiaal", "Value":"Hout"}, - {"Name":"Data.Kenmerken.UitsparingData.Y.Breedte", "Value":"195"}, + {"Name":"Data.Kenmerken.UitsparingData.Y.Breedte", "Value":"215"}, {"Name":"Data.Kenmerken.UitsparingData.Y.Hoogte", "Value":"M"}, {"Name":"Data.Kenmerken.UitsparingData.Y.Materiaal", "Value":"Hout"}, {"Name":"Data.Kenmerken.UitsparingData.Z1.Breedte", "Value":"274"}, Index: accept/integratietest/tax/tax-lade-veel-extras.txt =================================================================== diff -u -r887 -r931 --- accept/integratietest/tax/tax-lade-veel-extras.txt (.../tax-lade-veel-extras.txt) (revision 887) +++ accept/integratietest/tax/tax-lade-veel-extras.txt (.../tax-lade-veel-extras.txt) (revision 931) @@ -203,7 +203,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Kenmerken.Opvullijstkleur", - "Value": "" + "Value": "PSG" }, { "__type": "NameValue:#VHServices", @@ -367,11 +367,6 @@ }, { "__type": "NameValue:#VHServices", - "Name": "Data.Lijn.Ongeldigewaarden[3]", - "Value": "Ui.Kenmerken.Opvullijstkleur: MandatoryNotFilled" - }, - { - "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Referentie", "Value": "" }, @@ -448,7 +443,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[1].Infodiverse[5]", - "Value": "Opvullijst: L+R" + "Value": "Opvullijst: L+R (Platina zilvergrijs)" }, { "__type": "NameValue:#VHServices", @@ -563,7 +558,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[2].Infodiverse[5]", - "Value": "Profil de distance: G+D" + "Value": "Profil de distance: G+D (Platina gris argent)" }, { "__type": "NameValue:#VHServices", @@ -678,7 +673,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[3].Infodiverse[5]", - "Value": "Avståndsprofil: L+R" + "Value": "Avståndsprofil: L+R (Platina silvergrå)" }, { "__type": "NameValue:#VHServices", @@ -793,7 +788,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[4].Infodiverse[5]", - "Value": "Avstandsprofil: L+R" + "Value": "Avstandsprofil: L+R (Platina sølvgrå)" }, { "__type": "NameValue:#VHServices", @@ -908,7 +903,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[5].Infodiverse[5]", - "Value": "Distance trim: L+R" + "Value": "Distance trim: L+R (Platina silver grey)" }, { "__type": "NameValue:#VHServices", @@ -1023,7 +1018,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[6].Infodiverse[5]", - "Value": "Listello distanziale: L+R" + "Value": "Listello distanziale: L+R (Platino grigio argento)" }, { "__type": "NameValue:#VHServices", @@ -1138,7 +1133,7 @@ { "__type": "NameValue:#VHServices", "Name": "Data.Lijn.Winkelkarinfo[7].Infodiverse[5]", - "Value": "Distanzleiste: L+R" + "Value": "Distanzleiste: L+R (Platina silbergrau)" }, { "__type": "NameValue:#VHServices", Index: accept/models/tax/TAX Configurator,1.0.0.xml =================================================================== diff -u -r930 -r931 --- accept/models/tax/TAX Configurator,1.0.0.xml (.../TAX Configurator,1.0.0.xml) (revision 930) +++ accept/models/tax/TAX Configurator,1.0.0.xml (.../TAX Configurator,1.0.0.xml) (revision 931) @@ -2301,10 +2301,10 @@ end if; // DARO -if (Config.Settings.PersonalityId == "10") then - Config.Settings.NietMeeleverenVerbergen = true; -end if; - +if (Config.Settings.PersonalityId == "10") then + Config.Settings.NietMeeleverenVerbergen = true; +end if; + // BESLAG DESIGN if (Config.Settings.PersonalityId == "14") then Config.Settings.KleurBardolinoToegelaten = false; @@ -2398,7 +2398,9 @@ // andere werking in AX //UI.Buttons.Top.ProcessButton@default = "task:eCon.UI.Tasks.SetValueTask:'STATE.ProcessedAndExit','true'"; UI.Buttons.Top.ProcessButton = "task:eCon.UI.Tasks.ProcessAndExitTask"; -STATE.ProcessedAndExit = true; +if (CONFIG.Backend == "axapta") then + STATE.ProcessedAndExit = true; +end if; UI.Buttons.Bottom.SaveAndExitButton@default = "task:eCon.UI.Tasks.SetValueTask:'STATE.SavedAndExit','true'"; UI.Buttons.Bottom.SaveAndContinueButton@default = "task:eCon.UI.Tasks.SetValueTask:'STATE.SavedAndContinue','true'"; @@ -4584,7 +4586,6 @@ UI.Kenmerken.RugHoogte = DATA.Kenmerken.RugHoogte end if; - if not(UI.Kenmerken.UitsparingData@visible) then DATA.Kenmerken.UitsparingData.UitsparingAantal = "";