FSN#52706 revert, verkeerde branch

svn path=/Website/branches/v2016.3/; revision=37444
FSN#52706 bez_bezoekers_opmerking niet wissen als S("vis_remark") readonly aangeeft
2018-03-21 13:41:23 +00:00 · 2018-03-21 12:42:28 +00:00 · 2017-06-20 07:02:42 +00:00 · 2017-06-14 06:42:45 +00:00 · 2017-06-08 07:37:08 +00:00 · 2017-05-29 09:48:51 +00:00
1194 changed files with 37266 additions and 20229 deletions
--- a/APPL/ALG/alg_district_list.inc
+++ b/APPL/ALG/alg_district_list.inc
@@ -54,19 +54,18 @@ function fnrowData(oRs)

  function doDelete(rowArray, isMulti)
  {
-    var disKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_district")))
-    {
-      var data = { key: disKeyString,
-                   level: "D"
-                 };
-      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+    FcltMgr.confirm(L("lcl_alg_del_txt_district"), { autoconfirm: isMulti },
+      function() {
+        var disKeyString = getKeyString(rowArray);
+        var data = { key: disKeyString,
+                     level: "D"
+                   };
+        <% protectRequest.dataToken("data"); %>+
+        $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+      }
+    );
  }
+
 </script>
 <%

--- a/APPL/ALG/alg_edit_district_save.asp
+++ b/APPL/ALG/alg_edit_district_save.asp
@@ -55,11 +55,19 @@ else
                            "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                            "    AND ALG_ONRGOED_NIVEAU = 'D' " +
                            "    AND ALG_ONRGOED_KEY = " + dis_key;
-      saveFlexKenmerken(dis_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "D",
-                                (dis_key<0),"ALG/D")
+      saveFlexKenmerken(dis_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/D",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "D",
+                          isNew: dis_key < 0
+                        });
 }
  %>
 <html>
--- a/APPL/ALG/alg_edit_gebouw.asp
+++ b/APPL/ALG/alg_edit_gebouw.asp
@@ -16,7 +16,7 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/calendar.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
-
+<!-- #include file="../Shared/adresselector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
 <!-- #include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="../Shared/persoonselector.inc" -->
@@ -66,6 +66,7 @@ if (bld_key > 0)
  var einduur    = oRs("alg_gebouw_einduur").Value;
  var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
  var verantw_key    = oRs("prs_perslid_key_verantw").Value;
+  var verantw_key2   = oRs("prs_perslid_key_verantw2").Value;
  var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
  oRs.Close();
 }
@@ -161,6 +162,13 @@ else
                              readonly: !this_alg.writeuse,
                              autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
                            });
+        FCLTpersoonselector("verantw2",
+                            "sgVerantw2",
+                            { perslidKey: verantw_key2,
+                              label: L("lcl_alg_verantw2"),
+                              readonly: !this_alg.writeuse,
+                              autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
+                            });
        manRWFIELD("bld_email",  "fld",     L("lcl_alg_gebouw_email"),       bld_email, {maxlength: 200});
        BLOCK_END();

@@ -175,17 +183,14 @@ else
        manRWFIELD("bld_opp",  "fld float",          L("lcl_estate_gebouw_man_bruto_vloeropp"),        bld_opp, {datatype:"float", maxlength: 15});
        manRWFIELD("bld_omtrek",  "fld",          L("lcl_estate_gebouw_man_omtrek"),        bld_omtrek, {maxlength: 15});
        manRWFIELD("bld_inhoud",  "fld",          L("lcl_estate_gebouw_man_inhoud"),        bld_inhoud, {maxlength: 15});
-        sql = "SELECT mld_adres_key"
-            + "     , mld_adres_naam "
-            + "  FROM mld_v_afleveradres"
-            + " ORDER BY mld_adres_naam ";
-        FCLTselector("mld_adres",
-                     sql,
-                     { label: L("lcl_delivery_address"),
-                       initKey: mld_adres,
+        FCLTadresselector("mld_adres", "sgAdres",
+                    {
+                       label: L("lcl_delivery_address"),
+                       adresKey:  mld_adres,
                       emptyOption: "",
+                       filtcode: "A",
                       readonly: !this_alg.writeman
-                     });
+                    }) ;
        manRWFIELD("bld_x",  "fld",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
        manRWFIELD("bld_y",  "fld",          L("lcl_geoycoord"),        bld_y, {maxlength: 25});

--- a/APPL/ALG/alg_edit_gebouw_save.asp
+++ b/APPL/ALG/alg_edit_gebouw_save.asp
@@ -36,9 +36,9 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
                  { dbs: "alg_gebouw_omschrijving",   typ: "varchar", frm: "bld_descr" },
                  { dbs: "alg_gebouw_email",          typ: "varchar", frm: "bld_email" },
                  { dbs: "alg_gebouw_getekend",       typ: "date",    frm: "bld_teken" },
-                  { dbs: "alg_gebouw_bruto_vloeropp", typ: "float",  frm: "bld_opp" },
-                  { dbs: "alg_gebouw_omtrek",         typ: "number",  frm: "bld_omtrek" },
-                  { dbs: "alg_gebouw_inhoud",         typ: "number",  frm: "bld_inhoud" },
+                  { dbs: "alg_gebouw_bruto_vloeropp", typ: "float",   frm: "bld_opp" },
+                  { dbs: "alg_gebouw_omtrek",         typ: "float",   frm: "bld_omtrek" },
+                  { dbs: "alg_gebouw_inhoud",         typ: "float",   frm: "bld_inhoud" },
                  { dbs: "alg_gebouw_opmerking",      typ: "varchar", frm: "bld_opmerk" },
                  { dbs: "mld_adres_key",             typ: "key",     frm: "mld_adres" },
                  { dbs: "prs_kostenplaats_key",      typ: "key",     frm: "prs_kstpl" },
@@ -51,7 +51,8 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
                  { dbs: "alg_gebouw_bez",            typ: "check",   frm: "bld_bez" },
                  { dbs: "alg_gebouw_werkdagen",      typ: "check0",  frm: "bld_werkdagen" },
                  { dbs: "alg_gebouw_vervaldatum",    typ: "date",    frm: "vervaldatum",  track: L("lcl_alg_vervaldatum") },
-                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw" }];
+                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw" },
+                  { dbs: "prs_perslid_key_verantw2",  typ: "key",     frm: "verantw2" }];

  if (beginuur != -2)
    fields.push({ dbs: "alg_gebouw_beginuur",       typ: "float",   val: beginuur });
@@ -89,11 +90,19 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
                            "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                            "    AND ALG_ONRGOED_NIVEAU = 'G' " +
                            "    AND ALG_ONRGOED_KEY = " + bld_key;
-      saveFlexKenmerken(bld_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "G",
-                                (bld_key<0),"ALG/G")
+      saveFlexKenmerken(bld_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/G",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "G",
+                          isNew: bld_key < 0
+                        });
  }
 %>

--- a/APPL/ALG/alg_edit_locatie_save.asp
+++ b/APPL/ALG/alg_edit_locatie_save.asp
@@ -70,11 +70,19 @@ else
                            "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                            "    AND ALG_ONRGOED_NIVEAU = 'L' " +
                            "    AND ALG_ONRGOED_KEY = " + loc_key;
-      saveFlexKenmerken(loc_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,
-                                "ALG_ONRGOED_NIVEAU", "L",
-                                (loc_key<0),"ALG/L")
+      saveFlexKenmerken(loc_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/L",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "L",
+                          isNew: loc_key < 0
+                        });
 }
  %>

--- a/APPL/ALG/alg_edit_terreinsector_save.asp
+++ b/APPL/ALG/alg_edit_terreinsector_save.asp
@@ -88,11 +88,19 @@ else
                            "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                            "    AND ALG_ONRGOED_NIVEAU = 'T' " +
                            "    AND ALG_ONRGOED_KEY = " + ter_key;
-      saveFlexKenmerken(ter_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "T",
-                                (ter_key<0),"ALG/T")
+      saveFlexKenmerken(ter_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/T",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "T",
+                          isNew: ter_key < 0
+                        });
 }
  %>

--- a/APPL/ALG/alg_edit_verdieping_save.asp
+++ b/APPL/ALG/alg_edit_verdieping_save.asp
@@ -59,11 +59,19 @@ else
                            "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                            "    AND ALG_ONRGOED_NIVEAU = 'V' " +
                            "    AND ALG_ONRGOED_KEY = " + flr_key;
-      saveFlexKenmerken(flr_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "V",
-                                (flr_key<0),"ALG/V")
+      saveFlexKenmerken(flr_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/V",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "V",
+                          isNew: flr_key < 0
+                        });
  }
  %>

--- a/APPL/ALG/alg_edit_wp.asp
+++ b/APPL/ALG/alg_edit_wp.asp
@@ -75,7 +75,7 @@ else if (S("prs_werkplek_implicit") == 1)
    }
    function alg_next()
    {
-        alert("TODO: Next nog niet ondersteund")
+        FcltMgr.alert("TODO: Next nog niet ondersteund")
    }

 function process_host_info(data)
--- a/APPL/ALG/alg_gebouw_list.inc
+++ b/APPL/ALG/alg_gebouw_list.inc
@@ -28,6 +28,38 @@ function fnrowData(oRs)

  return JSON.stringify(data);
 }
+
+var recent = new Date();
+function fnrowClass(oRs)
+{
+  var lclass = "";
+  // Tracking: hoe lang geleden voor het laatst gewijzigd?
+  if (oRs.Fields("recentdatum").Value != null)
+  {
+    var ltrackdate1 = new Date();
+    var ltrackdate10 = new Date();
+    var ltrackdate100 = new Date();
+    var alg_onrgoed_recent = S("alg_onrgoed_recent");
+    ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+    ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+    ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+    var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+    if (fac_recent > ltrackdate1)
+    {
+      lclass += " updated";
+    }
+    else if (fac_recent > ltrackdate10)
+    {
+      lclass += " updated10";
+    }
+    else if (fac_recent > ltrackdate100)
+    {
+      lclass += " updated100";
+    }
+  }
+  return lclass;
+}
 %>
 <script type="text/javascript">

@@ -54,18 +86,14 @@ function fnrowData(oRs)

 function doDelete(rowArray, isMulti)
 {
-  var bldKeyString = getKeyString(rowArray);
-  if (isMulti || confirm(L("lcl_alg_del_txt_gebouw")))
-  {
+  FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), { autoconfirm: isMulti }, function() {
+    var bldKeyString = getKeyString(rowArray);
    var data = { key: bldKeyString,
                 level: "G"
               };
    <% protectRequest.dataToken("data"); %>
-    $.post("alg_delete.asp",
-           data,
-           FcltCallbackRefresh,
-           "json");
-  }
+    $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+  });
 }
 </script>
 <%
@@ -130,6 +158,13 @@ function gebouw_list(pautfunction, params)
           + "     , g.alg_gebouw_x"
           + "     , g.alg_gebouw_y"
           + "     , g.alg_gebouw_vervaldatum"
+           + "     , (SELECT MAX(t.fac_tracking_datum)"
+           + "          FROM fac_tracking t"
+           + "             , fac_srtnotificatie sn"
+           + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
+           + "           AND t.fac_tracking_refkey = g.alg_gebouw_key"
+           + "           AND sn.fac_srtnotificatie_xmlnode = 'gebouw'"
+           + "       ) recentdatum"
           + "  FROM alg_gebouw g"
           + "     , alg_locatie l"
           + "     , alg_srtgebouw s"
@@ -164,7 +199,7 @@ function gebouw_list(pautfunction, params)
      sqln += " AND g.alg_srtgebouw_key = " + srtgebouw_key;

    if (verantw_key)
-      sqln += " AND g.prs_perslid_key_verantw = " + verantw_key;
+      sqln += " AND (g.prs_perslid_key_verantw = " + verantw_key + " OR g.prs_perslid_key_verantw2 = " + verantw_key + ")";

    if (!expalgincl)
      sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
@@ -187,6 +222,7 @@ function gebouw_list(pautfunction, params)
                                   title: L("lcl_menu_alg_gebouw"),
                                   showAll: showall,
                                   rowData: fnrowData,
+                                   rowClass: fnrowClass,
                                   rowActionEnabler: fnrowActionEnabler,
                                   flexModule: "ALG",
                                   flexId: "alg_gebouw_key",
--- a/APPL/ALG/alg_gebouw_search.asp
+++ b/APPL/ALG/alg_gebouw_search.asp
@@ -18,6 +18,7 @@ var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
 var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
+var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var autosearch = getQParamInt("autosearch", 0) == 1;
 var authparams = alg.checkAutorisation();
 var this_alg = alg.func_enabled(gebouw_key);
--- a/APPL/ALG/alg_gebouw_search_list.asp
+++ b/APPL/ALG/alg_gebouw_search_list.asp
@@ -30,6 +30,7 @@ var bld_code = getQParam("bld_code", ""); // Gebouwcode
 var bld_name = getQParam("bld_name", ""); // Gebouwnaam
 var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
