Index: development/integratietest/mvx/mvx-lade-veel-extras.txt
===================================================================
diff -u -r4348 -r4505
--- development/integratietest/mvx/mvx-lade-veel-extras.txt (.../mvx-lade-veel-extras.txt) (revision 4348)
+++ development/integratietest/mvx/mvx-lade-veel-extras.txt (.../mvx-lade-veel-extras.txt) (revision 4505)
@@ -13,7 +13,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Berekendewaarden.Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -613,7 +613,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Kenmerken.Zijwandtype",
- "Value": ""
+ "Value": "Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -628,7 +628,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Kenmerken.Zijwandverhogingrelingkleur",
- "Value": ""
+ "Value": "OG-M"
},
{
"__type": "NameValue:#VHServices",
@@ -648,15 +648,10 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Isgeldig",
- "Value": "false"
+ "Value": "true"
},
{
"__type": "NameValue:#VHServices",
- "Name": "Data.Lijn.Ongeldigewaarden[1]",
- "Value": "Ui.Kenmerken.Zijwandtype: MandatoryNotFilled"
- },
- {
- "__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Referentie",
"Value": ""
},
@@ -668,7 +663,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[1].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -748,7 +743,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[1].Infodiverse[4]",
- "Value": ""
+ "Value": "Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -803,7 +798,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[10].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -883,7 +878,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[10].Infodiverse[4]",
- "Value": ""
+ "Value": "Gallery"
},
{
"__type": "NameValue:#VHServices",
@@ -938,7 +933,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[11].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1018,7 +1013,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[11].Infodiverse[4]",
- "Value": ""
+ "Value": "Ringhierina"
},
{
"__type": "NameValue:#VHServices",
@@ -1073,7 +1068,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[12].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1153,7 +1148,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[12].Infodiverse[4]",
- "Value": ""
+ "Value": "Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1208,7 +1203,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[2].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1288,7 +1283,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[2].Infodiverse[4]",
- "Value": ""
+ "Value": "Galerie"
},
{
"__type": "NameValue:#VHServices",
@@ -1343,7 +1338,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[3].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1423,7 +1418,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[3].Infodiverse[4]",
- "Value": ""
+ "Value": "Galleri"
},
{
"__type": "NameValue:#VHServices",
@@ -1478,7 +1473,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[4].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1558,7 +1553,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[4].Infodiverse[4]",
- "Value": ""
+ "Value": "Stång"
},
{
"__type": "NameValue:#VHServices",
@@ -1613,7 +1608,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[5].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1693,7 +1688,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[5].Infodiverse[4]",
- "Value": ""
+ "Value": "Galleria"
},
{
"__type": "NameValue:#VHServices",
@@ -1748,7 +1743,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[6].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1828,7 +1823,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[6].Infodiverse[4]",
- "Value": ""
+ "Value": "Galeria"
},
{
"__type": "NameValue:#VHServices",
@@ -1883,7 +1878,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[7].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -1963,7 +1958,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[7].Infodiverse[4]",
- "Value": ""
+ "Value": "Galería"
},
{
"__type": "NameValue:#VHServices",
@@ -2018,7 +2013,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[8].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -2073,7 +2068,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[8].Infodiverse[13]",
- "Value": "Reling poprzeczny (Ilość: 3)"
+ "Value": "Reling poprzeczny (organizacja wewnętrzna) (Ilość: 3)"
},
{
"__type": "NameValue:#VHServices",
@@ -2098,7 +2093,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[8].Infodiverse[4]",
- "Value": ""
+ "Value": "Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -2153,7 +2148,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[9].Afbeeldingcode",
- "Value": "MVX_Lade_E_"
+ "Value": "MVX_Lade_E_Reling"
},
{
"__type": "NameValue:#VHServices",
@@ -2233,7 +2228,7 @@
{
"__type": "NameValue:#VHServices",
"Name": "Data.Lijn.Winkelkarinfo[9].Infodiverse[4]",
- "Value": ""
+ "Value": "Forhøyning"
},
{
"__type": "NameValue:#VHServices",
Index: development/models/mvx/MVX Configurator,1.0.0.xml
===================================================================
diff -u -r4474 -r4505
--- development/models/mvx/MVX Configurator,1.0.0.xml (.../MVX Configurator,1.0.0.xml) (revision 4474)
+++ development/models/mvx/MVX Configurator,1.0.0.xml (.../MVX Configurator,1.0.0.xml) (revision 4505)
@@ -172,7 +172,7 @@
-
+
@@ -187,15 +187,15 @@
-
+
-
+
@@ -3016,7 +3016,7 @@
-
+
@@ -4956,7 +4956,7 @@
not(BEHAVIOR.IsInteractive) and not(BEHAVIOR.ContextName in {"AxNewBulkIngave";"AxCreateBulkWijzigingenToepassen"})
-If (GetArg("data;kenmerken;rugwandmateriaal") == "") then
+If (((GetArg("data;kenmerken;rugwandmateriaal") == "")and not(BEHAVIOR.OperationMode == "CreateConfig")) or ((BEHAVIOR.OperationMode == "CreateConfig") and (DATA.Kenmerken.RugwandMateriaal == ""))) then
DATA.Kenmerken.RugwandMateriaal = "Hout";
end if;
@@ -4977,7 +4977,7 @@
not(BEHAVIOR.IsInteractive) and not(BEHAVIOR.ContextName in {"AxNewBulkIngave";"AxCreateBulkWijzigingenToepassen"})
-If (GetArg("data;kenmerken;verpakkingtype") == "") then
+If (((GetArg("data;kenmerken;verpakkingtype") == "") and not(BEHAVIOR.OperationMode == "CreateConfig")) or ((BEHAVIOR.OperationMode == "CreateConfig") and (DATA.Kenmerken.VerpakkingType == ""))) then
DATA.Kenmerken.VerpakkingType = "Probox";
end if;
@@ -5031,7 +5031,7 @@
not(BEHAVIOR.IsInteractive) and not(BEHAVIOR.ContextName in {"AxNewBulkIngave";"AxCreateBulkWijzigingenToepassen"})
-If (GetArg("data;kenmerken;zijwandtype") == "") then
+If (((GetArg("data;kenmerken;zijwandtype") == "") and not(BEHAVIOR.OperationMode == "CreateConfig")) or ((BEHAVIOR.OperationMode == "CreateConfig") and (DATA.Kenmerken.ZijwandType == ""))) then
If (DATA.Kenmerken.LadeHoogte == "E") then
DATA.Kenmerken.ZijwandType = "Reling";
end if;