+var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen

 gebouw_list ( "*",
@@ -37,6 +38,7 @@ gebouw_list ( "*",
                 showall: showall,
                 srtgebouw_key: (srtgebouw_key != -1? srtgebouw_key: null),
                 verantw_key: (verantw_key != -1? verantw_key: null),
+                 verantw_key2: (verantw_key2 != -1? verantw_key2: null),
                 reg_key: (reg_key != -1? reg_key : null),
                 dis_key: (dis_key != -1? dis_key : null),
                 loc_key: (loc_key != -1? loc_key : null),
--- a/APPL/ALG/alg_locatie_list.inc
+++ b/APPL/ALG/alg_locatie_list.inc
@@ -31,6 +31,37 @@ function fnrowData(oRs)
  return JSON.stringify(data);
 }

+var recent = new Date();
+function fnrowClass(oRs)
+{
+  var lclass = "";
+  // Tracking: hoe lang geleden voor het laatst gewijzigd?
+  if (oRs.Fields("recentdatum").Value != null)
+  {
+    var ltrackdate1 = new Date();
+    var ltrackdate10 = new Date();
+    var ltrackdate100 = new Date();
+    var alg_onrgoed_recent = S("alg_onrgoed_recent");
+    ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+    ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+    ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+    var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+    if (fac_recent > ltrackdate1)
+    {
+      lclass += " updated";
+    }
+    else if (fac_recent > ltrackdate10)
+    {
+      lclass += " updated10";
+    }
+    else if (fac_recent > ltrackdate100)
+    {
+      lclass += " updated100";
+    }
+  }
+  return lclass;
+}
 %>
 <script type="text/javascript">
  var autosearch = 1; //automatisch laden van resultaat op search pagina
@@ -62,18 +93,14 @@ function fnrowData(oRs)

  function doDelete(rowArray, isMulti)
  {
-    var locKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_locatie")))
-    {
-      var data = { key: locKeyString,
-                   level: "L"
-                 };
-      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+    FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), { autoconfirm: isMulti }, function() {
+        var locKeyString = getKeyString(rowArray);
+        var data = { key: locKeyString,
+                     level: "L"
+                   };
+        <% protectRequest.dataToken("data"); %>
+        $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
  }
 </script>
 <%
@@ -117,27 +144,34 @@ function locatie_list(pautfunction, params)
    <% FCLTHeader.Generate({outputmode:outputmode}) %>
  </head>
  <body id="listbody">
-<%  var sqln = "SELECT   l.alg_locatie_key, "
-             + "         l.alg_district_key, "
-             + "         l.alg_locatie_code, "
-             + "         l.alg_locatie_omschrijving, "
-             + "         d.alg_district_omschrijving, "
-             + "         l.alg_locatie_adres, "
-             + "         l.alg_locatie_post_adres, "
-             + "         l.alg_locatie_postcode, "
-             + "         l.alg_locatie_post_postcode, "
-             + "         l.alg_locatie_plaats, "
-             + "         l.alg_locatie_post_plaats, "
-             + "         l.alg_locatie_land, "
-             + "         l.alg_locatie_post_land, "
-             + "         l.alg_locatie_verantw, "
-             + "         l.alg_locatie_verantw_tel, "
-             + "         l.alg_locatie_x, "
-             + "         l.alg_locatie_y "
-             + "    FROM alg_v_aanweziglocatie l, "
-             + "         alg_district d "
-             + "   WHERE d.alg_district_key(+) = l.alg_district_key "
-             + "     AND l.alg_locatie_verwijder IS NULL ";
+<%  var sqln = "SELECT l.alg_locatie_key"
+             + "     , l.alg_district_key"
+             + "     , l.alg_locatie_code"
+             + "     , l.alg_locatie_omschrijving"
+             + "     , d.alg_district_omschrijving"
+             + "     , l.alg_locatie_adres"
+             + "     , l.alg_locatie_post_adres"
+             + "     , l.alg_locatie_postcode"
+             + "     , l.alg_locatie_post_postcode"
+             + "     , l.alg_locatie_plaats"
+             + "     , l.alg_locatie_post_plaats"
+             + "     , l.alg_locatie_land"
+             + "     , l.alg_locatie_post_land"
+             + "     , l.alg_locatie_verantw"
+             + "     , l.alg_locatie_verantw_tel"
+             + "     , l.alg_locatie_x"
+             + "     , l.alg_locatie_y"
+             + "     , (SELECT MAX(t.fac_tracking_datum)"
+             + "          FROM fac_tracking t"
+             + "             , fac_srtnotificatie sn"
+             + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
+             + "           AND t.fac_tracking_refkey = l.alg_locatie_key"
+             + "           AND sn.fac_srtnotificatie_xmlnode = 'locatie'"
+             + "       ) recentdatum"
+             + "  FROM alg_v_aanweziglocatie l"
+             + "     , alg_district d "
+             + " WHERE d.alg_district_key(+) = l.alg_district_key"
+             + "   AND l.alg_locatie_verwijder IS NULL";

    if (authparams.ALGreadlevel > -1)
    { // Er is een scope-beperking van kracht
@@ -161,6 +195,9 @@ function locatie_list(pautfunction, params)
    {
      sqln += " AND d.alg_regio_key = " + reg_key;
    }
+    
+    if (params.loc_code)
+        sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");    

    sqln += " ORDER BY l.alg_locatie_upper ASC "

@@ -178,6 +215,7 @@ function locatie_list(pautfunction, params)
                                   title: L("lcl_menu_alg_locatie"),
                                   showAll: showall,
                                   rowData: fnrowData,
+                                   rowClass: fnrowClass,
                                   rowActionEnabler: fnrowActionEnabler,
                                   outputmode: outputmode,
                                   flexModule: "ALG",
--- a/APPL/ALG/alg_locatie_search.asp
+++ b/APPL/ALG/alg_locatie_search.asp
@@ -57,6 +57,10 @@ var authparams = alg.checkAutorisation();
                                                                  whenEmpty: L("lcl_search_generic")  // want filter
                                                                });
 %>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_locatie_man_code")%>:</label></td>
+                <td><input type="text" class="wildcard" id="loc_code" name="loc_code" value=""></td>
+              </tr>
              </table>
            </td><!-- end column 1 -->

--- a/APPL/ALG/alg_locatie_search_list.asp
+++ b/APPL/ALG/alg_locatie_search_list.asp
@@ -25,6 +25,7 @@ var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijz
 var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
+var loc_code = getQParam("loc_code", ""); // Locatiecode

 locatie_list ( "*",
              {  outputmode: outputmode,
@@ -32,6 +33,7 @@ locatie_list ( "*",
                 reg_key: (reg_key != -1? reg_key : null),
                 dis_key: (dis_key != -1? dis_key : null),
                 loc_key: (loc_key != -1? loc_key : null),
+                 loc_code: loc_code,                 
                 noref: (noref != -1? noref : null)
              }
             );
--- a/APPL/ALG/alg_regio_list.inc
+++ b/APPL/ALG/alg_regio_list.inc
@@ -52,18 +52,14 @@ function fnrowData(oRs)

  function doDelete(rowArray, isMulti)
  {
-    var regKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_regio")))
-    {
+    FcltMgr.confirm(L("lcl_alg_del_txt_regio"), { autoconfirm: isMulti }, function() {
+      var regKeyString = getKeyString(rowArray);
      var data = { key: regKeyString,
                   level: "RE"
                 };
      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
  }
    </script>
 <%
--- a/APPL/ALG/alg_ruimte_list.inc
+++ b/APPL/ALG/alg_ruimte_list.inc
@@ -100,19 +100,15 @@ function ruimte_list(pautfunction, params)

        function doDelete(row, isMulti)
        {
-          $(row).addClass('dirty');
-          var room_key = row.getAttribute("ROWKEY");
-          if (isMulti || confirm(L("lcl_alg_del_txt_ruimte")))
-          {
+          FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), { autoconfirm: isMulti }, function() {
+            $(row).addClass('dirty');
+            var room_key = row.getAttribute("ROWKEY");
            var data = { key: room_key,
                         level: "R"
                       };
            <% protectRequest.dataToken("data"); %>
-            $.post("alg_delete.asp",
-                   data,
-                   FcltCallbackRefresh,
-                   "json");
-          }
+            $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+          });
        }
      </script>
    </head>
--- a/APPL/ALG/alg_ruimteafdeling.js
+++ b/APPL/ALG/alg_ruimteafdeling.js
@@ -39,7 +39,7 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
  cell = tr.insertCell(-1);
  cell.className = "result";
  cell.align = "center";
-  cell.innerHTML = "<img src='../Pictures/order_cancel.gif' OnClick='delRow(this)' style='cursor:pointer'>";
+  cell.innerHTML = "<i class='fa fa-fw fa-times' OnClick='delRow(this)' style='cursor:pointer'></i>";

  // innerHTML opent een htmlparser die overbodige spaties en line breaks verwijderd in IE, daarom met innerText oplossen
  // Input velden moeten wel met innerHTML of outerHTML anders wordt het text
@@ -73,13 +73,12 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
 function delRow(img)
 {
  // Verwijder de aangeklikte afdeling uit de lijst (de regel)
-  if (!confirm(L("lcl_alg_cancelDepartment")))
-    return;
-  var tr = $(img).closest("tr")[0];
-  if (tr.myData.afd_key != null)
-  {
-    document.getElementById("afdbezettingtable").deleteRow(tr.rowIndex);
-  }
+  FcltMgr.confirm(L("lcl_alg_cancelDepartment"), function() {
+      var tr = $(img).closest("tr")[0];
+      if (tr.myData.afd_key != null) {
+          document.getElementById("afdbezettingtable").deleteRow(tr.rowIndex);
+      }
+  });
 }

 function alg_submit()
@@ -94,7 +93,7 @@ function alg_submit()
     	  if (oppPerc > 100)
    	  {
    	  	percValid = false;
-          alert(L("lcl_alg_bezetting_ongeldig"));
+          FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
          $("#bez"+i).select();
          $("#bez"+i).focus();
        }
@@ -133,7 +132,7 @@ function changeOppervlak(prowIndex)
 	if (!isGoodNumber($("#bezopp"+prowIndex).val(), false,false,8,2))
 	{
 	  bereken = false;
-    alert(L("lcl_alg_bezetting_ongeldig"));
+    FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
    $("#bezopp"+prowIndex).select();
    $("#bezopp"+prowIndex).focus();
 	}
@@ -157,7 +156,7 @@ function changeBezetting(prowIndex)
 {
  if (!isGoodNumber($("#bez"+prowIndex).val(), false,false,8,2) || parseFloat($("#bez"+prowIndex).val().replace(',', '.')) > 100)
  {
-    alert(L("lcl_alg_bezetting_ongeldig"));
+    FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
    $("#bez"+prowIndex).select();
    $("#bez"+prowIndex).focus();
  }
--- a/APPL/ALG/alg_ruimtefunctie_list.inc
+++ b/APPL/ALG/alg_ruimtefunctie_list.inc
@@ -53,18 +53,14 @@ function ruimtefunctie_list(pautfunction, params)

        function ruimtefunctie_delete(row, isMulti)
        {
-          $(row).addClass('dirty');
-          var srtruimte_lg_key = row.getAttribute("ROWKEY");
-          if (isMulti || confirm(L("lcl_alg_del_txt_ruimtefunctie")))
-          {
+          FcltMgr.confirm(L("lcl_alg_del_txt_ruimtefunctie"), { autoconfirm: isMulti }, function() {
+            $(row).addClass('dirty');
+            var srtruimte_lg_key = row.getAttribute("ROWKEY");
            var data = { key: srtruimte_lg_key
                       };
            <% protectRequest.dataToken("data"); %>
-            $.post("alg_ruimtefunctie_delete.asp",
-                   data,
-                   FcltCallbackRefresh,
-                   "json");
-          }
+            $.post("alg_ruimtefunctie_delete.asp", data, FcltCallbackRefresh, "json");
+          });
        }
      </script>
    </head>
--- a/APPL/ALG/alg_ruimteresscope.asp
+++ b/APPL/ALG/alg_ruimteresscope.asp
@@ -33,10 +33,10 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
        {
            if ($('select#objcatmulti option:selected').length == 0)
                return;
-            if (!confirm(L(scopemode=="A"?"lcl_add":"lcl_delete") + "\n" + L("lcl_R_U_sure")))
-                return;
-        	$('input#scopemode').val(scopemode);
-            $.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), FcltCallbackClose, "json");;
+            FcltMgr.confirm(L(scopemode == "A" ? "lcl_add" : "lcl_delete") + "\n" + L("lcl_R_U_sure"), function() {
+                $('input#scopemode').val(scopemode);
+                $.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), FcltCallbackClose, "json");;
+            });
        }
    </script>
 </head>
--- a/APPL/ALG/alg_search.asp
+++ b/APPL/ALG/alg_search.asp
@@ -49,8 +49,8 @@ var authparams = alg.checkAutorisation();
  </head>
  <body id="searchbody">
    <div id="search">
-<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
      <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
          <tr>
            <td class="searchkolom1">
              <table>
@@ -68,10 +68,9 @@ var authparams = alg.checkAutorisation();
 %>
              </table>
            </td><!-- end column 1 -->
-            <td class="searchkolom2"><input type="hidden" name="noref" value="1"><input type="hidden" name="chkgeb" value="1"> 
+            <td class="searchkolom2"><input type="hidden" name="noref" value="1"><input type="hidden" name="chkgeb" value="1">
           </td><!-- end column 1 -->
          </tr>
-      </form>
 <%    BLOCK_END();

  var buttons =  [
@@ -82,7 +81,9 @@ var authparams = alg.checkAutorisation();
     {title: L("lcl_menu_alg_terreinsector"), action: "doSubmit('T')"}
    ];
  CreateButtons(buttons, { entersubmit: true });
-%></div> <!-- search -->
+%>
+      </form>
+</div> <!-- search -->

    <div id="result">
      <iframe width="100%" height="100%"
--- a/APPL/ALG/alg_show_district.asp
+++ b/APPL/ALG/alg_show_district.asp
@@ -47,17 +47,17 @@ oRs.Close();
      }
      function dis_delete()
      {
-        if (confirm(L("lcl_alg_del_txt_district")))
-        {
-            var data = { key: <%=dis_key%>,
-                         level: "D"
-                       };
+        FcltMgr.confirm(L("lcl_alg_del_txt_district"), function() {
+            var data = {
+                key: <%=dis_key%>,
+                level: "D"
+            };
            <% protectRequest.dataToken("data"); %>
            $.post("alg_delete.asp",
-                   data,
-                   FcltCallbackClose,
-                   "json");
-        }
+                data,
+                FcltCallbackClose,
+                "json");
+        });
      }
    </script>
  </head>
--- a/APPL/ALG/alg_show_gebouw.asp
+++ b/APPL/ALG/alg_show_gebouw.asp
@@ -58,6 +58,7 @@ var beginuur   = oRs("alg_gebouw_beginuur").Value;
 var einduur    = oRs("alg_gebouw_einduur").Value;
 var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
 var verantw    = oRs("prs_perslid_key_verantw").Value;
+var verantw2    = oRs("prs_perslid_key_verantw2").Value;
 var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
 oRs.Close();
 %>
@@ -73,17 +74,17 @@ oRs.Close();
      }
      function bld_delete()
      {
-        if (confirm(L("lcl_alg_del_txt_gebouw")))
-        {
-          var data = { key: <%=bld_key%>,
-                       level: "G"
-                     };
-          <% protectRequest.dataToken("data"); %>
-          $.post("alg_delete.asp",
-                 data,
-                 FcltCallbackClose,
-                 "json");
-        }
+        FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), function() {
+            var data = {
+                key: <%=bld_key%>,
+                level: "G"
+            };
+            <% protectRequest.dataToken("data"); %>
+            $.post("alg_delete.asp",
+                data,
+                FcltCallbackClose,
+                "json");
+        });
      }
 <%  if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) { %>
      function openMaps(bldKey)
@@ -128,6 +129,7 @@ oRs.Close();
                           { gebouwkey: bld_key,
                             startlevel: 2, //Locatie
                             eindlevel: 3, // Gebouw
+                             moreinfo: true,
                             readonly: true
                           });
        sql = "SELECT alg_srtgebouw_key"
@@ -177,6 +179,15 @@ oRs.Close();
                              suppressEmpty: true,
                              moreinfo: this_alg.readman
                            });
+        FCLTpersoonselector("verantw2",
+                            "sgVerantw2",
+                            { perslidKey: verantw2,
+                              label: L("lcl_alg_verantw2"),
+                              readonly: true,
+                              suppressEmpty: true,
+                              moreinfo: this_alg.readman
+                            });
+
        AFIELDTR('fldmailto details', L("lcl_alg_gebouw_email"), "mailto:" + bld_email, bld_email, { suppressEmpty: true });
        BLOCK_END();

@@ -189,18 +200,15 @@ oRs.Close();
        ROFIELDTR("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true});
        ROFIELDTR("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true});
        ROFIELDTR("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, {suppressEmpty: true});
-        sql = "SELECT mld_adres_key"
-            + "     , mld_adres_naam"
-            + "  FROM mld_v_afleveradres"
-            + " ORDER BY mld_adres_naam";
-        FCLTselector("del_address",
-                     sql,
-                     {  label: L("lcl_delivery_address"),
-                        initKey: mld_adres,
-                        emptyOption: "",
-                        readonly: true,
-                        suppressEmpty: true
-                     });
+        sql = "SELECT mld_adres_naam"
+            + "  FROM mld_adres"
+            + " WHERE mld_adres_key = " + mld_adres;
+        oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            ROFIELDTR("fld", L("lcl_delivery_address"), oRs("mld_adres_naam").value, {suppressEmpty: true});
+        }
+        oRs.Close();
        ROFIELDTR("fld", L("lcl_geoxcoord"), bld_x, {suppressEmpty:true});
        ROFIELDTR("fld", L("lcl_geoycoord"), bld_y, {suppressEmpty:true});
        var fldcls = "fld";
--- a/APPL/ALG/alg_show_locatie.asp
+++ b/APPL/ALG/alg_show_locatie.asp
@@ -71,17 +71,17 @@ oRs.Close();

      function loc_delete()
      {
-        if (confirm(L("lcl_alg_del_txt_locatie")))
-        {
-          var data = { key: <%=loc_key%>,
-                       level: "L"
-                     };
-          <% protectRequest.dataToken("data"); %>
-          $.post("alg_delete.asp",
-                 data,
-                 FcltCallbackClose,
-                 "json");
-         }
+        FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), function() {
+            var data = {
+                key: <%=loc_key%>,
+                level: "L"
+            };
+            <% protectRequest.dataToken("data"); %>
+            $.post("alg_delete.asp",
+                data,
+                FcltCallbackClose,
+                "json");
+        });
      }
 <%  if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {  %>
      function openMaps(locKey)
--- a/APPL/ALG/alg_show_regio.asp
+++ b/APPL/ALG/alg_show_regio.asp
@@ -49,15 +49,16 @@ var regio_deleted = regio_exists && !!regio_data.deleted;

      function reg_delete()
      {
-        if (confirm(L("lcl_alg_del_txt_regio")))
-        {
-            var data = { action: "D" };
+        FcltMgr.confirm(L("lcl_alg_del_txt_regio"), function() {
+            var data = {
+                action: "D"
+            };
            <% protectRequest.dataToken("data"); %>
            $.post($("form[name=u2]")[0].action,
-                   data,
-                   FcltCallbackClose,
-                   "json");
-        }
+                data,
+                FcltCallbackClose,
+                "json");
+        });
      }
    </script>
  </head>
--- a/APPL/ALG/alg_show_ruimte.asp
+++ b/APPL/ALG/alg_show_ruimte.asp
@@ -54,15 +54,16 @@ if (!room_data.cadcontours.length)
        }
        function room_delete()
        {
-            if (confirm(L("lcl_alg_del_txt_ruimte")))
-            {
-                var data = { room_action: "D" };
+            FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), function() {
+                var data = {
+                    room_action: "D"
+                };
                <% protectRequest.dataToken("data"); %>
                $.post($("form[name=u2]")[0].action,
-                       data,
-                       FcltCallbackClose,
-                       "json");
-            }
+                    data,
+                    FcltCallbackClose,
+                    "json");
+            });
        }
        function openFG()
        {
--- a/APPL/ALG/alg_show_terreinsector.asp
+++ b/APPL/ALG/alg_show_terreinsector.asp
@@ -87,18 +87,18 @@ oRs.Close();
      }
      function ter_delete()
      {
-          if (confirm(L("lcl_alg_del_txt_terreinsector")))
-          {
-            var data = { key: <%=ter_key%>,
-                         level: "T"
-                       };
+        FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), function() {
+            var data = {
+                key: <%=ter_key%>,
+                level: "T"
+            };
            <% protectRequest.dataToken("data"); %>
            var ter_key = <%=ter_key%>
            $.post("alg_delete.asp",
-                   data,
-                   FcltCallbackClose,
-                   "json");
-          }
+                data,
+                FcltCallbackClose,
+                "json");
+        });
      }
    </script>
  </head>
--- a/APPL/ALG/alg_show_verdieping.asp
+++ b/APPL/ALG/alg_show_verdieping.asp
@@ -52,17 +52,17 @@ oRs.Close();

      function flr_delete()
      {
-        if (confirm(L("lcl_alg_del_txt_verdieping")))
-        {
-          var data = { key: <%=flr_key%>,
-                       level: "V"
-                     };
-          <% protectRequest.dataToken("data"); %>
-          $.post("alg_delete.asp",
-                 data,
-                 FcltCallbackClose,
-                 "json");
-        }
+        FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), function() {
+            var data = {
+                key: <%=flr_key%>,
+                level: "V"
+            };
+            <% protectRequest.dataToken("data"); %>
+            $.post("alg_delete.asp",
+                data,
+                FcltCallbackClose,
+                "json");
+        });
      }
    </script>
  </head>
@@ -91,6 +91,7 @@ oRs.Close();
                            verdiepingkey: flr_key,
                            startlevel: 2, //locatie
                            eindlevel: 4, // Verdieping
+                            moreinfo: true,
                            readonly: true });

        ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code);
@@ -104,14 +105,14 @@ oRs.Close();
            oRs = Oracle.Execute(sql);
            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
            oRs.Close();
-        }        
+        }
        BLOCK_END();
-        
+
        BLOCK_START("algLoc2", "&nbsp;");
-          var calcopp = alg.calc_algm2(flr_key, onrgoedlvl); 
+          var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
-          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true}); 
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
        BLOCK_END();

        generateFlexKenmerkBlock ({
--- a/APPL/ALG/alg_show_wp.asp
+++ b/APPL/ALG/alg_show_wp.asp
@@ -58,17 +58,17 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
      function wp_delete()
      {
         var wp_key = <%=wp_key%>;
-         if (confirm(L("lcl_alg_del_txt_werkplek")))
-         {
-           var data = { key: <%=wp_key%>,
-                        level: "W"
-                      };
-           <% protectRequest.dataToken("data"); %>
-           $.post("alg_delete.asp",
-                  data,
-                  FcltCallbackClose,
-                  "json");
-         }
+         FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), function() {
+             var data = {
+                 key: <%=wp_key%>,
+                 level: "W"
+             };
+             <% protectRequest.dataToken("data"); %>
+             $.post("alg_delete.asp",
+                 data,
+                 FcltCallbackClose,
+                 "json");
+         });
      }
    </script>
  </head>
--- a/APPL/ALG/alg_srtruimte.asp
+++ b/APPL/ALG/alg_srtruimte.asp
@@ -119,7 +119,7 @@ if (mode == "save")
    {
 %>
        <script>
-            alert("<%=safe.jsstring(err.friendlyMsg)%>");
+            FcltMgr.alert("<%=safe.jsstring(err.friendlyMsg)%>");
        </script>
 <%
    }
@@ -171,8 +171,10 @@ else if (srtruimte_key > 0 && mode == "delete")

    function alg_delete()
    {
-        if (confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>"))
-            window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
+        FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>",
+            function() {
+                window.location.href = "../alg/alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
+            });
    }

    function alg_cancel()
--- a/APPL/ALG/alg_srtruimte_search.asp
+++ b/APPL/ALG/alg_srtruimte_search.asp
@@ -44,8 +44,8 @@ FCLTHeader.Generate();

  <body id="searchbody">
    <div id="search">
-<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
      <form name="u2" target="workFrame" action="alg_srtruimte_search_list.asp" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
          <tr>
            <td class="searchkolom1">
              <table><!-- x rijen, 2 kolommen: label + veld -->
--- a/APPL/ALG/alg_terreinsector_list.inc
+++ b/APPL/ALG/alg_terreinsector_list.inc
@@ -49,18 +49,14 @@ function fnrowData(oRs)

  function doDelete(rowArray, isMulti)
  {
-    var terKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_terreinsector")))
-    {
+    FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), { autoconfirm: isMulti }, function() {
+      var terKeyString = getKeyString(rowArray);
      var data = { key: terKeyString,
                   level: "T"
                 };
      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
  }
 </script>
 <%
--- a/APPL/ALG/alg_verdieping_list.inc
+++ b/APPL/ALG/alg_verdieping_list.inc
@@ -54,18 +54,14 @@ function fnrowData(oRs)

  function doDelete(rowArray, isMulti)
  {
-    var flrKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_verdieping")))
-    {
+    FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), { autoconfirm: isMulti }, function() {
+      var flrKeyString = getKeyString(rowArray);
      var data = { key: flrKeyString,
                   level: "V"
                 };
      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
  }

 </script>
--- a/APPL/ALG/alg_werkplek_list.inc
+++ b/APPL/ALG/alg_werkplek_list.inc
@@ -67,18 +67,14 @@ FCLTHeader.Requires({ plugins:["jQuery"],

    function doDelete(rowArray, isMulti)
    {
-    var wpKeyString = getKeyString(rowArray);
-      if (isMulti || confirm(L("lcl_alg_del_txt_werkplek")))
-      {
+      FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), { autoconfirm: isMulti }, function() {
+        var wpKeyString = getKeyString(rowArray);
        var data = { key: wpKeyString,
                     level: "W"
                   };
        <% protectRequest.dataToken("data"); %>
-        $.post("alg_delete.asp",
-               data,
-               FcltCallbackRefresh,
-               "json");
-      }
+        $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+      });
    }

    function doAddWP(room_key) // als impliciet==0
--- a/APPL/API/api_mldsoap.asp
+++ b/APPL/API/api_mldsoap.asp
@@ -128,7 +128,7 @@ for (i = 0; i < meldingen.length; i++)
     else
     {
        meldaction = "insert";
-     } 
+     }
  }

  if (ext_id == null)
@@ -194,9 +194,8 @@ for (i = 0; i < meldingen.length; i++)
          perslid_key = voor_key;
       }
    }
-  
-    tsql = "SELECT sm.mld_stdmelding_t_uitvoertijd.tijdsduur tijdsduur"
-         + "     , sm.mld_stdmelding_t_uitvoertijd.eenheid eenheid"
+
+    tsql = "SELECT 1"
         + "  FROM mld_stdmelding sm"
         + " WHERE sm.mld_stdmelding_key = " + stdmld_key
         + "   AND sm.mld_stdmelding_verwijder IS NULL";
@@ -208,8 +207,12 @@ for (i = 0; i < meldingen.length; i++)
    }
    else
    { // Hier heb ik een geldige mld_stdmelding_key.
-      stdmld_sla_tijdsduur = oRs("tijdsduur").value;
-      stdmld_sla_eenheid = oRs("eenheid").value;
+      var stdm_info = mld.mld_stdmeldinginfo(stdmld_key);
+
+      var stdmld_sla_tijdsduur = stdm_info.prioriteiten[3].uitvoertijd;
+      var stdmld_sla_eenheid = stdm_info.prioriteiten[3].eenheid;
+      var stdmld_niveau = stdm_info.alg_onrgoed_niveau; // required niveau
+      var alglevel_ok = !stdm_info.ins_srtdiscipline_alg || !stdmld_niveau; // Zonder niveau altijd goed

      fields.push({ dbs: "mld_stdmelding_key", typ: "key", val: stdmld_key });
      fields.push({ dbs: "mld_melding_t_uitvoertijd.tijdsduur", typ: "number",  val: stdmld_sla_tijdsduur, obj: "MLD_T_UITVOERTIJD" });
@@ -262,6 +265,7 @@ for (i = 0; i < meldingen.length; i++)
      var oRs = Oracle.Execute(tsql);
      if (!oRs.eof)
      {
+        alglevel_ok = alglevel_ok || stdmld_niveau == "L";
        locatie_key = oRs("alg_locatie_key").value;
        fields.push({ dbs: "mld_alg_locatie_key", typ: "key", val: locatie_key });

@@ -272,6 +276,7 @@ for (i = 0; i < meldingen.length; i++)
        var oRs = Oracle.Execute(tsql);
        if (!oRs.eof)
        {
+          alglevel_ok = alglevel_ok || stdmld_niveau == "G";
          plaats_key = oRs("alg_gebouw_key").value;

          tsql = "SELECT alg_verdieping_key  "
@@ -281,6 +286,7 @@ for (i = 0; i < meldingen.length; i++)
          var oRs = Oracle.Execute(tsql);
          if (!oRs.eof)
          {
+            alglevel_ok = alglevel_ok || stdmld_niveau == "V";
            plaats_key = oRs("alg_verdieping_key").value;

            tsql = "SELECT alg_ruimte_key  "
@@ -289,6 +295,7 @@ for (i = 0; i < meldingen.length; i++)
                + " AND alg_ruimte_nr="+ safe.quoted_sql(meldrnr);
            var oRs = Oracle.Execute(tsql);
            if (!oRs.eof) {
+                alglevel_ok = alglevel_ok || stdmld_niveau == "R";
                plaats_key = oRs("alg_ruimte_key").value;
            }
          }
@@ -299,6 +306,12 @@ for (i = 0; i < meldingen.length; i++)
          fields.push({ dbs: "mld_alg_onroerendgoed_keys", typ: "key", val: plaats_key });
        }
      }
+      if (!alglevel_ok)
+      {
+        resultcode = 4;
+        resulttekst = "Location not found";
+        __DoLog(resulttekst, "#00FF00");
+      }

      fields = fields.concat(
                      [ { dbs: "mld_melding_key",            typ: "key",     seq: "mld_s_mld_melding_key" },
@@ -442,7 +455,7 @@ for (i = 0; i < meldingen.length; i++)

        resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze melding.
        // En nog maar even de aanname dat een extern systeem niet aan workflows/ktos doet?
-        
+
        // Klantspecifieke check functie (hookfunction) voor de invoer
        var pResult = new HookResult();
        if (!custfunc.mld_postsave(mld_key, pResult))
--- a/APPL/API/api_opdrsoap.asp
+++ b/APPL/API/api_opdrsoap.asp
@@ -170,7 +170,7 @@ for (i=0; i < opdrachten.length; i++)
  if (externopdrnr == null)
  { // Voorkom problemen als externopdrnr-node ontbreekt/leeg!
    externopdrnr = '';
-  }  
+  }
  if (voor_email == null)
  { // Voorkom problemen als het emailadres ontbreekt/leeg!
    voor_email = '';
@@ -184,7 +184,7 @@ for (i=0; i < opdrachten.length; i++)
  if (!oRs.eof)
  {
     voor_key = oRs("prs_perslid_key").value;
-  } 
+  }

  // Kijk of er een opdracht bestaat met dit externe opdracht nummer.
  // Ben je bang dat het nummer vaker voorkomt dan kun je deze prefixen in de xsl
@@ -202,7 +202,7 @@ for (i=0; i < opdrachten.length; i++)
     // Als het externe opdracht nummer al bestaat weten we zeker dat het om een update gaat.
     opdraction = "update";
  }
-  
+
  if (opdraction == "insert")
  {
    // Let op: mld_melding_externnr is niet gegarandeerd uniek: meerdere externe systemen
@@ -266,7 +266,7 @@ for (i=0; i < opdrachten.length; i++)
              if (meldingtekst != null)
              {
                 meld_oms = meld_oms + "\n" + meldingtekst;
-              } 
+              }
              mld_key = mld.insertmelding(stdm_key,
                      {
                          kostenplaats_key: kpn_key,
@@ -367,12 +367,12 @@ for (i=0; i < opdrachten.length; i++)
      }

      opdr_key = mldIns.sequences["mld_opdr_key"]; // Hier heb ik de geldige opdr_key (igv. insert).
-      
+
      tsql = "UPDATE mld_opdr"
          + "    SET mld_opdr_id = " + safe.quoted_sql(externopdrnr)
          + "  WHERE mld_opdr_key=" + opdr_key;
      Oracle.Execute(tsql);
-            
+
      mld.setopdrachtstatus (opdr_key, 5);
      mld.updatemeldingstatus (mld_key, 0);
    }
@@ -446,7 +446,7 @@ for (i=0; i < opdrachten.length; i++)
      var maxmarge = new Date();
      maxmarge.setDate(maxmarge.getDate() - mld_opdr.typeopdr_afmeldmarge);
      if (mut_datum < maxmarge)
-          mut_datum = new Date(); // te lang geleden
+          mut_datum = maxmarge; // te lang geleden
    }

    // Dit zijn de wijzigingen, die voeren we alleen uit bij een geldige statuswijziging
--- a/APPL/API/phonebook_js.asp
+++ b/APPL/API/phonebook_js.asp
@@ -24,6 +24,7 @@ var EXPIRED_PASSWORD_OK = true; // performance
    var API = new API_func();

    var nojQuery = getQParam("nojQuery", 0)==1;
+    var suggesticon = getQParam("suggesticon", "");

    var transitParam = "&fac_id="+Session("customerId") + buildTransitParam(["API", "APIKEY", "charset"]);

@@ -77,7 +78,7 @@ function L(p_lcl)
    {
        if (key > 0)
            jQuery.ajax({ type: "GET",
-                url: "<%=site%>/appl/api/get_phonebook_info.asp?req_info=prs_perslid&prs_perslid_key=" + key + "<%=transitParam%>",
+                url: "<%=safe.jsstring(site)%>/appl/api/get_phonebook_info.asp?req_info=prs_perslid&prs_perslid_key=" + key + "<%=transitParam%>",
                dataType: "jsonp",
                success: window.facilitor.show_phonebook
            });
@@ -90,7 +91,7 @@ function L(p_lcl)
        { detailWidth : 450,
          toonFoto: true,
          detailurl: "appl/fac/fac_user_info.asp",
-          deeplinkurl: "<%=site%>/?nomenu=1&noheader=1&ihatetabs=1&JumpTo=",
+          deeplinkurl: "<%=safe.jsstring(site)%>/?nomenu=1&noheader=1&ihatetabs=1&JumpTo=",
          fields: [ { lbl: "<%=L("lcl_prs_email")%>",   val: "prs_perslid_email" },
                    { lbl: "<%=L("lcl_pb_phone")%>",    val: "prs_perslid_telefoonnr" },
                    { lbl: "<%=L("lcl_pb_mobile")%>",   val: "prs_perslid_mobiel" },
@@ -127,7 +128,7 @@ function L(p_lcl)
        var trs = "";
        if (window.facilitor.phonebook_options.toonFoto && data.photopath)
        {
-            trs += "<tr><td></td><td></td><td rowspan='50'><img src='<%=sitenoroot%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
+            trs += "<tr><td></td><td></td><td rowspan='50'><img src='<%=safe.jsstring(sitenoroot)%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
        }
        var fld;
        for (fld in window.facilitor.phonebook_options.fields)
@@ -187,12 +188,14 @@ function L(p_lcl)

            sgPerson = new Suggest({ objectName: "sgPerson",
                                    queryField: $("#sName_key_show")[0],
-                                    queryUrl: "<%=site%>/appl/shared/suggest/SuggestPerslid.asp?filtcode=PHB<%=transitParam%>",
+                                    queryUrl: "<%=safe.jsstring(site)%>/appl/shared/suggest/SuggestPerslid.asp?filtcode=PHB<%=transitParam%>",
                                    initKey: -1,
                                    noJustOne: true,
                                    keyField: $("#sName_key")[0],
                                    JSONP: true,
-                                    embedded: true
+                                    embedded: true,
+                                    suggesticon: "<%=safe.jsstring(suggesticon)%>",
+                                    site: "<%=safe.jsstring(site)%>"
                                  });
        };
 })();
--- a/APPL/API/shorturl.asp
+++ b/APPL/API/shorturl.asp
@@ -23,6 +23,8 @@
 <!-- #include file="../shared/useragent.inc" -->

 <%
+__Log("== Entering shorturl.asp ==");
+
    var u = getQParam("u");
    var known_bookmarks =
    {
--- a/APPL/API2/TESTER/api2_tester.asp
+++ b/APPL/API2/TESTER/api2_tester.asp
@@ -7,11 +7,15 @@
 ANONYMOUS_Allowed = 1;
 %>
 <!-- #include file="../../Shared/common.inc" -->
+<%
+var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString("fac_id"))||"";
+%>
 <!DOCTYPE html>
 <html>

    <head>
        <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+        <title>API2 Tester</title>
        <script src="jquery-1.11.3.min.js"></script>
        <script src="tester.js"></script>
        <script src="jquery.iecors.js"></script>
@@ -43,7 +47,7 @@ ANONYMOUS_Allowed = 1;
                </td>
            </tr>
            <tr><td><label>fac_id</label></td>
-                <td><input id="facid" type="text" style="width:100px" value="">
+                <td><input id="facid" type="text" style="width:100px" value="<%=safe.htmlattr(fac_id)%>">
                </td>
            </tr>
            <tr><td><label>APIKEY</label></td>
@@ -56,7 +60,6 @@ ANONYMOUS_Allowed = 1;
                </td>
            </tr>
            <tr><td><label>Website</label></td>
-<!--                <td><input id="urlbase" type="text" style="width:250px" value="http://uwva.5iwork/Facilitor5iwork"> -->
                <td><input id="urlbase" type="text" style="width:250px" value="<%=safe.htmlattr(HTTP.urlzelf())%>">
                </td>
            </tr>
@@ -84,10 +87,10 @@ ANONYMOUS_Allowed = 1;
                </td>
            </tr>
            <tr><td><label>Method</label></td>
-                <td><input type='radio' id='method' name='method' value='GET' checked='1'>GET</input>
-                    <input type='radio' id='method' name='method' value='PUT'>PUT (update)</input>
-                    <input type='radio' id='method' name='method' value='POST'>POST (insert)</input>
-                    <input type='radio' id='method' name='method' value='DELETE'>DELETE</input>
+                <td><label><input type='radio' id='method' name='method' value='GET' checked='1'>GET</label>
+                    <label><input type='radio' id='method' name='method' value='PUT'>PUT (update)</label>
+                    <label><input type='radio' id='method' name='method' value='POST'>POST (insert)</label>
+                    <label><input type='radio' id='method' name='method' value='DELETE'>DELETE</label>
                </td>
            </tr>
            <tr><td><label>Request body</label></td>
--- a/APPL/API2/TESTER/api2_tester.html
+++ b/APPL/API2/TESTER/api2_tester.html
@@ -43,7 +43,7 @@
            </tr>
            <tr><td><label>Website</label></td>
 <!--                <td><input id="urlbase" type="text" style="width:250px" value="http://uwva.5iwork/Facilitor5iwork"> -->
-                <td><input id="urlbase" type="text" style="width:250px" value="http://sgf12/Facilitor5iwork">
+                <td><input id="urlbase" type="text" style="width:250px" value="http://uwva.facws001/branch20163/">
                </td>
            </tr>
            <tr><td><label>Pretty JSON</label></td>
--- a/APPL/API2/TESTER/tester.js
+++ b/APPL/API2/TESTER/tester.js
@@ -19,7 +19,7 @@ function callbackDone(data, textStatus, jqXHR)
 }
 function callbackFail(jqXHR, textStatus, errorThrown)
 {
-    // alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message));
+    // FcltMgr.alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message));
    $("#Status").text(jqXHR.status + " " + (typeof errorThrown == "string"?errorThrown:errorThrown.message)).css("background-color", "red");
    $("#StatusText").text(textStatus);
    var txt = String(jqXHR.responseText);
--- a/APPL/API2/api2.inc
+++ b/APPL/API2/api2.inc
@@ -60,8 +60,13 @@ api2 = {
                                    {
                                        var radio = bit.radios[r];
                                        var invert = radio.invert;
-
-                                        val += ((Request.Form(radio.name).count==1)?(invert?0:radio.mask):(invert?radio.mask:0));
+                                        // LET OP: Als de bit readonly is wordt er wel een form-parameter meegegeven met waarde "on" of leeg,
+                                        //         om de oude waarde te kunnen bewaren.
+                                        //         Als de bit editable is er alleen de form-parameter aanwezig als het veld aangevinkt is.
+                                        if (radio.readonly)
+                                            val += ((Request.Form(radio.name)=="on")?(invert?0:radio.mask):(invert?radio.mask:0));
+                                        else
+                                            val += ((Request.Form(radio.name).count==1)?(invert?0:radio.mask):(invert?radio.mask:0));
                                    }
                                }
                                else if (bit.typ == "radio")
@@ -527,12 +532,12 @@ api2 = {
                if (dbs.indexOf(".") < 0)
                {
                    dbs = model.table + "." + dbs;
-                    if (field.translate)
-                        dbs = lcl.xsql(dbs, model.table + "." + model.fields.id.dbs);
+                    if (field.translate && !params.for_edit)
+                        dbs = lcl.xsql(dbs, model.table + "." + model.fields.id.dbs, null, true); // never autolcl
                    if (model.aliasprefix)
                        dbs += " AS " + api2.sqlfield_alias(model, fld);
                    else
-                        if (field.translate)
+                        if (field.translate && !params.for_edit)
                            dbs += " AS " + field.dbs;
                }
                if (!inArray(dbs, selects))
@@ -657,6 +662,15 @@ api2 = {
                        }
                        else
                        {
+                            if (params.orderby)
+                            {
+                                for (var i = 0; i < params.orderby.length; i++)
+                                {
+                                    var field = inc.model.fields[params.orderby[i]];
+                                    if (field)
+                                        orderbys.push(inc.model.table + "." + field.dbs);
+                                }
+                            }
                            // In orderbys worden de include primary keys verzameld om te sorteren
                            // We bieden daar geen garantie op maar tijdens testen is deterministisch
                            // gedrag wel fijn.
@@ -1121,6 +1135,12 @@ api2 = {
            total_count ++;
            data.push(record);
        }
+        if ("merged_model" in model) // de disc_params truc
+        {
+            model.merged_model.limit = limit;
+            //model.offset = offset;
+            model.merged_model.total_count = total_count;
+        }
        model.limit = limit;
        //model.offset = offset;
        model.total_count = total_count;
@@ -1232,12 +1252,16 @@ api2 = {
            GENERIC_ONLY_WITH_AUTFUNCTION;

        model.REST_GET = generic_REST_GET(model, gparams);
-        model.REST_POST = generic_REST_POST(model, gparams);
-        model.REST_PUT = generic_REST_PUT(model, gparams);
-        model.REST_DELETE = generic_REST_DELETE(model, gparams);
+        if (model.primary)
+        {
+            model.REST_POST = generic_REST_POST(model, gparams);
+            model.REST_PUT = generic_REST_PUT(model, gparams);
+            model.REST_DELETE = generic_REST_DELETE(model, gparams);
+        }
    },
-    merge_disc_params_model: function(deze, template_model, tomodel)
+    merge_disc_params_model: function(deze, template_model)
    {
+        template_model.merged_model = deze; // hebben we nodig om total_count te kunnen zetten
        for (var x in template_model)
            deze[x] = template_model[x];

@@ -1322,7 +1346,14 @@ function generic_REST_GET(model, gparams)
            }

            if (!orderbys.length)
-                orderbys.push(model.fields.name?model.fields.name.dbs:model.fields.id.dbs);
+            {
+                if ("name" in model.fields)
+                    orderbys.push(model.fields.name.dbs);
+                else if ("id" in model.fields)
+                    orderbys.push(model.fields.id.dbs);
+                else
+                    orderbys.push(1); // FAC_VERSION heeft niets van dit alles
+            }

            sql += " ORDER BY " + orderbys.join(", "); // TODO: Altijd goed met includes?

--- a/APPL/API2/api2_rest.inc
+++ b/APPL/API2/api2_rest.inc
@@ -134,10 +134,14 @@ api2_rest = {
        var wasCodePage = Session.Codepage;
        Session.Codepage = 65001; // We doen *uitsluitend* utf-8
        Response.Charset = 'utf-8';
+        var format = getQParamSafe("format", "invalid").toLowerCase();
+        if (format == "json")
+            /* global */ JSON_Result = true; // Zelf doen we er niets mee maar
+                                             // shared.simple_page kijkt er naar

        api2_rest.authenticate();
        // Kip-ei: de omzetting naar new model() mag pas als je geauthenticeerd bent
-        // Hieroboven willen we heb echter al wel meegeven
+        // Hierboven willen we het echter al wel meegeven
        if (typeof model == "function") // Nieuwe stijl is het een function. Even compatible.
            model = new model();

@@ -163,7 +167,7 @@ api2_rest = {

        if (/PUT|POST/.test(method)) // Dan is er in de body data meegestuurd
        {
-            switch (getQParamSafe("format", "invalid").toLowerCase())
+            switch (format)
            {
                case "json":
                {
@@ -197,11 +201,11 @@ api2_rest = {
        var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
        var isSingle = /PUT|POST|DELETE/.test(method) || (key > 0);  // PUT, POST en DELETE altijd single

-        if (getQParamSafe("format", "json") == "doc")
+        if (format == "doc")
        {
            // Dan hoeven we verder niets te doen
        }
-        else if (getQParamSafe("format", "json") == "api")
+        else if (format == "api")
        {
            // TODO: Onderstaande in een of ander standaardformaat opleveren?
            var result = { id: model.records_name,
@@ -314,7 +318,7 @@ api2_rest = {
            }
        }

-        api2_rest.deliver(data, model, getQParamSafe("format", "json"), isSingle);
+        api2_rest.deliver(data, model, format, isSingle);

    },
    // Data is een array met 'records'
@@ -687,7 +691,7 @@ function RequestJSON()
    }
    catch (e)
    {
-        __DoLog("JSON eval faalt met: {0}<br>{1}".format(e.description, jvraag), "ffff00");
+        __DoLog("JSON eval faalt met: '{0}'\n{1}".format(e.description||e.message, jvraag), "ffff00");
        return { error: e.description };
    }
    return { json: vraag };
--- a/APPL/API2/api_notes.asp
+++ b/APPL/API2/api_notes.asp
@@ -22,4 +22,5 @@
 <!-- #include file="./model_notes.inc" -->
 <%
    api2_rest.process(new model_notes(getQParam("module", "").toUpperCase()));
+
 %>
--- a/APPL/API2/api_settings.asp
+++ b/APPL/API2/api_settings.asp
@@ -0,0 +1,25 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_settings.asp
+
+    Description:    FAC_SETTING API
+    Parameters:
+    Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
+
+    Notes:
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api2/api_settings.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="./model_fac_setting.inc" -->
+<%
+    api2_rest.process(model_fac_setting);
+%>
--- a/APPL/API2/model_alg_srtterreinsector.inc
+++ b/APPL/API2/model_alg_srtterreinsector.inc
@@ -43,36 +43,43 @@ function model_alg_srtterreinsector()
        "price_1": {
            "dbs": "alg_srtterreinsector_prijs",
            "label": L("alg_srtterreinsector_prijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "price_2": {
            "dbs": "alg_srtterreinsector_prijs2",
            "label": L("alg_srtterreinsector_prijs2"),
+            "iscurrency": true,
            "typ": "float"
        },
        "price_3": {
            "dbs": "alg_srtterreinsector_prijs3",
            "label": L("alg_srtterreinsector_prijs3"),
+            "iscurrency": true,
            "typ": "float"
        },
        "price_4": {
            "dbs": "alg_srtterreinsector_prijs4",
-           "label": L("alg_srtterreinsector_prijs4"),
+            "label": L("alg_srtterreinsector_prijs4"),
+            "iscurrency": true,
            "typ": "float"
        },
        "price_5": {
            "dbs": "alg_srtterreinsector_prijs5",
            "label": L("alg_srtterreinsector_prijs5"),
+            "iscurrency": true,
            "typ": "float"
        },
        "rentable": {
            "dbs": "prs_verhuurbaar",
            "label": L("prs_verhuurbaar"),
+            "iscurrency": true,
            "typ": "check"
        },
        "code": {
            "dbs": "alg_srtterreinsector_code",
            "label": L("alg_srtterreinsector_code"),
+            "iscurrency": true,
            "typ": "varchar"
        }
    };
--- a/APPL/API2/model_appointments.inc
+++ b/APPL/API2/model_appointments.inc
@@ -44,7 +44,8 @@ function model_appointments()
             "action"     : { dbs: "bez_actie_key",            typ: "key",      foreign: "bez_actie", label: L("lcl_action"), track: true},
             "location"   : { dbs: "alg_locatie_key",          typ: "key",      foreign: "alg_locatie"},
             "_alg_keys"  : { dbs: "alg_onrgoed_keys",         typ: "key",      fnval: afs_alg_onrgoed_keys },
-             "contact"    : { dbs: "bez_afspraak_contact_key", typ: "key",      foreign: "prs_perslid", label: L("lcl_vis_contactperson"), track: true}
+             "contact"    : { dbs: "bez_afspraak_contact_key", typ: "key",      foreign: "prs_perslid", label: L("lcl_vis_contactperson"), track: true},
+             "reservation": { dbs: "res_rsv_ruimte_key",       typ: "key",      foreign: "res_rsv_ruimte", label: L("lcl_reservation"), track: true}
            };

    if (S("vis_afspraak_onrgoed_uses_keys"))
@@ -137,10 +138,10 @@ function model_appointments()
        }
        else
        {
-            if (!params.isNew)
+            if (params.isNew)
            {
                // Pak de default actie of de alfabetisch eerste
-                var sqla = "SELECT bsez_actie_key"
+                var sqla = "SELECT bez_actie_key"
                         + "     , bez_actie_omschrijving"
                         + "  FROM bez_actie"
                         + " ORDER BY bez_actie_default DESC NULLS LAST, bez_actie_omschrijving";
--- a/APPL/API2/model_approvals.inc
+++ b/APPL/API2/model_approvals.inc
@@ -27,7 +27,7 @@ model_approvals =
               "name"         : {  dbs: "aanvraagnummer",           typ: "varchar"  },
               "date"         : {  dbs: "datum",                    typ: "datetime" },
               "requestor"    : {  dbs: "prs_perslid_naam_full",    typ: "varchar"  },
-               "amount"       : {  dbs: "bedrag",                   typ: "float"    },
+               "amount"       : {  dbs: "bedrag",                   typ: "float",   "iscurrency": true    },
               "module"       : {  dbs: "module",                   typ: "varchar"  },
               "type"         : {  dbs: "type",                     typ: "varchar"  },
               //"status"       : {  dbs: "fiatstatus",               typ: "varchar"},
--- a/APPL/API2/model_bes_disc_params.inc
+++ b/APPL/API2/model_bes_disc_params.inc
@@ -37,31 +37,38 @@ model_bes_disc_params =
        "bestellimiet1": {
            "dbs": "bes_disc_params_bestellimiet",
            "label": L("bes_discipline_bestellimiet1"),
+            "iscurrency": true,
            "typ": "float"
        },
        "bestellimiet2": {
            "dbs": "bes_disc_params_bestellimiet2",
            "label": L("bes_discipline_bestellimiet2"),
+            "iscurrency": true,
            "typ": "float"
        },
        "bestellimiet3": {
            "dbs": "bes_disc_params_bestellimiet3",
            "label": L("bes_discipline_bestellimiet3"),
+            "iscurrency": true,
            "typ": "float"
        },
        "bestellimiet4": {
            "dbs": "bes_disc_params_bestellimiet4",
            "label": L("bes_discipline_bestellimiet4"),
+            "iscurrency": true,
            "typ": "float"
        },
        "bestellimiet5": {
            "dbs": "bes_disc_params_bestellimiet5",
            "label": L("bes_discipline_bestellimiet5"),
+            "iscurrency": true,
            "typ": "float"
        },
        "min_bedrag": {
            "dbs": "bes_disc_params_min_bedrag",
            "label": L("bes_discipline_min_bedrag"),
+            "iscurrency": true,
+            "iscurrency": true,
            "typ": "float"
        },
        "auto_order": {
@@ -89,6 +96,7 @@ model_bes_disc_params =
        "herfiatmarge": {
            "dbs": "bes_disc_params_herfiatmarge",
            "label": L("bes_discipline_herfiatmarge"),
+            "iscurrency": true,
            "typ": "float"
        },
        "factuurpct": {
@@ -99,6 +107,7 @@ model_bes_disc_params =
        "factuurmarge": {
            "dbs": "bes_disc_params_factuurmarge",
            "label": L("bes_discipline_factuurmarge"),
+            "iscurrency": true,
            "typ": "float"
        },
        "factmatchmode": {
--- a/APPL/API2/model_bes_kenmerk.inc
+++ b/APPL/API2/model_bes_kenmerk.inc
@@ -64,7 +64,8 @@ function model_bes_kenmerk()
            },
            "filter": "exact",
            "defaultvalue": null,
-            "LOVinit": ""
+            "LOVinit": "",
+            "friendlyname": true
        },
        "article_catalogue": {
            "dbs": "bes_kenmerkbestelregel.ins_discipline_key",
--- a/APPL/API2/model_bes_kenmerkbestel.inc
+++ b/APPL/API2/model_bes_kenmerkbestel.inc
@@ -66,7 +66,8 @@ function model_bes_kenmerkbestel()
            },
            "filter": "exact",
            "defaultvalue": null,
-            "emptyoption": null
+            "emptyoption": null,
+            "friendlyname": true
        },
        "level": {
            "dbs": "bes_kenmerk_niveau",
--- a/APPL/API2/model_cad_label.inc
+++ b/APPL/API2/model_cad_label.inc
@@ -61,7 +61,7 @@ function model_cad_label()
            "dbs": "fac_functie_key",
            "label": L("fac_functie_key"),
            "typ": "key",
-            "foreign": fac_functie_foreign("EXT"),
+            "foreign": "fac_functie",
            "LOVinit": ""
        },
        "type_place": {
--- a/APPL/API2/model_cad_thema.inc
+++ b/APPL/API2/model_cad_thema.inc
@@ -63,7 +63,7 @@ function model_cad_thema()
            "dbs": "fac_functie_key",
            "label": L("fac_functie_key"),
            "typ": "key",
-            "foreign": fac_functie_foreign("EXT"),
+            "foreign": "fac_functie",
            "LOVinit": ""
        },
        "type_place": {
@@ -121,6 +121,7 @@ function model_cad_thema()
                    "label": L("cad_label_type_situatie"),
                    "typ": "radio",
                    "mask": 4,
+                    "readonly": false,
                    "radios": [
                        {
                            "mask": 0,
--- a/APPL/API2/model_cnt_disc_params.inc
+++ b/APPL/API2/model_cnt_disc_params.inc
@@ -45,6 +45,11 @@ model_cnt_disc_params =
                "desc": "cnt_typecontract_omschrijving"
            }
        },
+        "invoice_schedule": {
+            "dbs": "cnt_disc_params_factuurschema",
+            "label": L("cnt_discipline_factuurschema"),
+            "typ": "check0"
+        },
        "percentage": {
            "dbs": "cnt_disc_params_factuurpct",
            "label": L("cnt_discipline_factuurpct"),
@@ -53,6 +58,7 @@ model_cnt_disc_params =
        "margin": {
            "dbs": "cnt_disc_params_factuurmarge",
            "label": L("cnt_discipline_factuurmarge"),
+            "iscurrency": true,
            "typ": "float"
        },
        "approve": {
--- a/APPL/API2/model_cnt_factuurschema.inc
+++ b/APPL/API2/model_cnt_factuurschema.inc
@@ -0,0 +1,67 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_cnt_factuurschema.inc
+
+    Description:    Model voor cnt_factuurschema
+
+    Context:
+
+    Notes:
+*/
+%>
+<%
+
+function model_cnt_factuurschema()
+{
+    this.table = "cnt_factuurschema";
+    this.primary = "cnt_factuurschema_key";
+    this.records_name = "cnt_factuurschemas";
+    this.record_name = "cnt_factuurschema";
+    this.autfunction = "WEB_CNTMGT";
+    this.record_title = L("cnt_factuurschema");
+    this.records_title = L("cnt_factuurschema_m");
+
+    this.fields = {
+        "id": {
+            "dbs": "cnt_factuurschema_key",
+            "label": "Key",
+            "typ": "key",
+            "required": true,
+            "seq": "cnt_s_cnt_factuurschema_key"
+        },
+        "cnt_contract_key": {
+            "dbs": "cnt_contract_key",
+            "typ": "key",
+            "foreign": "cnt_contract",
+            "label": L("lcl_contract")
+        },
+        "accountingperiod": {
+            "dbs": "cnt_factuurschema_boekmaand",
+            "typ": "varchar",
+            "required": true,
+            "label": L("lcl_fin_divide_period"),
+            "friendlyname": true // accountingperiod hernoemen naar "name" is me te verwarrend
+
+        },
+        "amount": {
+            "dbs": "cnt_factuurschema_bedrag",
+            "typ": "float",
+            "iscurrency": true,
+            "required": true,
+            "label": L("lcl_cnt_period_sum")
+        },
+        "description": {
+            "dbs": "cnt_factuurschema_opmerking",
+            "typ": "memo",
+            "label": L("cnt_factuurschema_opmerking")
+        }
+    };
+
+    this.REST_GET    = generic_REST_GET(this);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
+}
+%>
--- a/APPL/API2/model_cnt_kenmerk.inc
+++ b/APPL/API2/model_cnt_kenmerk.inc
@@ -51,7 +51,8 @@ function model_cnt_kenmerk()
            },
            "filter": "exact",
            "defaultvalue": null,
-            "LOVinit": ""
+            "LOVinit": "",
+            "friendlyname": true
        },
        "property_type": {
            "dbs": "cnt_srtkenmerk.cnt_srtkenmerk_kenmerktype",
--- a/APPL/API2/model_companies.inc
+++ b/APPL/API2/model_companies.inc
@@ -40,7 +40,7 @@ function model_companies()
        "contactphone" : { dbs: "prs_bedrijf_contact_telefoon", typ: "varchar", filter: "like" },
        "remark"       : { dbs: "prs_bedrijf_opmerking"       , typ: "varchar", filter: "like" },
        "remark2"      : { dbs: "prs_bedrijf_opmerking2"      , typ: "varchar", filter: "like" }, /*?*/
-        "hourrate"     : { dbs: "prs_bedrijf_uurloon"         , typ: "float",   filter: "like" },
+        "hourrate"     : { dbs: "prs_bedrijf_uurloon"         , typ: "float",   "iscurrency": true, filter: "like" },
        "code"         : { dbs: "prs_leverancier_nr"          , typ: "varchar", filter: "like" },
        "agreement"    : { dbs: "prs_overeenkomst_nr"         , typ: "varchar", filter: "like" },
        "agreementdate": { dbs: "prs_overeenkomst_datum"      , typ: "date",    filter: "range" },
--- a/APPL/API2/model_contracts.inc
+++ b/APPL/API2/model_contracts.inc
@@ -15,6 +15,7 @@
 <!-- #include file="../Shared/discx3d.inc" -->
 <!-- #include file="../cnt/cnt.inc" -->
 <!-- #include file="./model_tracking.inc"-->
+<!-- #include file="./model_cnt_factuurschema.inc"-->
 <%

 model_contracts =
@@ -47,6 +48,10 @@ model_contracts =
                "tracking": {
                                  model: new model_tracking(['contract']),
                                  joinfield: "fac_tracking_refkey"
+                            },
+                "schedule": {
+                                  model: new model_cnt_factuurschema(),
+                                  joinfield: "cnt_contract_key"
                            }
              },

--- a/APPL/API2/model_fac_export_app.inc
+++ b/APPL/API2/model_fac_export_app.inc
@@ -47,7 +47,7 @@ function model_fac_export_app()
            "dbs": "fac_functie_key",
            "label": L("fac_functie_key"),
            "typ": "key",
-            "foreign": fac_functie_foreign("EXT1")
+            "foreign": "fac_functie"
        },
        "charset": {
            "dbs": "fac_export_app_charset",
--- a/APPL/API2/model_fac_functie.inc
+++ b/APPL/API2/model_fac_functie.inc
@@ -48,7 +48,7 @@ function model_fac_functie (functie_key, params)
        "foreign": {
                "tbl": "fac_module",
                "key": "fac_module_name",
-                "desc": "fac_module_name || ' - ' || fac_module_remark"
+                "desc": "fac_module_name || ' - ' || lcl.l(fac_module_remark)"
            }
      },
      "name": {
@@ -90,12 +90,14 @@ function model_fac_functie (functie_key, params)
        "dbs": "fac_functie_omschrijving",
        "label": L("fac_functie_omschrijving"),
        "typ": "varchar",
-        "required": true
+        "required": true,
+        "islcl": true
      },
      "info": {
        "dbs": "fac_functie_info",
        "label": L("fac_functie_info"),
-        "typ": "memo"
+        "typ": "memo",
+        "islcl": true
      }
    };

--- a/APPL/API2/model_fac_groeprechten.inc
+++ b/APPL/API2/model_fac_groeprechten.inc
@@ -69,11 +69,7 @@ function model_fac_groeprechten (params)
        "label": L("fac_functie_key"),
        "typ": "key",
        "hidden_fld": true,
-        "foreign": {
-          "tbl": "fac_functie",
-          "key": "fac_functie_key",
-          "desc": "fac_functie_omschrijving"
-        }
+        "foreign": "fac_functie"
      },
      "ins_discipline": {
        "dbs": "ins_discipline_key",
--- a/APPL/API2/model_fac_idp.inc
+++ b/APPL/API2/model_fac_idp.inc
@@ -90,11 +90,6 @@ function fac_idp()
            "label": L("fac_idp_remote_logouturl"),
            "typ": "varchar"
        },
-        "usermapping": {
-            "dbs": "fac_idp_usermapping",
-            "label": L("fac_idp_usermapping"),
-            "typ": "varchar"
-        },
        "ipfilter": {
            "dbs": "fac_idp_ipfilter",
            "label": L("fac_idp_ipfilter"),
@@ -129,7 +124,7 @@ function fac_idp()
            "dbs": "fac_functie_key",
            "label": L("fac_idp_functie_key"),
            "typ": "key",
-            "foreign": fac_functie_foreign()
+            "foreign": "fac_functie"
        },
 */
        "internal": {
--- a/APPL/API2/model_fac_import_app.inc
+++ b/APPL/API2/model_fac_import_app.inc
@@ -49,7 +49,7 @@ function model_fac_import_app()
            "dbs": "fac_functie_key",
            "label": L("fac_functie_key"),
            "typ": "key",
-            "foreign": fac_functie_foreign(),
+            "foreign": "fac_functie",
            "filter": "exact"
        },
        "catalog": {
--- a/APPL/API2/model_fac_profielwaarde.inc
+++ b/APPL/API2/model_fac_profielwaarde.inc
@@ -72,7 +72,8 @@ function model_fac_profielwaarde()
                "tbl": "("+ catalogus_sql + ")",
                "key": "ins_discipline_key",
                "desc": "omschrijving_ext"
-            }
+            },
+            "friendlyname": true
        },
        "value_limit": {
            "dbs": "fac_profielwaarde_limiet",
--- a/APPL/API2/model_fac_setting.inc
+++ b/APPL/API2/model_fac_setting.inc
@@ -0,0 +1,128 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_fac_setting.inc
+
+    Description:    model voor fac_setting
+
+    Context:
+
+    Notes:
+*/
+%>
+<%
+function model_fac_setting()
+{
+    this.table = "fac_setting";
+    this.primary = "fac_setting_key";
+    this.records_name = "fac_settings";
+    this.record_name = "fac_setting";
+    this.autfunction = "WEB_PROFIL"; //Om zelf al je geregistreerde gegevens te kunnen inzien
+    this.record_title = L("lcl_fac_setting");
+//    this.records_title = L("lcl_fac_setting_m");
+
+
+    this.fields = {
+        "id": {
+            "dbs": "fac_setting_key",
+            "label": "Key",
+            "typ": "key",
+            "required": true,
+            "filter": "exact",
+            "seq": "fac_s_fac_setting"
+        },
+        "module": {
+            "dbs": "fac_setting_module",
+//            "label": L("lcl_fac_module"),
+            "typ": "varchar",
+            "required": true
+        },
+        "name": {
+            "dbs": "fac_setting_name",
+//            "label": L("lcl_fac_name"),
+            "typ": "varchar",
+            "required": true
+        },
+        "description": {
+            "dbs": "fac_setting_description",
+//            "label": L("lcl_fac_descr"),
+            "typ": "varchar",
+            "required": true
+        },
+        "comment": {
+            "dbs": "fac_setting_comment",
+//            "label": L("lcl_fac_comment"),
+            "typ": "varchar"
+        },
+        "flags": {
+            "dbs": "fac_setting_flags",
+//            "label": L("lcl_fac_flags"),
+            "typ": "number"
+        },
+        "type": {
+            "dbs": "fac_setting_type",
+//            "label": L("lcl_fac_settingtype"),
+            "typ": "varchar",
+            "required": true
+        },
+        "default": {
+            "dbs": "fac_setting_default",
+//            "label": L("lcl_fac_default"),
+            "typ": "varchar"
+        },
+        "overrule": {
+            "dbs": "fac_setting_pvalue",
+//            "label": L("lcl_fac_overrule"),
+            "typ": "varchar"
+        },
+        "value": {
+            "dbs": "value",
+            "sql": "COALESCE(fac_setting_pvalue, fac_setting_default)",
+//            "label": L("lcl_fac_value"),
+            "typ": "varchar"
+        },
+        "date": {
+            "dbs": "fac_setting_datum",
+//            "label": L("lcl_fac_time"),
+            "typ": "datetime"
+        },
+        "changed_by": {
+            "dbs": "prs_perslid_key",
+            "label": L("prs_perslid"),
+            "typ": "number",
+            "foreign": "prs_perslid"
+        },
+        "authorization": {
+            "dbs": "fac_functie_key",
+            "label": L("fac_functie_key"),
+            "typ": "key",
+            "foreign": "fac_functie"
+        }
+    };
+
+    this.list = {
+        "columns": [
+            "id",
+            "name",
+            "value"
+        ]
+    };
+    this.search = {
+        "autosearch": true
+    };
+
+
+    this.REST_GET    = generic_REST_GET(this,
+                                           { "GET": {
+                                                     wheres: [ "BITAND(fac_setting_flags,1)=1"
+                                                             ]
+                                                    }
+                                            }
+                                      )
+
+    //this.REST_POST   = generic_REST_POST(this);
+    //this.REST_PUT    = generic_REST_PUT(this);
+    //this.REST_DELETE = generic_REST_DELETE(this, {});
+}
+%>
--- a/APPL/API2/model_fac_srtnotificatie.inc
+++ b/APPL/API2/model_fac_srtnotificatie.inc
@@ -43,6 +43,7 @@ function model_fac_srtnotificatie(cust)
            "label": L("fac_srtnotificatie_oms"),
            "typ": "memo",
            "translate": true,
+            "islcl": true,
            "filter": "like"
        },
        "xmlnode": {
@@ -105,6 +106,17 @@ function model_fac_srtnotificatie(cust)
                }
            ]
        },
+        "attachment": {
+            "dbs": "fac_srtnotificatie_srtkm_key",
+            "label": L("fac_srtnotificatie_srtkenmerk"),
+            "typ": "key",
+            "foreign": {
+                "tbl": "(" + xxx_srtkenmerk_sql() + ")",
+                "key": "srtkenmerk_key",
+                "desc": "omschrijving"
+            },
+            "defaultvalue": null
+        },
        "usermode": {
            "dbs": "fac_srtnotificatie_usermode",
            "label": L("fac_srtnotificatie_usermode"),
@@ -167,6 +179,17 @@ function model_fac_srtnotificatie(cust)
            }
        };

+    function xxx_srtkenmerk_sql()
+    {
+        var sql = "(select sk.mld_srtkenmerk_key srtkenmerk_key"
+                + "      , sk.mld_srtkenmerk_omschrijving || ' (' || sk.mld_srtkenmerk_key || ')' omschrijving"
+                + "   from mld_srtkenmerk sk"
+                + "  where sk.mld_srtkenmerk_verwijder is null"
+                + "    and sk.mld_srtkenmerk_kenmerktype in ('M', 'F')" // -- 'E', 'X')
+                + "  order by sk.mld_srtkenmerk_omschrijving)"
+        return sql;
+    }
+
    if (cust==1 && user.has("WEB_FACTAB"))
    {
        // Een gebruiker met WEB_FACTAB-rechten mag meer velden wijzigen...
@@ -197,6 +220,15 @@ function model_fac_srtnotificatie(cust)
        if (iscust == 1 || !inArray(obj.name.substring(0,3), ["MLD", "ORD"]))
            fld.mail_building.readonly = true;

+        if (inArray(obj.name, ["MLDAFM", "MLDAFR"]))
+        {
+            fld.attachment.foreign.tbl = xxx_srtkenmerk_sql();
+        }
+        else
+        {
+            delete fld.attachment;
+        }
+
        if (iscust == 1 && obj.id != -1)
            obj.name = obj.name.substring(4,7); // De "CUST" ervoor weg halen.
    }
--- a/APPL/API2/model_fac_usergraph.inc
+++ b/APPL/API2/model_fac_usergraph.inc
@@ -57,17 +57,7 @@ function model_fac_usergraph()
            "dbs": "fac_functie_key",
            "label": L("fac_functie_key"),
            "typ": "key",
-            "foreign": fac_functie_foreign("EXT"),
-/*
-            {
-                "tbl": "(SELECT f.fac_functie_key"
-                     + "      , f.fac_functie_code || ': ' || f.fac_functie_omschrijving fac_functie_omschrijving"
-                     + "   FROM fac_functie f"
-                     + "  ORDER BY 2)",
-                "key": "fac_functie_key",
-                "desc": "fac_functie_omschrijving"
-            },
-*/
+            "foreign": "fac_functie",
            "LOVinit": ""
        },
        "orderby": {
--- a/APPL/API2/model_fac_usrdata.inc
+++ b/APPL/API2/model_fac_usrdata.inc
@@ -61,6 +61,7 @@ function model_fac_usrdata()
        "price": {
            "dbs": "fac_usrdata_prijs",
            "label": L("fac_usrdata_prijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "expirationdate": {
--- a/APPL/API2/model_fac_usrtab.inc
+++ b/APPL/API2/model_fac_usrtab.inc
@@ -73,7 +73,7 @@ function model_fac_usrtab()
            "dbs": "fac_functie_key",
            "label": L("lcl_mgt_aut_group"),
            "typ": "key",
-            "foreign": fac_functie_foreign(),
+            "foreign": "fac_functie",
            "filter": "exact"
        }
    };
--- a/APPL/API2/model_fac_widget.inc
+++ b/APPL/API2/model_fac_widget.inc
@@ -51,7 +51,8 @@ function model_fac_widget()
            "label": L("fac_widget_title"),
            "translate": true,
            "typ": "varchar",
-            "filter": "like"
+            "filter": "like",
+            "friendlyname": true
        },
        "sequence": {
            "dbs": "fac_widget_volgnr",
@@ -88,7 +89,7 @@ function model_fac_widget()
            "dbs": "fac_functie_key",
            "label": L("lcl_fac_menuautorisatie"),
            "typ": "key",
-            "foreign": fac_functie_foreign("EXT"),
+            "foreign": "fac_functie",
            "filter": "exact",
            "defaultvalue": null
        }
--- a/APPL/API2/model_fin_verkoopfactuur.inc
+++ b/APPL/API2/model_fin_verkoopfactuur.inc
@@ -123,12 +123,14 @@ function model_fin_verkoopfactuurregels()
    "fin_verkoopfactuur_bedrag": {
      "dbs": "fin_verkoopfactuur_bedrag",
      "label": L("lcl_fin_verkoopfactuur_bedrag"),
+      "iscurrency": true,
      "typ": "float",
      "total": true
    },
    "fin_verkoopfactuur_btw": {
      "dbs": "fin_verkoopfactuur_btw",
      "label": L("lcl_fin_verkoopfactuur_btw"),
+      "iscurrency": true,
      "typ": "float",
      "total": true
    },
@@ -162,30 +164,35 @@ function model_fin_verkoopfactuurregels()
      "dbs": "fin_verkoopfactuur_n1",
      "label": L("lcl_fin_verkoopfactuur_n1"),
      "typ": "number",
+      "iscurrency": true,
      "datatype": "float"
    },
    "fin_verkoopfactuur_n2": {
      "dbs": "fin_verkoopfactuur_n2",
      "label": L("lcl_fin_verkoopfactuur_n2"),
      "typ": "number",
+      "iscurrency": true,
      "datatype": "float"
    },
    "fin_verkoopfactuur_n3": {
      "dbs": "fin_verkoopfactuur_n3",
      "label": L("lcl_fin_verkoopfactuur_n3"),
      "typ": "number",
+      "iscurrency": true,
      "datatype": "float"
    },
    "fin_verkoopfactuur_n4": {
      "dbs": "fin_verkoopfactuur_n4",
      "label": L("lcl_fin_verkoopfactuur_n4"),
      "typ": "number",
+      "iscurrency": true,
      "datatype": "float"
    },
    "fin_verkoopfactuur_n5": {
      "dbs": "fin_verkoopfactuur_n5",
      "label": L("lcl_fin_verkoopfactuur_n5"),
      "typ": "number",
+      "iscurrency": true,
      "datatype": "float"
    },
    "fin_verkoopfactuur_c1": {
@@ -326,12 +333,14 @@ model_fin_verkoopfactuur = function()
        "fin_verkoopfactuur_bedrag": {
          "dbs": "fin_verkoopfactuur_bedrag",
          "label": L("lcl_fin_verkoopfactuur_bedrag"),
+          "iscurrency": true,
          "typ": "float",
          "total": true
        },
        "fin_verkoopfactuur_btw": {
          "dbs": "fin_verkoopfactuur_btw",
          "label": L("lcl_fin_verkoopfactuur_btw"),
+          "iscurrency": true,
          "typ": "float",
          "total": true
        },
--- a/APPL/API2/model_generic.inc
+++ b/APPL/API2/model_generic.inc
@@ -26,6 +26,8 @@ function model_generic_template()

 function _findseq(primary)
 {
+    if (!primary)
+        return null;
    var seq_name = primary.substr(0,3) + "_S_" + primary;
    var seq =  null;
    var sql = "SELECT sequence_name"
@@ -51,34 +53,49 @@ function model_generic(table, autfunction)
    model.record_name = table.substring(0,1).toUpperCase() + table.substring(1);
    model.records_name = model.record_name + "s";

-    var sql = "SELECT LOWER(cols.column_name) column_name, cols.position, cons.status, cons.owner"
-            + "  FROM user_constraints cons, user_cons_columns cols"
-            + " WHERE cols.table_name = " + safe.quoted_sql_upper(table)
+    var sql = "SELECT LOWER(cols.column_name) column_name, cols.position, cons.status, cons.owner, utc.data_type"
+            + "  FROM user_constraints cons, user_cons_columns cols, user_tab_columns utc"
+            + " WHERE cons.table_name = " + safe.quoted_sql_upper(table)
+            + "   AND cols.table_name = cons.table_name"
            + "   AND cons.constraint_type = 'P'"
            + "   AND cons.constraint_name = cols.constraint_name"
            + "   AND cons.owner = cols.owner"
+            + "   AND utc.table_name = cols.table_name"
+            + "   AND utc.column_name = cols.column_name"
            + " ORDER BY cols.table_name, cols.position";
    var oRs = Oracle.Execute(sql);
    if (oRs.Eof)
    {
-        abort_with_warning("Unable to determine primary key for table {0}".format(table));
+        //abort_with_warning("Unable to determine primary key for table {0}".format(table));
+        model.primary = null;
    }
-
-    model.primary = oRs("column_name").Value;
-    oRs.MoveNext();
-    if (!oRs.Eof)
+    else
    {
-        abort_with_warning("Composite primary key not supported for table {0}".format(table));
+        model.primary = oRs("column_name").Value;
+        var data_type = oRs("data_type").Value;
+        if (data_type != 'NUMBER')
+        {
+            //abort_with_warning("Only NUMBER primary key supported, not {0} ({1})".format(data_type, model.primary));
+            model.primary = null;
+        }
+        oRs.MoveNext();
+        if (!oRs.Eof)
+        {
+            //abort_with_warning("Composite primary key not supported for table {0}".format(table));
+            model.primary = null;
+        }
    }
    oRs.Close();

-
    var sql = "SELECT num_rows, last_analyzed"
            + "  FROM user_tables"
            + " WHERE table_name = " + safe.quoted_sql_upper(table);
    var oRs = Oracle.Execute(sql);
-    model.estimated_rows = oRs("num_rows").Value;
-    model.last_analyzed = oRs("last_analyzed").Value;
+    if (!oRs.Eof) // Is er niet bij views
+    {
+        model.estimated_rows = oRs("num_rows").Value;
+        model.last_analyzed = oRs("last_analyzed").Value;
+    }
    oRs.Close;

    var sql = "SELECT LOWER(column_name) column_name"
@@ -91,9 +108,11 @@ function model_generic(table, autfunction)
        + " ORDER BY column_id";
    var oRs = Oracle.Execute(sql);
    var hasName = false;
+    model.nrfields = 0;
    var seq = _findseq(model.primary);
    while (!oRs.eof)
    {
+        model.nrfields++;
        var field = { dbs: oRs.Fields("column_name").Value,
                      label: oRs.Fields("column_name").Value,
                      typ: "varchar"
@@ -111,30 +130,61 @@ function model_generic(table, autfunction)
                {
                    field.datatype = 'float';
                }
-                if (field.dbs.match(/_key$/))
+                if (field.dbs.match(/key$/)) // hier fac_tracking_refkey ook herkennen
                {
                    field.typ = 'key';
-                    if (field.dbs != model.primary &&
-                        foreignKeyTable(field.dbs.replace(/_key$/,""))) // TODO ipv. de replace echt foreign-key constraint controleren
+                    if (field.dbs != model.primary)
                    {
-                        field.foreign = field.dbs.replace(/_key$/,"");
-                        field.label = field.foreign + "(_key)"; // indicatie dat het foreign is
-                        field.filter = "exact";
+                        var ftable = field.dbs.replace(/_key$/,"");// TODO ipv. de replace echt foreign-key constraint controleren
+
+                        var sql = "SELECT table_name, num_rows"
+                                + "  FROM user_tables"
+                                + " WHERE table_name = " + safe.quoted_sql_upper(ftable)
+                                + "    OR table_name = " + safe.quoted_sql_upper(ftable.substr(4)); // mld_alg_locatie_key bijv.
+                        if (ftable.match(/ins_discipline$/))
+                            sql += " OR table_name = 'INS_TAB_DISCIPLINE'";
+                        var oRs2 = Oracle.Execute(sql);
+                        if (!oRs2.Eof)
+                        {
+                            ftable = oRs2("table_name").Value.toLowerCase();
+                            field.num_rows = oRs2("num_rows").Value; // voor scf auto-listboxen interessant
+                            field.foreign = { tbl: ftable, key: field.dbs, desc: field.dbs };
+                            // TODO: Kan dit niet (beter) terugvallen op foreignKeyTabel MLD_DISCIPLINE en zo?
+                            if (ftable == "ins_tab_discipline")
+                            {
+                                field.foreign = { tbl: ftable, key: "ins_discipline_key", desc: "ins_discipline_omschrijving" };
+                            }
+                            field.infoPointer = { Url: "appl/mgt/mgt_generic.asp?mode=show&table=" + ftable + "&id=" };
+                        }
+                        oRs2.Close();
+
+                        if (foreignKeyTable(ftable))
+                        {
+                            field.foreign = ftable;
+                            field.label = field.label.replace(/_key$/, "(_key)"); // indicatie dat het foreign is
+                            field.filter = "exact";
+                        }
                    }
                }
                break;
            case "DATE":
                field.typ = 'datetime';
+                if (field.dbs == model.table + "_datum" ||
+                    field.dbs == model.table + "_van" ||
+                    field.dbs == model.table + "_aanmaak")
+                    field.filter = "range";
                break;
+            case "CHAR":
            case "VARCHAR2":
                field.typ = 'varchar';
                break;
            case "MLD_T_UITVOERTIJD":
-                field.typ = 'xvarchar';
-                field.readonly = true
+                field.typ = 'varchar';
+                field.readonly = true;
                // Het volgende werkt niet goed: er *moet* een table-alias voor die kan varieren?
                // field.sql = field.dbs + ".tijdsduur || " + field.dbs + ".eenheid";
-                field.sql = "'$mld_t_uitvoertijd not supported yet$'";
+                // field.sql = "'$mld_t_uitvoertijd not supported yet$'";
+                field.sql = "mld.uitvoertijd_to_char({0})".format(field.dbs);
                break;
            default:
                abort_with_warning("Unknown Oracle type '{0}'".format(ora_type));
@@ -156,15 +206,15 @@ function model_generic(table, autfunction)
            if (seq)
                field.seq = seq;
        }
+        if (fld.match(/(_omschrijving|_oms|_remark|_code|_nr)$/))
+            field.filter = "like";
        if (!hasName && fld.match(/_code$/))
        {
-            field.filter = "like";
            fld = "name";
            hasName = true;
        }
        if (!hasName && fld.match(/(_omschrijving|_oms|_remark)$/))
        {
-            field.filter = "like";
            fld = "name";
            hasName = true;
        }
--- a/APPL/API2/model_ins_srtcontrole.inc
+++ b/APPL/API2/model_ins_srtcontrole.inc
@@ -149,21 +149,25 @@ function model_ins_srtcontrole()
        "costs": {
            "dbs": "ins_srtcontrole_kosten",
            "label": L("ins_srtcontrole_kosten"),
+            "iscurrency": true,
            "typ": "float"
        },
        "costs2": {
            "dbs": "ins_srtcontrole_kosten2",
            "label": L("ins_srtcontrole_kosten2"),
+            "iscurrency": true,
            "typ": "float"
        },
        "costs3": {
            "dbs": "ins_srtcontrole_kosten3",
            "label": L("ins_srtcontrole_kosten3"),
+            "iscurrency": true,
            "typ": "float"
        },
        "material": {
            "dbs": "ins_srtcontrole_materiaal",
            "label": L("ins_srtcontrole_materiaal"),
+            "iscurrency": true,
            "typ": "float"
        },
        "hours": {
@@ -204,6 +208,45 @@ function model_ins_srtcontrole()
                                                    + ")"
                       }
        },
+        "options": {
+            "dbs": "ins_srtcontrole_options",
+            "label": L("ins_srtcontrole_options"),
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 15,
+                    "radios": [
+                        {
+                            "name": "inplan",
+                            "label": L("ins_srtcontrole_plan"),
+                            "mask": 1,
+                            "defaultvalue": 1
+                        },
+                        {
+                            "name": "start",
+                            "label": L("ins_srtcontrole_start"),
+                            "mask": 2,
+                            "defaultvalue": 1
+                        },
+                        {
+                            "name": "afmeld",
+                            "label": L("ins_srtcontrole_afmeld"),
+                            "mask": 4,
+                            "defaultvalue": 1
+                        },
+                        {
+                            "name": "afrond",
+                            "label": L("ins_srtcontrole_afrond"),
+                            "mask": 8,
+                            "defaultvalue": 1
+                        }
+                    ]
+                }
+            ]
+        },
        "remark": {
            "dbs": "ins_srtcontrole_opmerking",
            "label": L("ins_srtcontrole_opmerking"),
--- a/APPL/API2/model_ins_tab_discipline.inc
+++ b/APPL/API2/model_ins_tab_discipline.inc
@@ -39,7 +39,7 @@ function model_ins_tab_discipline(disc_key, params)
            "foreign": {
                    "tbl": "fac_module",
                    "key": "fac_module_name",
-                    "desc": "fac_module_name || ' - ' || fac_module_remark",
+                    "desc": "fac_module_name || ' - ' || lcl.l(fac_module_remark)",
                    "where": "fac_module_name IN (SELECT fac_functie_module FROM fac_functie WHERE fac_functie_discipline = 1)"
                }
        },
--- a/APPL/API2/model_invoicelines.inc
+++ b/APPL/API2/model_invoicelines.inc
@@ -27,8 +27,8 @@ model_invoicelines =
    fields: { "id"       : { dbs: "fin_factuurregel_key",          typ: "key",                                                                              filter: "exact" },
              "name"     : { dbs: "fin_factuurregel_omschrijving", typ: "varchar",                                track: true, label: L("lcl_descr"),                    filter: "like"  },
              "line"     : { dbs: "fin_factuurregel_nr",           typ: "number"                                                                                            },
-              "total"    : { dbs: "fin_factuurregel_totaal",       typ: "float",                                  track: true, label: L("lcl_fin_total_sum_exBTW")                       },
-              "vat"      : { dbs: "fin_factuurregel_btw",          typ: "float",                                  track: true, label: L("lcl_fin_total_sum_inBTW")                       },
+              "total"    : { dbs: "fin_factuurregel_totaal",       typ: "float",   "iscurrency": true,            track: true, label: L("lcl_fin_total_sum_exBTW")                       },
+              "vat"      : { dbs: "fin_factuurregel_btw",          typ: "float",   "iscurrency": true,            track: true, label: L("lcl_fin_total_sum_inBTW")                       },
              "reference": { dbs: "fin_factuurregel_referentie",   typ: "varchar",                                track: true, label: L("lcl_fin_referencecode"),        filter: "like"  },
              "vatvalue" : { dbs: "fin_btwtabelwaarde_key",        typ: "key",     foreign: "fin_btwtabelwaarde", track: true, label: L("lcl_fin_btwtarief"),            filter: "exact" },
              "costtype" : { dbs: "prs_kostensoort_key",           typ: "key",     foreign: "prs_kostensoort",    track: true, label: L("lcl_shared_charge_type"),       filter: "exact" },
--- a/APPL/API2/model_invoices.inc
+++ b/APPL/API2/model_invoices.inc
@@ -47,8 +47,8 @@ function model_invoices(fin_key, params)
             "order"           : { dbs: "mld_opdr_key",             typ: "key",     foreign: "mld_opdr",                                                    filter: "exact"},
             "contract"        : { dbs: "cnt_contract_key",         typ: "key",     foreign: "cnt_contract",                                                filter: "exact"},
             "purchaseorder"   : { dbs: "bes_bestelopdr_key",       typ: "key",     foreign: "bes_bestelopdr",                                              filter: "exact"},
-             "total"           : { dbs: "fin_factuur_totaal",       typ: "float",                                  track: true, label: L("lcl_fin_totaal_bedrag"),       filter: "range" },
-             "vat"             : { dbs: "fin_factuur_totaal_btw",   typ: "float",                                  track: true, label: L("lcl_fin_totaal_bedrag_btw"),   filter: "range" },
+             "total"           : { dbs: "fin_factuur_totaal",       typ: "float",   "iscurrency": true,            track: true, label: L("lcl_fin_totaal_bedrag"),       filter: "range" },
+             "vat"             : { dbs: "fin_factuur_totaal_btw",   typ: "float",   "iscurrency": true,            track: true, label: L("lcl_fin_totaal_bedrag_btw"),   filter: "range" },
             "finstatus"       : { dbs: "fin_factuur_statuses_key", typ: "key",     foreign: fin.getfinstatustext, track: true, label: L("lcl_fin_fin_status"),          filter: "exact" },
             "accountingperiod": { dbs: "fin_factuur_boekmaand",    typ: "varchar",                                track: true, label: L("lcl_fin_divide_period"),       filter: "exact" },
             "debiteur_nr"     : { dbs: "fin_factuur_debiteur_nr",  typ: "varchar",                                track: true, label: L("lcl_fin_debtor_nr"),           filter: "like" },
--- a/APPL/API2/model_mld_dienstpakket.inc
+++ b/APPL/API2/model_mld_dienstpakket.inc
@@ -60,7 +60,8 @@ function model_mld_dienstpakket()
                     + "  order by 2)",
                "key": "mld_stdmelding_key",
                "desc": "full_description"
-            }
+            },
+            "friendlyname": true
        }
    };

--- a/APPL/API2/model_mld_disc_params.inc
+++ b/APPL/API2/model_mld_disc_params.inc
@@ -48,26 +48,31 @@ model_mld_disc_params =
        "orderlimit1": {
            "dbs": "mld_disc_params_bestellimiet",
            "label": L("mld_discipline_bestellimiet1"),
+            "iscurrency": true,
            "typ": "float"
        },
        "orderlimit2": {
            "dbs": "mld_disc_params_bestellimiet2",
            "label": L("mld_discipline_bestellimiet2"),
+            "iscurrency": true,
            "typ": "float"
        },
        "orderlimit3": {
            "dbs": "mld_disc_params_bestellimiet3",
            "label": L("mld_discipline_bestellimiet3"),
+            "iscurrency": true,
            "typ": "float"
        },
        "orderlimit4": {
            "dbs": "mld_disc_params_bestellimiet4",
            "label": L("mld_discipline_bestellimiet4"),
+            "iscurrency": true,
            "typ": "float"
        },
        "orderlimit5": {
            "dbs": "mld_disc_params_bestellimiet5",
            "label": L("mld_discipline_bestellimiet5"),
+            "iscurrency": true,
            "typ": "float"
        },
        "chargebudget": {
@@ -113,6 +118,7 @@ model_mld_disc_params =
        "invoicemargin": {
            "dbs": "mld_disc_params_factuurmarge",
            "label": L("mld_discipline_margin"),
+            "iscurrency": true,
            "typ": "float",
            "defaultvalue": 0
        },
@@ -172,8 +178,7 @@ model_mld_disc_params =
                "tbl": "fac_activiteit",
                "key": "fac_activiteit_key",
                "desc": "fac_activiteit_omschrijving"
-            },
-            "emptyoption": null
+            }
        },
        "autooffer": {
            "dbs": "mld_disc_params_offerteauto",
--- a/APPL/API2/model_mld_kenmerk.inc
+++ b/APPL/API2/model_mld_kenmerk.inc
@@ -62,7 +62,8 @@ function model_mld_kenmerk()
            },
            "filter": "exact",
            "defaultvalue": null,
-            "LOVinit": ""
+            "LOVinit": "",
+            "friendlyname": true
        },
        "order_type": {
            "dbs": "mld_typeopdr_key",
--- a/APPL/API2/model_mld_kosten.inc
+++ b/APPL/API2/model_mld_kosten.inc
@@ -65,9 +65,10 @@ function model_mld_kosten()
            "translate": true,
            "len": 15
        },
-        "expences": {
+        "expenses": {
            "dbs": "mld_kosten_kosten",
            "label": L("mld_kosten_kosten"),
+            "iscurrency": true,
            "typ": "float"
        }
    };
--- a/APPL/API2/model_mld_typeopdr.inc
+++ b/APPL/API2/model_mld_typeopdr.inc
@@ -101,11 +101,13 @@ function model_mld_typeopdr()
        "offerlimit": {
            "dbs": "mld_typeopdr_offertelimiet",
            "label": L("mld_typeopdr_offertelimiet"),
-            "typ": "number"
+            "iscurrency": true,
+            "typ": "float"
        },
        "approval": {
            "dbs": "mld_typeopdr_gvs",
            "label": L("mld_typeopdr_gvs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "nextordertype": {
--- a/APPL/API2/model_mld_typeopdr_srtdiscipline.inc
+++ b/APPL/API2/model_mld_typeopdr_srtdiscipline.inc
@@ -41,7 +41,8 @@ function model_mld_typeopdr_srtdiscipline()
                "tbl": "mld_typeopdr",
                "key": "mld_typeopdr_key",
                "desc": "mld_typeopdr_omschrijving"
-            }
+            },
+            "friendlyname": true
        },
        "typeopdr_b": {
            "dbs": "ins_srtdiscipline_key",
--- a/APPL/API2/model_mld_vrije_dagen.inc
+++ b/APPL/API2/model_mld_vrije_dagen.inc
@@ -40,7 +40,8 @@ function model_mld_vrije_dagen()
            "typ": "date",
            "required": true,
            "autosize": true,
-            "filter": "range"
+            "filter": "range",
+            "friendlyname": true
        }
    };

--- a/APPL/API2/model_mld_workflowrule.inc
+++ b/APPL/API2/model_mld_workflowrule.inc
@@ -41,12 +41,14 @@ function model_mld_workflowrule(mystart_key)
            "foreign": {
                "tbl": "(SELECT s.mld_workflowstep_key"
                     + "      , mld_workflowstep_start_key"
-                     + "      , d.ins_discipline_omschrijving || '/ ' || m.mld_stdmelding_omschrijving stdmelding_omschr"
+                     + "      , case when srt.ins_srtdiscipline_prefix is not null then srt.ins_srtdiscipline_prefix || '-' end || d.ins_discipline_omschrijving || '/ ' || m.mld_stdmelding_omschrijving  stdmelding_omschr"
                     + "   FROM mld_workflowstep s"
                     + "      , mld_stdmelding m"
                     + "      , mld_v_aanwezigdiscipline d"
+                     + "      , ins_srtdiscipline srt"
                     + "  WHERE m.mld_stdmelding_key = s.mld_stdmelding_key"
                     + "    AND m.mld_ins_discipline_key = d.ins_discipline_key"
+                     + "    AND srt.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
                     + "  ORDER by d.ins_discipline_omschrijving asc"
                     + "         , m.mld_stdmelding_omschrijving asc)",
                "key": "mld_workflowstep_key",
@@ -69,12 +71,14 @@ function model_mld_workflowrule(mystart_key)
            "foreign": {
                "tbl": "(SELECT s.mld_workflowstep_key"
                     + "      , mld_workflowstep_start_key"
-                     + "      , d.ins_discipline_omschrijving || '/ ' || m.mld_stdmelding_omschrijving stdmelding_omschr"
+                     + "      , case when srt.ins_srtdiscipline_prefix is not null then srt.ins_srtdiscipline_prefix || '-' end || d.ins_discipline_omschrijving || '/ ' || m.mld_stdmelding_omschrijving  stdmelding_omschr"
                     + "   FROM mld_workflowstep s"
                     + "      , mld_stdmelding m"
                     + "      , mld_v_aanwezigdiscipline d"
+                     + "      , ins_srtdiscipline srt"
                     + "  WHERE m.mld_stdmelding_key = s.mld_stdmelding_key"
                     + "    AND m.mld_ins_discipline_key = d.ins_discipline_key"
+                     + "    AND srt.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
                     + "  ORDER by d.ins_discipline_omschrijving asc"
                     + "         , m.mld_stdmelding_omschrijving asc)",
                "key": "mld_workflowstep_key",
--- a/APPL/API2/model_mld_workflowstep.inc
+++ b/APPL/API2/model_mld_workflowstep.inc
@@ -79,10 +79,12 @@ function model_mld_workflowstep(mystart_key)
            "typ": "key",
            "foreign": {
                "tbl": "(select m.mld_stdmelding_key"
-                     + "      , d.ins_discipline_omschrijving || '/ ' || m.mld_stdmelding_omschrijving  stdmelding_omschr"
+                     + "      , case when srt.ins_srtdiscipline_prefix is not null then srt.ins_srtdiscipline_prefix || '-' end || d.ins_discipline_omschrijving || '/ ' || m.mld_stdmelding_omschrijving  stdmelding_omschr"
                     + "   from mld_stdmelding m"
                     + "      , mld_v_aanwezigdiscipline d"
+                     + "      , ins_srtdiscipline srt"
                     + "  where m.mld_ins_discipline_key = d.ins_discipline_key"
+                     + "    and srt.ins_srtdiscipline_key = d.ins_srtdiscipline_key"
                     + "    and (mld_stdmelding_vervaldatum IS NULL OR mld_stdmelding_vervaldatum > SYSDATE)"
                     + "    and m.mld_stdmelding_verwijder IS NULL"
                     + "  order by d.ins_discipline_omschrijving asc"
--- a/APPL/API2/model_notes.inc
+++ b/APPL/API2/model_notes.inc
@@ -59,7 +59,6 @@ SELECT 'PRJ'

 %>
 <!-- #include file="../mld/mld.inc" -->
-<!-- #include file="model_objects.inc"-->
 <%

 function model_notes(module)
@@ -74,30 +73,35 @@ function model_notes(module)
    {
        case "MLD":
        {   tabel.naam   = "mld_melding_note";
+            tabel.id     = "mld_melding_note_key";
            tabel.seq    = "mld_s_mld_melding_note_key";
            tabel.parent = "mld_melding";
            break;
        }
        case "ORD":
        {   tabel.naam   = "mld_opdr_note";
+            tabel.id     = "mld_opdr_note_key";
            tabel.seq    = "mld_s_mld_opdr_note_key";
            tabel.parent = "mld_opdr";
            break;
        }
        case "FIN":
        {   tabel.naam   = "fin_factuur_note";
+            tabel.id     = "fin_dactuur_note_key";
            tabel.seq    = "fin_s_fin_factuur_note_key";
            tabel.parent = "fin_factuur";
            break;
        }
        case "CNT":
        {   tabel.naam   = "cnt_contract_note";
+            tabel.id     = "cnt_contract_note_key";
            tabel.seq    = "cnt_s_cnt_contract_note_key";
            tabel.parent = "cnt_contract";
            break;
        }
        case "PRJ":
        {   tabel.naam   = "prj_scenario_note";
+            tabel.id     = "prj_scenario_note_key";
            tabel.seq    = "prj_s_prj_scenario_note_key";
            tabel.parent = "prj_scenario";
            break;
@@ -108,12 +112,11 @@ function model_notes(module)
    this.table = tabel.naam;
    this.primary = tabel.parent + "_note_key";
    this.fields =
-            { "id"          : { dbs: tabel.naam + "_key",          typ: "key", seq: tabel.seq, filter: "exact" },
+            { "id"          : { dbs: tabel.id,                     typ: "key",     seq:     tabel.seq,     filter: "exact" },
              "author"      : { dbs: "prs_perslid_key",            typ: "key",     foreign: "prs_perslid", filter: "exact" },
              "description" : { dbs: tabel.naam + "_omschrijving", typ: "varchar",                         filter: "like"  },
-              "createdate"  : { dbs: tabel.naam + "_aanmaak",      typ: "datetime"  },
-            // { name: "module",      dbs: "module",          typ: "varchar",                         filter: "exact" }
-              "parent"      : { dbs: tabel.parent + "_key",      typ: "key",                             filter: "exact" }
+              "createdate"  : { dbs: tabel.naam + "_aanmaak",      typ: "datetime"},
+              "parent"      : { dbs: tabel.parent + "_key",        typ: "key",                             filter: "exact" }
        };

    this.list = {
@@ -125,8 +128,53 @@ function model_notes(module)
            ]
          };

-  // TODO: REST_GET niet (rechtstreeks) toestaan?
-  this.REST_GET = function _GET(params)
+    function _check_authorization (params, method)
+        {
+            params.message = "";
+
+            if (params.filter.module == "MLD")
+            {
+                var autfunction = (params.filter.scope == "fe"? "WEB_MLDFOF" : "WEB_MLDBOF");
+                params.authparams = user.checkAutorisation(autfunction, null, null, true); // pessimistisch
+
+                switch (method)
+                {
+                    case "GET":
+                        if (params.filter.parent_key)
+                        {
+                            var mld_key = params.filter.parent_key;
+                            var this_mld = mld.func_enabled_melding(mld_key, params);
+                            user.auth_required_or_abort(this_mld.canReadNotes);
+                        }
+                        break;
+                    case "DELETE":
+                        // Notes mogen niet worden verwijderd.
+                        // en verder met de autorisatie van PUT...
+                    case "PUT":
+                        var mld_key = params.filter.parent;
+                        var this_mld = mld.func_enabled_melding(mld_key, params);
+                        user.auth_required_or_abort(this_mld.canWriteNotes);
+                        params.isNew = false;
+                        break;
+                    case "POST":
+                        var mld_key = params.filter.parent_key;
+                        var this_mld = mld.func_enabled_melding(mld_key, params);
+                        user.auth_required_or_abort(!this_mld.canWriteNotes);
+                        params.isNew = true;
+                        break;
+                }
+                params.func_enabled = this_mld || {};
+            }
+            else
+            {
+                // Voor alle andere modules toevoegen niet toestaan.
+                if (method == "POST")
+                    user.auth_required_or_abort(false);
+            }
+        }
+
+    // TODO: REST_GET niet (rechtstreeks) toestaan?
+    this.REST_GET = function _GET(params)
        {
            var query = api2.sqlfields(params, this );
            var wheres = api2.sqlfilter(params, this);
@@ -161,11 +209,14 @@ function model_notes(module)

    this.REST_POST = function (params, jsondata) /* new note */
        {
-            params.isNew = true;
+            params.filter.parent_key = jsondata.parent;
+            _check_authorization(params, "POST");
            //
+            var dbfields = api2.update_fields(params, this, jsondata); // Build updater
+            dbfields["id"] = { dbs: tabel.id, typ: "key", seq: tabel.seq };

            var xxxIns = buildInsert(this.table, dbfields, { noValidateToken: true });
-            var new_key = xxxIns.sequences[xxx_tabel.naam];
+            var new_key = xxxIns.sequences[tabel.id];

            Oracle.Execute(xxxIns.sql);

--- a/APPL/API2/model_orders.inc
+++ b/APPL/API2/model_orders.inc
@@ -64,9 +64,9 @@ function model_orders(opdr_key, params)
             "remark"         : { dbs: "mld_opdr_opmerking",                           typ: "varchar",                                     label: L("lcl_mld_inf_Opmerking"),    track: true, filter: "like", len: 4000 },
             "account"        : { dbs: "prs_kostenplaats_key",                         typ: "key",      foreign: "prs_kostenplaats",       label: L("lcl_mld_inf_Kostenplaats"), track: true, filter: "exact" },
             "hours"          : { dbs: "mld_opdr_uren",                                typ: "float",                                       label: L("lcl_mld_hours"),            track: true },
-             "hourrate"       : { dbs: "mld_opdr_uurloon",                             typ: "float",                                       label: L("lcl_hour_rate"),            track: true },
-             "materialcost"   : { dbs: "mld_opdr_materiaal",                           typ: "float",                                       label: L("lcl_mater_cost"),           track: true },
-             "costs"          : { dbs: "mld_opdr_kosten",                              typ: "float",                                       label: L("lcl_total_cost"),           track: true },
+             "hourrate"       : { dbs: "mld_opdr_uurloon",                             typ: "float",    "iscurrency": true,                label: L("lcl_hour_rate"),            track: true },
+             "materialcost"   : { dbs: "mld_opdr_materiaal",                           typ: "float",    "iscurrency": true,                label: L("lcl_mater_cost"),           track: true },
+             "costs"          : { dbs: "mld_opdr_kosten",                              typ: "float",    "iscurrency": true,                label: L("lcl_total_cost"),           track: true },
             "status"         : { dbs: "mld_statusopdr_key",                           typ: "key",      foreign: status.getopdrstatustext, label: L("lcl_status"),               track: true, filter: "exact" },
             "ordernr"        : { dbs: "mld_opdr_ordernr",                             typ: "varchar",                                     label: L("lcl_mld_inf_Ordernr"),      track: true },
             "orderdate"      : { dbs: "mld_opdr_datumbegin",                          typ: "datetime",                                    label: L("lcl_orderdate"),            track: true, filter:"range" },
@@ -913,19 +913,19 @@ function model_orders(opdr_key, params)
                if (reapprove || refiat)
                {   // Zet de refiat waarden. Het hergoedkeurings- en/of herfiatteringstraject wordt opnieuw ingegaan. // Tracking hiervan is niet nodig.
                    if (opdr_info.hours > 0)
-                        dbfields["hoursrefiat"] = { dbs: "mld_opdr_uren_refiat",       typ: "float",  val: opdr_info.hours };
+                        dbfields["hoursrefiat"] = { dbs: "mld_opdr_uren_refiat",       typ: "float",  "iscurrency": true, val: opdr_info.hours };
                    if (opdr_info.h_rate > 0)
-                        dbfields["raterefiat"] = { dbs: "mld_opdr_uurloon_refiat",    typ: "float",  val: opdr_info.h_rate };
+                        dbfields["raterefiat"] = { dbs: "mld_opdr_uurloon_refiat",    typ: "float", "iscurrency": true,  val: opdr_info.h_rate };
                    if (opdr_info.m_cost > 0)
-                        dbfields["matrerialfiat"] = { dbs: "mld_opdr_materiaal_refiat",  typ: "float",  val: opdr_info.m_cost };
+                        dbfields["matrerialfiat"] = { dbs: "mld_opdr_materiaal_refiat",  typ: "float", "iscurrency": true,  val: opdr_info.m_cost };
                    if (opdr_info.t_cost > 0)
-                        dbfields["costrefiat"] = { dbs: "mld_opdr_kosten_refiat",     typ: "float",  val: opdr_info.t_cost };
+                        dbfields["costrefiat"] = { dbs: "mld_opdr_kosten_refiat",     typ: "float", "iscurrency": true,  val: opdr_info.t_cost };

                    // Ook voor status 5 wordt refiatstatus gezet zodat bekend is dat het om een herfiattering gaat. De fiatteringsvoorwaarde is dan iets anders.
                    dbfields["statusrefiat"] = { dbs: "mld_statusopdr_key_refiat",  typ: "number", val: opdr_info.opdr_status };
                    // Goedkeuring opnieuw ingaan kan alleen als het approved bedrag leeg is.
-                    dbfields["approvedrefiat"] = { dbs: "mld_opdr_approved_refiat",   typ: "float",  val: opdr_info.approved };
-                    dbfields["approved"] = { dbs: "mld_opdr_approved",          typ: "float",  val: null };
+                    dbfields["approvedrefiat"] = { dbs: "mld_opdr_approved_refiat",   typ: "float", "iscurrency": true,  val: opdr_info.approved };
+                    dbfields["approved"] = { dbs: "mld_opdr_approved",          typ: "float", "iscurrency": true,  val: null };
                }

                // Met FSN#20132 kan bij bestaande opdrachten via deze weg niet meer het opdrachttype wijzigen
@@ -1219,18 +1219,14 @@ function model_orders(opdr_key, params)
                        if (params.mld_opdr.act_key <= 0 && params.mld_opdr.uitvoerende > 0)
                        {   // RWSN#15010: Bij het opslaan van een nieuwe opdracht GEEN bon tonen/printen als
                            // de uitvoerende een INTERNE uitvoerende is (S("mld_order_autoprint") == 2).
-                            var sql = "SELECT 'P' pbtype"
-                                    + "  FROM prs_perslid p"
-                                    + " WHERE p.prs_perslid_key = " + params.mld_opdr.uitvoerende
-                                    + " UNION "
-                                    + "SELECT 'B' pbtype"
-                                    + "  FROM prs_v_aanwezigbedrijf d"
-                                    + " WHERE d.prs_bedrijf_key = " + params.mld_opdr.uitvoerende;
+                            sql = "SELECT mu.intern"
+                                + "  FROM mld_v_uitvoerende mu"
+                                + " WHERE mu.mld_uitvoerende_key = " +  params.mld_opdr.uitvoerende;
                            var oRs = Oracle.Execute(sql);
-                            var pbtype = oRs("pbtype").Value;
+                            var intern = oRs("intern").Value == 1;
                            oRs.Close();

-                            if ((S("mld_order_autoprint") == 2 && pbtype == "B") || (S("mld_order_autoprint") != 2))
+                            if ((S("mld_order_autoprint") == 2 && !intern) || (S("mld_order_autoprint") != 2))
                            {   // Als S("mld_order_autoprint") == 2 dan geen bon bij prs_perslid (interne uitvoerende)
                                // parameter autoprint wordt in de functie closeDetail() opgepakt
                                doneParams.autoprint = true;
--- a/APPL/API2/model_persons.inc
+++ b/APPL/API2/model_persons.inc
@@ -103,7 +103,7 @@ function model_persons()
            query.tables.push("prs_v_werkplek_gegevens  wg");
            query.tables.push("prs_v_afdeling  pa");
            query.wheres.push("pa.prs_afdeling_key = prs_perslid.prs_afdeling_key");
-            query.tables.push("prs_v_hoofdperslidwerkplek  pw");
+            query.tables.push("prs_v_hoofdperslidwerkplek2 pw");
            query.wheres.push("pw.prs_perslid_key(+) = prs_perslid.prs_perslid_key");
            query.wheres.push("pw.prs_werkplek_key = wg.prs_werkplek_key(+)");

--- a/APPL/API2/model_prs_srtperslid.inc
+++ b/APPL/API2/model_prs_srtperslid.inc
@@ -44,6 +44,7 @@ function model_prs_srtperslid()
        "hourly_wages": {
            "dbs": "prs_srtperslid_uurloon",
            "label": L("prs_srtperslid_uurloon"),
+            "iscurrency": true,
            "typ": "float"
        },
        "area": {
--- a/APPL/API2/model_prs_staffel.inc
+++ b/APPL/API2/model_prs_staffel.inc
@@ -55,6 +55,7 @@ function model_prs_staffel()
            "dbs": "prs_staffel_korting",
            "label": L("prs_staffel_korting"),
            "typ": "float",
+            "iscurrency": true,
            "required": true
        }
    };
--- a/APPL/API2/model_reportcolumns.inc
+++ b/APPL/API2/model_reportcolumns.inc
@@ -99,6 +99,7 @@ function model_reportcolumns(usrrap_key, params)
            dbs: "fac_usrrap_cols_expression",
            typ: "memo",
            label: "sql-expressie",
+            required: true,
            readonly: true
        }
    };
@@ -121,7 +122,7 @@ function model_reportcolumns(usrrap_key, params)
        rowClass: this.fnrowClass
    };

-    this.hook_pre_edit = function (obj)
+    this.hook_pre_edit = function (obj, fld)
    {
        this.fields.filter.LOV = api2.filterLOV(L("lcl_rap_filterLOV"), "A,E,R"); // De meesten mogen L(ike) niet
        if ((obj.datatype && !obj.expression) || !user.has("WEB_FACTAB"))
@@ -162,6 +163,11 @@ function model_reportcolumns(usrrap_key, params)
        {
            this.fields.expression.readonly = false;
            this.fields.name.insertonly = false;
+            // Een zelf toegevoegd veld mag ook verwijderd worden.
+            if (obj.expression)
+            {
+                this.REST_DELETE = generic_REST_DELETE(this);
+            }
        }
    };

@@ -169,7 +175,23 @@ function model_reportcolumns(usrrap_key, params)
    {
        if (obj.id == -1)
            this.fields.expression.readonly = false;
-    }
+    };
+
+    this.hook_pre_delete = function (params, columns_key)
+    {
+        var sql = "SELECT 1"
+                + "  FROM fac_usrrap_cols"
+                + " WHERE fac_usrrap_cols_expression IS NOT NULL"
+                + "   AND fac_usrrap_cols_key = " + columns_key;
+        var oRs = Oracle.Execute(sql, true);
+
+        if (oRs.eof)
+            abort_with_warning(L("lcl_cnt_Del_Fails_Auth"));
+
+        oRs.Close();
+        user.checkAutorisation("WEB_FACTAB");
+        this.REST_DELETE = generic_REST_DELETE(this);
+    };

    // Maakt de default fac_usrrap_cols records aan aan de hand van de view of werk ze bij
    this._view2columns = function (usrrap_key, lastrefresh, oldcols)
@@ -357,7 +379,7 @@ function model_reportcolumns(usrrap_key, params)
                    + "   SET fac_usrrap_col_refresh = SYSDATE"
                    + " WHERE fac_usrrap_key = " + usrrap_key;
            Oracle.Execute(sql);
-        },
+        }

    this.REST_GET = function _GET(params)
        {
@@ -378,13 +400,20 @@ function model_reportcolumns(usrrap_key, params)
            }

            return json;
-        };
+        }
+
    this.REST_PUT = function (params, jsondata, the_key) /* update columns */
        {
            var valid_char = /^[_0-9a-zA-Z]+$/; // Alleen deze tekens zijn geldig!
            if (!valid_char.test(jsondata.name))
                abort_with_warning(L("lcl_rap_column_invalid"));

+            if (user.has("WEB_FACTAB") && (jsondata.expression || !jsondata.id))
+            {
+                this.fields.expression.readonly = false;
+                this.fields.name.insertonly = false;
+            }
+
            var dbfields = api2.update_fields(params, this, jsondata); // Build updater

            var sql = buildUpdate("fac_usrrap_cols", dbfields, { noValidateToken: true }) + " fac_usrrap_cols_key = " + the_key;
@@ -393,7 +422,8 @@ function model_reportcolumns(usrrap_key, params)
                abort_with_warning(err.friendlyMsg);

            return { key: the_key };
-        };
+        }
+
    this._REST_PUT = this.REST_PUT; // Interne is er altijd

    // Only internally used by report_clone and _view2columns
@@ -418,7 +448,6 @@ function model_reportcolumns(usrrap_key, params)

            return { key: col_key, warning: "" };
        }
-    // REST_DELETE: not supported

    if (rap_key > 0)
    {
--- a/APPL/API2/model_reports.inc
+++ b/APPL/API2/model_reports.inc
@@ -78,6 +78,22 @@ function model_reports_template()
            var bMetDiscipline = (oRs("fac_functie_discipline").Value == 1);
            oRs.Close();

+            if (bMetALGAuth && "fclt_3d_regio_key" in this.fields && this.authparams.ALGreadlevel > -1)
+            {
+                wheres.push(" fclt_3d_regio_key IN"
+                          + "(SELECT alg_regio_key "
+                          + "   FROM fac_v_my_regions "
+                          + "  WHERE niveau ="+this.authparams.ALGreadlevel
+                          + "    AND prs_perslid_key="+user_key+")");
+            }
+            if (bMetALGAuth && "fclt_3d_district_key" in this.fields && this.authparams.ALGreadlevel > -1)
+            {
+                wheres.push(" fclt_3d_district_key IN"
+                          + "(SELECT alg_district_key "
+                          + "   FROM fac_v_my_districts "
+                          + "  WHERE niveau ="+this.authparams.ALGreadlevel
+                          + "    AND prs_perslid_key="+user_key+")");
+            }
            if (bMetALGAuth && "fclt_3d_locatie_key" in this.fields && this.authparams.ALGreadlevel > -1)
            {
                wheres.push(" fclt_3d_locatie_key IN"
@@ -175,7 +191,7 @@ function model_reports(fac_usrrap_key)
    model.styling = usrrap.styling;
    model.graph_options = usrrap.graph_options;
    model.graph_type = usrrap.graph_type;
-    model.list = { columns : [], groupby : [], canGroup: true, canCSV: true, autoCount: usrrap.count.id, autoPivot: usrrap.pivot.id, autoGraph: usrrap.graph.id };
+    model.list = { columns : [], groupby : [], canGroup: true, canCSV: true, autoCount: usrrap.count.id, autoPivot: usrrap.pivot.id, autoGraph: usrrap.graph.id, autoRatio: usrrap.ratio.id };
    if (model.styling && (model.styling.id & 1))
        model.list.fixedColumns = true;
    model.search.title = L("lcl_usrrap_report") + " " + usrrap.name;
@@ -272,6 +288,11 @@ function model_reports(fac_usrrap_key)
        model.list.columns.push("scf_count");
        model.list.groupby.push("");
    }
+    if ((model.list.autoRatio & 2) == 2)
+    {
+        model.list.columns.push("scf_ratio");
+        model.list.groupby.push("");
+    }

    return model;
 }
@@ -298,9 +319,18 @@ function report_GET(params)
    {
        if (params.columns.length == 1)
            shared.simpel_page(L("lcl_empty_rstable"));
+
        this.fields["scf_count"] = { dbs: "scf_count", sql: "COUNT(*)", typ: "number", label: L("lcl_count"), orglabel: L("lcl_count"), total: true };
        hasAggregate = true;
    }
+    if (params.columns && inArray("scf_ratio", params.columns))
+    {
+        if (params.columns.length == 1)
+            shared.simpel_page(L("lcl_empty_rstable"));
+
+        this.fields["scf_ratio"] = { dbs: "scf_ratio", sql: "RATIO_TO_REPORT(COUNT(*)) OVER() * 100", typ: "float", label: L("lcl_ratio"), orglabel: L("lcl_ratio"), total: true };
+        hasAggregate = true;
+    }
    if (params.columns && params.groupby && params.groupby.length > 0)
    {
        if (params.columns.length != params.groupby.length)
@@ -359,7 +389,7 @@ function report_GET(params)
        for (var i=0; i < params.columns.length; i++)
        {
            var fld = params.columns[i];
-            if (fld == "scf_count")
+            if (fld == "scf_count" || fld == "scf_ratio" )
                continue;
            var field = this.fields[fld];
            var field_expression = (field.sql ? field.sql : field.dbs);
--- a/APPL/API2/model_reportsx.inc
+++ b/APPL/API2/model_reportsx.inc
@@ -38,6 +38,8 @@ function model_reportsx(usrrap_key, rapparams)
                    "autorefresh"  : {  dbs: "fac_usrrap_autorefresh",   typ: "check",    label: L("lcl_usrrap_autorefresh")},
                    "count"        : {  dbs: "fac_usrrap_count",         typ: "number",   label: L("lcl_usrrap_showcount"),
                                            required: true, defaultvalue: 1, LOV: L("lcl_usrrap_showcountLOV")}, // 0;Uit, verborgen;1;Uit, kiesbaar;2;Aan, verborgen;3;Aan, kiesbaar
+                    "ratio"        : {  dbs: "fac_usrrap_ratio",         typ: "number",   label: L("lcl_usrrap_showratio"),
+                                            required: true, defaultvalue: 1, LOV: L("lcl_usrrap_showcountLOV")}, // 0;Uit, verborgen;1;Uit, kiesbaar;2;Aan, verborgen;3;Aan, kiesbaar
                    "pivot"        : {  dbs: "fac_usrrap_pivot",         typ: "number",   label: L("lcl_usrrap_showpivot"),
                                            required: true, defaultvalue: 0, LOV: L("lcl_usrrap_showcountLOV")},
                    "graph"        : {  dbs: "fac_usrrap_graph",         typ: "number",   label: L("lcl_usrrap_showgraph"),
@@ -98,7 +100,7 @@ function model_reportsx(usrrap_key, rapparams)
            {
              "tbl": "fac_functie",
              "key": "fac_functie_key",
-              "desc": "fac_functie_omschrijving || ' (' || fac_functie_code || ')'",
+              "desc": "lcl.l(fac_functie_omschrijving, 1) || ' (' || fac_functie_code || ')'",
              "where": "fac_functie_code NOT IN ('WEB_FACFAC', 'WEB_FACTAB')"
            }
    }
@@ -259,6 +261,7 @@ function model_reportsx(usrrap_key, rapparams)
        if (S("fac_usrrap_mode") != 1)
        {
            this.fields["count"].readonly = true;
+            this.fields["ratio"].readonly = true;  // denk ik dan
            this.fields["pivot"].readonly = true;
            this.fields["graph"].readonly = true;
        }
--- a/APPL/API2/model_res_activiteit.inc
+++ b/APPL/API2/model_res_activiteit.inc
@@ -30,6 +30,19 @@ function model_res_activiteit()
            "filter": "exact",
            "seq": "res_s_res_activiteit_key"
        },
+        "res_srtactiviteit_key": {
+            "dbs": "res_srtactiviteit_key",
+            "label": L("res_srtactiviteit_key"),
+            "typ": "key",
+            "required": true,
+            "foreign": {
+                "tbl": "res_srtactiviteit",
+                "key": "res_srtactiviteit_key",
+                "desc": "res_srtactiviteit_omschrijving",
+                "where": "res_srtactiviteit_verwijder IS NULL"
+            },
+            "filter": "exact"
+        },
        "name": {
            "dbs": "res_activiteit_omschrijving",
            "label": L("res_activiteit_omschrijving"),
@@ -62,18 +75,11 @@ function model_res_activiteit()
            "label": L("res_activiteit_duur"),
            "typ": "float"
        },
-        "res_srtactiviteit_key": {
-            "dbs": "res_srtactiviteit_key",
-            "label": L("res_srtactiviteit_key"),
-            "typ": "key",
-            "required": true,
-            "foreign": {
-                "tbl": "res_srtactiviteit",
-                "key": "res_srtactiviteit_key",
-                "desc": "res_srtactiviteit_omschrijving",
-                "where": "res_srtactiviteit_verwijder IS NULL"
-            },
-            "filter": "exact"
+        "has_endtime": {
+            "dbs": "res_activiteit_meteindtijd",
+            "label": L("res_activiteit_meteindtijd"),
+            "typ": "check0",
+            "defaultvalue": 1
        }
    };

--- a/APPL/API2/model_res_alg_ruimte.inc
+++ b/APPL/API2/model_res_alg_ruimte.inc
@@ -55,6 +55,7 @@ function model_res_alg_ruimte(fnparams)
                "where": "alg_onroerendgoed_type = 'R'",
                "selectorforeign": "ALG_RUIMTE"
            },
+            "friendlyname": true,
            "foreignfiltercode": null // Ook facilitor irrelevant
        },
        "locatiekey": { // liever location maar zo komt het uit de plaatsselector
--- a/APPL/API2/model_res_artikel.inc
+++ b/APPL/API2/model_res_artikel.inc
@@ -69,11 +69,13 @@ function model_res_artikel()
        "res_artikel_prijs": {
            "dbs": "res_artikel_prijs",
            "label": L("res_artikel_prijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_artikel_btw": {
            "dbs": "res_artikel_btw",
            "label": L("res_artikel_btw"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_artikel_prijs_vast": {
@@ -84,16 +86,19 @@ function model_res_artikel()
        "res_artikel_inkoopprijs": {
            "dbs": "res_artikel_inkoopprijs",
            "label": L("res_artikel_inkoopprijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_artikel_kostenpersoneel": {
            "dbs": "res_artikel_kostenpersoneel",
            "label": L("res_artikel_kostenpersoneel"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_artikel_kostenalgemeen": {
            "dbs": "res_artikel_kostenalgemeen",
            "label": L("res_artikel_kostenalgemeen"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_artikel_minimum": {
--- a/APPL/API2/model_res_deel.inc
+++ b/APPL/API2/model_res_deel.inc
@@ -82,6 +82,7 @@ function model_res_deel()
        "res_deel_prijs": {
            "dbs": "res_deel_prijs",
            "label": L("res_deel_prijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_deel_prijs_vast": {
--- a/APPL/API2/model_res_kenmerk.inc
+++ b/APPL/API2/model_res_kenmerk.inc
@@ -47,7 +47,8 @@ function model_res_kenmerk()
                "desc": "res_srtkenmerk_omschrijving"
            },
            "filter": "exact",
-            "LOVinit": ""
+            "LOVinit": "",
+            "friendlyname": true
        },
        "level": {
            "dbs": "res_kenmerk_niveau",
--- a/APPL/API2/model_res_ruimte.inc
+++ b/APPL/API2/model_res_ruimte.inc
@@ -94,14 +94,31 @@ function model_res_ruimte()
            "label": L("res_ruimte_begintijd"),
            "typ": "float",
            "LOV": api2.getTimetable(),
-            "emptyoption": "Standaard"
+            "emptyoption": L("lcl_res_standaard").format(toTimeString(S("res_t1"),false))
        },
        "close": {
            "dbs": "res_ruimte_eindtijd",
            "label": L("res_ruimte_eindtijd"),
            "typ": "float",
            "LOV": api2.getTimetable(),
-            "emptyoption": "Standaard"
+            "emptyoption": L("lcl_res_standaard").format(toTimeString(S("res_t2"),false))
+        },
+        "blockstart": {
+            "dbs": "res_ruimte_begintijdblok",
+            "label": L("res_ruimte_begintijdblok"),
+            "typ": "float",
+            "LOV": api2.getTimetable()
+        },
+        "blockend": {
+            "dbs": "res_ruimte_eindtijdblok",
+            "label": L("res_ruimte_eindtijdblok"),
+            "typ": "float",
+            "LOV": api2.getTimetable()
+        },
+        "min_res_time": {
+            "dbs": "res_ruimte_min_duur",
+            "label": L("res_ruimte_min_duur"),
+            "typ": "float"
        },
        "res_ruimte_prijs_vast": {
            "dbs": "res_ruimte_prijs_vast",
@@ -117,26 +134,31 @@ function model_res_ruimte()
        "res_ruimte_intprijs": {
            "dbs": "res_ruimte_intprijs",
            "label": L("res_ruimte_intprijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_intprijs_ochtend": {
            "dbs": "res_ruimte_intprijs_ochtend",
            "label": L("res_ruimte_intprijs_ochtend"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_intprijs_middag": {
            "dbs": "res_ruimte_intprijs_middag",
            "label": L("res_ruimte_intprijs_middag"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_intprijs_avond": {
            "dbs": "res_ruimte_intprijs_avond",
            "label": L("res_ruimte_intprijs_avond"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_intprijs_dag": {
            "dbs": "res_ruimte_intprijs_dag",
            "label": L("res_ruimte_intprijs_dag"),
+            "iscurrency": true,
            "typ": "float"
        },
        "_externe_prijzen": {
@@ -148,26 +170,31 @@ function model_res_ruimte()
        "res_ruimte_prijs": {
            "dbs": "res_ruimte_prijs",
            "label": L("res_ruimte_prijs"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_prijs_ochtend": {
            "dbs": "res_ruimte_prijs_ochtend",
            "label": L("res_ruimte_prijs_ochtend"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_prijs_middag": {
            "dbs": "res_ruimte_prijs_middag",
            "label": L("res_ruimte_prijs_middag"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_prijs_avond": {
            "dbs": "res_ruimte_prijs_avond",
            "label": L("res_ruimte_prijs_avond"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_prijs_dag": {
            "dbs": "res_ruimte_prijs_dag",
            "label": L("res_ruimte_prijs_dag"),
+            "iscurrency": true,
            "typ": "float"
        },
        "res_ruimte_image": {
--- a/APPL/API2/model_res_srtartikel_onrgoed.inc
+++ b/APPL/API2/model_res_srtartikel_onrgoed.inc
@@ -73,6 +73,7 @@ function model_res_srtartikel_onrgoed()
                "where": "alg_onroerendgoed_type = res_srtartikel_onrgoed.alg_onrgoed_niveau",
                "selectorforeign": "ALG_RUIMTE"
            },
+            "friendlyname": true,
            "foreignfiltercode": null // Ook facilitor irrelevant
        }
    };
--- a/APPL/API2/model_reservableconsumables.inc
+++ b/APPL/API2/model_reservableconsumables.inc
@@ -27,12 +27,12 @@ model_reservableconsumables =
              "sequence"    : { dbs: "res_artikel_volgnummer",      typ: "number" },
              "remark"      : { dbs: "res_artikel_opmerking",       typ: "varchar", filter: "like"  },
              "unit"        : { dbs: "res_artikel_eenheid",         typ: "varchar", filter: "like"  },
-              "price"       : { dbs: "res_artikel_prijs",           typ: "float"  },
+              "price"       : { dbs: "res_artikel_prijs",           typ: "float",   "iscurrency": true  },
              "fixed"       : { dbs: "res_artikel_prijs_vast",      typ: "check0",  filter: "exact" },
-              "purchase"    : { dbs: "res_artikel_inkoopprijs",     typ: "float"},
+              "purchase"    : { dbs: "res_artikel_inkoopprijs",     typ: "float",   "iscurrency": true},
              "vat"         : { dbs: "res_artikel_btw",             typ: "float" },
-              "employeecost": { dbs: "res_artikel_kostenpersoneel", typ: "float" },
-              "generalcost" : { dbs: "res_artikel_kostenalgemeen",  typ: "float" },
+              "employeecost": { dbs: "res_artikel_kostenpersoneel", typ: "float",   "iscurrency": true },
+              "generalcost" : { dbs: "res_artikel_kostenalgemeen",  typ: "float",   "iscurrency": true },
              "catalog"     : { dbs: "res_discipline_key",          typ: "key",     foreign: "res_discipline" },
              "group"       : { dbs: "res_artikel_groep",           typ: "varchar", filter: "like" },
              "start"       : { dbs: "res_artikel_ingangsdatum",    typ: "date" },
--- a/Show More
+++ b/Show More