verkeerde versie

svn path=/Website/branches/v2018.1/; revision=39890
Foutieve Merge laatste 2017.3 wijzigingen
2018-11-20 15:29:16 +00:00 · 2018-11-19 17:11:16 +00:00 · 2018-11-19 10:39:24 +00:00 · 2018-11-19 10:32:00 +00:00 · 2018-11-19 10:30:48 +00:00 · 2018-11-19 10:29:24 +00:00
2311 changed files with 150921 additions and 89461 deletions
--- a/APPL/ALG/alg_district_list.inc
+++ b/APPL/ALG/alg_district_list.inc
@@ -131,6 +131,11 @@ function district_list(pautfunction, params)
      sqln += " AND d.alg_district_key = " + dis_key;
      }

+   if (params.distr_descr)
+      {
+        sqln += " AND UPPER(d.alg_district_omschrijving) LIKE " + safe.quoted_sql_wild(params.distr_descr + "%");
+      }
+
   else if (reg_key)
      {
      sqln += " AND d.alg_regio_key = " + reg_key;
--- a/APPL/ALG/alg_district_search.asp
+++ b/APPL/ALG/alg_district_search.asp
@@ -28,16 +28,16 @@ var authparams = alg.checkAutorisation();
          // Submitten met kenmerken
          doSubmitWithKenmerken();
      }
-        function myModal()
+        function myModal(init)
        {
          var lvl = "D";
          var key = 0;
          var bld_key = "";
          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" +bld_key + "&onrgoed_niveau=" + lvl;
          var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel)
+          showKenmerkModal(url, titel, init)
        }
-            $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
+            $(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
        </script>
 </head>
  <body id="searchbody">
@@ -52,10 +52,14 @@ var authparams = alg.checkAutorisation();
                                                                  regiokey: regio_key,
                                                                  districtkey: district_key,
                                                                  startlevel: 0, // Regio
-                                                                  eindlevel: 1, // District
+                                                                  eindlevel: 0, // Regio
                                                                  whenEmpty: L("lcl_search_generic")
                                                                });
 %>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_district_man_descr")%>:</label></td>
+                <td><input type="text" class="wildcard" id="distr_descr" name="distr_descr" value=""></td>
+              </tr>
              </table>
            </td><!-- end column 1 -->
            <td class="searchkolom2">
--- a/APPL/ALG/alg_district_search_list.asp
+++ b/APPL/ALG/alg_district_search_list.asp
@@ -4,9 +4,9 @@
     $Id$

    File:        alg_district_search_list.asp
-    Description: 
-    Parameters: 
-    Context:     
+    Description:
+    Parameters:
+    Context:
    Note:
 */ %>

@@ -23,12 +23,14 @@ var outputmode = getQParamInt("outputmode", 0); //  0 = screen, 1 = print, 2 = e
 var showall = getQParamInt("showall", 0) == 1;
 var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
+var distr_descr = getQParam("distr_descr", ""); // Districtomschrijving

 district_list ( "*",
              {  outputmode: outputmode,
                 showall: showall,
                 reg_key: (reg_key != -1? reg_key : null),
-                 dis_key: (dis_key != -1? dis_key : null)
+                 dis_key: (dis_key != -1? dis_key : null),
+                 distr_descr: distr_descr
              }
             );
 %>
--- a/APPL/ALG/alg_edit_district_save.asp
+++ b/APPL/ALG/alg_edit_district_save.asp
@@ -74,11 +74,13 @@ else
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { dis_key: <%=dis_key%>,
-                                          warning: "<%=safe.jsstring(warning)%>",
-                                          keepForm: <%=warning?"true":"false"%>
-                                         }); } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { dis_key: <%=dis_key%>,
+                                        warning: "<%=safe.jsstring(warning)%>",
+                                        keepForm: <%=warning?"true":"false"%>
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_edit_gebouw.asp
+++ b/APPL/ALG/alg_edit_gebouw.asp
@@ -26,6 +26,7 @@
 <%
 FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: []})

+var ins_score_enabled = S("ins_score_enabled") == 1;
 var bld_key  = getQParamInt("bld_key");

 var onrgoedlvl = "G";
@@ -68,6 +69,7 @@ if (bld_key > 0)
  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;
+  var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
  oRs.Close();
 }
 else
@@ -120,7 +122,7 @@ else
                             readonly: bld_key > 0,
                             required: true
                           });
-        manRWFIELD("bld_naam",  "fld",          L("lcl_estate_gebouw_man_name"),        bld_naam, {required: true, maxlength: 30});
+        manRWFIELD("bld_naam",  "fld",          L("lcl_estate_gebouw_man_name"),        bld_naam, {required: true, maxlength: 60});
        sql = "SELECT   alg_srtgebouw_key, "
            + "         "+lcl.xsqla('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')
            + "    FROM alg_srtgebouw "
@@ -176,19 +178,19 @@ else
        if (bld_key > 0)
        {
          var calcopp = alg.calc_algm2(bld_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_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true, datatype: "float"});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
        }
-        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});
+        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, {datatype: "float", maxlength: 15});
+        manRWFIELD("bld_inhoud",  "fld",          L("lcl_estate_gebouw_man_inhoud"),        bld_inhoud, {datatype: "float", maxlength: 15});
        FCLTadresselector("mld_adres", "sgAdres",
                    {
                       label: L("lcl_delivery_address"),
                       adresKey:  mld_adres,
                       emptyOption: "",
-                       filtcode: "A",
+                       filtercode: "A",
                       readonly: !this_alg.writeman
                    }) ;
        manRWFIELD("bld_x",  "fld",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
@@ -228,6 +230,8 @@ else
                      );
        if (this_alg.writeman)
          CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
+        if (ins_score_enabled)
+          ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
        BLOCK_END();

        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
--- a/APPL/ALG/alg_edit_gebouw_save.asp
+++ b/APPL/ALG/alg_edit_gebouw_save.asp
@@ -110,11 +110,13 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { bld_key: <%=bld_key%>,
-                                          warning: "<%=safe.jsstring(warning)%>",
-                                          keepForm: <%=warning?"true":"false"%>
-                                         }); } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { bld_key: <%=bld_key%>,
+                                        warning: "<%=safe.jsstring(warning)%>",
+                                        keepForm: <%=warning?"true":"false"%>
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_edit_locatie.asp
+++ b/APPL/ALG/alg_edit_locatie.asp
@@ -22,6 +22,7 @@
 <%
 FCLTHeader.Requires({plugins:["suggest","jQuery","kenmerk"], js: []})

+var ins_score_enabled = S("ins_score_enabled") == 1;
 var loc_key  = getQParamInt("loc_key", -1);
 var dis_key

@@ -53,7 +54,8 @@ if (loc_key > 0)
    var pst_adres  = oRs("alg_locatie_post_adres").value;
    var pst_plaats = oRs("alg_locatie_post_plaats").value;
    var pst_land   = oRs("alg_locatie_post_land").value;
-  var dienstniveau  = oRs("mld_dienstniveau_key").value;
+    var dienstniveau  = oRs("mld_dienstniveau_key").value;
+    var loc_score1 = oRs("alg_locatie_mjb_score1").value;

    oRs.Close();
 }
@@ -138,6 +140,8 @@ manRWFIELD("pst_land",  "fld",          L("lcl_prs_address_post_land"),        p
 manRWFIELD("loc_vw",  "fld",          L("lcl_estate_locatie_man_verantw"),        loc_vw, {maxlength: 30});
 manRWFIELD("loc_vwtel",  "fld",          L("lcl_estate_locatie_man_verantw_tel"),        loc_vwtel, {maxlength: 15});
 manRWFIELD("loc_mail",  "fld",          L("lcl_noti_email"),        loc_mail, {maxlength: 200});
+if (ins_score_enabled)
+  ROFIELDTR("fld",                        L("lcl_alg_locatie_mjb_score1"),        loc_score1, {suppressEmpty: true});

 BLOCK_END();

--- a/APPL/ALG/alg_edit_locatie_save.asp
+++ b/APPL/ALG/alg_edit_locatie_save.asp
@@ -90,11 +90,13 @@ else
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { loc_key: <%=loc_key%>,
-                                          warning: "<%=safe.jsstring(warning)%>",
-                                          keepForm: <%=warning?"true":"false"%>
-                                         }); } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { loc_key: <%=loc_key%>,
+                                        warning: "<%=safe.jsstring(warning)%>",
+                                        keepForm: <%=warning?"true":"false"%>
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_edit_ruimte.asp
+++ b/APPL/ALG/alg_edit_ruimte.asp
@@ -164,14 +164,14 @@ if (!room_exists)
        BLOCK_START("algLoc2", "&nbsp;");

          manRWFIELD("room_opp",  "fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {maxlength: 10, datatype: "float"});
-          ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"), room_data.cadcontours[0].cadarea);
+          ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"), room_data.cadcontours[0].cadarea, {datatype: "float"});
          if (S("fg_contourlayers_alt1")!="" && S("fg_labellayers_alt1")!="") {
            manRWFIELD("room_oppa1",  "fldshort", L("lcl_estate_ruimte_opp_alt1"),       room_data.area1, {maxlength: 10, datatype: "float"});
-            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"), room_data.cadcontours[0].cadalt1);
+            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"), room_data.cadcontours[0].cadalt1, {datatype: "float"});
          }
          if (S("fg_contourlayers_alt2")!="" && S("fg_labellayers_alt2")!="") {
            manRWFIELD("room_oppa2",  "fldshort", L("lcl_estate_ruimte_opp_alt2"),       room_data.area2, {maxlength: 10, datatype: "float"});
-            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"), room_data.cadcontours[0].cadalt2);
+            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"), room_data.cadcontours[0].cadalt2, {datatype: "float"});
          }
          manRWFIELD("room_omt",  "fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {maxlength: 10, datatype: "float"});
          manRWFIELD("room_inh",  "fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,  {maxlength: 13, datatype: "float"});
--- a/APPL/ALG/alg_edit_ruimte_multi_save.asp
+++ b/APPL/ALG/alg_edit_ruimte_multi_save.asp
@@ -52,6 +52,10 @@ for (var i = 0; i < alg_key_arr.length; i++)


        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
+                            + ",      k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
+                            + ",      k.alg_kenmerk_systeem     kenmerk_systeem"
+                            + ",      k.alg_kenmerk_toonbaar    kenmerk_readonly"
+                            + ",      k.alg_kenmerk_uniek       kenmerk_uniek"
                            + ",      fac_kenmerkdomein_key"
                            + "  FROM alg_kenmerk k"
                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
--- a/APPL/ALG/alg_edit_ruimtefunctie.asp
+++ b/APPL/ALG/alg_edit_ruimtefunctie.asp
@@ -63,7 +63,7 @@ if (srtruimte_lg_key > -1)
 <html>
  <head>
 <%  FCLTHeader.Generate(); %>
-    <script  type="text/javascript" >
+    <script type="text/javascript">
      function ruimtefunctie_submit()
      {
        document.activeElement.blur(); // trigger laatste onChanges
@@ -79,10 +79,10 @@ if (srtruimte_lg_key > -1)
        FcltMgr.closeDetail(window, { cancel: true } );
      }

-      jQuery(document).ready(function()
-                             {
-                               FcltMgr.resized(window);
-                             });
+      $(function()
+      {
+        FcltMgr.resized(window);
+      });
    </script>
  </head>

--- a/APPL/ALG/alg_edit_ruimtefunctie_save.asp
+++ b/APPL/ALG/alg_edit_ruimtefunctie_save.asp
@@ -90,11 +90,12 @@ __Log("srtruimte_lg_key = " + srtruimte_lg_key);
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { warning: "<%=safe.jsstring(warning)%>",
-                                          refresh: true
-                                         });
-         } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { warning: "<%=safe.jsstring(warning)%>",
+                                        refresh: true
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_edit_terreinsector_save.asp
+++ b/APPL/ALG/alg_edit_terreinsector_save.asp
@@ -108,11 +108,13 @@ else
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { ter_key: <%=ter_key%>,
-                                          warning: "<%=safe.jsstring(warning)%>",
-                                          keepForm: <%=warning?"true":"false"%>
-                                         }); } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { ter_key: <%=ter_key%>,
+                                        warning: "<%=safe.jsstring(warning)%>",
+                                        keepForm: <%=warning?"true":"false"%>
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_edit_verdieping.asp
+++ b/APPL/ALG/alg_edit_verdieping.asp
@@ -116,11 +116,11 @@ BLOCK_END();
 BLOCK_START("algLoc2", "&nbsp;");
 if (flr_key > 0)
 {
-  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});
-}  
+  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, datatype: "float"});
+  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
+  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
+}
 BLOCK_END();

 generateFlexKenmerkBlock ({
--- a/APPL/ALG/alg_edit_verdieping_save.asp
+++ b/APPL/ALG/alg_edit_verdieping_save.asp
@@ -79,10 +79,13 @@ else
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function ()
-          { FcltMgr.closeDetail(window, { flr_key: <%=flr_key%>,
-                                          warning: "<%=safe.jsstring(warning)%>",
-                                          keepForm: <%=warning?"true":"false"%> }); } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { flr_key: <%=flr_key%>,
+                                        warning: "<%=safe.jsstring(warning)%>",
+                                        keepForm: <%=warning?"true":"false"%>
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_edit_wp.asp
+++ b/APPL/ALG/alg_edit_wp.asp
@@ -95,7 +95,7 @@ function onChangeVolgnr()
 }

 <% if (wp_key<0) { %>
-$(document).ready(function(){ onChangeRoom(<%=room_key%>)});
+$(function(){ onChangeRoom(<%=room_key%>)});
 <% } %>

 </script>
--- a/APPL/ALG/alg_edit_wp_save.asp
+++ b/APPL/ALG/alg_edit_wp_save.asp
@@ -80,11 +80,13 @@ else
  <head>
    <%  FCLTHeader.Generate() %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { wp_key: <%=wp_key%>,
-                                          warning: "<%=safe.jsstring(warning)%>",
-                                          keepForm: <%=warning? "true" : "false"%>
-                                          }); } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { wp_key: <%=wp_key%>,
+                                        warning: "<%=safe.jsstring(warning)%>",
+                                        keepForm: <%=warning? "true" : "false"%>
+                                      });
+        });
    </script>
  </head>
  <body>
--- a/APPL/ALG/alg_flexkenmerk.inc
+++ b/APPL/ALG/alg_flexkenmerk.inc
@@ -63,6 +63,7 @@ function generateFlexKenmerkBlock(params)
             + "         k.alg_kenmerk_dec              kenmerk_dec, "
             + "         k.alg_kenmerk_nmin             kenmerk_nmin, "
             + "         k.alg_kenmerk_nmax             kenmerk_nmax, "
+             + "         k.alg_kenmerk_systeem          kenmerk_systeem, "
             + (onrgoed_key > 0
               ? "     (SELECT v.alg_onrgoedkenmerk_waarde "
                 + "      FROM alg_onrgoedkenmerk v "
--- a/APPL/ALG/alg_gebouw_list.inc
+++ b/APPL/ALG/alg_gebouw_list.inc
@@ -68,33 +68,41 @@ function fnrowClass(oRs)
  function gotoDetails(row)
  {
    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
+    var url = "appl/alg/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
    FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
  }
  function gotoParent(row)
  {
    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
+    var url = "appl/alg/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
    FcltMgr.openDetail(url, "<%=L("lcl_location")%>");
  }
-    function gebouwEdit(row)
+  function gebouwEdit(row)
  {
    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_gebouw.asp?mode=viewUpdate&key=" + algData.key;
+    var url = "appl/alg/alg_gebouw.asp?mode=viewUpdate&key=" + algData.key;
    FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
  }

-function doDelete(rowArray, isMulti)
+  function doDelete(rowArray, isMulti)
+  {
+    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");
+    });
+  }
+
+function toObjMan(row)
 {
-  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");
-  });
+  var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+  var url = "appl/ins/ins_search.asp?urole=bo&gebouw_key=" + algData.key;
+  FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
 }
+
 </script>
 <%

@@ -111,6 +119,7 @@ function gebouw_list(pautfunction, params)

  var noref = params.noref;

+  var ins_score_enabled = S("ins_score_enabled") == 1;
  var reg_key = params.reg_key;
  var dis_key = params.dis_key;
  var loc_key = params.loc_key;
@@ -118,13 +127,23 @@ function gebouw_list(pautfunction, params)
  var srtgebouw_key = params.srtgebouw_key;
  var verantw_key = params.verantw_key;
  var expalgincl = params.expalgincl;
+  var fitness_score1_from = params.fitness_score1_from;
+  var fitness_score1_through = params.fitness_score1_through;

+  var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true);
+  var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
+  var readuse = autparamsINSUSE && autparamsINSUSE.PRSreadlevel < 9 && autparamsINSUSE.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
+  var readman = autparamsINSMAN && autparamsINSMAN.PRSreadlevel < 9 && autparamsINSMAN.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
  function fnrowActionEnabler(oRs)
  {
    var eDelete = false;
+    var eObjMan = false;
    if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
      eDelete = true;
-    return ({eDelete: eDelete})
+    // Heb ik rechten om het objectenbeheer overzicht te zien?
+    if (readuse || readman)
+      eObjMan = true;
+    return ({eDelete: eDelete, eObjMan: eObjMan});
  }

  function fnrowFlexParams(oRs)
@@ -158,6 +177,7 @@ function gebouw_list(pautfunction, params)
           + "     , g.alg_gebouw_x"
           + "     , g.alg_gebouw_y"
           + "     , g.alg_gebouw_vervaldatum"
+           + "     , g.alg_gebouw_mjb_score1"
           + "     , (SELECT MAX(t.fac_tracking_datum)"
           + "          FROM fac_tracking t"
           + "             , fac_srtnotificatie sn"
@@ -204,6 +224,15 @@ function gebouw_list(pautfunction, params)
    if (!expalgincl)
      sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";

+    if (ins_score_enabled)
+    { // Conditiescore.
+      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
+      if (fitness_score1_from > 0)
+        sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
+      if (fitness_score1_through > 0)
+        sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
+    }
+
    sqln += " ORDER BY l.alg_locatie_upper ASC, "
          +  "          g.alg_gebouw_upper ASC  ";

@@ -247,14 +276,12 @@ function gebouw_list(pautfunction, params)
      rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_gebouw_x"}));
      rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_gebouw_y"}));
    }
+    if (ins_score_enabled)
+      rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1"}));

    rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault:  true});
    rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});
-    if (!noref)
-    {
-      rst.addAction({ action: "gotoDetails", caption: L("lcl_goto_verdieping_list")});
-      rst.addAction({ action: "gotoParent", caption: L("lcl_goto_locatie_list")});
-    }
+    rst.addAction({ action: "toObjMan", caption: L("lcl_ins_object_management"), enabler: "eObjMan"});
    var cnt = rst.processResultset();
 %>
    </body>
--- a/APPL/ALG/alg_gebouw_search.asp
+++ b/APPL/ALG/alg_gebouw_search.asp
@@ -14,6 +14,7 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });

+var ins_score_enabled = S("ins_score_enabled") == 1;
 var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
 var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
@@ -34,17 +35,17 @@ var this_alg = alg.func_enabled(gebouw_key);
                doSubmitWithKenmerken();
            }

-        function myModal()
+        function myModal(init)
        {
          var lvl = "G";
          var key = 0;
          var bld_key = "";
          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
          var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel)
+          showKenmerkModal(url, titel, init)
        }

-          $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+          $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
      </script>
  </head>
  <body id="searchbody">
@@ -91,26 +92,62 @@ var this_alg = alg.func_enabled(gebouw_key);
                + "  FROM alg_srtgebouw"
                + " WHERE alg_srtgebouw_verwijder IS NULL"
                + " ORDER BY UPPER("+lcl.xsql('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')+")";
-            FCLTselector("srt",
-                         sql,
-                         { initKey: srtgebouw_key,
-                           label: L("lcl_estate_gebouw_srtgebouw"),
-                           trclass: "primsearch",
-                           emptyOption: ""
-                         });
-%>
-            <!-- Gebouw verantwoordelijke -->
-<%          // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
-            FCLTpersoonselector("verantw",
-                                "sgVerantw",
-                                { perslidKey: verantw_key,
-                                  label: L("lcl_alg_bld_verantw"),
-                                  filtercode: "GV", // Gebouw Verantwoordelijke
-                                  trclass: "primsearch",
-                                  suppressNoValues: true,
-                                  whenEmpty: L("lcl_search_generic")  // want filter
-                                });
+              FCLTselector("srt",
+                           sql,
+                           { initKey: srtgebouw_key,
+                             label: L("lcl_estate_gebouw_srtgebouw"),
+                             trclass: "primsearch",
+                             emptyOption: ""
+                           });
 %>
+              <!-- Gebouw verantwoordelijke -->
+<%            // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
+              FCLTpersoonselector("verantw",
+                                  "sgVerantw",
+                                  { perslidKey: verantw_key,
+                                    label: L("lcl_alg_bld_verantw"),
+                                    filtercode: "GV", // Gebouw Verantwoordelijke
+                                    trclass: "primsearch",
+                                    suppressNoValues: true,
+                                    whenEmpty: L("lcl_search_generic")  // want filter
+                                  });
+
+              if (ins_score_enabled)
+              { // Conditiescore
+%>              <tr class="primsearch fldfitness_score" id="fitness_score">
+                  <td>
+                    <table width="100%">
+                      <tr>
+                        <td class="label">
+                        <label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
+                        </td>
+                        <td style="text-align: right">
+                          <%=L("lcl_mjb_from")%>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                  <td class="score">
+                    <input type="text"
+                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                           id="fitness_score1_from"
+                           name="fitness_score1_from"
+                           class="fldflexN  number "
+                           value=""
+                           maxlength="1">
+                    &nbsp;<%=L("lcl_mjb_through")%>&nbsp;
+                    <input type="text"
+                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                           id="fitness_score1_through"
+                           name="fitness_score1_through"
+                           class="fldflexN  number "
+                           value=""
+                           maxlength="1">
+                  </td>
+                </tr>
+<%            } %>
            </table>
          </td><!-- end column 1 -->
        </tr>
--- a/APPL/ALG/alg_gebouw_search_list.asp
+++ b/APPL/ALG/alg_gebouw_search_list.asp
@@ -32,6 +32,8 @@ 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
+var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
+var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.

 gebouw_list ( "*",
              { outputmode: outputmode,
@@ -45,6 +47,8 @@ gebouw_list ( "*",
                 bld_key: (bld_key != -1? bld_key : null),
                 bld_code: bld_code,
                 bld_name: bld_name,
+                 fitness_score1_from : fitness_score1_from,
+                 fitness_score1_through : fitness_score1_through,
                 noref: (noref != -1? noref : null),
                 expalgincl: expalgincl
              }
--- a/APPL/ALG/alg_locatie_list.inc
+++ b/APPL/ALG/alg_locatie_list.inc
@@ -71,12 +71,6 @@ function fnrowClass(oRs)
    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
    var url = "appl/ALG/alg_gebouw_search.asp?locatie_key="+algData.detail_key+"&autosearch="+autosearch;
    FcltMgr.openDetail(url, "<%=L("lcl_building")%>");
-  }
-    function gotoDetails2(row)
-  {
-    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_terreinsector_search.asp?locatie_key="+algData.detail_key+"&autosearch="+autosearch;
-    FcltMgr.openDetail(url, "<%=L("lcl_terra")%>");
  }
  function gotoParent(row)
  {
@@ -117,9 +111,12 @@ function locatie_list(pautfunction, params)

  var noref = params.noref;

+  var ins_score_enabled = S("ins_score_enabled") == 1;
  var reg_key = params.reg_key;
  var dis_key = params.dis_key;
  var loc_key = params.loc_key;
+  var fitness_score1_from = params.fitness_score1_from;
+  var fitness_score1_through = params.fitness_score1_through;

  function fnrowActionEnabler(oRs)
  {
@@ -161,6 +158,7 @@ function locatie_list(pautfunction, params)
             + "     , l.alg_locatie_verantw_tel"
             + "     , l.alg_locatie_x"
             + "     , l.alg_locatie_y"
+             + "     , l.alg_locatie_mjb_score1"
             + "     , (SELECT MAX(t.fac_tracking_datum)"
             + "          FROM fac_tracking t"
             + "             , fac_srtnotificatie sn"
@@ -195,11 +193,22 @@ 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 "
+    if (params.loc_code)
+        sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");
+    if (params.loc_descr)
+        sqln += " AND UPPER(l.alg_locatie_omschrijving) LIKE " + safe.quoted_sql_wild(params.loc_descr + "%");
+
+    if (ins_score_enabled)
+    { // Conditiescore.
+      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
+      if (fitness_score1_from > 0)
+        sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
+      if (fitness_score1_through > 0)
+        sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
+    }
+
+    sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";

    var addurl = "appl/alg/alg_locatie.asp";
 //  addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
@@ -231,6 +240,8 @@ function locatie_list(pautfunction, params)
    rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
    rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
    rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
+    if (ins_score_enabled)
+      rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1"}));

    if (outputmode != 0)
    {
@@ -249,7 +260,6 @@ function locatie_list(pautfunction, params)
    rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});
    if (!noref) {
        rst.addAction({ action: "gotoDetails", caption: L("lcl_goto_gebouw_list")});
-        rst.addAction({ action: "gotoDetails2", caption: L("lcl_goto_terreinsector_list")});
        rst.addAction({ action: "gotoParent", caption: L("lcl_goto_district_list")});
    }
    var cnt = rst.processResultset();
--- a/APPL/ALG/alg_locatie_search.asp
+++ b/APPL/ALG/alg_locatie_search.asp
@@ -12,6 +12,7 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });

+var ins_score_enabled = S("ins_score_enabled") == 1;
 var district_key = getQParamInt("district_key", -1); //district
 var locatie_key = getQParamInt("locatie_key", -1); //locatie
 var autosearch = getQParamInt("autosearch", 0) == 1;
@@ -28,23 +29,23 @@ var authparams = alg.checkAutorisation();
              doSubmitWithKenmerken();
          }

-        function myModal()
+        function myModal(init)
        {
          var lvl = "L";
          var key = 0;
          var bld_key = "";
          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
          var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel)
+          showKenmerkModal(url, titel, init)
        }

-        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+        $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
    </script>
  </head>
  <body id="searchbody">
    <div id="search">
      <form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
-<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+<%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
          <tr>
            <td class="searchkolom1">
              <table><!-- x rijen, 2 kolommen: label + veld -->
@@ -53,7 +54,7 @@ var authparams = alg.checkAutorisation();
                                                                  districtkey: district_key,
                                                                  locatiekey: locatie_key,
                                                                  startlevel: 1, // District
-                                                                  eindlevel: 2, // locatie
+                                                                  eindlevel: 2, // Locatie
                                                                  whenEmpty: L("lcl_search_generic")  // want filter
                                                                });
 %>
@@ -61,13 +62,56 @@ var authparams = alg.checkAutorisation();
                <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>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_locatie_man_descr")%>:</label></td>
+                <td><input type="text" class="wildcard" id="loc_descr" name="loc_descr" value=""></td>
+              </tr>
              </table>
            </td><!-- end column 1 -->

+            <!-- Second column -->
            <td class="searchkolom2">
-            </td><!-- end column 1 -->
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+<%              if (ins_score_enabled)
+                { // Conditiescore
+%>                <tr class="primsearch fldfitness_score" id="fitness_score">
+                    <td>
+                      <table width="100%">
+                        <tr>
+                          <td class="label">
+                            <label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
+                          </td>
+                          <td style="text-align: right">
+                            <%=L("lcl_mjb_from")%>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                    <td class="score">
+                      <input type="text"
+                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                             onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                             id="fitness_score1_from"
+                             name="fitness_score1_from"
+                             class="fldflexN  number "
+                             value=""
+                             maxlength="1">
+                      &nbsp;<%=L("lcl_mjb_through")%>&nbsp;
+                      <input type="text"
+                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                             onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                             id="fitness_score1_through"
+                             name="fitness_score1_through"
+                             class="fldflexN  number "
+                             value=""
+                             maxlength="1">
+                    </td>
+                  </tr>
+<%              } %>
+              </table>
+            </td><!-- end column 2 -->
          </tr>
-<%    BLOCK_END();
+<%      BLOCK_END();

  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
--- a/APPL/ALG/alg_locatie_search_list.asp
+++ b/APPL/ALG/alg_locatie_search_list.asp
@@ -3,10 +3,10 @@
     $Revision$
     $Id$

-    File:       
-    Description: 
-    Parameters:  
-    Context:     
+    File:
+    Description:
+    Parameters:
+    Context:
    Note:
 */ %>

@@ -26,6 +26,9 @@ 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
+var loc_descr = getQParam("loc_descr", ""); // Locatienaam
+var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
+var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.

 locatie_list ( "*",
              {  outputmode: outputmode,
@@ -33,7 +36,10 @@ 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,                 
+                 loc_code: loc_code,
+                 loc_descr: loc_descr,
+                 fitness_score1_from : fitness_score1_from,
+                 fitness_score1_through : fitness_score1_through,
                 noref: (noref != -1? noref : null)
              }
             );
--- a/APPL/ALG/alg_regio_search.asp
+++ b/APPL/ALG/alg_regio_search.asp
@@ -23,7 +23,7 @@ var authparams = alg.checkAutorisation();
  <head>
    <%  FCLTHeader.Generate(); %>
    <script type="text/javascript">
-    $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+    $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
    </script>
  </head>
  <body id="searchbody">
--- a/APPL/ALG/alg_ruimte.asp
+++ b/APPL/ALG/alg_ruimte.asp
@@ -114,7 +114,7 @@ else
      var insman_read = authparamsINSMAN;
      if (insman_read)
      {
-          var page4="../INS/ins_list.asp?embedded=1&tiny=1&ruimtekey=" + room_key
+          var page4="../INS/ins_list.asp?embedded=1&tiny=1&inacObjIncl=1&ruimtekey=" + room_key
          IFRAMER("insdeel", page4, { initHeight: "450px" } );
      }
      var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
--- a/APPL/ALG/alg_ruimte_list.inc
+++ b/APPL/ALG/alg_ruimte_list.inc
@@ -28,18 +28,17 @@ function ruimte_list(pautfunction, params)
  // Voor resulttable de globalen zetten; zou ng anders moeten.
  var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
  var showall = params.showall;
-
  var noref = params.noref;
-  var reg_key = params.reg_key;
-  var dis_key = params.dis_key;
-  var loc_key = params.loc_key;
-  var bld_key = params.bld_key;
-  var lvl_key = params.lvl_key;
-  var room_key = params.room_key;
+  var reg_key_arr = params.reg_key_arr;
+  var dis_key_arr = params.dis_key_arr;
+  var loc_key_arr = params.loc_key_arr;
+  var bld_key_arr = params.bld_key_arr;
+  var flr_key_arr = params.flr_key_arr;
+  var room_key_arr = params.room_key_arr;
  var area_nr = params.area_nr;
  var area_descr = params.area_descr;
  var srtruimte_key = params.srtruimte_key
-  var dept_key = params.dept_key;
+  var dept_key_arr = params.dept_key_arr;
  var chkgeb = params.chkgeb;
 %>

@@ -153,26 +152,26 @@ function ruimte_list(pautfunction, params)

      sqln += getKenmerkSql("ALG", "r.alg_ruimte_key");

-      if (room_key)
+      if (room_key_arr && room_key_arr.length)
      {
-        sqln += " AND r.alg_ruimte_key = " + room_key;
+        sqln += " AND r.alg_ruimte_key IN (" + room_key_arr.join(",") + ")";
      }
-      else if (lvl_key)
+      else if (flr_key_arr && flr_key_arr.length)
      {
-        sqln += " AND v.alg_verdieping_key = " + lvl_key;
+        sqln += " AND v.alg_verdieping_key IN (" + flr_key_arr.join(",") + ")";
      }
-      else if (bld_key)
+      else if (bld_key_arr && bld_key_arr.length)
      {
-        sqln += " AND v.alg_gebouw_key = " + bld_key;
+        sqln += " AND v.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")";
      }
-      else if (loc_key)
+      else if (loc_key_arr && loc_key_arr.length)
      {
-        sqln += " AND g.alg_locatie_key = " + loc_key;
+        sqln += " AND g.alg_locatie_key IN (" + loc_key_arr.join(",") + ")";
      }
-      else if (dis_key)
-        sqln += " AND l.alg_district_key = " + dis_key;
-      else if (reg_key)
-        sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
+      else if (dis_key_arr && dis_key_arr.length)
+        sqln += " AND l.alg_district_key IN (" + dis_key_arr.join(",") + ")";
+      else if (reg_key_arr && reg_key_arr.length)
+        sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key IN (" + reg_key_arr.join(",") + "))";

      if (srtruimte_key)
      {
@@ -189,13 +188,13 @@ function ruimte_list(pautfunction, params)
        sqln += " AND UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_wild("%" + area_descr + "%");
      }

-      if (dept_key)
+      if (dept_key_arr && dept_key_arr.length)
      {
        sqln += " AND r.alg_ruimte_key in "
             +  "                    (SELECT alg_ruimte_key "
             +  "                      FROM prs_ruimteafdeling "
             +  "                     WHERE prs_ruimteafdeling_verwijder IS NULL "
-             +  "                       AND prs_afdeling_key = " + dept_key + ")";
+             +  "                       AND prs_afdeling_key IN (" + dept_key_arr.join(",") + "))";
      }

      if (!chkgeb)
@@ -237,8 +236,7 @@ function ruimte_list(pautfunction, params)

      function fnrowFlexParams(oRs)
      {
-        var room_key = oRs("alg_ruimte_key").Value;
-        var this_alg = alg.func_enabled(room_key, "R");
+        var this_alg = alg.func_enabled(oRs("alg_ruimte_key").Value, "R");

        var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
        return flexParams;
--- a/APPL/ALG/alg_ruimte_search.asp
+++ b/APPL/ALG/alg_ruimte_search.asp
@@ -36,17 +36,17 @@ var authparams = alg.checkAutorisation();
          doSubmitWithKenmerken();
      }

-        function myModal()
+        function myModal(init)
        {
          var lvl = "R";
          var key = 0;
          var bld_key = "";
          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
          var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel)
+          showKenmerkModal(url, titel, init)
        }

-        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+        $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
    </script>
  </head>
  <body id="searchbody">
@@ -64,12 +64,12 @@ var authparams = alg.checkAutorisation();
                                                                  gebouwkey: gebouw_key,
                                                                  verdiepingkey: verdieping_key,
                                                                  ruimtekey: ruimte_key,
+                                                                  multitoggle: 6, // true|false (=all) or till alg_level_# (0-6)
                                                                  startlevel: 2, // locatie
                                                                  eindlevel: 5, // ruimte
                                                                  filtercode: "INCVR",
                                                                  whenEmpty: L("lcl_search_generic")  // want filter
                                                                });
-
 %>
              </table>
            </td><!-- end column 1 -->
@@ -109,6 +109,7 @@ var authparams = alg.checkAutorisation();
                               "dept",
                               { label: L("lcl_prs_organisatie"),
                                 autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
+                                 multitoggle: true,
                                 whenEmpty: L("lcl_search_generic"),
                                 filtercode: "AR"
                               });
--- a/APPL/ALG/alg_ruimte_search_list.asp
+++ b/APPL/ALG/alg_ruimte_search_list.asp
@@ -22,31 +22,31 @@
 var outputmode = getQParamInt("outputmode", 0) //  0 = screen, 1 = print, 2 = excel etc
 var showall = getQParamInt("showall", 0) == 1;
 var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijzingen)
-var reg_key = getQParamInt("regiokey", -1); // Regio
-var dis_key = getQParamInt("districtkey", -1); // District
-var loc_key = getQParamInt("locatiekey", -1); // Locatie
-var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
-var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
-var room_key = getQParamInt("ruimtekey", -1); // Ruimte
+var reg_key_arr = getQParamIntArray("regiokey", []);      // Regio
+var dis_key_arr = getQParamIntArray("districtkey", []);   // District
+var loc_key_arr = getQParamIntArray("locatiekey", []);    // Locatie
+var bld_key_arr = getQParamIntArray("gebouwkey", []);     // Gebouw
+var flr_key_arr = getQParamIntArray("verdiepingkey", []); // Verdieping
+var room_key_arr = getQParamIntArray("ruimtekey", []);    // Ruimte
 var area_nr = getQParam("nr", null); // Ruimte nr
 var area_descr = getQParam("descr", null); // Ruimte omschrijving
 var srtruimte_key = getQParamInt("srt", null); // Ruimtefunctie
-var dept_key = getQParamInt("dept", -1); // Afdeling
+var dept_key_arr = getQParamIntArray("dept", []); // Afdeling
 var chkgeb  = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw lvl_key/geb_key niet)

 ruimte_list ( "*",
              {  outputmode: outputmode,
                 showall: showall,
-                 reg_key: (reg_key != -1? reg_key : null),
-                 dis_key: (dis_key != -1? dis_key : null),
-                 loc_key: (loc_key != -1? loc_key : null),
-                 bld_key: (bld_key != -1? bld_key : null),
-                 lvl_key: (lvl_key != -1? lvl_key : null),
-                 room_key: (room_key != -1? room_key : null),
+                 reg_key_arr: reg_key_arr,
+                 dis_key_arr: dis_key_arr,
+                 loc_key_arr: loc_key_arr,
+                 bld_key_arr: bld_key_arr,
+                 flr_key_arr: flr_key_arr,
+                 room_key_arr: room_key_arr,
                 area_nr: (area_nr != -1? area_nr : null),
                 area_descr: (area_descr != ""? area_descr : null),
                 srtruimte_key: (srtruimte_key != -1? srtruimte_key : null),
-                 dept_key: (dept_key !=-1? dept_key : null),
+                 dept_key_arr: dept_key_arr,
                 noref: (noref != -1? noref : null),
                 chkgeb: chkgeb
              }
--- a/APPL/ALG/alg_ruimteafdeling.asp
+++ b/APPL/ALG/alg_ruimteafdeling.asp
@@ -37,8 +37,19 @@ if (submitting)

  var afdeling_key = -1;
  var bezetting = -1;
-  var afdeling_keys = [];
-  var bezetting_keys = [];
+  var bezettingen = new Array();
+  var afdeling_keys = new Array();
+  var afdeling_names = [];
+
+  function shorttxt(txt, len)
+  {
+      len = len || S("max_tracking_length");
+      if  (txt.length < len)
+          return txt;
+      else
+          return txt.substr(0, len-4) + "...";
+  }
+
  for (var i = 0; i < nrRows; i++)
  {
    afdeling_key = getFParamInt("afd" + i, 0);
@@ -47,10 +58,47 @@ if (submitting)
    if (afdeling_key > 0 && bezetting >= 0)
    {
      afdeling_keys.push(afdeling_key);
-      bezetting_keys.push(bezetting);
+      bezettingen.push(bezetting);
    }
  }

+  if (afdeling_keys.length)
+  {
+      var sql = "SELECT prs_afdeling_key, prs_afdeling_omschrijving"
+              + "  FROM prs_afdeling a"
+              + " WHERE prs_afdeling_key IN (" + afdeling_keys.join(",") + ")"
+              + "   AND prs_afdeling_verwijder IS NULL";
+      var oRs = Oracle.Execute(sql);
+      while (!oRs.Eof)
+      {
+          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
+          oRs.MoveNext();
+      }
+  }
+
+  var oldvals = [];
+  var sql = "SELECT ra.alg_ruimte_key, ra.prs_afdeling_key, a.prs_afdeling_omschrijving, ra.prs_ruimteafdeling_bezetting"
+          + "  FROM prs_ruimteafdeling ra, prs_afdeling a"
+          + " WHERE ra.alg_ruimte_key IN (" + ruimte_key_arr.join(",") + ")"
+          + "   AND ra.prs_afdeling_key = a.prs_afdeling_key"
+          + "   AND ra.prs_ruimteafdeling_verwijder IS NULL"
+          + "   AND a.prs_afdeling_verwijder IS NULL";
+
+
+  var oRs = Oracle.Execute(sql);
+  while (!oRs.Eof)
+  {
+      var tempTuple = { afd_key: oRs("prs_afdeling_key").value, bez: oRs("prs_ruimteafdeling_bezetting").value };
+      if (typeof oldvals[oRs("alg_ruimte_key").value] === 'undefined') // New ruimte
+          oldvals[oRs("alg_ruimte_key").value] = [tempTuple];
+      else
+          oldvals[oRs("alg_ruimte_key").value].push(tempTuple);
+
+      if (typeof afdeling_names[oRs("prs_afdeling_key").value] === 'undefined')
+          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
+      oRs.MoveNext();
+  }
+
  for (var j = 0; j < ruimte_key_arr.length; j++)
  { // Verwijderen
    var sql = "DELETE prs_ruimteafdeling"
@@ -73,7 +121,7 @@ if (submitting)
      if (!oRs.eof)
      { // Update
        var sql = "UPDATE prs_ruimteafdeling SET"
-                + "       prs_ruimteafdeling_bezetting = " + bezetting_keys[i]
+                + "       prs_ruimteafdeling_bezetting = " + bezettingen[i]
                + " WHERE prs_ruimteafdeling_key = " + oRs("prs_ruimteafdeling_key").Value;
        Oracle.Execute(sql);
      }
@@ -83,11 +131,60 @@ if (submitting)
                + "        (alg_ruimte_key, prs_afdeling_key, prs_ruimteafdeling_bezetting)"
                + " VALUES (" + ruimte_key_arr[j] + ","
                +               afdeling_keys[i] + ","
-                +               bezetting_keys[i] + ")";
+                +               bezettingen[i] + ")";
        Oracle.Execute(sql);
      }
+      oRs.Close();
    }
  }
+
+  var trackingArr = new Object();
+  var fromLbl = "";
+  var toLbl = "";
+  var rowNr = -1;
+  var doneAfdeling = new Array();
+
+  for (var i = 0; i < ruimte_key_arr.length; i++)
+  {
+      if (typeof oldvals[ruimte_key_arr[i]] !== 'undefined')
+          for (var x = 0; x < oldvals[ruimte_key_arr[i]].length; x++)
+          {
+              fromLbl = shorttxt(afdeling_names[oldvals[ruimte_key_arr[i]][x].afd_key]) + " (" + oldvals[ruimte_key_arr[i]][x].bez + "%) ";
+
+              rowNr = sharedIndexOf(oldvals[ruimte_key_arr[i]][x].afd_key, afdeling_keys);
+              if (rowNr > -1) // Update
+              {
+                  doneAfdeling[rowNr] = true;
+                  if (oldvals[ruimte_key_arr[i]][x].bez == bezettingen[rowNr]) // No change
+                      continue;
+                  toLbl = " " + shorttxt(afdeling_names[afdeling_keys[rowNr]]) + " (" + bezettingen[rowNr] + "%)";
+              }
+              else // Delete
+                  toLbl = " " + L("lcl_tracktoempty");
+
+              if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
+                  trackingArr[ruimte_key_arr[i]] = new Array();
+              trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
+          }
+
+        for (var y = 0; y < afdeling_keys.length; y++)
+        {
+            if (doneAfdeling[y])
+                continue;
+            else if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
+                trackingArr[ruimte_key_arr[i]] = new Array();
+            // Insert
+            fromLbl = L("lcl_trackfromempty") + " ";
+            toLbl = " " + shorttxt(afdeling_names[afdeling_keys[y]]) + " (" + bezettingen[y] + "%)";
+            trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
+        }
+  }
+
+  for (var i = 0; i < ruimte_key_arr.length; i++)
+  {
+      if (typeof trackingArr[ruimte_key_arr[i]] !== 'undefined')
+          shared.trackaction("ALGRUP", ruimte_key_arr[i], L("lcl_alg_is_algrup") + "\n" + trackingArr[ruimte_key_arr[i]].join("\n"));
+  }
 %>
  <script type="text/javascript">
    FcltMgr.closeDetail(window, { success: true });
--- a/APPL/ALG/alg_show_gebouw.asp
+++ b/APPL/ALG/alg_show_gebouw.asp
@@ -24,6 +24,7 @@
 FCLTHeader.Requires({ plugins:["jQuery"],
                      js: [] })

+var ins_score_enabled = S("ins_score_enabled") == 1;
 var bld_key  = getQParamInt("bld_key");
 var onrgoedlvl = "G";
 var this_alg = alg.func_enabled(bld_key, onrgoedlvl);
@@ -60,6 +61,7 @@ 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;
+var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
 oRs.Close();
 %>

@@ -89,10 +91,9 @@ oRs.Close();
 <%  if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) { %>
      function openMaps(bldKey)
      {
-          fwnd = window.open('../cad/ShowGoogleMap.asp?bld_key=' + bldKey, 'FGShow',
+          FcltMgr.windowopen('../cad/ShowGoogleMap.asp?bld_key=' + bldKey, 'FGShow',
                             "width=800, height=600, directories=no, location=no, menubar=no,"
                           + "resizable=yes, status=no, titlebar=yes, toolbar=no");
-          fwnd.focus()
          return;
      }
 <%  } %>
@@ -129,7 +130,7 @@ oRs.Close();
                           { gebouwkey: bld_key,
                             startlevel: 2, //Locatie
                             eindlevel: 3, // Gebouw
-                             moreinfo: true,
+                             moreinfo: true,  // wel beetje suf om door te linken naar jezelf
                             readonly: true
                           });
        sql = "SELECT alg_srtgebouw_key"
@@ -145,7 +146,11 @@ oRs.Close();
                       suppressEmpty: true,
                       readonly: true
                     });
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, {suppressEmpty:true});
+        params = { infoPointer: { Url: "appl/shared/status_info.asp?bld_key=" + bld_key,
+                                  Title: L("lcl_status_details") + " " + bld_naam
+                                }
+                 }
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, params);
        ROFIELDTR("fld", L("lcl_estate_gebouw_man_opmerk"), bld_opmerk, {suppressEmpty:true});
        sql = "SELECT prs_kostenplaats_key"
            + "     , k.prs_kostenplaats_nr || ' ' || k.prs_kostenplaats_omschrijving"
@@ -193,13 +198,13 @@ oRs.Close();

        BLOCK_START("algLoc2", "&nbsp;");
        var calcopp = alg.calc_algm2(bld_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_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true, datatype: "float"});
+        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
+        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});

-        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});
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true, datatype: "float"});
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true, datatype: "float"});
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, {suppressEmpty: true, datatype: "float"});
        sql = "SELECT mld_adres_naam"
            + "  FROM mld_adres"
            + " WHERE mld_adres_key = " + mld_adres;
@@ -219,6 +224,8 @@ oRs.Close();
        ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
        ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
        ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);
+        if (ins_score_enabled)
+          ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), geb_score1, {suppressEmpty: true});
        BLOCK_END();

        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
--- a/APPL/ALG/alg_show_locatie.asp
+++ b/APPL/ALG/alg_show_locatie.asp
@@ -21,6 +21,7 @@
 <%
 FCLTHeader.Requires({plugins:["jQuery"], js: []})

+var ins_score_enabled = S("ins_score_enabled") == 1;
 var loc_key  = getQParamInt("loc_key");
 var onrgoedlvl = "L";
 var this_alg = alg.func_enabled(loc_key, onrgoedlvl);
@@ -40,6 +41,7 @@ var loc_vwtel  = oRs("alg_locatie_verantw_tel").value;
 var loc_x      = oRs("alg_locatie_x").value;
 var loc_y      = oRs("alg_locatie_y").value;
 var loc_mail   = oRs("alg_locatie_email").value;
+var loc_score1 = oRs("alg_locatie_mjb_score1").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
 var pst_postc  = oRs("alg_locatie_post_postcode").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
@@ -53,9 +55,10 @@ oRs.Close();
  <head>
 <%  FCLTHeader.Generate(); %>
    <script  type="text/javascript" >
-      jQuery(document).ready(function() {
-           $('textarea').resize(function () { FcltMgr.resized(window) } );
-           $('textarea').autogrow();
+      $(function()
+      {
+        $('textarea').resize(function () { FcltMgr.resized(window) } );
+        $('textarea').autogrow();
      });

      function alg_showphotos()
@@ -86,10 +89,9 @@ oRs.Close();
 <%  if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {  %>
      function openMaps(locKey)
      {
-          fwnd = window.open('../cad/ShowGoogleMap.asp?loc_key=' + locKey, 'FGShow',
+          FcltMgr.windowopen('../cad/ShowGoogleMap.asp?loc_key=' + locKey, 'FGShow',
                             "width=800, height=600, directories=no, location=no, menubar=no,"
                           + "resizable=yes, status=no, titlebar=yes, toolbar=no");
-          fwnd.focus()
          return;
      }
 <%  } %>
@@ -156,6 +158,8 @@ oRs.Close();
        ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
        ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
        AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
+        if (ins_score_enabled)
+          ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});

        BLOCK_END();

--- a/APPL/ALG/alg_show_ruimte.asp
+++ b/APPL/ALG/alg_show_ruimte.asp
@@ -122,17 +122,17 @@ if (!room_data.cadcontours.length)
        BLOCK_END();
        BLOCK_START("algLoc2", "&nbsp;");

-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true, datatype: "float"});
          if (room_data.grossarea != room_data.cadcontours[0].cadarea)
-              ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"),    room_data.cadcontours[0].cadarea,   {suppressEmpty:true});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt1"),       room_data.area1,     {suppressEmpty:true});
+              ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"),    room_data.cadcontours[0].cadarea,   {suppressEmpty:true, datatype: "float"});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt1"),       room_data.area1,     {suppressEmpty:true, datatype: "float"});
          if (room_data.area1 != room_data.cadcontours[0].cadalt1)
-              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"),       room_data.cadcontours[0].cadalt1,   {suppressEmpty:true});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt2"),       room_data.area2,     {suppressEmpty:true});
+              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"),       room_data.cadcontours[0].cadalt1,   {suppressEmpty:true, datatype: "float"});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt2"),       room_data.area2,     {suppressEmpty:true, datatype: "float"});
          if (room_data.area2 != room_data.cadcontours[0].cadalt2)
-              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"),       room_data.cadcontours[0].cadalt2,   {suppressEmpty:true});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {suppressEmpty:true});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,    {suppressEmpty:true});
+              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"),       room_data.cadcontours[0].cadalt2,   {suppressEmpty:true, datatype: "float"});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {suppressEmpty:true, datatype: "float"});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,    {suppressEmpty:true, datatype: "float"});
          ROFIELDTR("fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,    {suppressEmpty:true});

          ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(room_data.openfrom),   {suppressEmpty:true});
--- a/APPL/ALG/alg_show_terreinsector.asp
+++ b/APPL/ALG/alg_show_terreinsector.asp
@@ -74,17 +74,20 @@ oRs.Close();
 <html>
  <head>
 <%  FCLTHeader.Generate(); %>
-    <script  type="text/javascript" >
-      jQuery(document).ready(function() {
-            $('textarea').resize(function () { FcltMgr.resized(window) } );
-            $('textarea').autogrow();
+    <script type="text/javascript">
+
+      $(function()
+      {
+        $('textarea').resize(function () { FcltMgr.resized(window) } );
+        $('textarea').autogrow();
      });

      function ter_change()
      {
-          if (FcltMgr.startEdit(window))
-              window.location.href = "alg_edit_terreinsector.asp?ter_key=<%=ter_key%>"
+        if (FcltMgr.startEdit(window))
+            window.location.href = "alg_edit_terreinsector.asp?ter_key=<%=ter_key%>"
      }
+
      function ter_delete()
      {
        FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), function() {
@@ -100,6 +103,7 @@ oRs.Close();
                "json");
        });
      }
+
    </script>
  </head>

@@ -137,8 +141,8 @@ oRs.Close();
        ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, {suppressEmpty: true});
        ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
        ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true, datatype: "float"});
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true, datatype: "float"});

        BLOCK_END();

--- a/APPL/ALG/alg_show_verdieping.asp
+++ b/APPL/ALG/alg_show_verdieping.asp
@@ -110,9 +110,9 @@ oRs.Close();

        BLOCK_START("algLoc2", "&nbsp;");
          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_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true, datatype: "float"});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
        BLOCK_END();

        generateFlexKenmerkBlock ({
--- a/APPL/ALG/alg_show_wp.asp
+++ b/APPL/ALG/alg_show_wp.asp
@@ -106,7 +106,7 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
            </label>
          </td>
        </tr>
-<%      ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true});
+<%      ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true, datatype: "float"});
        if (wp_virt==1)
            CHECKBOXTR(L("lcl_estate_wp_virt"), "fldalgbez", "wp_virt", wp_virt, { suppressEmpty:true, html: " disabled" });
        ROFIELDTR("wp_type",      L("lcl_wptype"),     wp_typ_str);
--- a/APPL/ALG/alg_srtruimte.asp
+++ b/APPL/ALG/alg_srtruimte.asp
@@ -127,7 +127,7 @@ if (mode == "save")
    {
 %>
        <script>
-            $(document).ready(function () {parent.window.location.href="alg_srtruimte.asp?mode=show&alg_srtruimte_key=<%=srtruimte_key%>";} );
+            $(function () {parent.window.location.href="alg_srtruimte.asp?mode=show&alg_srtruimte_key=<%=srtruimte_key%>";} );
        </script>
 <%
    }
@@ -142,12 +142,13 @@ else if (srtruimte_key > 0 && mode == "delete")
    var err = Oracle.Execute(sql, true);
 %>
    <script>
-        $(document).ready(function () {
-            FcltMgr.closeDetail(window, { alg_srtruimte_key: <%=srtruimte_key%>,
-                                          warning: "<%=safe.jsstring(err.friendlyMsg)%>",
-                                          keepForm: <%=err.friendlyMsg? "true" : "false"%>
-                                        });
-        } );
+        $(function ()
+        {
+          FcltMgr.closeDetail(window, { alg_srtruimte_key: <%=srtruimte_key%>,
+                                        warning: "<%=safe.jsstring(err.friendlyMsg)%>",
+                                        keepForm: <%=err.friendlyMsg? "true" : "false"%>
+                                      });
+        });
    </script>
 <%
    Response.End;
@@ -236,11 +237,12 @@ else if (srtruimte_key > 0 && mode == "delete")
          $("#dayshours_urg").prop("disabled", false);
    }

-    jQuery(document).ready(function()
-                           {
-                               $('textarea').resize(function () { FcltMgr.resized(window) } );
-                               $('textarea').autogrow();
-                           });
+    $(function()
+    {
+        $('textarea').resize(function () { FcltMgr.resized(window) } );
+        $('textarea').autogrow();
+    });
+
 </script>
  </head>

@@ -289,7 +291,7 @@ else if (srtruimte_key > 0 && mode == "delete")
            target="hidFrameSubmit"
            onSubmit="alg_submit()">
 <%
-        BLOCK_START("algInfo", safe.html(L("lcl_general_properties")));
+        BLOCK_START("algInfo", L("lcl_general_properties"));

            ROFIELDTR(                  "fld",      L("lcl_key"),                     srtruimte_key);
            myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving, { translate: {fld: "mld_afmeldtekst_naam", key: srtruimte_key} });
--- a/APPL/ALG/alg_srtruimte_search.asp
+++ b/APPL/ALG/alg_srtruimte_search.asp
@@ -29,12 +29,13 @@ FCLTHeader.Generate();
 %>

 <script type="text/javascript">
+
    function doSubmit()
    {
-        document.forms.u2.submit();
+      document.forms.u2.submit();
    }

-    $(document).ready(function()
+    $(function()
    {
      <% if (autosearch) { %> document.forms.u2.submit();<%}%>
    });
--- a/APPL/ALG/alg_srtruimte_search_list.asp
+++ b/APPL/ALG/alg_srtruimte_search_list.asp
@@ -93,7 +93,7 @@ FCLTHeader.Generate({outputmode: outputmode});
                                   buttons: buttons
                                 });

-    rst.addColumn(new Column({caption: "Key",                       content: "alg_srtruimte_key"}));
+    rst.addColumn(new Column({caption: "Key",                       content: "alg_srtruimte_key",  datatype: "number"}));
    rst.addColumn(new Column({caption: L("lcl_descr"),              content: "alg_srtruimte_omschrijving"}));
    rst.addColumn(new Column({caption: L("lcl_alg_alg_tarief"),     content: "alg_srtruimte_prijs",  datatype: "currency"}));
    rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefA"),    content: "alg_srtruimte_prijs2", datatype: "currency"}));
--- a/APPL/ALG/alg_terreinsector_search.asp
+++ b/APPL/ALG/alg_terreinsector_search.asp
@@ -24,22 +24,25 @@ var authparams = alg.checkAutorisation();
  <head>
 <%  FCLTHeader.Generate(); %>
    <script type="text/javascript">
-    function doSubmit()
-      {
+
+        function doSubmit()
+        {
          // Submitten met kenmerken
          doSubmitWithKenmerken();
-      }
+        }

-        function myModal()
+        function myModal(init)
        {
          var lvl = "T";
          var key = 0;
          var bld_key = "";
          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
          var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel)
+          showKenmerkModal(url, titel, init)
        }
-        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
+
+        $(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
+
    </script>
  </head>
  <body id="searchbody">
--- a/APPL/ALG/alg_verdieping_search.asp
+++ b/APPL/ALG/alg_verdieping_search.asp
@@ -25,23 +25,25 @@ var authparams = alg.checkAutorisation();
  <head>
 <%  FCLTHeader.Generate(); %>
    <script>
+
      function doSubmit()
      {
          // Submitten met kenmerken
          doSubmitWithKenmerken();
      }

-      function myModal()
+      function myModal(init)
      {
        var lvl = "V";
        var key = 0;
        var bld_key = "";
        var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
        var titel = "<%=L("lcl_properties")%>";
-        showKenmerkModal(url, titel)
+        showKenmerkModal(url, titel, init)
      }

-      $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+      $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+
    </script>
  </head>

--- a/APPL/ALG/alg_werkplek_search.asp
+++ b/APPL/ALG/alg_werkplek_search.asp
@@ -34,7 +34,7 @@ var authparams = alg.checkAutorisation();
  <head>
 <%  FCLTHeader.Generate(); %>
    <script>
-      $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+      $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
    </script>
  </head>
  <body id="searchbody">
--- a/APPL/API/api.inc
+++ b/APPL/API/api.inc
@@ -59,6 +59,7 @@ function API_func()
        loglevel:         oRs("fac_api_loglevel").Value,
        usrrap_key:       oRs("fac_usrrap_key").Value,
        stylesheet:       oRs("fac_api_stylesheet").Value,
+        stylesheet_out:   oRs("fac_api_stylesheet_out").Value,
        import_app_key:   oRs("fac_import_app_key").Value
    };

--- a/APPL/API/api_SOAP.asp
+++ b/APPL/API/api_SOAP.asp
@@ -55,6 +55,15 @@ try

    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
    xmlReq.load(Request);
+    if (xmlReq.parseError.errorCode != 0)
+    {
+      __DoLog( "Error loading XML: "
+                   + xmlReq.parseError.errorCode
+                   + "\n" + xmlReq.parseError.reason
+                   + " regel " + xmlReq.parseError.line
+                   + "(" + xmlReq.parseError.linepos + ")"
+               , "#ff0000");
+    }

    if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_IN");

--- a/APPL/API/api_besordsoap.asp
+++ b/APPL/API/api_besordsoap.asp
@@ -405,6 +405,7 @@

    xmlResp.appendChild(FCLTElement);

+    Response.ContentType = "text/xml";
    if (API.apidata.stylesheet)
    {
        // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -412,7 +413,6 @@
    }
    else
    {
-        Response.ContentType = "text/xml";
        Response.Write(xmlResp.xml)
    }
 %>
--- a/APPL/API/api_gen_import.asp
+++ b/APPL/API/api_gen_import.asp
@@ -18,6 +18,7 @@
 <!-- #include file="../../appl/Shared/common.inc" -->
 <!-- #include file="../../appl/api/api.inc" -->
 <!-- #include file="../../appl/shared/FlexFiles.inc" -->
+<!-- #include file="../Shared/xml_converter.inc" -->
 <script language="javascript" src="../imp/imp_shared.js" runat="server"></script>
 <%
    // We sturen het antwoord in UTF-8.
@@ -120,5 +121,12 @@
    xmlResp.appendChild(FCLTElement);

    Response.ContentType = "text/xml";
-    Response.Write(xmlResp.xml);
+    if (API.apidata.stylesheet_out)
+    {
+        var params = {};
+        STR2Stream(xmlResp.xml, API.apidata.stylesheet_out, Response, params);
+    }
+    else
+        Response.Write(xmlResp.xml);
+
 %>
--- a/APPL/API/api_hmail.asp
+++ b/APPL/API/api_hmail.asp
@@ -65,6 +65,7 @@ var Subject  = XMLval(xmlReq, "subject");
 var fromAddr = XMLval(xmlReq, "fromaddr"); // "Returns the address that the sender gave in the MAIL FROM SMTP-command."
 var from     = XMLval(xmlReq, "from");     // "This property returns the content of the From MIME-header of the email."
 var toAddr   = XMLval(xmlReq, "to");
+var RecipientNr = XMLval(xmlReq, "RecipientNr"); // 0 voor 1e recipient, soms 1 voor tweede
 var htmlBody = XMLval(xmlReq, "htmlbody");
 var Body     = XMLval(xmlReq, "body");

@@ -72,6 +73,7 @@ __Log("Subject: "  + Subject);
 __Log("From: "     + fromAddr);
 __Log("FromAddr: " + from);
 __Log("To: "       + toAddr);
+__Log("RecipientNr: " + RecipientNr);
 __Log("htmlBody: " + htmlBody);
 __Log("body: "     + Body);

--- a/APPL/API/api_inssoap.asp
+++ b/APPL/API/api_inssoap.asp
@@ -258,6 +258,7 @@
    if (API.apidata.stylesheet)
    {
        // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
+        Response.ContentType = "text/xml";
        STR2Stream(xmlResp.xml, API.apidata.stylesheet, Response, {});
    }
    else
--- a/APPL/API/api_mldsoap.asp
+++ b/APPL/API/api_mldsoap.asp
@@ -17,6 +17,7 @@
    THIS_FILE = "appl/api/api_mldsoap.asp";
 %>
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
@@ -38,18 +39,31 @@ var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
 if (API.apidata.stylesheet)
 {
    var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    iXsl.resolveExternals = true; // XSL kan includes hebben
    if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) )
    {
        API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason);
    }
    var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0");
    inputXML.load(Request);
+
+    if (inputXML.parseError.errorCode != 0)
+    {
+      __DoLog( "Error loading XML: "
+                   + inputXML.parseError.errorCode
+                   + "\n" + inputXML.parseError.reason
+                   + " regel " + inputXML.parseError.line
+                   + "(" + inputXML.parseError.linepos + ")"
+               , "#ff0000");
+    }
+    if (API.apidata.loglevel) __Log2File(inputXML.xml, API.APIname + "_IN");
+
    inputXML.transformNodeToObject(iXsl, xmlReq);
 }
 else
    xmlReq.load(Request);

-if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_IN");
+if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");

 var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
 xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -86,6 +100,7 @@ var meldingen = xmlReq.getElementsByTagName("melding");
 for (i = 0; i < meldingen.length; i++)
 {
  resultcode = -1;
+  resulttekst = "";
  // Lees per node de (optionele) tags en waarden.
  var fields = []; // Bij te werken velden.
  var ext_id        = meldingen[i].getAttribute("key");
@@ -262,9 +277,12 @@ for (i = 0; i < meldingen.length; i++)
        if (meld_oms)
          fields.push({ dbs: "mld_melding_omschrijving",  typ: "varchar",   val: meld_oms,     track: L("lcl_mld_inf_Omschrijving"),  len: 4000 });

-        var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
-        Oracle.Execute(mldUpd.sql);
-        mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
+        if (fields.length>0)
+        {
+            var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
+            Oracle.Execute(mldUpd.sql);
+            mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
+        }

        // De kenmerken.
        upsertKenmerk(mldkenmerken, stdmld_key, mld_key);
@@ -441,11 +459,20 @@ for (i = 0; i < meldingen.length; i++)
          {
             __DoLog(pResult.errmsg, "#00FF00");
          }
+          // De hookfunctie kan de stdmelding aanpassen.
+          if (pResult.stdmld_key)
+          {
+             // check de paden van de flexfiles als de stdmeldingkey aangepast is
+             mld.keepFlexDocuments(mld_key, stdmld_key, pResult.stdmld_key);
+          }
        }
      } // end geldige stdmld_key
    } // end insert
  } // end geldige ext_id

+  if (resultcode > 0)
+    __DoLog("api_mldsoap fail.\nResultcode: {0}\nReturntekst: {1}".format(resultcode, resulttekst), "#00FF00");
+
  var binfo = {returncode: resultcode,
               returntekst: resulttekst,
               // executed:sql,   // debug
@@ -597,6 +624,7 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)

 xmlResp.appendChild(FCLTElement);

+Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 {
  // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -604,7 +632,6 @@ if (API.apidata.stylesheet)
 }
 else
 {
-  Response.ContentType = "text/xml";
  Response.Write(xmlResp.xml)
 }
 %>
--- a/APPL/API/api_opdrsoap.asp
+++ b/APPL/API/api_opdrsoap.asp
@@ -55,9 +55,14 @@ if ("ORDremark" in API.apidata.options)
 var tsql = "-";     // Voor tijdelijke statement.
 var sql = "-";      // De uiteindelijke insert/update-sql.
 var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+
+//if (API.apidata.loglevel) __Log2File(Request, API.APIname + "_IN1");
+
 if (API.apidata.stylesheet)
 {
  var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+  iXsl.resolveExternals = true; // XSL kan includes hebben
+
  if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) )
  {
      API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason);
@@ -79,7 +84,18 @@ if (API.apidata.stylesheet)
  inputXML.transformNodeToObject(iXsl, xmlReq);
 }
 else
+{
  xmlReq.load(Request);
+  if (xmlReq.parseError.errorCode != 0)
+  {
+    __DoLog( "Error loading XML: "
+                 + xmlReq.parseError.errorCode
+                 + "\n" + xmlReq.parseError.reason
+                 + " regel " + xmlReq.parseError.line
+                 + "(" + xmlReq.parseError.linepos + ")"
+             , "#ff0000");
+  }
+}

 if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");

@@ -131,6 +147,8 @@ for (i=0; i < opdrachten.length; i++)
  var externnr        = XMLval(opdrachten[i], "externnr"); // NEW
  var externopdrnr    = XMLval(opdrachten[i], "externopdrnr");
  var plandatum       = XMLval(opdrachten[i], "plandatum");
+  if (S("mld_use_plandate2") & 2) // Otherwise ignore 'plandatum2'
+    var plandatum2      = XMLval(opdrachten[i], "plandatum2");
  var voor_key        = parseInt(XMLval(opdrachten[i], "voor"), 10); // NEW
  var voor_email      = XMLval(opdrachten[i], "voor_email"); // NEW
  var stdm_key        = parseInt(XMLval(opdrachten[i], "stdmelding_key"), 10); // NEW
@@ -140,6 +158,7 @@ for (i=0; i < opdrachten.length; i++)
  var meldingtekst    = XMLval(opdrachten[i], "meldingtekst"); // NEW
  var onderwerp       = XMLval(opdrachten[i], "onderwerp"); // NEW
  var opdr_kpn        = XMLval(opdrachten[i], "kostenplaats");
+  var flag            = parseInt(XMLval(opdrachten[i], "flag"), 10);

  var txt_mut_datum   = XMLval(opdrachten[i], "mut_datum"); // UPD
  var opdrstatus      = XMLval(opdrachten[i], "status"); // UPD
@@ -183,6 +202,7 @@ for (i=0; i < opdrachten.length; i++)
  {
     voor_key = oRs("prs_perslid_key").value;
  }
+  oRs.Close();

  // 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
@@ -200,6 +220,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";
  }
+  oRs.Close();

  if (opdraction == "insert")
  {
@@ -231,6 +252,12 @@ for (i=0; i < opdrachten.length; i++)
              resulttekst = "Undefined stdmelding " + stdm_key;
            }

+            if (isNaN(voor_key))
+            {
+              resultcode = 3;
+              resulttekst = "Undefined 'voor': " + voor_email;
+            }
+
            // Hier heb ik een geldige stdm_key.
            if (resultcode == -1) // Nog steeds geen fouten.
            { // Bepaal kostenplaats via voor-user
@@ -384,6 +411,12 @@ for (i=0; i < opdrachten.length; i++)
        fields.push({ dbs: "mld_opdr_omschrijving",      typ: "varchar",  val: opdrachttekst, len: 4000 });
      }

+      // Flag, ignore if invalid
+      if (!isNaN(flag) && flag >= 0 && flag < S("mld_opdracht_flags"))
+      {
+        fields.push({ dbs: "mld_opdr_flag",      typ: "number",  val: flag });
+      }
+
      var mldIns = buildInsert("mld_opdr", fields, { noValidateToken: true });
      var sql = mldIns.sql;
      var err = Oracle.Execute(sql, true);
@@ -404,7 +437,7 @@ for (i=0; i < opdrachten.length; i++)
      mld.updatemeldingstatus (mld_key, 0);
    }
  }
-  else if (opdraction == "update")
+  else if (opdraction == "update" || opdraction == "note")
  {   // Bestaande opdracht zoeken
    var idarr = opdrid.split('/');
    mld_key = parseInt(idarr[0], 10);
@@ -433,6 +466,13 @@ for (i=0; i < opdrachten.length; i++)
      }
      oRs.Close();
    }
+    if (resultcode == -1 && opdraction == "note")
+    {
+       tsql = "INSERT INTO mld_opdr_note(mld_opdr_key, prs_perslid_key, mld_opdr_note_omschrijving)"
+            + " VALUES (" + opdr_key + "," + user_key + "," + safe.quoted_sql(opdropmerking) + ")";
+       Oracle.Execute(tsql);
+       resultcode = 0;   // we zijn klaar.
+    }
  }
  else
  {
@@ -517,19 +557,66 @@ for (i=0; i < opdrachten.length; i++)
    if (opdrkosten != null)
        opdr_fields.push({ dbs: "mld_opdr_kosten",     typ: "float",   val: opdrkosten,     track: L("lcl_total_cost") });

-    if (plandatum != null)
-    {
-      var plandatumdate = XMLtoJsDate(plandatum);
-      opdr_fields.push({ dbs: "mld_opdr_plandatum",  typ: "datetime",    val: plandatumdate, track: L("lcl_opdr_plandate") });
-    }
+    var ins_srtdiscipline_prefix = mld.mld_prefix(mld_key);
+    var formattedID = ins_srtdiscipline_prefix + opdrid;

+    var orddat_tracking = "";
    if (opdrgereed != null)
    {
-      var opdrgereeddate = XMLtoJsDate(opdrgereed);
-      opdr_fields.push({ dbs: "mld_opdr_einddatum",  typ: "date",    val: opdrgereeddate, track: L("lcl_opdr_enddate") });
+      var old_einddatum = mld_opdr.mld_opdr_einddatum;
+      var new_einddatum = XMLtoJsDate(opdrgereed);
+      if (old_einddatum == null || old_einddatum.midnight().getTime() != new_einddatum.midnight().getTime()) // Difference? (Check Date only)
+      {
+        opdr_fields.push({ dbs: "mld_opdr_einddatum", typ: "date", val: new_einddatum });
+        orddat_tracking = L("lcl_ord_is_orddattrack").format(formattedID) + ": " + buildTrackText("date", old_einddatum, new_einddatum);
+      }
      if (autoorder) // Ooit: net als appendRemark via json configureerbaar maken?
-        mld_fields.push({ dbs: "mld_melding_einddatum",  typ: "date",    val: opdrgereeddate, track: L("lcl_mld_enddate") });
+        mld_fields.push({ dbs: "mld_melding_einddatum",  typ: "date", val: new_einddatum, track: L("lcl_mld_enddate") });
    }
+
+    var ordpld_tracking = "";
+    if (plandatum != null)
+    {
+      var old_plandatum = mld_opdr.mld_opdr_plandatum;
+      var new_plandatum = XMLtoJsDate(plandatum);
+      if (old_plandatum == null || old_plandatum.getTime() != new_plandatum.getTime()) // Difference?
+      {
+        opdr_fields.push({ dbs: "mld_opdr_plandatum", typ: "datetime", val: new_plandatum });
+        ordpld_tracking = L("lcl_ord_is_ordpldtrack").format(formattedID) + ": " + buildTrackText("datetime", old_plandatum, new_plandatum);
+      }
+    }
+
+    var ordpl2_tracking = "";
+    if (S("mld_use_plandate2") & 2 && plandatum2 != null)
+    {
+      var old_plandatum2 = mld_opdr.mld_opdr_plandatum2;
+      var new_plandatum2 = XMLtoJsDate(plandatum2);
+      if (old_plandatum2 == null || old_plandatum2.getTime() != new_plandatum2.getTime()) // Difference?
+      {
+        opdr_fields.push({ dbs: "mld_opdr_plandatum2", typ: "datetime", val: new_plandatum2 });
+        ordpl2_tracking = L("lcl_ord_is_ordpl2track").format(formattedID) + ": " + buildTrackText("datetime", old_plandatum2, new_plandatum2);
+      }
+    }
+
+    if (S("mld_use_plandate2") & 2)
+    {
+      var latest_pld = new_plandatum  || mld_opdr.mld_opdr_plandatum;
+      var latest_pl2 = new_plandatum2 || mld_opdr.mld_opdr_plandatum2;
+      if (latest_pld != null && latest_pl2 != null        // We have a plan-start-date and a plan-end-date
+        && (new_plandatum || new_plandatum2)              // and at least 1 of them is new
+        && latest_pld.getTime() > latest_pl2.getTime())   // plan-start-date is later than plan-end-date
+      {
+        resultcode = 6;
+        resulttekst = L("lcl_opdr_plandate") + " (" + latest_pld + ") later than " + L("lcl_opdr_plandate2") + " (" + latest_pl2 + ")";
+      }
+    }
+
+    // Flag, ignore if invalid
+    if (!isNaN(flag) && flag >= 0 && flag < S("mld_opdracht_flags"))
+    {
+      opdr_fields.push({ dbs: "mld_opdr_flag",  typ: "number",    val: flag });
+    }
+
    // We weten nu de updates, straks voeren we deze pas uit
    // Eerst de eventuele statuswijzigingen
    var newstatus = -1;
@@ -610,6 +697,21 @@ for (i=0; i < opdrachten.length; i++)
              var sql = "BEGIN fac.backtrackaction('ORDUPD', " + opdr_key + ", " + user_key + ", " + mut_datum.toSQL(true) +"); END;"
              Oracle.Execute(sql);
          }
+          // Tracken en notificeren van de einddatum (ORDDAT) (notificeren aan de gebouwverantwoordelijke van het betreffende gebouw van de onderliggende melding).
+          if (orddat_tracking != "")
+          {
+            mld.trackopdreinddatumupdate(opdr_key, orddat_tracking);
+          }
+          // Tracken en notificeren van de geplande aanvang datum (ORDPLD) (notificeren aan interne contactpersoon).
+          if (ordpld_tracking != "")
+          {
+            mld.trackopdrplandatumupdate(opdr_key, ordpld_tracking);
+          }
+          // Tracken en notificeren van de geplande einddatum (ORDPL2) (notificeren aan interne contactpersoon).
+          if (S("mld_use_plandate2") & 2 && ordpl2_tracking != "")
+          {
+            mld.trackopdrplandatum2update(opdr_key, ordpl2_tracking);
+          }
        }
      }

@@ -781,6 +883,10 @@ for (i=0; i < opdrachten.length; i++)
  {
    resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze opdracht.
  }
+  else if (resultcode > 0)
+  {
+    __DoLog("api_opdrsoap fail.\nResultcode: {0}\nReturntekst: {1}\nOpdracht: {2}".format(resultcode, resulttekst, opdrid), "#00FF00");
+  }

  var binfo = {
               returncode: resultcode,
@@ -807,13 +913,13 @@ for (i=0; i < opdrachten.length; i++)

 xmlResp.appendChild(FCLTElement);

+Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 { // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
  STR2Stream(xmlResp.xml, API.apidata.stylesheet, Response, {});
 }
 else
 {
-  Response.ContentType = "text/xml";
  Response.Write(xmlResp.xml)
 }
 %>
--- a/APPL/API/api_ressoap.asp
+++ b/APPL/API/api_ressoap.asp
@@ -441,6 +441,7 @@

    xmlResp.appendChild(FCLTElement);

+    Response.ContentType = "text/xml";
    if (API.apidata.stylesheet)
    {
        // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -448,7 +449,6 @@
    }
    else
    {
-        Response.ContentType = "text/xml";
        Response.Write(xmlResp.xml)
    }
 %>
--- a/APPL/API/phonebook_js.asp
+++ b/APPL/API/phonebook_js.asp
@@ -66,7 +66,7 @@ function L(p_lcl)
  getCSS("appl/api/api.css");

  <% if (!nojQuery) { /* kan conflicteren */ %>
-        getScript("appl/localscripts/<%=_jqueryver%>.min.js");
+        getScript("appl/localscripts/jquery.min.js");
  <% } %>
  getScript("appl/shared/suggest/suggest.js");

--- a/APPL/API/shorturl.asp
+++ b/APPL/API/shorturl.asp
@@ -62,6 +62,9 @@ __Log("== Entering shorturl.asp ==");
                + "   AND prs_bedrijfadres_locksecret IS NOT NULL"
                + "   AND prs_bedrijfadres_lockuser_key IS NOT NULL";
        var oRs = Oracle.Execute(sql);
+        if (oRs.EOF)
+            shared.simpel_page("Fixed user for company '{0}' is not or no longer valid.".format(locked_bdradr_key));
+
        var locksecret = oRs("prs_bedrijfadres_locksecret").Value;
        var lockuser_key = oRs("prs_bedrijfadres_lockuser_key").Value;
        var lockexpire = oRs("prs_bedrijfadres_lockexpire").Value;
@@ -129,12 +132,13 @@ __Log("== Entering shorturl.asp ==");
    else
    {
        var sql = "SELECT fac_bookmark_path,"
-                + "       fac_bookmark_query,"
-                + "       prs_perslid_key_auth,"
-                + "       fac_bookmark_unauth_url,"
+                + "       fac_bookmark_query,"        // Ooit was bedacht dat je de parameters apart in fac_bookmark_query stopt.
+                + "       prs_perslid_key_auth,"      // In de praktijk stoppen mensen het ook vaak in fac_bookmark_path
+                + "       fac_bookmark_unauth_url,"   // Dat kunnen we tegenwoordig (2018.1 Gold C) ook wel aan.
                + "       fac_bookmark_expire,"
                + "       fac_bookmark_refreshtime,"
-                + "       fac_bookmark_naam"
+                + "       fac_bookmark_naam,"
+                + "       fac_bookmark_flags"
                + "  FROM fac_bookmark"
                + " WHERE fac_bookmark_id = " + safe.quoted_sql(u);
        var oRs = Oracle.Execute(sql);
@@ -152,6 +156,11 @@ __Log("== Entering shorturl.asp ==");
        }

        var url = oRs("fac_bookmark_path").Value;
+        if (url.indexOf("{$*}") > 0) // default.asp?Jumpto=cust/uwva/pacta.asp{$*}
+        {
+            url = url.replace("{$*}", safe.url("?" + rest));
+            rest = "";
+        }
        var refresher = oRs("fac_bookmark_refreshtime").Value;
        var bookmark_naam = oRs("fac_bookmark_naam").Value;

@@ -187,10 +196,14 @@ __Log("== Entering shorturl.asp ==");
            if (rest)
                params = rest;
        }
-        oRs.Close();

        if (params)
-            url = url + "?" + params;
+            url = url + (url.indexOf('?') > -1?"&":"?") + params;
+
+        if (oRs("fac_bookmark_flags").Value == 0)
+            var url = protectQS.create(url); // prs/pchange_reset.asp, PRS\prs_perslid_qr_confirm.asp en PRS\self_register_confirm.asp verwachten dit
+
+        oRs.Close();
    }

    // Als de bookmark een refreshrate heeft ingesteld wordt automatisch gerefreshed
@@ -203,7 +216,9 @@ __Log("== Entering shorturl.asp ==");
        theURL = "appl/shared/refresher.asp?url=" + Server.URLencode("/?norefresh=1" + transitQS()) + "&refreshrate=" + refresher;
    }
    else
-        var theURL = protectQS.create(url);
+    {
+        var theURL = url;
+    }

    if (locked_bdradr_key < 0 && isKnownBookmark && !isMobile && getQParamInt("internal", 0) == 0)
    {
--- a/APPL/API2/TESTER/api2_tester.asp
+++ b/APPL/API2/TESTER/api2_tester.asp
@@ -39,7 +39,7 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
    <body style='background-color:#E5EAF1; font-family: Helvetica; font-size: 0.8em;'>
        <form method="post" onsubmit="doSubmit();return false;">
          <table>
-            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="<%=safe.htmlattr(HTTP.urlzelf())%>/api2/" target="_blank">API reference</a> ]</th>
+            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="<%=safe.htmlattr(HTTP.urlzelf())%>/api2/" target="_blank" rel="noopener noreferrer">API reference</a> ]</th>
            <tr><td><label>Format</label></td>
                <td><input type='radio' id='format' name='format' value='json' checked='1'>json</input>
                    <input type='radio' id='format' name='format' value='xml'>xml</input>
--- a/APPL/API2/TESTER/testall.js
+++ b/APPL/API2/TESTER/testall.js
@@ -368,9 +368,9 @@ String.prototype.format = function()

 WScript.Echo("Zorg dat je Fiddler open hebt staan");

-var G_fclt_url = 'http://uwva.facws001/trunk/';
+var G_fclt_url = 'http://uwva.facws001.sg.nl/trunk/';
 var G_fclt_url = 'http://uwva.lokalhost/trunk/';
-var G_fclt_url = 'http://uwva.facws001/branch20171/';
+//var G_fclt_url = 'http://uwva.facws001/branch20171/';
 var G_fclt_apikey = 'APIPFO';

 var apis = getAPI2JSON("GET", "apis");
@@ -391,6 +391,11 @@ function testOne(api2_name, docparam)
        if (data[api2_name].length && data[api2_name] instanceof Array)
        {
            var model = getAPI2JSON("GET", api2_name + ".api" + (docparam?"?x=1"+docparam:""));
+            if (!model)
+            {
+                WScript.echo("GET van api2_name + ".api + " werkt niet?");
+                return;
+            }

            url += "/" + data[api2_name][0]["id"];
            var data = getAPI2JSON("GET", url + (docparam?"?x=1"+docparam:""));
@@ -404,6 +409,11 @@ function testOne(api2_name, docparam)
            {
                for (var inc in model.includes)
                var data = getAPI2JSON("GET", url + "?include=" + model.includes[inc]);
+                if (!model)
+                {
+                    WScript.echo("GET van " + url + "?include=" + model.includes[inc] + " werkt niet?");
+                    return;
+                }
                if (!(model.record_name in data))
                {
                    WScript.echo("Data niet gevonden als include toegevoegd?");
@@ -423,6 +433,8 @@ function getAPI2JSON(method, url, data)
    {
        return eval ("(" + objXMLHTTP.responseText + ")");
    }
+    else
+        return null;
 }

 function FcltAPI2(method, url, data)
@@ -433,6 +445,7 @@ function FcltAPI2(method, url, data)

    objXMLHTTP.open(method, url, false);
    objXMLHTTP.setRequestHeader ("X-FACILITOR-API-Key", G_fclt_apikey);
+    objXMLHTTP.setRequestHeader ("Accept", "application/json");
    objXMLHTTP.send(data);
    if (objXMLHTTP.status >= 200 && objXMLHTTP.status <= 299)
    {
@@ -440,5 +453,6 @@ function FcltAPI2(method, url, data)
    }
    WScript.Echo(objXMLHTTP.responseText);
    WScript.Echo(objXMLHTTP.status);
+    WScript.Echo(objXMLHTTP.statusText);
    return null;
 }
--- a/APPL/API2/api2.inc
+++ b/APPL/API2/api2.inc
@@ -12,6 +12,7 @@
 */
 %>
 <!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="api2_tools.inc" -->
 <%
 api2 = {
    form2JSONdata: function _form2JSONdata(model, params, formfields) // Maak een jsondata-object voor gebruik vanuit model_xxx.inc
@@ -100,6 +101,13 @@ api2 = {
                    case "varchar":
                        val = getFParam(formfields[i].frm, null);
                        break;
+                    case "processingtime":
+                        val = {
+                                "duration": getFParamFloat(formfields[i].frm, null),
+                                "unit": getFParam(formfields[i].frm + "_eenheid", "D")
+                              }
+
+                        break;
                    default:
                    {
                        __DoLog(model.fields[formfields[i].name].typ);
@@ -176,6 +184,9 @@ api2 = {
                            continue;
                        if (filterval < 0 && field.typ == "key")
                            continue;
+                        if (filter == "like" && typeof filterval == "string" &&
+                           (filterval.toUpperCase() == "NULL" || filterval.toUpperCase() == "NOT NULL"))
+                            continue; // niet compatible met "like" filter
                    }

                    // Voor ranges komt de naam (misschien) niet letterlijk voor, maar (mogelijk) met start_ of end_ ervoor
@@ -188,11 +199,19 @@ api2 = {
                            filterval1 = filterval;
                        if ((filterval1 === "" || filterval1 === null) && (filterval2 === "" || filterval2 === null))
                            continue;
+                        if (typeof filterval1 == "string" && (filterval1.toUpperCase() == "NULL" || filterval1.toUpperCase() == "NOT NULL"))
+                            continue; // niet compatible met "range" filter
                    }
                    // Nu is ook voor ranges alles weer normaal
                    var clause;
                    var operand = " = ";
-                    switch (field.typ)
+                    if (filterval && typeof filterval == "string" &&
+                       (filterval.toUpperCase() == "NULL" || filterval.toUpperCase() == "NOT NULL"))
+                    {
+                        operand = " IS ";
+                        var safe_val = filterval;
+                    }
+                    else switch (field.typ)
                    {
                        case "key":
                            if (!filterval)
@@ -302,6 +321,8 @@ api2 = {
                                var safe_val = 0;
                            else
                                var safe_val = parseInt(filterval, 10);
+                            if (field.invert)
+                                safe_val = (safe_val==1?0:1);
                            if (isNaN(safe_val))
                            {
                                return ["0=1"]; // niets gevonden
@@ -378,12 +399,12 @@ api2 = {
                                if (filterval1) {
                                    var safe_val1 = api2.toDate(filterval1);
                                    var withtime = (field.typ == "datetime" && api2.hasTime(safe_val1));
-                                    safe_val1 = withtime?safe_val1.toSQL(true):safe_val1.beginToSQL();
+                                    safe_val1 = withtime?safe_val1.toSQL(true, true):safe_val1.beginToSQL();
                                }
                                if (filterval2) {
                                    var safe_val2 = api2.toDate(filterval2);
                                    var withtime = (field.typ == "datetime" && api2.hasTime(safe_val2));
-                                    safe_val2 = withtime?safe_val2.toSQL(true):safe_val2.endToSQL();
+                                    safe_val2 = withtime?safe_val2.toSQL(true, true):safe_val2.endToSQL();
                                }
                                if (filterval1 && filterval2) {
                                    operand = " BETWEEN ";
@@ -551,6 +572,17 @@ api2 = {
                    dbs = model.aliasprefix + fld;
                selects.push(field.sql + " AS " + dbs);
            }
+            else if (field.typ == "processingtime")
+            {
+                var sqltijd = "(SELECT xx." + field.dbs + ".tijdsduur"
+                                 + "  FROM " + model.table + " xx"
+                                 + " WHERE xx." + model.primary + " = " + model.table + "." + model.primary + ")";
+                selects.push(sqltijd + " AS " + fld + "_tijdsduur");
+                var sqleenh = "(SELECT xx." + field.dbs + ".eenheid"
+                                 + "  FROM " + model.table + " xx"
+                                 + " WHERE xx." + model.primary + " = " + model.table + "." + model.primary + ")";
+                selects.push(sqleenh + " AS " + fld + "_eenheid");
+            }
            else if (dbs)
            {
                // veldnamen moeten gelijk zijn bij het ophalen. Zie ook: sql2jsonval
@@ -775,10 +807,12 @@ api2 = {
                            if (field.foreign.desc_is_unique) // Dan mag je die bij saven ook opgeven
                            {
                                field.typ = "sql";
-                                newval = "(SELECT {0} FROM {1} WHERE {2} = {3})".format(field.foreign.key,
-                                                                                        field.foreign.tbl,
-                                                                                        field.foreign.desc,
-                                                                                        safe.quoted_sql(newval.name));
+                                var where = "{0} = {1}".format(field.foreign.desc, safe.quoted_sql(newval.name));
+                                if (typeof field.foreign.desc_is_unique == "string")
+                                    where += " AND " + field.foreign.desc_is_unique;
+                                newval = "(SELECT {0} FROM {1} WHERE {2})".format(field.foreign.key,
+                                                                                  field.foreign.tbl,
+                                                                                  where);
                            }
                        }
                    }
@@ -878,11 +912,14 @@ api2 = {
                            existing_includes[inckey].found = true;
                        }
                    }
-                    for (oldi in existing_includes)
+                    if (!incmodel.keyfield) // niet voor custom_fields
                    {
-                        if (!existing_includes[oldi].found)
+                        for (oldi in existing_includes)
                        {
-                            incmodel.REST_DELETE(params, oldi);
+                            if (!existing_includes[oldi].found)
+                            {
+                                incmodel.REST_DELETE(params, oldi);
+                            }
                        }
                    }
                }
@@ -894,33 +931,45 @@ api2 = {
        }
    },
    // Geeft de GET terug van een enkel veld
+    // Onder bepaalde omstandigheden wordt deze functie *heel* veel aangroepen
+    // Houd hem daarom efficient.
    sql2jsonval: function _sql2jsonval(oRs, fld, model)
    {
        var field = model.fields[fld];
        var sqlfieldname = (model.aliasprefix ? api2.sqlfield_alias(model, fld) : field.dbs);
+
+        if (field.typ == "processingtime")
+        {
+            var val = { "duration": oRs(fld + "_tijdsduur").Value,
+                        "unit": oRs(fld + "_eenheid").Value
+                      }
+            return val;
+        }
+
        if (field.val instanceof Function)
            var val = field.val(oRs, field, model, sqlfieldname);
        else if (field.dbs.indexOf(".") < 0)
-        {
            var val = oRs(sqlfieldname).Value;
-        }
        else
            var val = oRs(field.dbs.split(".")[1]).Value;

-        if (field.typ == "check" || field.typ == "check0")
-        {
-            if (field.invert)
-                val = (val==1?0:1);
-        }
-
-        if (val === null)
+        if (val === null && !field.invert)
            return val;
-        if (field.typ == "date")
-            val = new Date(val);
-        if (field.typ == "datetime")
-            val = new Date(val);
-        if (field.typ == "time") // In de database ondersteunen we dit niet maar komt voor bij fac_report
-            val = new Date(val);
+
+        switch (field.typ)
+        {
+            case "check":
+            case "check0":
+                if (field.invert)
+                    val = (val==1?0:1);
+                return val;
+                break;
+            case "date":
+            case "datetime":
+            case "time": // In de database ondersteunen we dit niet maar komt voor bij fac_report
+                return new Date(val);
+            break;
+        }
        // Wat te doen met lege waarde
        //  action: null
        //  action: {key: null, name: null}
@@ -1068,10 +1117,10 @@ api2 = {
        var oRs = Oracle.Execute(sql, params.errmsg);
        if (params.errmsg && oRs.friendlyMsg)
        {
-                var record = {};
-                record[model.list.columns[0]] = oRs.friendlyMsg;
-                data.push(record);
-                return data;
+            var record = {};
+            record[model.list.columns[0]] = oRs.friendlyMsg;
+            data.push(record);
+            return data;
        }

        var lastkey = 0;
@@ -1084,6 +1133,8 @@ api2 = {
            limit = params.filter.limit;
        if (params.filter.nolimit || limit == -1)
            limit = 99999999; // Excel/CSV alles tonen
+
+        var to_skip = params.filter.offset || 0;
        while (!oRs.Eof)
        {
            if (data.length >= limit) // Alleen nog maar tellen
@@ -1102,6 +1153,7 @@ api2 = {
                oRs.MoveNext();
                continue;
            }
+            var newrecord = true;
            if (model.primary)
            {
                var key = oRs(model.primary).Value;
@@ -1114,13 +1166,18 @@ api2 = {

                    if (lastkey && !isEmptyObject(record)) // Record was er mogelijk uit gefilterd
                    {
-                        data.push(record);
+                        if (to_skip > 0)
+                            to_skip --;
+                        else
+                            data.push(record);
                        total_count ++;
                        if (data.length == limit)
                            continue; // alleen nog tellen, 'volgende' record niet meer opbouwen
                    }
                    var record = {};
                }
+                else
+                    newrecord = false; // er komen nog wel include-records achteraan
            }

            // Complexe filtering die we niet voor elkaar kregen met een WHERE-clause
@@ -1135,21 +1192,24 @@ api2 = {
            }

            var fld;
-            for (fld in model.fields)
+            if (newrecord) // dan moeten de velden van het basis model eerst
            {
-                if (fld.substring(0,1) == "_")
-                    continue;
-                var field = model.fields[fld];
-                if (field.hidden)
-                    continue;
-                if ("fields" in params.filter && !inArray(fld, params.filter.fields.split(",")))
-                    continue;
+                for (fld in model.fields)
+                {
+                    if (fld.substring(0,1) == "_")
+                        continue;
+                    var field = model.fields[fld];
+                    if (field.hidden)
+                        continue;
+                    if ("fields" in params.filter && !inArray(fld, params.filter.fields.split(",")))
+                        continue;

-                var val = api2.sql2jsonval(oRs, fld, model)
-                //waarom was dit aanwezig?
-                //if (field.readonly && !val.id)
-                //    continue;
-                record[fld] = val;
+                    var val = api2.sql2jsonval(oRs, fld, model)
+                    //waarom was dit aanwezig?
+                    //if (field.readonly && !val.id)
+                    //    continue;
+                    record[fld] = val;
+                }
            }
            if (params.include && model.includes)
            {
@@ -1173,10 +1233,13 @@ api2 = {
                            // Nu kan het zo zijn dat ons include record al eerder is toegevoegd
                            // Kan gebeuren bij res_ruimte als je een include van res_alg_ruimte *en* opstelling doet
                            var incfound = false;
-                            for (var i = 0; i < record[incname].length && !incfound; i++)
+                          if (model.uglyincludefix || params.include.length > 1) // niet onnodig doen, kan kwadratische performance impact hebben
                            {
-                                if (record[incname][i].id == inc_key)
-                                    incfound = true;
+                                for (var i = 0; i < record[incname].length && !incfound; i++)
+                                {
+                                    if (record[incname][i].id == inc_key)
+                                        incfound = true;
+                                }
                            }
                            if (!incfound)
                                record[incname].push(api2.sql2jsonfields(params, oRs, incmodel));
@@ -1201,25 +1264,32 @@ api2 = {
            lastkey = key;
            if (!model.primary)
            {
-                data.push(record);
+                if (to_skip > 0)
+                    to_skip --;
+                else
+                    data.push(record);
                record = {};
                total_count ++;
            }
            oRs.MoveNext();
        }
+        oRs.Close();
        if (lastkey && data.length < limit)
        {
            total_count ++;
-            data.push(record);
+            if (to_skip > 0)
+                to_skip --;
+            else
+                data.push(record);
        }
        if ("merged_model" in model) // de disc_params truc
        {
            model.merged_model.limit = limit;
-            //model.offset = offset;
+            model.merged_model.offset = params.filter.offset || 0;
            model.merged_model.total_count = total_count;
        }
        model.limit = limit;
-        //model.offset = offset;
+        model.offset = params.filter.offset || 0;
        model.total_count = total_count;
        return data;
    },
@@ -1315,7 +1385,7 @@ api2 = {
            if (dt && dt instanceof Date)
                return dt;
        }
-        NOT_A_DATE;
+        api2.error(400, "Invalid date format");
    },
    generic_REST: function(model, gparams)
    {
@@ -1438,7 +1508,10 @@ function generic_REST_GET(model, gparams)
                for (var i = 0; i < params.orderby.length; i++)
                {
                    var field = model.fields[params.orderby[i]];
-                    orderbys.push(field._foreignname || field.dbs);
+                    if (field.sql)
+                        orderbys.push(field.sql);
+                    else
+                        orderbys.push(field._foreignname || field.dbs);
                }
            }

@@ -1478,7 +1551,13 @@ function generic_REST_GET(model, gparams)
                    sql += ", " + inc0.table + "." + inc0.fields["id"].dbs;
            }

-            var maxcnt = params.filter.showall==1?S("qp_maxrows2"):S("qp_maxrows");
+            if (params.filter.limit > 0)
+                maxcnt = params.filter.limit; // deze is in shared.inc/_qssafe 'safe' gemaakt
+            else
+                var maxcnt = params.filter.showall==1?S("qp_maxrows2"):S("qp_maxrows");
+            if (params.filter.offset > 0)
+                maxcnt += params.filter.offset; // deze is in shared.inc/_qssafe 'safe' gemaakt
+
            if (params.include && params.include.length)
            {
                // geen beperking
@@ -1489,7 +1568,7 @@ function generic_REST_GET(model, gparams)
            }
            else
            {
-                if (!params.filter.nolimit) // Dan niet (Excel, CSV)
+                if (!params.filter.nolimit && !(gparams.GET.filter && gparams.GET.filter.nolimit)) // Dan niet (Excel, CSV, budgetmutaties)
                   var sql = "SELECT * FROM (" + sql + ") WHERE ROWNUM <= " + (maxcnt + 1); // Eentje extra om overflow-melding te triggeren in resultsettable
            }

@@ -1560,7 +1639,9 @@ function generic_REST_POST(model, gparams)

            var err = Oracle.Execute(xxxIns.sql, true);
            if (err.friendlyMsg)
-                abort_with_warning(err.friendlyMsg);
+                api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
+            if (model.trackcode && user_key > 0) // Bij SAML user-provisioning is er nog niet niemand ingelogd.
+              shared.trackaction(model.trackcode, the_key, L("lcl_inserted0").format(model.record_title));

            var inctrack = api2.process_includes(params, model, jsondata, the_key);

@@ -1612,22 +1693,29 @@ function generic_REST_PUT(model, gparams)
                jsondata_dp[model.disc_params.joinfield] = the_key;
            }

-            var dbfields = api2.update_fields(params, model, jsondata);
-            var wheres = [model.fields["id"].dbs + "  = " + the_key];
-            var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
-            // TODO: Generieke tracking?
-
-            if (xxxUpd) // Misschien geen velden opgegeven.
+            if (params.custom_fields_only)
            {
-                var err = Oracle.Execute(xxxUpd.sql, true);
-                if (err.friendlyMsg)
-                    abort_with_warning(err.friendlyMsg);
-                if (model.trackcode)
-                    shared.trackaction(model.trackcode, the_key, xxxUpd.trackarray.join("\n"));
+                var xxxUpd = { trackarray: [] };
+            }
+            else
+            {
+                var dbfields = api2.update_fields(params, model, jsondata);
+                var wheres = [model.fields["id"].dbs + "  = " + the_key];
+                var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
+                // TODO: Generieke tracking?
+
+                if (xxxUpd) // Misschien geen velden opgegeven.
+                {
+                    var err = Oracle.Execute(xxxUpd.sql, true);
+                    if (err.friendlyMsg)
+                        api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
+                    if (model.trackcode && xxxUpd.trackarray.length > 0)
+                        shared.trackaction(model.trackcode, the_key, L("lcl_updated") + "\n" + xxxUpd.trackarray.join("\n"));
+                }
            }
            var inctrack = api2.process_includes(params, model, jsondata, the_key);

-            if ("disc_params" in model)
+            if (!params.custom_fields_only && "disc_params" in model)
            {
                // Nu de one-on-one tabel
                var dbfields = api2.update_fields(params, model.disc_params.model, jsondata_dp);
@@ -1637,7 +1725,7 @@ function generic_REST_PUT(model, gparams)
                {
                    var err = Oracle.Execute(xxxUpd.sql, true);
                    if (err.friendlyMsg)
-                        abort_with_warning(err.friendlyMsg);
+                        api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
                }
            }

@@ -1672,7 +1760,7 @@ function generic_REST_DELETE(model, gparams)

            var err = Oracle.Execute(sql, true);
            if (err.friendlyMsg)
-                abort_with_warning(err.friendlyMsg);
+                api2.error(400, err.friendlyMsg); // Veronderstel Bad Request

            return { key: the_key, warning: "" };
        }
--- a/APPL/API2/api2_dispatch.inc
+++ b/APPL/API2/api2_dispatch.inc
@@ -55,7 +55,7 @@ var api2_mapper = {
    "emailsettings"           : { "filename": "appl/mgt/fac_email_setting.asp" },
    "exportfunctions"         : { "filename": "appl/mgt/fac_export_app.asp" },
    "authorizationfunctions"  : { "filename": "appl/mgt/fac_functie.asp" },
-    "authorizationgroups"     : { "filename": "appl/mgt/fac_groep.asp" },
+    "authorizationgroups"     : { "filename": "appl/api2/api_authorizationgroups.asp" },
    "authorizations"          : { "filename": "appl/mgt/fac_groeprechten.asp", "nodoc": true },
    "identityproviders"       : { "filename": "appl/mgt/aut_idp.asp" },
    "importfunctions"         : { "filename": "appl/mgt/fac_import_app.asp" },
@@ -82,7 +82,8 @@ var api2_mapper = {
    "servicelevels"           : { "filename": "appl/mgt/mld_dienstniveau.asp" },
    "issuedisciplines"        : { "filename": "appl/mgt/mld_discipline.asp" },
    "unproductivetimes"       : { "filename": "appl/mgt/mld_impropdr.asp" },
-    "issueproperties"         : { "filename": "appl/mgt/mld_kenmerk.asp" },
+    "issueproperties"         : { "filename": "appl/mgt/mld_mld_kenmerk.asp" },
+    "issueorderproperties"    : { "filename": "appl/mgt/mld_kenmerk.asp" },
    "expenses"                : { "filename": "appl/mgt/mld_kosten.asp" },
    "callsources"             : { "filename": "appl/mgt/mld_meldbron.asp" },
    "disciplinetypes"         : { "filename": "appl/mgt/mld_srtdiscipline.asp" },
@@ -94,9 +95,10 @@ var api2_mapper = {
    "workflowsteps"           : { "filename": "appl/mgt/mld_workflowstep.asp", "nodoc": true },
    "workflowexpressions"     : { "filename": "appl/mgt/mld_workflow_expression.asp" },
    "issuedisciplines"        : { "filename": "appl/api2/api_issuedisciplines.asp",         "module": "MLD" },
-    "orders"                  : { "filename": "appl/api2/api_orders.asp",                   "module": "MLD" },
+//    "orders"                  : { "filename": "appl/api2/api_orders.asp",                   "module": "MLD" },
+    "orders"                  : { "filename": "appl/bgt/mld_opdr.asp",                      "module": "MLD" },
    "issues"                  : { "filename": "appl/api2/api_issues.asp",                   "module": "MLD" },
-    "issuetypes"              : { "filename": "appl/api2/api_issuetypes.asp",               "module": "MLD" },
+    "issuetypes"              : { "filename": "appl/mgt/mld_stdmelding.asp",                "module": "MLD" },
    "pinboardcategories"      : { "filename": "appl/mgt/mrk_discipline.asp" },
    "services"                : { "filename": "appl/mgt/prs_dienst.asp" },
    "basisproperties"         : { "filename": "appl/mgt/prs_kenmerk.asp",                   "docparam": "&level=P" },
@@ -105,7 +107,7 @@ var api2_mapper = {
    "costtypegroups"          : { "filename": "appl/mgt/prs_kostensoortgrp.asp" },
    "costcentregroups"        : { "filename": "appl/mgt/prs_kostenplaatsgrp.asp" },
    "costcentres"             : { "filename": "appl/mgt/prs_kostenplaats.asp" },
-    "persons"                 : { "filename": "appl/mgt/prs_perslid.asp", "nodoc": true },
+    "persons"                 : { "filename": "appl/api2/api_persons.asp", "nodoc": true },
    "mandates"                : { "filename": "appl/mgt/prs_perslidkostenplaats.asp" },
    "relationtypes"           : { "filename": "appl/mgt/prs_relatietype.asp" },
    "employeefunctions"       : { "filename": "appl/mgt/prs_srtperslid.asp" },
@@ -134,7 +136,7 @@ var api2_mapper = {
    "doc"                     : { "filename": "appl/api2/api_doc.asp",                      "module": "API" },
    "apis"                    : { "filename": "appl/api2/api_apis.asp",                     "module": "API" },
    "about"                   : { "filename": "appl/api2/api_about.asp",                    "module": "API" },
-    "cadcontours"             : { "filename": "appl/api2/api_cadcontours.asp",              "module": "CAD" },
+    "cadcontours"             : { "filename": "appl/api2/api_cadcontours.asp",              "module": "CAD", "nodoc": true },
    "contracts"               : { "filename": "appl/api2/api_contracts.asp",                "module": "CNT" },
    "notes"                   : { "filename": "appl/api2/api_notes.asp",                    "module": "FAC", "docparam": "&module=MLD" },
    "approvals"               : { "filename": "appl/api2/api_approvals.asp",                "module": "FAC" },
@@ -143,6 +145,8 @@ var api2_mapper = {
    "reports"                 : { "filename": "appl/api2/api_reports.asp",                  "module": "FAC", "nodoc": true },
    "invoices"                : { "filename": "appl/api2/api_invoices.asp",                 "module": "FIN" },
    "objects"                 : { "filename": "appl/api2/api_objects.asp",                  "module": "INS" },
+    "inspections"             : { "filename": "appl/api2/api_ins_deelsrtcontrole.asp",      "module": "INS" },
+    "statehistory"            : { "filename": "appl/mgt/ins_deel_state_history.asp",        "module": "INS" },
    "companies"               : { "filename": "appl/api2/api_companies.asp",                "module": "PRS" },
    "departments"             : { "filename": "appl/mgt/prs_afdeling.asp",                  "module": "PRS" },

--- a/APPL/API2/api2_rest.inc
+++ b/APPL/API2/api2_rest.inc
@@ -18,47 +18,22 @@ var DEZE = this;
 api2_rest = {
    authenticate: function _authenticate()
    {
-        var APIKEY;
-        if (S("fac_api_key_in_url"))
-            APIKEY = getQParam("APIKEY", "");
-        if (!APIKEY && Request.ServerVariables("HTTP_X_FACILITOR_API_KEY").Count)
-            APIKEY = String(Request.ServerVariables("HTTP_X_FACILITOR_API_KEY")); // Meegegeven als X-FACILITOR-API-Key
-
-        if (!APIKEY && Session("user_key") > 0)
+        var method = String(Request.ServerVariables("REQUEST_METHOD"));
+        if (method != "GET" && Session("stateless") != 1) // Vereis dan wel het CSRF token
        {
-            user_key = Session("user_key"); // Hierdoor is de API intern te gebruiken zonder authenticatie
-            var method = String(Request.ServerVariables("REQUEST_METHOD"));
-            if (method != "GET") // Vereis dan wel het CSRF token
-            {
-                var token = Request.ServerVariables("HTTP_X_CSRF_TOKEN").Count   // Meegegeven als X-CSRF-TOKEN
-                                ? String(Request.ServerVariables("HTTP_X_CSRF_TOKEN"))
-                                : "";
-                protectRequest.validateToken(token);
-            }
+            var token = Request.ServerVariables("HTTP_X_CSRF_TOKEN").Count   // Meegegeven als X-CSRF-TOKEN
+                            ? String(Request.ServerVariables("HTTP_X_CSRF_TOKEN"))
+                            : "";
+            protectRequest.validateToken(token);
        }
-        else
+        if (user_key < 0)
        {
-            if (Session("user_key") > 0)
-                {} // Tijdens ontwikkeling heb je soms in tweede tab de GUI open. Laat dat ongemoeid.
-            else
-                Session.Abandon(); // Altijd, voor de zekerheid
-
-            var sql = "SELECT prs_perslid_key, prs_perslid_naam, prs_perslid_oslogin"
-                    + "  FROM prs_perslid"
-                    + " WHERE prs_perslid_verwijder IS NULL"
-                    + "   AND prs_perslid_apikey = " + safe.quoted_sql(APIKEY);
-            var oRs = Oracle.Execute(sql);
-            if (oRs.Eof || !APIKEY)
-            {
-                Response.Status = "401 Unauthorized";
-                // Sommige applicaties kunnen in reactie hierop een b64 encoded username:password sturen
-                // Die onderscheppen wij in LoginTry.asp uiteindelijk
-                if (S("basic_auth_realm"))
-                    Response.AddHeader("WWW-Authenticate", "Basic realm=\"" + S("basic_auth_realm") + "\"");
-                Response.End;
-            };
-            __Log("API2 User is: {0} ({1})".format(oRs("prs_perslid_naam").Value, oRs("prs_perslid_oslogin").Value));
-            /* global */ user_key = oRs("prs_perslid_key").Value;
+            Response.Status = "401 Unauthorized";
+            // Sommige applicaties kunnen in reactie hierop een b64 encoded username:password sturen
+            // Die onderscheppen wij in LoginTry.asp uiteindelijk
+            if (S("basic_auth_realm"))
+                Response.AddHeader("WWW-Authenticate", "Basic realm=\"" + S("basic_auth_realm") + "\"");
+            Response.End;

            if (typeof NO_ADDHEADER == "undefined" && Request.Servervariables("HTTP_FCLT_VERSION").Count > 0)
            {   // wordt opgepikt door FCLTAPI.DLL voor in de logging en daarna gestript. Niet in Fiddler dus
@@ -93,7 +68,6 @@ api2_rest = {
            oRs.Close()
        }

-        /* global */ user = new Perslid(user_key); // wordt mogelijk nog overruled door imporsonate
        CheckForLogging(Request.QueryString("logging")); // Nu pas kan autorisatie via user gecontroleerd worden
    },

@@ -160,6 +134,12 @@ api2_rest = {
            /* global */ JSON_Result = true; // Zelf doen we er niets mee maar
                                             // shared.simple_page kijkt er naar

+        var orgError = api2.error;
+        api2.error = function (code, msg)
+        {
+            api2_rest.plugin.error_handler(code, msg, orgError);
+        }
+
        api2_rest.authenticate();
        // Kip-ei: de omzetting naar new model() mag pas als je geauthenticeerd bent
        // Hierboven willen we het echter al wel meegeven
@@ -175,20 +155,44 @@ api2_rest = {
            Response.Status = "405 Method not allowed";
            Response.End;
        }
-        if (!("REST_" + method in model))
+        // JGL: Met zeer grote tegenzin behoorlijk UWVA specifiek
+        if (Session("isWriteonlyApi2User"))
+        {
+            if (method == "PUT" || (method == "GET" && getQParam("api2") == "reports"))
+            {
+                // Dat is toegestaan
+            }
+            else
+            {
+                Response.Status = api2.error(400, "Method not supported for this user");
+            }
+        }
+
+        var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
+
+        var jsondata = {};
+        var filter = shared.qs2json(model);
+        filter = api2_rest.plugin.transform_filter(filter);
+        var requestparams = { filter: filter, include: getQParamArray("include", []) };
+        if (filter.mode == "attachment" && !("includes" in model && "custom_fields" in model.includes))
+            api2.error(400, "Attachment not supported for this model");
+
+        if (filter.mode == "attachment")
+        {
+            if (key > 0 && method == "POST") // het bestand mag dan wel nieuw zijn (POST is van toepassing),
+                method = "PUT";              // intern is het een update van een bestaand record, dus PUT
+        }
+
+        if (!("REST_" + method in model) || !model["REST_" + method])
        {
            Response.Status = "501 Not Implemented";
            // TODO The response MUST include an Allow header containing a list of valid methods for the requested resource.
            Response.End;
        }
-        var jsondata = {};
-        var filter = shared.qs2json(model);
-        filter = api2_rest.plugin.transform_filter(filter);
-        var requestparams = { filter: filter, include: getQParamArray("include", []) };

        if (/PUT|POST/.test(method)) // Dan is er in de body data meegestuurd
        {
-            if (filter.mode == "attachment" && "custom_fields" in model.includes)
+            if (filter.mode == "attachment")
            {
                // Body bevat application/octet-stream, dat lezen we later wel uit
            }
@@ -250,14 +254,18 @@ 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 (outputformat == "doc")
        {
            // Dan hoeven we verder bijna niets te doen
            if ("autfunction" in model)
-                model.autfunctionname = L("lcl_" + model.autfunction);
+            {
+                if (typeof model["autfunction"] == "string")
+                    model.autfunctionname = L("lcl_" + model.autfunction);
+                else
+                    delete model["autfunction"];
+            }
            // TODO: velden strippen waar je niets mee te maken hebt?
        }
        else if (outputformat == "api" && getQParamInt("swagger", 0) == 0)
@@ -304,10 +312,13 @@ api2_rest = {
        {
            if (method == "DELETE")
            {
+                if (!(key > 0))
+                    api2.error(400, "Missing id");
                var result = model["REST_" + method]( requestparams, key );
            }
-            else if (filter.mode == "attachment" && "custom_fields" in model.includes)
-            {   // GET/PUT/POST https://xxxx.facilitor.nl/trunk/api2/visitors/99685/attachments/1040/testfile.jpg"
+            else if (filter.mode == "attachment")
+            {   // GET/PUT/POST https://xxxx.facilitor.nl/api2/visitors/99685/attachments/1040/testfile.jpg" bestaande folder
+                // POST https://xxxx.facilitor.nl/api2/issues/0/attachments/1040/testfile.jpg" nieuw object, maakt TEMP aan
                if (wasCodePage != 65001)
                {
                    // Door de IIS rewriter is de filenaam in de url utf-8 encoded
@@ -341,17 +352,40 @@ api2_rest = {
                {
                    var bytes = Request.TotalBytes;
                    if (bytes == 0)
-                    { // TODO
-                        //__DoLog("api_gen_import empty body posted", "#ffff00");
-                        //Response.Write("Error: no data posted for API import");
-                        //Response.End; // Grof maar anders AiAi, dat is nog erger
-                    }
+                        api2.error(400, "Empty file");
+
                    var fileStream = Server.CreateObject("ADODB.Stream");
                    fileStream.Type = 1; // adTypeBinary eerst nog
                    fileStream.Open();
-                    fileStream.Write(Request.BinaryRead(bytes));
+                    try
+                    {
+                        fileStream.Write(Request.BinaryRead(bytes));
+                    }
+                    catch(e)
+                    {
+                        var msg = L("lcl_shared_upload_error_start") + e.description + L("lcl_shared_upload_error_end");
+                        api2.error(400, msg);
+                    }
                    jsondata["custom_fields"][0]["attachments"][0].datastream = fileStream;
+                    if (key == 0) // new record
+                    {
+                        var token = model.includes["custom_fields"].model.REST_POST(requestparams, jsondata.custom_fields[0], -1);
+                        var record = { xflexparentkey: -1, propertyid: jsondata.custom_fields[0].propertyid};
+                        var fileparams = { getFiles: true, api2name: null, tmpfolder: token };
+                    }
+                    else
+                    {
+                        requestparams.custom_fields_only = true; // Voorkom bij nieuwe bijlage onnodige update vam hele issue
+                        model["REST_" + method](requestparams, jsondata, key); // via het hoofdmodel met authorisatie controle en alles
+                        var record = { xflexparentkey: key, propertyid: jsondata.custom_fields[0].propertyid};
+                        var fileparams = { getFiles: true, api2name: model.records_name };
+                    }
+                    var data = model.includes["custom_fields"].model.get_file_info(requestparams, record, fileparams );
+
+                    api2_rest.deliver(data, /* dummy model */ { record_name: "attachment" }, outputformat, true);
+                    return;
                }
+                // Geen atachment dus door met de reguliere code
                var data = model["REST_" + method](requestparams, jsondata, key);
                if (method == "GET")
                {
@@ -370,6 +404,8 @@ api2_rest = {
            }
            else if (model.record_name in jsondata) // een enkel record
            {
+                if (method == "PUT" && !(key > 0))
+                    api2.error(400, "Missing id");
                if (jsondata[model.record_name] instanceof Array)
                    api2.error(400, "{0} should be single record only.".format(method))

@@ -402,9 +438,9 @@ api2_rest = {
            case "POST":
            {
                var key = result.key;
-                if (key > 0)
+                if (key > 0 && !Session("isWriteonlyApi2User"))
                {
-                    var params = { filter: shared.qs2json(model), include: getQParamArray("include", []) }, jsondata, key
+                    // var params = { filter: shared.qs2json(model), include: getQParamArray("include", []) }, jsondata, key
                    // requestparams.include is mogelijk uitgebreid met wat er in de body stond
                    data = model.REST_GET({ filter: { id: key }, include: requestparams.include }); // resulterende data weer terug
                    __Log(data);
@@ -439,9 +475,12 @@ api2_rest = {
            else
            {
                result.total_count = model.total_count;
-                result.limit = model.limit;
-                result.offset = 0;
-                result[model.records_name] = data;
+                if (!(getQParam("justcount", 0) == 1))
+                {
+                    result.limit = model.limit;
+                    result.offset = model.offset;
+                    result[model.records_name] = data;
+                }
            }

            var resultdata = api2_rest.plugin.transform_outgoing({}, result);
@@ -613,8 +652,12 @@ api2_rest = {

        // str_antwoord heeft nu het te versturen antwoord
        // Bepaal eTag
-        var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
-        var eTag = '"' + oCrypto.hex_sha1(String(S("cache_changecounter")) + "_" + str_antwoord).toLowerCase() + '"';
+        var eTag = api2_rest.plugin.get_eTag({}, resultdata);
+        if (!eTag)
+        {
+            var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
+            var eTag = '"' + oCrypto.hex_sha1(String(S("cache_changecounter")) + "_" + str_antwoord).toLowerCase() + '"';
+        }
        Response.AddHeader("ETag", eTag);
        if (Request.ServerVariables("HTTP_IF_NONE_MATCH") == eTag)
        {   // We hebben een match! Effectief besparen wel alleen op dataverkeer, de queries zijn al geweest
@@ -749,10 +792,11 @@ api2_rest = {
            var arrayElement = xmlDoc.createElement(rootname);
            arrayElement.setAttribute("total_count", model.total_count);
            arrayElement.setAttribute("limit", model.limit);
-            arrayElement.setAttribute("offset", 0);
+            arrayElement.setAttribute("offset", model.offset);

            for (var i = 0; i < data.length; i++)
                arrayElement.appendChild(record2json(data[i], record_name));
+
            xmlDoc.appendChild(arrayElement);
        }
        return xmlDoc;
@@ -857,6 +901,16 @@ api2_rest = {
            hook = null;
            return outdata;
        },
+        error_handler: function(code, msg, orgHandler)
+        {
+            var hook = api2_rest.find_plugin();
+            if ("error_handler" in hook)
+                outdata = hook.error_handler(code, msg, orgHandler);
+            else
+                outdata = orgHandler(code, msg);
+            hook = null;
+            return outdata;
+        },
        transform_incoming: function(params, data)
        {
            var outdata = data;
@@ -876,6 +930,15 @@ api2_rest = {
                outdata = hook.transform_outgoing(params, data);
            hook = null;
            return outdata;
+        },
+        get_eTag: function(params, data)
+        {
+            var outdata = null;
+            var hook = api2_rest.find_plugin();
+            if ("get_eTag" in hook)
+                outdata = hook.get_eTag(params, data);
+            hook = null;
+            return outdata;
        }
    }
 }
@@ -890,7 +953,7 @@ function RequestJSON()
        var lngBytesCount = Request.TotalBytes;
        jvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
    }
-    __Log("Vraag: " + jvraag);
+    __Log("Request body: " + jvraag);
    try
    {
        var vraag = myJSON.parse(jvraag);
@@ -898,7 +961,7 @@ function RequestJSON()
    catch (e)
    {
        result = { error: e.description || (e.message + ": " + e.name) };
-        __DoLog("JSON eval faalt met: '{0}'\n{1}".format(result, jvraag), "ffff00");
+        __DoLog("JSON eval faalt met: '{0}'\n{1}".format(result.error, jvraag), "ffff00");
        return result ;
    }
    return { json: vraag };
@@ -932,7 +995,13 @@ function BytesToStr(bytes)
    stream.type = 2; // Text
    stream.charset = "utf-8";

-    var sOut = stream.readtext();
+    // Als onverhoopt toch windows-1252 is gestuurd met diacrieten gaf
+    // stream.readtext() een 'The parameter is incorrect'
+    // Vreemd genoeg lijkt het expliciet meegeven van een lengte dat te voorkomen.
+    // Die mag zelfs gewoon veel 'te lang' zijn.
+    // Merk op dat we windows-1252 niet ondersteunen, je moet echt utf-8 sturen
+    // (we hadden waarschijnlijk ook 99999999 kunnen kiezen)
+    var sOut = stream.readtext(stream.Size * 2);
    stream.close;
    return sOut;
 }
--- a/APPL/API2/api2_tools.inc
+++ b/APPL/API2/api2_tools.inc
@@ -2,13 +2,14 @@
    $Revision$
    $Id$

-    File:           mgt_tools.inc
+    File:           api2_tools.inc

    Description:

    Context:

-    Notes:
+    Notes:          voorheen mgt/mgt_tools.inc maar de functies zijn essentieel
+                    voor vele modellen dus moet het in api2_tools.inc
 */
 %>
 <%
@@ -26,6 +27,9 @@
            case "D":
                kenmerktypeLOV = "D;" + L("mgt_srtkenmerk_datum");
                break;
+            case "T":
+                kenmerktypeLOV = "T;" + L("mgt_srtkenmerk_tijd");
+                break;
            case "R":
                kenmerktypeLOV = "R;" + L("mgt_srtkenmerk_referentie_l") + ";"
                               + "S;" + L("mgt_srtkenmerk_referentie_s")
@@ -65,6 +69,7 @@
                               +  "C;" + L("mgt_srtkenmerk_karakter")
                               + ";N;" + L("mgt_srtkenmerk_numeriek")
                               + ";D;" + L("mgt_srtkenmerk_datum")
+                               + ";T;" + L("mgt_srtkenmerk_tijd")
                               + ";R;" + L("mgt_srtkenmerk_referentie_l")
                               + ";S;" + L("mgt_srtkenmerk_referentie_s")
                               + ";X;" + L("mgt_srtkenmerk_bestandsnaam")
@@ -317,6 +322,15 @@ function buildStatusList()
    return statusList;
 }

+function buildStdmeldingObjReqStatusList()
+{
+    var statusList = "-1;"
+                   + ";2;" + L("lcl_mld_altijd_verplicht")
+                   + ";1;" + L("lcl_mld_afgewezen")
+                   + ";5;" + L("lcl_mld_afgemeld");
+    return statusList;
+}
+
 function buildCadPositionLOV()
    {
        return "1;"  + L("cad_label_type_bi_rui")
--- a/APPL/API2/api_authorizationgroups.asp
+++ b/APPL/API2/api_authorizationgroups.asp
@@ -0,0 +1,26 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_authorizationgroups.asp
+
+    Description:    ALG_GEBOUW API
+    Parameters:
+    Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
+
+    Notes:          Eigen bestand zodat we internal: true kunnen meegeven
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api/api_authorizationgroups.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_fac_groep.inc" -->
+<%
+    var groep = new model_fac_groep(null, { internal: true }); // internal zodat PUT/POST/DELETE ook kunnen
+    api2_rest.process(groep);
+%>
--- a/APPL/API2/api_ins_deelsrtcontrole.asp
+++ b/APPL/API2/api_ins_deelsrtcontrole.asp
@@ -0,0 +1,25 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_ins_deelsrtcontrole.asp
+
+    Description:    Inspecties model
+    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/api/api_ins_deelsrtcontrole.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_ins_deelsrtcontrole.inc" -->
+<%
+    api2_rest.process(model_ins_deelsrtcontrole);
+%>
--- a/APPL/API2/api_persons.asp
+++ b/APPL/API2/api_persons.asp
@@ -0,0 +1,26 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_persons.asp
+
+    Description:    ALG_GEBOUW API
+    Parameters:
+    Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
+
+    Notes:          Eigen bestand zodat we internal: true kunnen meegeven
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api/api_persons.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_prs_perslid.inc" -->
+<%
+    var perslid = new model_prs_perslid({ internal: true }); // internal zodat PUT/POST/DELETE ook kunnen
+    api2_rest.process(perslid);
+%>
--- a/APPL/API2/model_aut_client.inc
+++ b/APPL/API2/model_aut_client.inc
@@ -17,7 +17,7 @@ function model_aut_client(params)
    this.record_name = "autclient";
    this.table = "aut_client";
    this.primary = "aut_client_key";
-    this.autfunction = "WEB_FACFAC";
+    this.autfunction = params.internal?false:"WEB_FACTAB";
    this.record_title = L("aut_client");
    this.records_title = L("aut_client_m");

@@ -32,7 +32,8 @@ function model_aut_client(params)
            "dbs": "aut_client_id",
            "label": L("aut_client_code"),
            "typ": "varchar",
-            "filter": "exact"
+            "filter": "exact",
+            "caseinsensitive": true
        },
        "name": {
            "dbs": "aut_client_omschrijving",
@@ -58,6 +59,12 @@ function model_aut_client(params)
            "typ": "varchar",
            "defaultvalue": shared.random(32),
            "secret": true
+        },
+        "company": {
+            "dbs": "prs_bedrijf_key",
+            "label": L("prs_bedrijf_key"),
+            "typ": "key",
+            "foreign": "PRS_BEDRIJF"
        }
 /*        ,
        "redirect_uri": {
@@ -74,12 +81,8 @@ function model_aut_client(params)
              };

    this.REST_GET    = generic_REST_GET(this);
-    if (params.internal) // Dan geloof ik het wel
-    {
-        this.autfunction = false;
-        this.REST_POST   = generic_REST_POST(this);
-        this.REST_PUT    = generic_REST_PUT(this);
-        this.REST_DELETE = generic_REST_DELETE(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_aut_client_perslid.inc
+++ b/APPL/API2/model_aut_client_perslid.inc
@@ -15,7 +15,7 @@ function model_aut_client_perslid(params)
    this.table = "aut_client_perslid";
    this.primary = "aut_client_perslid_key";
    this.autSELF = "person";
-    this.autfunction = "WEB_FACFAC";
+    this.autfunction = params.self?false:"WEB_FACFAC";
    this.record_title = L("aut_client_perslid");
    this.records_title = L("aut_client_perslid_m");

@@ -38,12 +38,23 @@ function model_aut_client_perslid(params)
                "desc": "aut_client_omschrijving"
            }
        },
+        "registrationdate": {
+            "dbs": "aut_client_perslid_aanmaak",
+            "label": L("aut_client_perslid_aanmaak"),
+            "typ": "datetime",
+            "readonly": "true"
+        },
        "device_id": {
            "dbs": "aut_client_perslid_device_id",
-            "label": L("aut_client_perslid_device"),
+            "label": L("aut_client_perslid_device_id"),
            "typ": "varchar",
            "filter": "exact"
        },
+        "device_name": {
+            "dbs": "aut_client_perslid_device_name",
+            "label": L("aut_client_perslid_device_name"),
+            "typ": "varchar"
+        },
        "scope": {
            "dbs": "aut_client_perslid_scope",
            "label": L("aut_client_perslid_scope"),
@@ -95,7 +106,7 @@ function model_aut_client_perslid(params)
    };

    this.list = {
-        "columns": ["person", "scope", "device"]
+        "columns": ["person", "scope", "device_id", "accessdate", "login"]
    };

    this.REST_GET    = generic_REST_GET(this);
@@ -106,5 +117,20 @@ function model_aut_client_perslid(params)
        this.REST_PUT    = generic_REST_PUT(this);
        this.REST_DELETE = generic_REST_DELETE(this);
    }
+/*
+TODO: je eigen device_name mogen bewerken en registratie mogen verwijderen
+    if (params.self) // Alleen device_name bewerken
+    {
+        for (var fld in this.fields)
+        {
+            if (fld != 'device_name')
+            {
+                this.fields[fld].readonly = true;
+                if (!inArray(fld,["autclient", "autclient","registrationdate", "refreshdate"]))
+                    this.fields[fld].hidden_fld = true;
+            }
+        }
+    }
+*/
 }
 %>
--- a/APPL/API2/model_aut_idp.inc
+++ b/APPL/API2/model_aut_idp.inc
@@ -146,13 +146,12 @@ function model_aut_idp(params)
             "foreign": "prs_afdeling",
             "label": L("lcl_idp_department")
        },
-/*        "authorization": {
+        "authorization": {
            "dbs": "fac_functie_key",
            "label": L("aut_idp_functie_key"),
            "typ": "key",
            "foreign": "fac_functie"
        },
-*/
        "loglevel": {
            "dbs": "aut_idp_loglevel",
            "label": L("aut_idp_loglevel"),
--- a/APPL/API2/model_aut_idp_map.inc
+++ b/APPL/API2/model_aut_idp_map.inc
@@ -53,10 +53,12 @@ function model_aut_idp_map(params)
                 + ";9;" + L("lcl_prs_person_email")
                 + ";10;" + L("lcl_prs_person_phone")
                 + ";11;" + L("lcl_prs_person_mobile")
+                 + ";12;" + L("prs_perslid_externid")

                 // De foreign's
                 + ";20;" + L("lcl_prs_person_function")
                 + ";21;" + L("lcl_prs_organisatie")
+                 + ";22;" + L("lcl_prs_profile")
                 //+ kostenplaats ondersteunen we niet, dat is in FACILITOR een organisatie of mandatering

                 // ";99;prs_perslid_key" gereserveerd voor intern gebruik
--- a/APPL/API2/model_aut_sp.inc
+++ b/APPL/API2/model_aut_sp.inc
@@ -0,0 +1,116 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_aut_sp.inc
+    Description:
+    Notes:
+*/
+
+%>
+<!-- #include file="./model_aut_sp_map.inc" -->
+<%
+function model_aut_sp(params)
+{
+    params = params || {};
+    this.records_name = "serviceproviders";
+    this.record_name = "serviceprovider";
+    this.table = "aut_sp";
+    this.primary = "aut_sp_key";
+    this.autfunction = params.internal?false:"WEB_FACTAB";
+    this.record_title = L("aut_sp");
+    this.records_title = L("aut_sp_m");
+
+    this.fields = {
+        "id": {
+            "dbs": "aut_sp_key",
+            "label": L("lcl_key"),
+            "typ": "key",
+            "seq": "aut_s_aut_sp_key"
+        },
+        "code": {
+            "dbs": "aut_sp_code",
+            "label": L("aut_sp_code"),
+            "typ": "varchar",
+            "filter": "exact"
+        },
+        "name": {
+            "dbs": "aut_sp_omschrijving",
+            "label": L("aut_sp_omschrijving"),
+            "typ": "varchar",
+            "required": true
+        },
+        "type": {
+            "dbs": "aut_sp_type",
+            "label": L("aut_sp_type"),
+            "typ": "key",
+            "required": true,
+            "LOV": L("aut_sp_typeLOV") // TODO?
+        },
+        "remark": {
+            "dbs": "aut_sp_opmerking",
+            "label": L("aut_sp_opmerking"),
+            "typ": "memo"
+        },
+        "secret": {
+            "dbs": "aut_sp_secret",
+            "label": L("aut_sp_secret"),
+            "typ": "varchar",
+            "defaultvalue": shared.random(32),
+            "secret": true
+        },
+        "audience": {
+            "dbs": "aut_sp_audience",
+            "label": L("aut_sp_audience"),
+            "typ": "varchar",
+            "placeholder": customerId + ".facilitor.nl"
+        },
+        "redirecturi": {
+            "dbs": "aut_sp_redirect_uri",
+            "label": L("aut_sp_redirect_uri"),
+            "typ": "varchar",
+            "placeholder": customerId + ".facilitor.nl"
+        },
+        "issuer": {
+            "dbs": "aut_sp_issuer",
+            "label": L("aut_sp_issuer"),
+            "typ": "varchar"
+        },
+        "algorithm": {
+            "dbs": "aut_sp_algorithm",
+            "label": L("aut_sp_algorithm"),
+            "typ": "varchar"
+        },
+        "authorization": {
+            "dbs": "fac_functie_key",
+            "label": L("aut_sp_functie_key"),
+            "typ": "key",
+            "foreign": "fac_functie"
+        },
+        "loglevel": {
+            "dbs": "aut_sp_loglevel",
+            "label": L("aut_sp_loglevel"),
+            "typ": "number",
+            "defaultvalue": 0
+        },
+        "internal": {
+            "dbs": "aut_sp_internal",
+            "label": L("aut_sp_internal"),
+            "typ": "check0",
+            "readonly": true
+        }
+    }
+
+    this.includes =
+               {  "spmappings": { model: new model_aut_sp_map(),
+                                  joinfield: "serviceprovider",
+                                  enable_update: true
+                                }
+              };
+
+    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_aut_sp_map.inc
+++ b/APPL/API2/model_aut_sp_map.inc
@@ -2,38 +2,39 @@
    $Revision$
    $Id$

-    File:           model_fac_sp_map.inc
+    File:           model_aut_sp_map.inc
    Description:    Door sp 'released attributes'
    Notes:
 */

-function model_fac_sp_map()
+function model_aut_sp_map(params)
 {
+    params = params || {};
    this.records_name = "spmappings";
    this.record_name = "spmapping";
-    this.table = "fac_sp_map";
-    this.primary = "fac_sp_map_key";
-    this.autfunction = "WEB_FACFAC";
-    this.record_title = L("fac_sp_map");
-    this.records_title = L("fac_sp_map_m");
+    this.table = "aut_sp_map";
+    this.primary = "aut_sp_map_key";
+    this.autfunction = params.internal?false:"WEB_FACTAB";
+    this.record_title = L("aut_sp_map");
+    this.records_title = L("aut_sp_map_m");

    this.fields = {
        "id": {
-            "dbs": "fac_sp_map_key",
+            "dbs": "aut_sp_map_key",
            "label": L("lcl_key"),
            "typ": "key",
-            "seq": "fac_s_fac_sp_map_key"
+            "seq": "fac_s_aut_sp_map_key"
        },
        "serviceprovider": {
-            "dbs": "fac_sp_key",
-            "label": L("fac_sp"),
+            "dbs": "aut_sp_key",
+            "label": L("aut_sp"),
            "typ": "key",
            "hidden_fld": true,
            "required": true
        },
        "name": {
-            "dbs": "fac_sp_map_from",
-            "label": L("fac_sp_map_from"),
+            "dbs": "aut_sp_map_from",
+            "label": L("aut_sp_map_from"),
            "typ": "key",
            "required": true,
            "LOV":   "1;"   + L("lcl_prs_person_login")
@@ -48,8 +49,8 @@ function model_fac_sp_map()
                  + ";101;" + L("fac_groeprechten_m")
        },
        "to": {
-            "dbs": "fac_sp_map_to",
-            "label": L("fac_sp_map_to"),
+            "dbs": "aut_sp_map_to",
+            "label": L("aut_sp_map_to"),
            "typ": "varchar",
            "required": true
        }
--- a/APPL/API2/model_bes_disc_params.inc
+++ b/APPL/API2/model_bes_disc_params.inc
@@ -151,11 +151,18 @@ model_bes_disc_params =
            "label": L("bes_discipline_remoteconfirm"),
            "typ": "check0"
        },
-        "freeartikel": {
-            "dbs": "bes_disc_params_freeartikel",
-            "label": L("bes_discipline_freeartikel"),
+        "ordermode": {
+            "dbs": "bes_disc_params_bestelmode",
+            "label": L("bes_discipline_bestelmode"),
            "typ": "number",
-            "LOV": L("bes_discipline_freeartikelLOV"),
+            "LOV": L("bes_discipline_bestelmodeLOV"),
+            "emptyoption": null
+        },
+        "photomode": {
+            "dbs": "bes_disc_params_fotomode",
+            "label": L("bes_discipline_fotomode"),
+            "typ": "number",
+            "LOV": L("bes_discipline_fotomodeLOV"),
            "emptyoption": null
        },
        "punchouturl": {
@@ -274,10 +281,27 @@ model_bes_disc_params =
                "desc": "cnt_termijn_omschrijving"
            }
        },
-        "for_others": {
+        "forothers": {
            "dbs": "bes_disc_params_for_others",
            "label": L("bes_discipline_for_others"),
            "typ": "check0"
+        },
+        "objectmode": {
+            "dbs": "bes_disc_params_ins_mode",
+            "label": L("lcl_ins_mode"),
+            "typ": "number",
+            "LOV": L("bes_discipline_ins_modeLOV"),
+            "emptyoption": null
+        },
+        "feconfirm": {
+            "dbs": "bes_disc_params_fe_confirm",
+            "label": L("bes_discipline_fe_confirm"),
+            "typ": "check0"
+        },
+        "fehidecost": {
+            "dbs": "bes_disc_params_hide_cost_fe",
+            "label": L("bes_discipline_fe_hide_cost"),
+            "typ": "check0"
        }
    }
 }
--- a/APPL/API2/model_bes_kenmerk.inc
+++ b/APPL/API2/model_bes_kenmerk.inc
@@ -4,13 +4,14 @@

    File:           model_bes_kenmerk.inc

-    Description:    Vanuit CodeCharge gegenereerd model voor bes_kenmerk
+    Description:    Model voor bes_kenmerk

    Context:

    Notes:
 */
 %>
+<!-- #include file="model_bes_srtkenmerk.inc"-->
 <%

 function model_bes_kenmerk(params)
@@ -165,6 +166,11 @@ function model_bes_kenmerk(params)
        }
    };

+    this.getPropertyType = function (kenmerkdata)
+    {
+        var typedata = api2.GET(new model_bes_srtkenmerk({internal: params.internal}), kenmerkdata.orderpropertytype.id);
+        return typedata;
+    }

    function buildBESKenmerkNiveauList()
    {
--- a/APPL/API2/model_bes_srtkenmerk.inc
+++ b/APPL/API2/model_bes_srtkenmerk.inc
@@ -13,14 +13,15 @@
 %>
 <%

-function model_bes_srtkenmerk()
+function model_bes_srtkenmerk(params)
 {
+    params = params || {};
    this.records_name = "orderpropertytypes";
    this.record_name = "orderpropertytype";
    this.table = "bes_srtkenmerk";
    this.primary = "bes_srtkenmerk_key";
    this.soft_delete = "bes_srtkenmerk_verwijder";
-    this.autfunction = "WEB_BESMGT";
+    this.autfunction = params.internal?false:"WEB_BESMGT";
    this.record_title = L("bes_srtkenmerk");
    this.records_title = L("bes_srtkenmerk_m");

@@ -53,7 +54,7 @@ function model_bes_srtkenmerk()
        "system": {
            "dbs": "bes_srtkenmerk_systeem",
            "label": L("mgt_srtkenmerk_systeem"),
-            "typ": "check"
+            "typ": "check0"
        },
        "length": {
            "dbs": "bes_srtkenmerk_lengte",
--- a/APPL/API2/model_bez_kenmerk.inc
+++ b/APPL/API2/model_bez_kenmerk.inc
@@ -90,10 +90,46 @@ function model_bez_kenmerk(params)
        },
        "system": {
            "dbs": "bez_kenmerk_systeem",
-            "label": L("mgt_srtkenmerk_systeem"),
-            "typ": "check"
+            "label": L("mgt_srtkenmerk_systeem_adv"),
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 15,
+                    "radios": [
+                        {
+                            "name": "ksystem",
+                            "label": L("mgt_kenmerk_systeem"),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        },
+                        {
+                            "name": "overview",
+                            "label": L("mgt_kenmerk_systeem_overview"),
+                            "mask": 2,
+                            "defaultvalue": 0
+                        },
+                        {
+                            "name": "conf",
+                            "label": L("mgt_kenmerk_systeem_conf"),
+                            "mask": 4,
+                            "defaultvalue": 0
+                        },
+                        {
+                            "name": "ano",
+                            "label": L("mgt_kenmerk_systeem_ano"),
+                            "mask": 8,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ],
+            "defaultvalue": 0,
+            "required": true
        },
-        "length": {
+       "length": {
            "dbs": "bez_kenmerk_lengte",
            "label": L("mgt_srtkenmerk_lengte"),
            "typ": "number"
--- a/APPL/API2/model_bgt_budget.inc
+++ b/APPL/API2/model_bgt_budget.inc
@@ -14,6 +14,7 @@
 <!-- #include file="../bgt/bgt_tools.inc" -->
 <!-- #include file="../api2/model_bgt_budgetmutatie.inc" -->
 <%
+var v_checkauth = getQParamInt("id", 0) > 0;

 function model_bgt_budget()
 {
@@ -41,8 +42,8 @@ function model_bgt_budget()
            "typ": "key",
            "required": true,
            "insertonly": true,
-            "foreign": bgt_budgetdiscipline_foreign(),
-            "emptyoption": null
+            "foreign": bgt_budgetdiscipline_foreign(v_checkauth),
+            "showtransit": true
        },
        "budgetproject": {
            "dbs": "bgt_project_key",
@@ -51,15 +52,18 @@ function model_bgt_budget()
            "required": true,
            "insertonly": true,
            "foreign": bgt_budgetproject_foreign(),
-            "emptyoption": null
+            "delayload": true,
+            "showtransit": true
        },
        "budgetcostcategory": {
            "dbs": "bgt_kostenrubriek_key",
            "label": L("bgt_kostenrubriek_oms"),
            "typ": "key",
-            "required": false,
+            "required": true,
            "insertonly": true,
-            "foreign": bgt_budgetcostcategory_foreign()
+            "foreign": bgt_budgetcostcategory_foreign(),
+            "delayload": true,
+            "showtransit": true
        },
        "costtypegroup": {
            "dbs": "prs_kostensoortgrp_key",
@@ -68,6 +72,8 @@ function model_bgt_budget()
            "required": false,
            "insertonly": true,
            "foreign": bgt_costtypegroup_foreign(),
+            "delayload": true,
+            "showtransit": true,
            "LOVinit": "",
            "filter": "exact"
        },
@@ -77,31 +83,49 @@ function model_bgt_budget()
            "typ": "key",
            "required": false,
            "insertonly": true,
-            "foreign": bgt_costtype_foreign()
+            "foreign": bgt_costtype_foreign(),
+            "delayload": true,
+            "showtransit": true
        },
        "amountoriginal": {
            "dbs": "bgt_budget_bedrag_origineel",
-            "sql": "(BGT.getBudgetOpDatum(bgt_budget.bgt_budget_key, NULL))",
+            "sql": "(BGT.getBudgetOpDatum(bgt_budget.bgt_budget_key, 0, NULL))",
            "label": L("bgt_budget_origineel"),
            "typ": "float",
            "iscurrency": true,
            "total": true
        },
+        "vatoriginal": {
+            "dbs": "bgt_budget_btwbedrag_origineel",
+            "sql": "(BGT.getBudgetOpDatum(bgt_budget.bgt_budget_key, 1, NULL))",
+            "label": L("bgt_budget_origineel")+" "+L("lcl_fin_btwtabelwaarde_oms"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
        "amountmutation": {
            "dbs": "bgt_budget_bedrag_mutatie",
-            "sql": "(BGT.getBudgetMutaties(bgt_budget.bgt_budget_key, NULL, NULL))",
+            "sql": "(BGT.getBudgetSoortMutatie(NULL, NULL, bgt_budget.prs_kostensoort_key, 0, 'EM', NULL))",
            "label": L("bgt_budget_mutaties"),
            "typ": "float",
            "iscurrency": true,
            "total": true
        },
+        "amountreservation": {
+            "dbs": "bgt_budget_bedrag_reserve",
+            "sql": "(BGT.getBudgetSoortMutatie(NULL, NULL, bgt_budget.prs_kostensoort_key, 0, 'AR', NULL))",
+            "label": L("bgt_budget_vnreserve"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
        "amount": {
            "dbs": "bgt_budget_bedrag",
            "label": L("bgt_budget_bedrag"),
            "typ": "float",
            "iscurrency": true,
            "total": true,
-            "required": true
+            "defaultvalue": 0
            },
        "vat": {
            "dbs": "bgt_budget_btwbedrag",
@@ -109,14 +133,32 @@ function model_bgt_budget()
            "typ": "float",
            "iscurrency": true,
            "total": true,
-            "required": true
+            "defaultvalue": 0
            },
+        "amountincl": {
+            "dbs": "bgt_budget_bedrag_incl",
+            "sql": "bgt_budget_bedrag + bgt_budget_btwbedrag",
+            "label": L("lcl_fin_total_sum"),
+            "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
+            "iscurrency": true,
+            "total": true,
+            "defaultvalue": "0",
+            "clone": false
+        },
        "contingency": {
          "dbs": "bgt_budget_isreserve",
          "label": L("bgt_budget_isreserve"),
          "typ": "check0",
          "defaultvalue": 0
        },
+        "account": {
+            "dbs": "prs_kostenplaats_key",
+            "label": L("bgt_budget_account"),
+            "typ": "key",
+            "foreign": bgt_account_foreign()
+        },
        "begin": {
            "dbs": "bgt_budget_begin",
            "label": L("bgt_budget_begin"),
@@ -139,16 +181,6 @@ function model_bgt_budget()
                "desc": "prs_kostenplaatsgrp_oms"
            },
            "hidden_fld": true
-        },
-        "account": {
-            "dbs": "prs_kostenplaats_key",
-            "label": L("bgt_budget_account"),
-            "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaats",
-                "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            }
        }
    };

@@ -166,13 +198,42 @@ function model_bgt_budget()
        ]
    };

+
    this.hook_pre_edit = function (obj, fld)
    {
+        var btw_data = {};
        if (obj.id > -1)
        {
-            fld.amount.readonly = true;
-            fld.vat.readonly = true;
+            var sql = "SELECT s.prs_kostensoort_btw"
+                    + "     , f.fin_btwtabelwaarde_perc"
+                    + "  FROM bgt_budget b"
+                    + "     , prs_kostensoort s"
+                    + "     , fin_btwtabelwaarde f"
+                    + " WHERE s.fin_btwtabelwaarde_key = f.fin_btwtabelwaarde_key"
+                    + "   AND b.prs_kostensoort_key = s.prs_kostensoort_key"
+                    + "   AND b.bgt_budget_key = " + obj.id;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                btw_data.btw_inc = oRs("prs_kostensoort_btw").Value;
+                btw_data.btw_val = oRs("fin_btwtabelwaarde_perc").Value;
+            }
+            oRs.Close();
        }
+        else
+        {
+            // Een nieuw budget heeft nog geen origineel- en mutatie-bedrag.
+            delete fld.amountoriginal;
+            delete fld.amountmutation;
+        }
+        %>
+        <script>
+            var cur_mode = "budget_edit"; // Laat alleen de kostensoorten zien waaraan nog geen budget gekoppeld is.
+            var btw_data = <%=JSON.stringify(btw_data)%>;
+            var budgetdiscipline_key = <%=(obj.budgetdiscipline ? obj.budgetdiscipline.id : -1)%>;
+            var budgetproject_key    = <%=(obj.budgetproject    ? obj.budgetproject.id    : -1)%>;
+        </script>
+        <%
    }

    this.hook_pre_post = function(params, obj)
@@ -185,10 +246,73 @@ function model_bgt_budget()
    {   // Zoek bij wijzigen van kostenplaats de kostenplaatsgrp_key op
    }

+    this.hook_pre_delete = function(params, key)
+    {
+        var key_arr = getFParamIntArray("id");

-    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);
+        var sql_c = "SELECT COUNT(*) aantal"
+                  + "  FROM mld_opdr"
+                  + " WHERE prs_kostensoort_key IN"
+                  + " (SELECT prs_kostensoort_key"
+                  + "    FROM bgt_budget"
+                  + "   WHERE bgt_budget_key IN (" + key_arr.join(",") + ")"
+                  + " )";
+        var oRs_c = Oracle.Execute(sql_c);
+        var nr_mld_opdr = oRs_c("aantal").Value;
+        oRs_c.Close();
+        if (nr_mld_opdr > 0)
+        {
+//            abort_with_warning(L("bgt_budget_delete_val1").format(L("lcl_fin_contracten"))); // De geselecteerde budgetten hebben contracten. Verwijder deze eerst.
+            abort_with_warning("De geselecteerde budgetten hebben contracten. Verwijder deze eerst.");
+        }
+
+        var sql_m = "SELECT COUNT(*) aantal"
+                  + "  FROM bgt_budgetmutatie"
+                  + " WHERE bgt_budget_key_naar IN (" + key_arr.join(",") + ")"
+                  + "    OR bgt_budget_key_van  IN (" + key_arr.join(",") + ")";
+        var oRs_m = Oracle.Execute(sql_m);
+        var nr_mutatie = oRs_m("aantal").Value;
+        oRs_m.Close();
+        if (nr_mutatie > 0)
+        {
+//            abort_with_warning(L("bgt_budget_delete_val1").format(L("bgt_budget_mutaties"))); // De geselecteerde budgetten hebben mutaties. Verwijder deze eerst.
+            abort_with_warning("De geselecteerde budgetten hebben mutaties. Verwijder deze eerst.");
+        }
+        // Er zijn geen contracten of budgetmutaties bij de geselecteerde budget(ten) bekend.
+        // Verwijderen is geen probleem meer.
+    }
+
+    var v_budgetdiscipline = getQParamInt("budgetdiscipline", -1);
+    if (v_budgetdiscipline == -1)
+    {
+        gparams = {
+            GET: {wheres: [
+                    "bgt_budget.ins_discipline_key IN"
+                    + " (SELECT w.ins_discipline_key"
+                    + "    FROM fac_v_webgebruiker w"
+                    + "       , ins_tab_discipline d"
+                    + "   WHERE w.ins_discipline_key = d.ins_discipline_key"
+                    + "     AND w.prs_perslid_key = " + user_key
+                    + "     AND (w.fac_gebruiker_prs_level_read<9 OR w.fac_gebruiker_alg_level_read<9)"
+                    + "     AND d.ins_discipline_module = 'BGT'"
+                    + "     AND d.ins_discipline_verwijder IS NULL"
+                    + " )"
+                ]
+            }
+        }
+        this.REST_GET = generic_REST_GET(this, gparams);
+    }
+    else
+    {
+        this.REST_GET = generic_REST_GET(this);
+    }
+    this.REST_PUT = generic_REST_PUT(this);
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    if (canWrite)
+    {
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
 }
 %>
--- a/APPL/API2/model_bgt_budgetmutatie.inc
+++ b/APPL/API2/model_bgt_budgetmutatie.inc
@@ -11,6 +11,7 @@
    Notes:
 */
 %>
+<!-- #include file="../bgt/bgt_tools.inc" -->
 <%

 function model_bgt_budgetmutatie()
@@ -26,7 +27,13 @@ function model_bgt_budgetmutatie()

    var p_budget_key  = getQParamInt("budgetcommon", -1);
    var p_mutatie_key = getQParamInt("id", -1);
-    var budgetnaam_sql = "SELECT b.bgt_budget_key"
+    var budgetnaam_sql = "SELECT NULL bgt_budget_key"
+//                       + "     , 'E '||" + safe.quoted_sql(L("bgt_budgetmutatie_extbudget")) bgt_budget_naam"
+                       + "     , 'E EXTERN BUDGET' bgt_budget_naam"
+                       + "     , NULL fin_btwtabelwaarde_perc"
+                       + " FROM DUAL"
+                       + " UNION "
+                       + "SELECT b.bgt_budget_key"
                       + "     , CASE WHEN b.prs_kostensoort_key IS NOT NULL"
                                 + "  THEN s.prs_kostensoort_oms"
                                 + "  ELSE CASE WHEN b.prs_kostensoortgrp_key IS NOT NULL"
@@ -47,11 +54,14 @@ function model_bgt_budgetmutatie()
                       + "   AND b.prs_kostensoortgrp_key = g.prs_kostensoortgrp_key(+)"
                       + "   AND b.prs_kostensoort_key    = s.prs_kostensoort_key(+)"
                       + "   AND s.fin_btwtabelwaarde_key = f.fin_btwtabelwaarde_key(+)"
-                       + "   AND b.bgt_project_key = "
-                            + "(SELECT p.bgt_project_key"
-                            + "   FROM bgt_budget p"
-                            + "  WHERE bgt_budget_key = " + p_budget_key
-                            + ")";
+                       + ( p_budget_key > -1
+                         ? "   AND b.bgt_project_key = "
+                         + "(SELECT p.bgt_project_key"
+                         + "   FROM bgt_budget p"
+                         + "  WHERE bgt_budget_key = " + p_budget_key
+                         + ")"
+                         : ""
+                         );

    this.fields = {
        "id": {
@@ -76,6 +86,25 @@ function model_bgt_budgetmutatie()
            "typ": "varchar",
            "required": true
        },
+        "code": {
+            "dbs": "bgt_budgetmutatie_code",
+            "label": L("bgt_budgetmutatie_code"),
+            "typ": "varchar",
+            "LOV": budgetmutatie_code_LOV(),
+            "emptyoption": null
+        },
+        "sequence": {
+            "dbs": "bgt_budgetmutatie_volgnr",
+            "label": L("bgt_budgetmutatie_volgnr"),
+            "typ": "number",
+            "readonly": true
+        },
+        "ident": {
+            "dbs": "bgt_budgetmutatie_identity",
+            "sql": "COALESCE(bgt_budgetmutatie_code || TO_CHAR(bgt_budgetmutatie_volgnr), TO_CHAR(bgt_budgetmutatie_key))",
+            "label": "Volgnr",
+            "typ": "varchar"
+        },
        "adjustedby": {
            "dbs": "prs_perslid_key",
            "label": L("bgt_budgetmutatie_door"),
@@ -92,7 +121,8 @@ function model_bgt_budgetmutatie()
               "tbl": "(" + budgetnaam_sql + ")",
               "key": "bgt_budget_key",
               "desc": "bgt_budget_naam"
-            }
+            },
+            "emptyoption": "EXTERN BUDGET" //L("bgt_budgetmutatie_extbudget")
        },
        "budgetto": {
            "dbs": "bgt_budget_key_naar",
@@ -102,14 +132,15 @@ function model_bgt_budgetmutatie()
                "tbl": "(" + budgetnaam_sql + ")",
                "key": "bgt_budget_key",
                "desc": "bgt_budget_naam"
-            }
+            },
+            "emptyoption": "EXTERN BUDGET" //L("bgt_budgetmutatie_extbudget")
        },
        "amountfrom": {
            "dbs": "bgt_budget_bedrag_van",
            "label": L("bgt_budgetmutatie_bedrag"),
            "typ": "float",
            "iscurrency": true,
-            "hidden": true,
+            "total": true,
            "hidden_fld": true
        },
        "vatfrom": {
@@ -117,28 +148,115 @@ function model_bgt_budgetmutatie()
            "label": L("bgt_budgetmutatie_btwbedrag"),
            "typ": "float",
            "iscurrency": true,
-            "hidden": true,
+            "total": true,
            "hidden_fld": true
        },
+        "amountfromexc": {
+            "dbs": "bgt_budget_bedrag_van_exc",
+            "sql": "CASE WHEN bgt_budget_key_van IS NULL THEN NULL ELSE bgt_budget_bedrag_van END",
+            "label": L("bgt_budgetmutatie_bedrag"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
+        "amountfromvat": {
+            "dbs": "bgt_budget_bedrag_van_btw",
+            "sql": "CASE WHEN bgt_budget_key_van IS NULL THEN NULL ELSE bgt_budget_btwbedrag_van END",
+            "label": L("bgt_budgetmutatie_btwbedrag"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
+        "amountfrominc": {
+            "dbs": "bgt_budget_bedrag_van_incl",
+            "sql": "COALESCE(bgt_budget_bedrag_van, 0) + COALESCE(bgt_budget_btwbedrag_van, 0)",
+            "label": L("lcl_fin_total_sum"),
+            "typ": "float",
+            "readonly": true,
+            "sqlshow": false,
+            "iscurrency": true,
+            "defaultvalue": "0"
+        },
        "amountto": {
            "dbs": "bgt_budget_bedrag_naar",
            "label": L("bgt_budgetmutatie_bedrag"),
            "typ": "float",
-            "iscurrency": true
+            "iscurrency": true,
+            "total": true
        },
        "vatto": {
            "dbs": "bgt_budget_btwbedrag_naar",
            "label": L("bgt_budgetmutatie_btwbedrag"),
            "typ": "float",
-            "iscurrency": true
+            "iscurrency": true,
+            "total": true
        },
-        "amountdifference": {
-            "dbs": "bgt_budget_bedrag_verschil",
-            "sql": "COALESCE(bgt_budget_bedrag_van, 0) + COALESCE(bgt_budget_bedrag_naar, 0)",
-            "label": L("bgt_budgetmutatie"),
+        "amounttoexc": {
+            "dbs": "bgt_budget_bedrag_naar_exc",
+            "sql": "CASE WHEN bgt_budget_key_naar IS NULL THEN NULL ELSE bgt_budget_bedrag_naar END",
+            "label": L("bgt_budgetmutatie_bedrag"),
            "typ": "float",
            "iscurrency": true,
            "total": true
+        },
+        "amounttovat": {
+            "dbs": "bgt_budget_bedrag_naar_btw",
+            "sql": "CASE WHEN bgt_budget_key_naar IS NULL THEN NULL ELSE bgt_budget_btwbedrag_naar END",
+            "label": L("bgt_budgetmutatie_btwbedrag"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
+        "amounttoinc": {
+            "dbs": "bgt_budget_bedrag_naar_incl",
+            "sql": "COALESCE(bgt_budget_bedrag_naar, 0) + COALESCE(bgt_budget_btwbedrag_naar, 0)",
+            "label": L("lcl_fin_total_sum"),
+            "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
+            "iscurrency": true,
+            "defaultvalue": "0"
+        },
+        "mutbudgetexc": {
+            "dbs": "bgt_budget_mutatie_exc",
+            "sql": "BGT.getMutatieOpBudget("+p_budget_key+", bgt_budgetmutatie_key, 0)",
+            "label": L("bgt_budgetmutatie_bedrag"),
+            "typ": "float",
+            "readonly": true,
+            "iscurrency": true,
+            "total": true
+        },
+        "mutbudgetvat": {
+            "dbs": "bgt_budget_mutatie_btw",
+            "sql": "BGT.getMutatieOpBudget("+p_budget_key+", bgt_budgetmutatie_key, 1)",
+            "label": L("bgt_budgetmutatie_btwbedrag"),
+            "typ": "float",
+            "readonly": true,
+            "iscurrency": true,
+            "total": true
+        },
+        "budgetdiscipline": {
+            "dbs": "bgt_budget.ins_discipline_key",
+            "label": L("bgt_discipline_omschrijving"),
+            "typ": "key",
+            "foreign": bgt_budgetdiscipline_foreign(),
+            "hidden_fld": true
+        },
+        "budgetproject": {
+            "dbs": "bgt_budget.bgt_project_key",
+            "label": L("bgt_project_omschrijving"),
+            "typ": "key",
+            "foreign": bgt_budgetproject_foreign(),
+            "delayload": true,
+            "hidden_fld": true
+        },
+        "budgetcostcategory": {
+            "dbs": "bgt_budget.bgt_kostenrubriek_key",
+            "label": L("bgt_kostenrubriek_oms"),
+            "typ": "key",
+            "foreign": bgt_budgetcostcategory_foreign(),
+            "delayload": true,
+            "hidden_fld": true
        }
    };

@@ -149,14 +267,38 @@ function model_bgt_budgetmutatie()
    this.list = {
        "columns": [
            "mutationdate",
+            "sequence",
+            "code",
+            //"ident",
            "name",
            "budgetfrom",
+            "amountfromexc",
+            "amountfromvat",
            "budgetto",
            "amountto",
-            "amountdifference"
+            "vatto",
+            "amounttoexc",
+            "amounttovat"
        ]
    };

+    function budgetmutatie_code_LOV()
+    {
+        var mutatie_code = ";;"
+                         + "A;A - " + safe.html(L("bgt_budgetmutatie_code_a"))   + ";"
+                         + "W;W - " + safe.html(L("bgt_budgetmutatie_code_w"))   + ";"
+                         + "E;E - " + safe.html(L("bgt_budgetmutatie_code_e"))   + ";"
+                         + "M;M - " + safe.html(L("bgt_budgetmutatie_code_m"))   + ";"
+                         + "R;R - " + safe.html(L("bgt_budgetmutatie_code_r"))   + ";"
+
+        var mutatie_code = ";;"
+                         + "A;A - automatische overboeking;"
+                         + "W;W - meerminder-werk;"
+                         + "E;E - extra;"
+                         + "M;M - mutatie;"
+                         + "R;R - reserve";
+        return mutatie_code;
+    }

    this.hook_pre_edit = function (obj, fld)
    {
@@ -169,8 +311,6 @@ function model_bgt_budgetmutatie()
        else // bestaande mutatie: alleen de omschrijving en bedrag is aan te passen
        {
            fld.adjustedby.readonly = true;
-            fld.budgetfrom.readonly = true;
-            fld.budgetto.readonly = true;

            var sql = "SELECT s.prs_kostensoort_btw"
                    + "     , f.fin_btwtabelwaarde_perc"
@@ -190,8 +330,9 @@ function model_bgt_budgetmutatie()
            }
            oRs.Close();
        }
+
 %>
-    <script type="text/javascript">
+    <script>
        // Deze variabelen zijn nodig in bgt_budgetmutatie.js
        var budget_key = <%=p_budget_key%>;
        var mutatie_key = <%=p_mutatie_key%>;
@@ -207,23 +348,288 @@ function model_bgt_budgetmutatie()

        if ((!jsondata.amountto || jsondata.amountto == 0) && (!jsondata.vatto || jsondata.vatto == 0))
            abort_with_warning(L("bgt_budgetmutatie_err2").format(L("bgt_budgetmutatie_bedrag"), L("bgt_budgetmutatie_btwbedrag")));
+        if (jsondata.amountto < 0 || jsondata.vatto < 0)
+            abort_with_warning(L("bgt_budgetmutatue_err3"));
+        jsondata.amountfrom = -1 * jsondata.amountto;
+        jsondata.vatfrom    = -1 * jsondata.vatto;
+
+        if (jsondata.budgetfrom == -1 || jsondata.budgetto == -1)
+            jsondata.code = "E";
    }

+    this.hook_post_post = function (params, jsondata, key)
+    {
+        // Alleen handmatig toegevoegde mutatie krijgen een volgnummer.
+        // Deze zijn uniek binnen het subproject.
+        var sql = "UPDATE bgt_budgetmutatie"
+                + "   SET bgt_budgetmutatie_volgnr ="
+                + "       (SELECT COALESCE(MAX(bgt_budgetmutatie_volgnr),0) + 1"
+                       + "   FROM bgt_budget b"
+                       + "      , bgt_budgetmutatie m"
+                       + "  WHERE (  b.bgt_budget_key = m.bgt_budget_key_naar"
+                       + "        OR b.bgt_budget_key = m.bgt_budget_key_van"
+                       + "        )"
+                       + "    AND b.bgt_project_key = (SELECT bs.bgt_project_key"
+                                                   + "   FROM bgt_budget bs"
+                                                   + "      , bgt_budgetmutatie ms"
+                                                   + "  WHERE bs.bgt_budget_key = COALESCE(ms.bgt_budget_key_van, ms.bgt_budget_key_naar)"
+                                                   + "    AND ms.bgt_budgetmutatie_key = " + key
+                                                   + ")"
+                + "       )"
+                + " WHERE bgt_budgetmutatie_key = " + key;
+        Oracle.Execute(sql);
+
+        if (jsondata.budgetfrom > -1 && jsondata.budgetto > -1)
+        {
+            // Haal de budget-keys voor correctie uit het mutatierecord.
+            // Alleen als beide keys bestaan.
+            var sql = "SELECT bgt_budget_key_van"
+                    + "     , bgt_budget_key_naar"
+                    + "  FROM bgt_budgetmutatie"
+                    + " WHERE bgt_budgetmutatie_key = " + key;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                mutatie_correctie(oRs("bgt_budget_key_van").Value);
+                mutatie_correctie(oRs("bgt_budget_key_naar").Value);
+            }
+            oRs.Close();
+        }
+    }
+
+    this.hook_pre_put = function (params, jsondata, key)
+    {
+        if ((!jsondata.amountto || jsondata.amountto == 0) && (!jsondata.vatto || jsondata.vatto == 0))
+            abort_with_warning(L("bgt_budgetmutatie_err2").format(L("bgt_budgetmutatie_bedrag"), L("bgt_budgetmutatie_btwbedrag")));
+        if (jsondata.amountto < 0 || jsondata.vatto < 0)
+            abort_with_warning(L("bgt_budgetmutatue_err3"));
+        jsondata.amountfrom = -1 * jsondata.amountto;
+        jsondata.vatfrom    = -1 * jsondata.vatto;
+    }
+
+    this.hook_post_put = function(params, jsondata, key)
+    {
+        // Haal de budget-keys voor correctie uit het mutatierecord.
+        var sql = "SELECT bgt_budget_key_van"
+                + "     , bgt_budget_key_naar"
+                + "  FROM bgt_budgetmutatie"
+                + " WHERE bgt_budgetmutatie_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            if (oRs("bgt_budget_key_van").Value && oRs("bgt_budget_key_naar").Value)
+            {   // Alleen als beide budget-key's bestaan een mutatie correctie
+                // Als er maar 1 budget-key is, gaat het om toevoegen of onttrekken van budget (eigenlijk een E-mutatie)
+                mutatie_correctie(oRs("bgt_budget_key_van").Value);
+                mutatie_correctie(oRs("bgt_budget_key_naar").Value);
+            }
+        }
+        oRs.Close();
+    }
+
+    function contract_waarde(p_budget_key)
+    {
+        var v_contract = { bedrag_exc: 0
+                         , bedrag_btw: 0
+                         };
+        var sql = "SELECT SUM(COALESCE(o.mld_opdr_kosten, 0)) contract_exc"
+                + "     , SUM(COALESCE(o.mld_opdr_kosten_btw, 0)) contract_btw"
+                + "  FROM bgt_budget b"
+                + "     , mld_opdr   o"
+                + " WHERE b.prs_kostensoort_key = o.prs_kostensoort_key(+)"
+                + "   AND b.bgt_budget_key = " + p_budget_key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            v_contract.bedrag_exc = oRs("contract_exc").Value;
+            v_contract.bedrag_btw = oRs("contract_btw").Value;
+        }
+        oRs.Close();
+        return v_contract;
+    }
+
+    function budget_waarde(p_budget_key)
+    {
+        var v_budget = { bedrag_exc: 0
+                       , bedrag_btw: 0
+                       , isreserve: true
+                       , reserve_key: -1
+                       };
+        var sql = "SELECT b.bgt_budget_isreserve"
+                + "     , COALESCE(b.bgt_budget_bedrag, 0)    bgt_budget_exc"
+                + "     , COALESCE(b.bgt_budget_btwbedrag, 0) bgt_budget_btw"
+                + "     , r.bgt_budget_key"
+                + "  FROM bgt_budget r"
+                + "     , bgt_budget b"
+                + " WHERE r.bgt_project_key = b.bgt_project_key"
+                + "   AND r.prs_kostensoort_key IS NULL"
+                + "   AND r.prs_kostensoortgrp_key IS NULL"
+                + "   AND b.bgt_budget_key = " + p_budget_key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            v_budget.bedrag_exc  = oRs("bgt_budget_exc").Value;
+            v_budget.bedrag_btw  = oRs("bgt_budget_btw").Value;
+            v_budget.isreserve   = oRs("bgt_budget_isreserve").Value == 1;
+            v_budget.reserve_key = oRs("bgt_budget_key").Value;
+        }
+        oRs.Close();
+        return v_budget;
+    }
+
+    function mutatie_waarde(p_budget_key, p_reserve)
+    {
+        var van_reserve = { bedrag_exc: 0
+                          , bedrag_btw: 0
+                          };
+        switch (p_reserve)
+        {
+            case "A": sql_res = " AND  m.bgt_budgetmutatie_reserve = 1"; break;  // alleen automatische overboekingen
+            case "M": sql_res = " AND  m.bgt_budgetmutatie_reserve = 0"; break;  // alleen mutaties
+            case "T": sql_res = ""; break;                                       // totaal alle mutaties
+            default: "";
+        }
+        var sql = "SELECT SUM(COALESCE(bedrag_exc, 0)) bedrag_exc"
+                + "     , SUM(COALESCE(bedrag_btw, 0)) bedrag_btw"
+                + "  FROM (SELECT SUM(COALESCE(m.bgt_budget_bedrag_van,    0)) bedrag_exc"
+                       + "      , SUM(COALESCE(m.bgt_budget_btwbedrag_van, 0)) bedrag_btw"
+                       + "   FROM bgt_budgetmutatie m"
+                       + "  WHERE bgt_budget_key_van = " + p_budget_key
+                       + sql_res
+                       + " UNION"
+                       + " SELECT SUM(COALESCE(m.bgt_budget_bedrag_naar,    0)) bedrag_exc"
+                       + "      , SUM(COALESCE(m.bgt_budget_btwbedrag_naar, 0)) bedrag_btw"
+                       + "   FROM bgt_budgetmutatie m"
+                       + "  WHERE bgt_budget_key_naar = " + p_budget_key
+                       + sql_res
+                       + ")";
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            van_reserve.bedrag_exc = oRs("bedrag_exc").Value;
+            van_reserve.bedrag_btw = oRs("bedrag_btw").Value;
+        }
+        oRs.Close();
+        return van_reserve;
+    }
+
+    function mutatie_correctie(p_budget_key)
+    {
+        function een_correctie(p_budget_key, p_budget_bedrag, p_uitreserve_bedrag, p_contract_bedrag)
+        {
+            // Als een deel van het budgetbedrag uit automatische overboeking bestaat kan het budgetbedrag nooit groter zijn dan het contractbedrag.
+            var te_contracteren = p_budget_bedrag - p_contract_bedrag;
+            var naar_reserve = ( (te_contracteren > p_uitreserve_bedrag) ? p_uitreserve_bedrag : te_contracteren);
+            return naar_reserve;
+        }
+
+        var v_budget = budget_waarde(p_budget_key);
+        var v_uitreserve = mutatie_waarde(p_budget_key, "A");
+        var v_contracten = contract_waarde(p_budget_key);
+
+        if (!v_budget.isreserve)
+        {   // Correctie is alleen voor budgetten op kostensoort, niet het reserve.
+            var v_correctie_bedrag_exc = een_correctie(p_budget_key, v_budget.bedrag_exc, v_uitreserve.bedrag_exc, v_contracten.bedrag_exc);
+            var v_correctie_bedrag_btw = een_correctie(p_budget_key, v_budget.bedrag_btw, v_uitreserve.bedrag_btw, v_contracten.bedrag_btw);
+
+            var data_correctie = { budget_res_key: v_budget.reserve_key
+                                 , budget_srt_key: p_budget_key
+                                 , bedrag_exc: v_correctie_bedrag_exc
+                                 , bedrag_btw: v_correctie_bedrag_btw
+                                 };
+            insertMutatie(data_correctie, "AO");
+        }
+    }
+
+    function insertMutatie(data_mutatie, mutatie_soort)
+    {
+        if (data_mutatie.bedrag_exc != 0 || data_mutatie.bedrag_btw != 0)
+        {
+            var sql = "SELECT prs_kostensoort_altcode"
+                    + "  FROM prs_kostensoort"
+                    + " WHERE prs_kostensoort_key = "
+                        + " (SELECT MIN(prs_kostensoort_key)"
+                        + "    FROM bgt_budget"
+                        + "   WHERE bgt_budget_key = " + data_mutatie.budget_srt_key
+                        + " )";
+            var oRs = Oracle.Execute(sql);
+            var v_costtype_code = oRs("prs_kostensoort_altcode").Value;
+            oRs.Close();
+
+            var mutatie_omschr = "";
+            var mutatie_code = "";
+            switch (mutatie_soort)
+            {
+                case "AO": mutatie_omschr = "AO Automatische overboeking";
+                           mutatie_code = "A";
+                           break;
+                case "MW": mutatie_omschr = "MW Meer-, minderwerk van " + v_costtype_code;
+                           mutatie_code = "W";
+                           break;
+            }
+
+            var sql_m = "INSERT INTO bgt_budgetmutatie"
+                      + "( bgt_budgetmutatie_datum"
+                      + ", bgt_budgetmutatie_omschrijving"
+                      + ", prs_perslid_key" // not null!
+                      + ", bgt_budget_key_van"
+                      + ", bgt_budget_bedrag_van"
+                      + ", bgt_budget_btwbedrag_van"
+                      + ", bgt_budget_key_naar"
+                      + ", bgt_budget_bedrag_naar"
+                      + ", bgt_budget_btwbedrag_naar"
+                      + ", bgt_budgetmutatie_reserve"
+                      + ", bgt_budgetmutatie_code"
+                      + ") VALUES"
+                      + "( SYSDATE"
+                      + ", " + safe.quoted_sql(mutatie_omschr)
+                      + ", " + user_key
+                      + ", " + data_mutatie.budget_res_key
+                      + ", " + data_mutatie.bedrag_exc
+                      + ", " + data_mutatie.bedrag_btw
+                      + ", " + data_mutatie.budget_srt_key
+                      + ", " + (-1 * data_mutatie.bedrag_exc)
+                      + ", " + (-1 * data_mutatie.bedrag_btw)
+                      + ", 1"
+                      + ", " + safe.quoted_sql(mutatie_code)
+                      + ")";
+            Oracle.Execute(sql_m);
+        }
+    }
+
+
+
    var budget_key = getQParamInt("budgetcommon", -1);
+    var mutatie_key = getQParamInt("id", -1);
+    var budgetproject_key = getQParamInt("budgetproject", -1);
+
+    var gparams = {
+            GET: {
+                tables: ["bgt_budget"],
+                wheres: ["(bgt_budget.bgt_budget_key = bgt_budgetmutatie.bgt_budget_key_van OR bgt_budget.bgt_budget_key = bgt_budgetmutatie.bgt_budget_key_naar)"]
+            }
+        };
+    gparams.GET["filter"] = { nolimit :true };
+
    if (budget_key > -1)
    {
-        this.REST_GET = generic_REST_GET(this, {
-            "GET": {
-                "wheres": ["bgt_budget_key_van = {0} or bgt_budget_key_naar = {0}".format(budget_key)]
-            }
-        });
+        var v_where = ( mutatie_key > -1
+                      ? "bgt_budgetmutatie_key = {0}".format(mutatie_key)
+                      : "(bgt_budget.bgt_budget_key = {0})".format(budget_key)
+                      );
+        gparams.GET.wheres.push(v_where);
    }
-    else
+
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    this.REST_GET = generic_REST_GET(this, gparams);
+    // Alleen een mutatie kunnen toevoegen als je van een budget komt, of (in overzichtslijst mutaties) project en deelproject zijn geselecteerd.
+    if (p_budget_key > -1 || (canWrite && budgetproject_key > -1))
+        this.REST_POST = generic_REST_POST(this);
+    if (canWrite)
    {
-        this.REST_GET = generic_REST_GET(this);
+        this.REST_PUT = generic_REST_PUT(this);
+        this.REST_DELETE = generic_REST_DELETE(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_bgt_disc_params.inc
+++ b/APPL/API2/model_bgt_disc_params.inc
@@ -18,7 +18,7 @@ model_bgt_disc_params =
    "record_name": "budgetdisciplineparam",
    "table": "bgt_disc_params",
    "primary": "bgt_disc_params_key",
-    "autfunction": "WEB_BGTMAN",
+    "autfunction": "WEB_BGTMGT",


    "fields": {
@@ -47,7 +47,8 @@ model_bgt_disc_params =
        "startdate": {
            "dbs": "bgt_disc_params_startdatum",
            "label": L("bgt_discipline_startdatum"),
-            "typ": "date"
+            "typ": "date",
+            "autosize": true
        }
    }
 }
--- a/APPL/API2/model_bgt_discipline.inc
+++ b/APPL/API2/model_bgt_discipline.inc
@@ -21,6 +21,25 @@ function model_bgt_discipline(disc_key, params)
    var disc = new _model_bgt_discipline();
    api2.merge_disc_params_model(this, disc);

+    this.hook_pre_delete = function(params, key)
+    {
+        // Alle deelprojecten ook op verwijderd zetten.
+        var sql = "UPDATE bgt_project"
+                + "   SET bgt_project_verwijder = SYSDATE"
+                + " WHERE ins_discipline_key = " + key;
+        Oracle.Execute(sql);
+        //
+        // Alle opdrachten van de deelprojecten op "Verwerkt" zetten.
+        var sql = "UPDATE mld_opdr"
+                + "   SET mld_statusopdr_key = 7"
+                + " WHERE prs_kostensoort_key IN"
+                + " (SELECT prs_kostensoort_key"
+                + "    FROM bgt_v_project_full"
+                + "   WHERE ins_discipline_key = " + key
+                + " )"
+        Oracle.Execute(sql);
+    }
+
    this.REST_GET    = generic_REST_GET(disc,  // Let op: de originele _model
                                           { "GET": {
                                                     wheres: [ "ins_tab_discipline.ins_discipline_module = 'BGT'"
@@ -42,7 +61,7 @@ function _model_bgt_discipline()
  this.audit = { "childtable": "bgt_disc_params" }, // Parameters voor fac_audit.
  this.primary = "ins_discipline_key";
  this.soft_delete = "ins_discipline_verwijder";  // ik wil er eigenlijk liever niet standaard op kunnen filteren
-  this.autfunction = "WEB_BGTMAN";
+  this.autfunction = "WEB_BGTMGT";
  this.record_title = L("bgt_discipline");
  this.records_title = L("bgt_discipline_m");

@@ -79,11 +98,12 @@ function _model_bgt_discipline()
            "dbs": "ins_discipline_btw",
            "label": L("bgt_discipline_btw"),
            "typ": "check",
-            "default": "false"
+            "default": "false",
+            "hidden_fld": true
        }
    };

-    this.print = { xmlnode: "budget", where: "discipline"};
+//    this.print = { xmlnode: "budget", where: "discipline"};

    /* Velden van BGT_DISC_PARAMS komen er dynamisch bij */
    this.disc_params = {
--- a/APPL/API2/model_bgt_kostenrubriek.inc
+++ b/APPL/API2/model_bgt_kostenrubriek.inc
@@ -45,7 +45,8 @@ function model_bgt_kostenrubriek()
                "key": "bgt_project_key",
                "desc": "bgt_project_omschrijving",
                "where": "bgt_project_verwijder IS NULL"
-            }
+            },
+            "showtransit": true
        },
        "name": {
            "dbs": "bgt_kostenrubriek_oms",
--- a/APPL/API2/model_bgt_project.inc
+++ b/APPL/API2/model_bgt_project.inc
@@ -12,6 +12,7 @@
 */
 %>
 <!-- #include file="../api2/model_bgt_kostenrubriek.inc" -->
+<!-- #include file="../bgt/bgt_tools.inc" -->
 <%

 function model_bgt_project()
@@ -48,7 +49,8 @@ function model_bgt_project()
                "key": "ins_discipline_key",
                "desc": "ins_discipline_omschrijving",
                "where": "ins_discipline_module = 'BGT' AND ins_discipline_verwijder IS NULL"
-            }
+            },
+            "showtransit": true
        },
        "name": {
            "dbs": "bgt_project_omschrijving",
@@ -60,7 +62,8 @@ function model_bgt_project()
        "code": {
            "dbs": "bgt_project_code",
            "label": L("bgt_project_code"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "required": true
        },
        "sequence": {
            "dbs": "bgt_project_volgnr",
@@ -71,11 +74,7 @@ function model_bgt_project()
            "dbs": "prs_kostenplaats_key",
            "label": L("bgt_budget_account"),
            "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaats",
-                "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            }
+            "foreign": bgt_account_foreign()
        },
        "pricedate": {
            "dbs": "bgt_project_prijspeildatum",
@@ -94,7 +93,80 @@ function model_bgt_project()
        }
    };

-    this.print = { xmlnode: "budget", where: "project"};
+    //this.print = { xmlnode: "budget", where: "project"};
+
+    this.hook_pre_edit = function (obj, fld)
+    {
+        if (mode != "save")
+        {
+            var sql = "SELECT count(*)"
+                    + "  FROM bgt_kostenrubriek"
+                    + " WHERE bgt_project_key = " + obj.id;
+            var oRs = Oracle.Execute(sql);
+            if (oRs(0) == 0) // Een nieuw project, of een project waaraan nog geen rubrieken zijn gekoppeld.
+            {   // Voeg de selectie voor het standaardproject toe.
+                fld["import"] = {
+                    "dbs": "fac_usrtab.fac_usrtab_key",
+                    "label": "Standaard projectdata",
+                    "typ": "key",
+                    "foreign": {
+                        "tbl": "(SELECT d.fac_usrdata_key"
+                             + "      , d.fac_usrdata_code"
+                             + "   FROM fac_usrtab t"
+                             + "      , fac_usrdata d"
+                             + "  WHERE d.fac_usrtab_key = t.fac_usrtab_key"
+                             + "    AND t.fac_usrtab_naam = 'project_import')",
+                        "key": "fac_usrdata_key",
+                        "desc": "fac_usrdata_code"
+                    }
+                };
+            }
+            oRs.Close();
+
+            if (obj.id > 0)
+            {
+                fld["account"].foreign.tbl = bgt_account_foreign_tbl(obj.id);
+            }
+            else
+            {
+                fld["account"].hidden_fld = true;
+            }
+        }
+    }
+
+    this.hook_pre_post = function(params, obj)
+    {
+        // Controle op, en wijzigingen aan data voordat het record wordt toegevoegd.
+    }
+
+    this.hook_post_post = function(params, obj, key)
+    {
+        // Nadat het project-record is toegevoegd is de key hiervan bekend.
+        create_default_kostenplaatsgrp(key);
+        var data_key = getFParamInt("import", -1);
+        create_default_projectdata(key, data_key);
+    }
+
+    this.hook_pre_put = function(params, obj, key)
+    {
+        // Wordt alleen gebruikt bij wijzigen.
+        create_default_kostenplaatsgrp(key);
+        var data_key = getFParamInt("import", -1);
+        create_default_projectdata(key, data_key);
+    }
+
+    this.hook_pre_delete = function(params, key)
+    {
+        // Alle opdrachten van dit deelproject op "Verwerkt" zetten.
+        var sql = "UPDATE mld_opdr"
+                + "   SET mld_statusopdr_key = 7"
+                + " WHERE prs_kostensoort_key IN"
+                + " (SELECT prs_kostensoort_key"
+                + "    FROM bgt_v_project_full"
+                + "   WHERE bgt_project_key = " + key
+                + " )"
+        Oracle.Execute(sql);
+    }

    // if (!S("bgt_enabled"))
    // {
@@ -106,5 +178,37 @@ function model_bgt_project()
    this.REST_POST   = generic_REST_POST(this);
    this.REST_PUT    = generic_REST_PUT(this);
    this.REST_DELETE = generic_REST_DELETE(this);
+
+
+    function create_default_kostenplaatsgrp(key)
+    {
+        var sql_u = "SELECT count(*) aantal"
+                + "  FROM prs_kostenplaatsgrp"
+                + " WHERE bgt_project_key = " + key;
+        var oRs_u = Oracle.Execute(sql_u);
+        if (oRs_u("aantal").Value == 0)
+        {
+            var sql = "SELECT d.bgt_disc_params_code"
+                    + "     , p.bgt_project_code"
+                    + "  FROM bgt_disc_params d"
+                    + "     , bgt_project p"
+                    + " WHERE d.bgt_ins_discipline_key = p.ins_discipline_key"
+                    + "   AND p.bgt_project_key = " + key;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                var sql_i = "INSERT INTO prs_kostenplaatsgrp"
+                          + " (prs_kostenplaatsgrp_nr, prs_kostenplaatsgrp_oms, bgt_project_key)"
+                          + " VALUES"
+                          + " (" + safe.quoted_sql(oRs("bgt_disc_params_code").Value)
+                          + " ," + safe.quoted_sql(oRs("bgt_project_code").Value)
+                          + " ," + key
+                          + " )";
+                Oracle.Execute(sql_i);
+            }
+            oRs.Close();
+        }
+        oRs_u.Close();
+    }
 }
 %>
--- a/APPL/API2/model_buildings.inc
+++ b/APPL/API2/model_buildings.inc
@@ -14,7 +14,6 @@
 %>
 <!-- #include file="../Shared/discxalg3d.inc"-->
 <!-- #include file="./model_custom_fields.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <!-- #include file="./model_alg_kenmerk.inc"-->
 <%
 function model_buildings()
--- a/APPL/API2/model_cad_label.inc
+++ b/APPL/API2/model_cad_label.inc
@@ -11,7 +11,6 @@
    Notes:
 */
 %>
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <%

 function model_cad_label()
--- a/APPL/API2/model_cad_thema.inc
+++ b/APPL/API2/model_cad_thema.inc
@@ -11,7 +11,6 @@
    Notes:      TODO: JGL: Ik ben er nog niet helemaal uit hoe de bitjes netjes op te lossen
 */
 %>
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <%

 function model_cad_thema()
@@ -173,6 +172,13 @@ function model_cad_thema()
    };


+    this.hook_pre_show = function(jsondata, fld)
+    {   // De checkboxen genereer- en bijwerken-legenda zijn alleen voor het uitvoren van een functie in edit-mode.
+        // Dus niet tonen in show-mode.
+        delete fld._generate;
+        delete fld._update;
+    }
+
    this.hook_pre_put = function(params, jsondata, key)
    {   // update
        refresh_legenda(jsondata);
--- a/APPL/API2/model_cadcontours.inc
+++ b/APPL/API2/model_cadcontours.inc
@@ -11,54 +11,22 @@
    Notes:
 */
 %>
-<!-- #include file="../ALG/alg.inc" -->
 <%

-model_cadcontours =
+function model_cadcontours()
 {
-    table: "cad_imp_contour",
-    primary: "cad_imp_contour_key",
-    aliasprefix: "CAD.",
-    records_name: "cadcontours",
-    record_name: "cadcontour",
-    fields: {"id"      : { dbs: "cad_imp_contour_key",      typ: "key", filter: "exact" },
-             "name"    : { dbs: "cad_imp_contour_nr",       typ: "varchar", filter: "like"  },
-             "cadarea" : { dbs: "cad_imp_contour_opp",      typ: "float"  },
-             "cadalt1" : { dbs: "cad_imp_contour_opp_alt1", typ: "float"  },
-             "cadalt2" : { dbs: "cad_imp_contour.cad_imp_contour_opp_alt2", typ: "float"  },
-             "concept" : { dbs: "cad_imp_contour_concept",  typ: "number" }
-            },
+    this.table = "cad_imp_contour",
+    this.primary = "cad_imp_contour_key";
+    this.records_name = "cadcontours";
+    this.record_name = "cadcontour";
+    this.fields = {"id"      : { dbs: "cad_imp_contour_key",      typ: "key", filter: "exact" },
+                   "name"    : { dbs: "cad_imp_contour_nr",       typ: "varchar", filter: "like"  },
+                   "cadarea" : { dbs: "cad_imp_contour_opp",      typ: "float"  },
+                   "cadalt1" : { dbs: "cad_imp_contour_opp_alt1", typ: "float"  },
+                   "cadalt2" : { dbs: "cad_imp_contour.cad_imp_contour_opp_alt2", typ: "float"  },
+                   "concept" : { dbs: "cad_imp_contour_concept",  typ: "number" }
+                  };

-    _check_authorization: function(params, method)
-        {
-        },
-    _analyze_fields: function (fields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
-        {
-        },
-    REST_GET: function _GET(params, jsondata)
-        {
-            model_cadcontours._check_authorization(params, "GET");
-            var query = api2.sqlfields(params, model_cadcontours);
-
-            var wheres = api2.sqlfilter(params, model_cadcontours);
-            query.wheres = query.wheres.concat(wheres);
-
-            var sql = "SELECT " + query.selects.join(", ")
-                    + "  FROM " + query.tables.join(", ")
-                    + (query.wheres.length ? " WHERE " + query.wheres.join(" AND " ) : "")
-
-            var json = api2.sql2json (params, sql, model_cadcontours);
-
-            return json;
-        },
-    REST_PUT: function (params, jsondata, the_key) /* update cad contour */
-        {
-        },
-    REST_POST: function (params, jsondata) /* new cad contour */
-        {
-        },
-    REST_DELETE: function (params, the_key) /* delete cad contour */
-        {
-        }
+    // (nog) geen eigen GET en dergelijke, alleen via include van model_rooms
 }
 %>
--- a/APPL/API2/model_cnt_disc_params.inc
+++ b/APPL/API2/model_cnt_disc_params.inc
@@ -2,7 +2,7 @@
    $Revision$
    $Id$

-    File:           model_bes_disc_params.inc
+    File:           model_cnt_disc_params.inc

    Description:    Vanuit CodeCharge gegenereerd model voor cnt_discipline

--- a/APPL/API2/model_cnt_kenmerk.inc
+++ b/APPL/API2/model_cnt_kenmerk.inc
@@ -4,13 +4,14 @@

    File:           model_cnt_kenmerk.inc

-    Description:    Vanuit CodeCharge gegenereerd model voor cnt_kenmerk
+    Description:    Model voor cnt_kenmerk

    Context:

    Notes:
 */
 %>
+<!-- #include file="model_cnt_srtkenmerk.inc"-->
 <%

 function model_cnt_kenmerk(params)
@@ -139,6 +140,11 @@ function model_cnt_kenmerk(params)
        }
    };

+    this.getPropertyType = function (kenmerkdata)
+    {
+        var typedata = api2.GET(new model_cnt_srtkenmerk({internal: params.internal}), kenmerkdata.contractpropertytype.id);
+        return typedata;
+    }

    this.hook_pre_edit = function (obj, fld)
    {
--- a/APPL/API2/model_cnt_srtkenmerk.inc
+++ b/APPL/API2/model_cnt_srtkenmerk.inc
@@ -13,14 +13,15 @@
 %>
 <%

-function model_cnt_srtkenmerk()
+function model_cnt_srtkenmerk(params)
 {
+    params = params || {};
    this.records_name = "contractpropertytypes";
    this.record_name = "contractpropertytype";
    this.table = "cnt_srtkenmerk";
    this.primary = "cnt_srtkenmerk_key";
    this.soft_delete = "cnt_srtkenmerk_verwijder";
-    this.autfunction = "WEB_CNTMGT";
+    this.autfunction = params.internal?false:"WEB_CNTMGT";
    this.record_title = L("cnt_srtkenmerk");
    this.records_title = L("cnt_srtkenmerk_m");

--- a/APPL/API2/model_companies.inc
+++ b/APPL/API2/model_companies.inc
@@ -13,7 +13,6 @@
 %>
 <!-- #include file="../prs/prs.inc" -->
 <!-- #include file="./model_custom_fields.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <!-- #include file="./model_prs_kenmerk.inc"-->
 <%

--- a/APPL/API2/model_contracts.inc
+++ b/APPL/API2/model_contracts.inc
@@ -20,6 +20,7 @@

 model_contracts =
 {
+    uglyincludefix: true, // voor CUST#54504
    module:       "CNT",
    table:        "cnt_contract",
    primary:      "cnt_contract_key",
--- a/APPL/API2/model_ctr_disc_params.inc
+++ b/APPL/API2/model_ctr_disc_params.inc
@@ -46,6 +46,12 @@ model_ctr_disc_params =
            "label": L("ctr_ismjob"),
            "typ": "check0",
            "readonly": S("mjb_enabled") != 1
+        },
+        "stdmelding": {
+            "dbs": "mld_stdmelding_key",
+            "label": L("mld_stdmelding_key"),
+            "typ": "key",
+            "foreign": "mld_stdmelding"
        }
    }
 }
--- a/APPL/API2/model_ctr_scenario.inc
+++ b/APPL/API2/model_ctr_scenario.inc
@@ -0,0 +1,83 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_ctr_scenario.inc
+
+    Description:    Model voor scenario's
+
+    Context:
+
+    Notes:
+*/
+%>
+<!-- #include file="../ins/ins.inc" -->
+<%
+
+function model_ctr_scenario()
+{
+    this.records_name = "scenarios";
+    this.record_name = "scenario";
+    this.table = "ins_scenario";
+    this.primary = "ins_scenario_key";
+    this.autfunction = "WEB_CTRMGT";
+    this.record_title = L("ctr_scenario");
+    this.records_title = L("ctr_scenario_m");
+
+
+    this.fields = {
+        "id": {
+            "dbs": "ins_scenario_key",
+            "label": L("lcl_key"),
+            "typ": "key",
+            "required": true,
+            "filter": "exact",
+            "seq": "ins_s_ins_scenario_key"
+        },
+        "name": {
+            "dbs": "ins_scenario_omschrijving",
+            "label": L("ctr_scenario_omschrijving"),
+            "typ": "varchar",
+            "required": true,
+            "translate": true
+        },
+        "nrelements": {
+          "dbs": "nn_elements",
+          "sql": "(SELECT COUNT(*) FROM ins_srtcontroledl_xcp isx WHERE isx.ins_scenario_key = ins_scenario.ins_scenario_key)",
+          "label": L("ctr_scenario_aantal"),
+          "typ": "number"
+        },
+        "remark": {
+            "dbs": "ins_scenario_opmerking",
+            "label": L("ctr_scenario_opmerking"),
+            "typ": "varchar",
+            "translate": true
+        },
+        "created": {
+            "dbs": "ins_scenario_aanmaak",
+            "label": L("ctr_scenario_aanmaak"),
+            "typ": "date",
+            "readonly": true
+        },
+        "status": {
+            "dbs": "ins_scenario_status",
+            "label": L("ctr_scenario_status"),
+            "foreign": ins.getscenariostatustext,
+            "typ": "exact"
+        },
+        "person": {
+            "dbs": "prs_perslid_key",
+            "label": L("lcl_user"),
+            "typ": "key",
+            "foreign" : "prs_perslid",
+            readonly: true
+        }
+    };
+
+
+    this.REST_GET    = generic_REST_GET(this, { GET: { wheres: [ "ins_scenario_key <> 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_custom_fields.inc
+++ b/APPL/API2/model_custom_fields.inc
@@ -21,14 +21,9 @@
 <!-- #include file="../Shared/resultset_flex.inc"-->
 <%

-function model_custom_fields(formodel, flexModule, flexParams)
+function model_custom_fields(formodel, flexModel, flexParams)
 {
-    var flexModel = null; // alleen nog niet bij issues
-    if (typeof flexModule != "string")
-    {
-        flexModel = flexModule;
-        flexModule = flexModel.module;
-    }
+    var flexModule = flexModel.module;

    flexParams         = flexParams || {};
    this.module        = flexModule;
@@ -93,34 +88,42 @@ function model_custom_fields(formodel, flexModule, flexParams)
        }
    };

+    this.get_file_info = function (params, record, fileparams)
+    {
+        var flexparam = flexProps(flexModule, record.xflexparentkey,
+                                  String(record.propertyid), flexParams.pNiveau,
+                                  fileparams);
+        var attachments = [];
+        for (var f in flexparam.files)
+        {
+            var file = flexparam.files[f];
+            var attachment = { name: file.name,
+                               date: file.date,
+                               size: file.size,
+                               content_url: file.deepurl,
+                               token: file.token,
+                               digest: file.digest };
+            switch (params.filter.fileencoding) // De enige twee encodings die we ondersteunen
+            {
+                case "base64":
+                    attachment.content_base64 = file.data;
+                    break;
+                case "hex":
+                    attachment.content_hex = file.data;
+                    break;
+            }
+            attachments.push(attachment);
+        };
+        return attachments;
+    }
    // Deze functie wordt na de GET aangeroepen. De bijlagen zijn zo afwijkend
    // dat ik dat niet fatsoenlijk in 'fields' verwerkt kreeg
    this.post_get = function (params, record)
        {
            if (record.type == 'F' || record.type == 'M')
            {
-                var flexparam = flexProps(flexModule, record.xflexparentkey, String(record.propertyid), flexParams.pNiveau,
-                                                { getFiles: true, getFileEncoded: params.filter.fileencoding, api2name: formodel.records_name });
-                record.attachments = [];
-                for (var f in flexparam.files)
-                {
-                    var file = flexparam.files[f];
-                    var attachment = { name: file.name,
-                                       date: file.date,
-                                       size: file.size,
-                                       content_url: file.deepurl,
-                                       digest: file.digest };
-                    switch (params.filter.fileencoding) // De enige twee encodings die we ondersteunen
-                    {
-                        case "base64":
-                            attachment.content_base64 = file.data;
-                            break;
-                        case "hex":
-                            attachment.content_hex = file.data;
-                            break;
-                    }
-                    record.attachments.push(attachment);
-                };
+                var fileparams = { getFiles: true, getFileEncoded: params.filter.fileencoding, api2name: formodel.records_name };
+                record.attachments = this.get_file_info(params, record, fileparams);
            }
            delete record["xflexparentkey"]; // nu niet meer nodig
        }
@@ -151,10 +154,16 @@ function model_custom_fields(formodel, flexModule, flexParams)
                            Response.Status = "304 Not modified";
                            Response.End;
                        }
-                        StreamFile(params.AttachPath, att.name, "application/octet-stream");
+                        var extension = att.name.split('.').pop();
+                        var mime = S("flex_mimetypes")[extension]; // Sommige mimetypes zijn bekend
+                        // Content-Type: image/jpeg; Charset=utf-8
+                        // Eigenlijk moet de Charset er alleen bij text/.... bij maar ik krijg die er niet netjes af
+                        // IE, FF en Chrome doen er in ieder geval niet moeilijk over
+                        //if (mime)
+                        //    Response.Charset = ''; /
+                        StreamFile(params.AttachPath, att.name, mime || "application/octet-stream");
                    }
                }
-
            }
        }
        __Log(filter);
@@ -166,11 +175,25 @@ function model_custom_fields(formodel, flexModule, flexParams)
    {   // Let op: parameter the_key is de kenmerk_key, niet een een kenmerkwaarde_key
        // Merk op dat flexProps ook wel het type oplevert. Ik wil echter migreren naar modellen
        var kenmerkdata = api2.GET(flexModel, jsondata.propertyid);
-        // TODO: if (!kenmerkdata) en rechtencontrole
-        var typ = kenmerkdata.attributetype.id;
+
+        // Als je op de volgende regel een 'Object expected' krijgt is er
+        // gesubmit met een kenmerk_key welke niet bestaat
+        // Ik weet nog niet of daar een 'Unautorized', 'Bad request' of 'Stil negeren' van toepassing is
+        // Vooralsnog maar even ongewijzigd er hard uitklappen
+        if ("attributetype" in kenmerkdata)
+        {
+            var typ = kenmerkdata.attributetype.id;
+        }
+        else
+        {
+            var typedata = flexModel.getPropertyType(kenmerkdata); // getPropertyType moet gedefinieerd zijn
+            var typ = typedata.attributetype.id;
+        }
        if (typ == 'F' || typ == 'M')
        {
-            var flexparams = flexProps(this.module, parent_key, the_key, flexParams.pNiveau);
+            if (!(parent_key > 0))
+                var tmpfolder =  safe.filename(shared.random(32));
+            var flexparams = flexProps(this.module, parent_key, the_key, flexParams.pNiveau, { tmpfolder: tmpfolder });
            // TODO: bij type F zorgen dat er <20><>n file overblijft
            for (var i = 0; i < jsondata.attachments.length; i++)
            {
@@ -193,28 +216,30 @@ function model_custom_fields(formodel, flexModule, flexParams)
                }
                else
                {
-                    Response.Status = "422 Unprocessable Entity";
-                    Response.End;
+                    api2.error(422, L("lcl_shared_file_ext_not_allowed"));
                }
            }
        }

-        if (typ != "M")
+        if (typ != "M" && parent_key > 0)
        {
-            var sql = "BEGIN flx.setflex({0}".format(safe.quoted_sql(this.module))
+            var sql = "BEGIN flx.setflex({0}".format(this.module == "MLD" && flexParams.pNiveau == "O" ? "'OPD'" : safe.quoted_sql(this.module))
                    + "                , {0}".format(the_key) // == jsondata.propertyid
                    + "                , {0}".format(parent_key)
-                    + "                , {0}".format(safe.quoted_sql(flexParams.pNiveau))
+                    + "                , {0}".format(this.module == "MLD" && flexParams.pNiveau == "O" ? "NULL" : safe.quoted_sql(flexParams.pNiveau))
                    + "                , {0});".format(safe.quoted_sql(jsondata.value))
                    + "END;"
-            Oracle.Execute(sql);
+            var err = Oracle.Execute(sql, true);
+            if (err.friendlyMsg)
+                api2.error(400, err.friendlyMsg);
        }
+        return tmpfolder;
    }

    if (flexModel) // nog even niet voor MLD
    this.REST_POST = function (params, jsondata, parent_key) /* add custom_field */
    {   // Voor flexvelden is er geen verschil tusen 'toevoegen' en 'bijwerken'
-        this.REST_PUT(params, jsondata, jsondata.propertyid, parent_key);
+        return this.REST_PUT(params, jsondata, jsondata.propertyid, parent_key);
    }

    this.disabled_REST_DELETE = function (params, the_key) /* remove custom_field */
--- a/APPL/API2/model_doc.inc
+++ b/APPL/API2/model_doc.inc
@@ -30,10 +30,16 @@ function model_doc()
    this.modules = { };
    for (var i = 0; i < apis.length; i++)
    {
+        if (apis[i].nodoc)
+            continue;
+
        var modulecode = apis[i].modulecode || "XXX";
        if (!(modulecode in this.modules))
            this.modules[modulecode] = { name: apis[i].module, apis: { } };
-        this.modules[modulecode].apis[ apis[i].id ] = { label: apis[i].name };
+        var apidata = { label: apis[i].name };
+        if (apis[i].docparam )
+            apidata.docparam = apis[i].docparam;
+        this.modules[modulecode].apis[ apis[i].id ] = apidata;
    }

    this.REST_GET = generic_REST_GET(this, {});
--- a/APPL/API2/model_doc.xsl
+++ b/APPL/API2/model_doc.xsl
@@ -21,7 +21,7 @@
                <xsl:sort select="local-name()" />
                <xsl:element name="li">
                    &#xA0;<xsl:element name="a">
-                        <xsl:attribute name="href">../api2/<xsl:value-of select="local-name()"/>.doc</xsl:attribute>
+                        <xsl:attribute name="href">../api2/<xsl:value-of select="local-name()"/>.doc<xsl:if test="docparam!=''">?x=x<xsl:value-of select="docparam"/></xsl:if></xsl:attribute>
        				<xsl:value-of select="local-name()"/>
                    </xsl:element>
                    &#xA0;<span class='apidesc'><xsl:value-of select="label"/></span>
--- a/APPL/API2/model_fac_groep.inc
+++ b/APPL/API2/model_fac_groep.inc
@@ -57,13 +57,24 @@ function model_fac_groep(groep_key, params)
        "label": L("lcl_prs_substitutes"),
        "typ": "check0"
      },
+      "externalid": {
+          "dbs": "fac_groep_externid",
+          "label": L("fac_groep_externid"),
+          "typ": "varchar"
+      },
      "membercount": {
        "dbs": "nn_leden",
        "sql": "(SELECT COUNT(*) FROM fac_gebruikersgroep WHERE fac_groep.fac_groep_key = fac_gebruikersgroep.fac_groep_key)",
        "label": L("fac_groep_nn_leden"),
        "typ": "number"
+      },
+        "created": {
+        "dbs": "fac_groep_aanmaak",
+        "label": "Aanmaakdatum",
+        "typ": "datetime",
+        "readonly": true
      }
-    }
+    };

    this.includes = {
        "users": {
@@ -103,7 +114,17 @@ function model_fac_groep(groep_key, params)
                               + "         WHERE fgr.fac_functie_key = ff.fac_functie_key"
                               + "           AND ff.fac_functie_code = 'WEB_FACTAB')");
    }
-    this.REST_GET    = generic_REST_GET(this, xparams);
+    // _groepen geven we nooit mee
+
+    this.REST_GET = function (params)
+    {
+        if ("filter" in params && params.filter.nointernal)
+            xparams.GET.wheres.push("SUBSTR(fac_groep_omschrijving, 0, 1) <> '_'");
+
+        // Verder met de default
+        return generic_REST_GET(this, xparams)(params)
+    }
+
    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_session.inc
+++ b/APPL/API2/model_fac_session.inc
@@ -47,10 +47,11 @@ model_fac_session = // Internal only
            "label": L("fac_session_data"),
            "typ": "varchar"
        },
-        "creation": {
+        "created": {
            "dbs": "fac_session_aanmaak",
            "label": L("fac_session_aanmaak"),
-            "typ": "datetime"
+            "typ": "datetime",
+            "readonly": true
        },
        "expire": {
            "dbs": "fac_session_expire",
--- a/APPL/API2/model_fac_sp.inc
+++ b/APPL/API2/model_fac_sp.inc
@@ -1,155 +0,0 @@
-<% /*
-    $Revision$
-    $Id$
-
-    File:           model_fac_sp.inc
-    Description:
-    Notes:
-*/
-
-%>
-<!-- #include file="./model_fac_sp_map.inc" -->
-<%
-function model_fac_sp()
-{
-    this.records_name = "identityproviders";
-    this.record_name = "identityprovider";
-    this.table = "fac_sp";
-    this.primary = "fac_sp_key";
-    this.autfunction = "WEB_FACFAC";
-    this.record_title = L("fac_sp");
-    this.records_title = L("fac_sp_m");
-
-    this.fields = {
-        "id": {
-            "dbs": "fac_sp_key",
-            "label": L("lcl_key"),
-            "typ": "key",
-            "seq": "fac_s_fac_sp_key"
-        },
-        "code": {
-            "dbs": "fac_sp_code",
-            "label": L("fac_sp_code"),
-            "typ": "varchar",
-            "filter": "exact"
-        },
-        "name": {
-            "dbs": "fac_sp_omschrijving",
-            "label": L("fac_sp_omschrijving"),
-            "typ": "varchar",
-            "required": true
-        },
-        "type": {
-            "dbs": "fac_sp_type",
-            "label": L("fac_sp_type"),
-            "typ": "key",
-            "required": true,
-            "LOV": L("fac_aut_typeLOV") // TODO?
-        },
-        "remark": {
-            "dbs": "fac_sp_opmerking",
-            "label": L("fac_sp_opmerking"),
-            "typ": "memo"
-        },
-        "secret": {
-            "dbs": "fac_sp_secret",
-            "label": L("fac_sp_secret"),
-            "typ": "varchar",
-            "defaultvalue": shared.random(32),
-            "secret": true
-        },
-        "audience": {
-            "dbs": "fac_sp_audience",
-            "label": L("fac_sp_audience"),
-            "typ": "varchar",
-            "placeholder": customerId + ".facilitor.nl"
-        },
-        "issuer": {
-            "dbs": "fac_sp_issuer",
-            "label": L("fac_sp_issuer"),
-            "typ": "varchar"
-        },
-        "algorithm": {
-            "dbs": "fac_sp_algorithm",
-            "label": L("fac_sp_algorithm"),
-            "typ": "varchar"
-        },
-        "timeout": {
-            "dbs": "fac_sp_clockskew",
-            "label": L("fac_sp_clockskew"),
-            "typ": "number",
-            "defaultvalue": 30
-        },
-        "duration": {
-            "dbs": "fac_sp_duration",
-            "label": L("fac_sp_duration"),
-            "typ": "number"
-        },
-        "remoteloginurl": {
-            "dbs": "fac_sp_remote_loginurl",
-            "label": L("fac_sp_remote_loginurl"),
-            "typ": "varchar"
-        },
-        "remotelogouturl": {
-            "dbs": "fac_sp_remote_logouturl",
-            "label": L("fac_sp_remote_logouturl"),
-            "typ": "varchar"
-        },
-        "ipfilter": {
-            "dbs": "fac_sp_ipfilter",
-            "label": L("fac_sp_ipfilter"),
-            "typ": "varchar"
-        },
-        "_currentIP" : {
-            "dbs": "",
-            "label": "Current IP",
-            "typ": "label",
-            "labelvalue": String(Request.ServerVariables("REMOTE_ADDR"))
-        },
-        "ipauto": {
-            "dbs": "fac_sp_ipauto",
-            "label": L("fac_sp_ipauto"),
-            "typ": "check0"
-        },
-/*
-        "company": {
-             "dbs": "prs_bedrijf_key",
-             "typ": "key",
-             "foreign": "prs_bedrijf",
-             "label": L("lcl_idp_company")
-        }
-        ,
-        "department": {
-             "dbs": "prs_afdeling_key",
-             "typ": "key",
-             "foreign": "prs_afdeling",
-             "label": L("lcl_idp_department")
-        },
-        "authorization": {
-            "dbs": "fac_functie_key",
-            "label": L("fac_sp_functie_key"),
-            "typ": "key",
-            "foreign": "fac_functie"
-        },
-*/
-        "internal": {
-            "dbs": "fac_sp_internal",
-            "label": L("fac_sp_internal"),
-            "typ": "check0",
-            "readonly": true
-        }
-    }
-
-    this.includes =
-               {  "spmappings": { model: new model_fac_sp_map(),
-                                  joinfield: "serviceprovider",
-                                  enable_update: true
-                                }
-              };
-
-    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_fac_srtnotificatie.inc
+++ b/APPL/API2/model_fac_srtnotificatie.inc
@@ -268,7 +268,8 @@ function model_fac_srtnotificatie(cust)

    this.hook_pre_put = function(params, obj, key)
    {
-        if (iscust == 1)
+        // Multiedit heeft geen obj.name
+        if (iscust == 1 && "name" in obj)
            obj.name = "CUST" + obj.name.toUpperCase(); // De "CUST" er weer voor zetten.
    }

--- a/APPL/API2/model_fac_usrdata.inc
+++ b/APPL/API2/model_fac_usrdata.inc
@@ -52,6 +52,7 @@ function model_fac_usrdata(params)
        "description": {
            "dbs": "fac_usrdata_omschr",
            "label": L("fac_usrdata_omschr"),
+            "required": true,
            "typ": "varchar",
            "translate": true
        },
@@ -63,7 +64,6 @@ function model_fac_usrdata(params)
        "price": {
            "dbs": "fac_usrdata_prijs",
            "label": L("fac_usrdata_prijs"),
-            "iscurrency": true,
            "typ": "float",
            "multiedit": true
        },
--- a/APPL/API2/model_fac_widget.inc
+++ b/APPL/API2/model_fac_widget.inc
@@ -86,7 +86,8 @@ function model_fac_widget()
            "dbs": "fac_widget_aanmaak",
            "label": L("fac_widget_aanmaak"),
            "typ": "date",
-            "hidden_fld": true
+            "hidden_fld": true,
+            "readonly": true
        },
        "authorization": {
            "dbs": "fac_functie_key",
--- a/APPL/API2/model_fin_factuur.inc
+++ b/APPL/API2/model_fin_factuur.inc
@@ -40,49 +40,74 @@ function model_fin_factuur()
            "typ": "key",
            "required": true,
            "foreign": bgt_budgetdiscipline_foreign(),
-            "emptyoption": null
+            "showtransit": true
        },
        "budgetproject": {
            "dbs": "bgt_project.bgt_project_key",
            "label": L("bgt_project_omschrijving"),
            "typ": "key",
-            "foreign": bgt_budgetproject_foreign()
-        },
-        "budgetcostcategory": {
-            "dbs": "bgt_kostenrubriek.bgt_kostenrubriek_key",
-            "label": L("bgt_kostenrubriek_oms"),
-            "typ": "key",
-            "foreign": bgt_budgetcostcategory_foreign()
-        },
-        "costtypegroup": {
-            "dbs": "prs_kostensoortgrp.prs_kostensoortgrp_key",
-            "label": L("prs_kostensoortgrp_key"),
-            "typ": "key",
-            "foreign": bgt_costtypegroup_foreign()
+            "foreign": bgt_budgetproject_foreign(),
+            "delayload": true,
+            "showtransit": true
        },
        "costtype": {
-            "dbs": "prs_kostensoort_key",
+            "dbs": "mld_opdr.prs_kostensoort_key",
            "label": L("prs_kostensoort_key"),
            "typ": "key",
            "foreign": bgt_costtype_foreign(),
-            "hidden_fld": true
+            "delayload": true,
+            "required": false
+        },
+        "company": {
+            "dbs": "mld_opdr.mld_uitvoerende_keys",
+            "label": L("lcl_ord_company"),
+            "typ": "key",
+            "foreign": bgt_company_foreign(),
+            "showtransit": true
        },
        "order": {
            "dbs": "mld_opdr_key",
            "label": L("lcl_fin_mld_opdr"),
            "typ": "key",
            "required": true,
-            "foreign": {
-                "tbl": "mld_opdr",
-                "key": "mld_opdr_key",
-                "desc": "mld_opdr_omschrijving"
-            },
+            "foreign": bgt_order_foreign(),
+            "delayload": true,
+            "showtransit": true,
            "clone": false
        },
+        "additional": {
+            "dbs": "mld_opdr.mld_opdr_meerwerk",
+            "label": L("lcl_mld_opdr_meerwerk"),
+            "typ": "check0",
+            "defaultvalue": 0,
+            "filter": "exact",
+            "multiedit": true
+        },
+         "ordernr_sort": {
+            "dbs": "mld_opdr_ordernr_int",
+            "label": L("bgt_opdr_ordernr"),
+            "sql": "fac.safe_to_number(mld_opdr.mld_opdr_ordernr)",
+            "typ": "number",
+            "readonly": true
+        },
        "ordernr": {
            "dbs": "mld_opdr.mld_opdr_ordernr",
            "label": L("bgt_opdr_ordernr"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "hidden_fld": true
+        },
+        "account": {
+            "dbs": "mld_opdr.prs_kostenplaats_key",
+            "label": L("bgt_budget_account"),
+            "typ": "key",
+            "foreign": bgt_account_foreign(),
+            "readonly": true
+        },
+        "_staticinvoice": {
+            "dbs": "",
+            "label": L("bgt_factuurnr_vast"),
+            "typ": "varchar",
+            "foreign": bgt_invoice_foreign()
        },
        "invoice": {
            "dbs": "fin_factuur_nr",
@@ -100,13 +125,21 @@ function model_fin_factuur()
            "label": L("lcl_fin_findate"),
            "typ": "date",
            "required": true,
-            "defaultvalue": new Date()
+            "defaultvalue": new Date(),
+            "filter": "exact"
        },
        "advice": {
            "dbs": "fin_factuur_advies",
            "label": L("lcl_fin_adviesdatum"),
            "typ": "date",
-            "defaultvalue": new Date()
+            "defaultvalue": new Date(),
+            "multiedit": true
+        },
+        "isprinted": {
+            "dbs": "fin_factuur_bron",
+            "label": "Geprint",
+            "typ": "check0",
+            "multiedit": true
        },
        "month": {
            "dbs": "fin_factuur_boekmaand",
@@ -118,24 +151,24 @@ function model_fin_factuur()
            "label": L("lcl_fin_fin_status"),
            "typ": "key",
            "foreign": bgt_invoicestatus_foreign(),
-            "defaultvalue": "2",
-            "clone": false  // Krijgt nu de default waarde.
+            "defaultvalue": "6",
+            "clone": false,  // Krijgt nu de default waarde.
+            "multiedit": true
        },
        "total": {
            "dbs": "fin_factuur_totaal",
            "label": L("lcl_fin_CO_sum"),
            "typ": "float",
            "iscurrency": true,
-            "total": true,
-            "defaultvalue": "0"
+            "total": true
        },
        "totalvat": {
            "dbs": "fin_factuur_totaal_btw",
            "label": L("lcl_fin_btwsum"),
            "typ": "float",
+            "defaultvalue": 0,
            "iscurrency": true,
            "total": true,
-            "defaultvalue": "0",
            "clone": false
        },
        "totalincl": {
@@ -143,6 +176,8 @@ function model_fin_factuur()
            "sql": "fin_factuur_totaal + fin_factuur_totaal_btw",
            "label": L("lcl_fin_total_sum"),
            "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
            "iscurrency": true,
            "total": true,
            "defaultvalue": "0",
@@ -162,18 +197,130 @@ function model_fin_factuur()
        ]
    };

-
    this.hook_pre_edit = function(obj, fld)
    {
-        // Bij klonen: id=-1, invoice=niet leeg. Dan een (volgende) volgnummer erachter zetten.
-        if (obj.invoice)
+        var btw_data = {};
+        if (obj.id > -1)
+        {
+            var sql = "SELECT ks.prs_kostensoort_btw"
+                    + "     , fb.fin_btwtabelwaarde_perc"
+                    + "  FROM fin_factuur ff"
+                    + "     , mld_opdr mo"
+                    + "     , prs_kostensoort ks"
+                    + "     , fin_btwtabelwaarde fb"
+                    + " WHERE fb.fin_btwtabelwaarde_key = ks.fin_btwtabelwaarde_key"
+                    + "   AND ks.prs_kostensoort_key = mo.prs_kostensoort_key"
+                    + "   AND mo.mld_opdr_key = ff.mld_opdr_key"
+                    + "   AND ff.fin_factuur_key = " + obj.id;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                btw_data.btw_inc = oRs("prs_kostensoort_btw").Value;
+                btw_data.btw_val = oRs("fin_btwtabelwaarde_perc").Value;
+            }
+            oRs.Close();
+        }
+
+        %>
+        <script>
+            var btw_data = <%=JSON.stringify(btw_data)%>;
+        </script>
+        <%
+
+        var vast_facnr = isVastFactuurnummer(obj.invoice);
+        if (!obj.id && obj.invoice)
        {
            var invoice = obj.invoice;
-            var cur_inv = (invoice.indexOf("/") > -1 ? invoice.substring(0,invoice.indexOf("/")-1) : invoice);
-            var cur_seq = (invoice.indexOf("/") > -1 ? invoice.substring(invoice.indexOf("/")+1) : 0);
-            cur_seq = (cur_seq ? cur_seq : 0);
-            var new_inv = cur_inv + "/" + (cur_seq + 1);
-            obj.invoice = new_inv;
+            if (!vast_facnr)
+            {
+                // Bij klonen: id=(bestaat niet), invoice=niet leeg. Dan een (volgende) volgnummer erachter zetten.
+                var cur_inv = (invoice.indexOf("/") > -1 ? invoice.substring(0,invoice.indexOf("/")) : invoice);
+                var cur_seq = (invoice.indexOf("/") > -1 ? invoice.substring(invoice.indexOf("/")+1) : 0);
+                cur_seq = parseInt(cur_seq ? cur_seq : 0);
+
+                var sql = "SELECT MAX(CASE WHEN INSTR(f.fin_factuur_nr, '/') > 0"
+                        + "                THEN TO_NUMBER(SUBSTR(f.fin_factuur_nr, INSTR(f.fin_factuur_nr, '/')+1))"
+                        + "                ELSE 0"
+                        + "           END) max_seq"
+                        + "  FROM bgt_kostenrubriek r"
+                        + "     , prs_kostensoortgrp g"
+                        + "     , prs_kostensoort s"
+                        + "     , mld_opdr o"
+                        + "     , fin_factuur f"
+                        + " WHERE r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                        + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                        + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                        + "   AND o.mld_opdr_key = f.mld_opdr_key"
+                        + "   AND r.bgt_project_key = " + obj.budgetproject.id
+                        + "   AND f.fin_factuur_nr LIKE " + safe.quoted_sql(cur_inv + "%");
+                var oRs = Oracle.Execute(sql);
+                cur_seq = oRs("max_seq").Value;
+                oRs.Close();
+
+                var new_inv = cur_inv + "/" + (cur_seq==0 ? "02" : ((cur_seq < 9 ? "0" : "") + (cur_seq + 1)));
+                obj.invoice = new_inv;
+            }
+            else
+            {
+                // Bij klonen van een factuur met een vast factuurnr blijft deze ongewijzigd.
+                obj.invoice = invoice;
+            }
+            var v_company = obj.company.id;
+        %>
+        <script>
+            var company_key = <%=(v_company || -1)%>;
+        </script>
+        <%
+        }
+        else
+        {
+            var mld_opdr_key = getQParamInt("opdrachtcommon", -1);
+            if (obj.id == -1 && mld_opdr_key > -1)
+            {   // Nieuwe factuur bij bekende opdracht.
+                var sql = "SELECT p.ins_discipline_key"
+                        + "     , p.bgt_project_key"
+                        + "     , o.mld_uitvoerende_keys"
+                        + "     , s.prs_kostensoort_key"
+                        + "     , s.prs_kostensoort_oms"
+                        + "  FROM mld_opdr o"
+                        + "     , prs_kostensoort s"
+                        + "     , prs_kostensoortgrp g"
+                        + "     , bgt_kostenrubriek r"
+                        + "     , bgt_project p"
+                        + " WHERE p.bgt_project_key = r.bgt_project_key"
+                        + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                        + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                        + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                        + "   AND o.mld_opdr_key = " + mld_opdr_key;
+                var oRs = Oracle.Execute(sql);
+                var v_order = mld_opdr_key;
+                var v_discipline = oRs("ins_discipline_key").Value;
+                var v_project = oRs("bgt_project_key").Value;
+                var v_soort = oRs("prs_kostensoort_key").Value;
+                var v_srtoms = oRs("prs_kostensoort_oms").Value;
+                var v_company = oRs("mld_uitvoerende_keys").Value;
+                oRs.Close();
+                // Er is geen QParam voor costtype gezet, dus deze zelf vullen.
+                obj.costtype = {id: v_soort, name: v_srtoms};
+            }
+            else
+            {
+                var v_order      = (obj.order            ? obj.order.id            : null);
+                var v_discipline = (obj.budgetdiscipline ? obj.budgetdiscipline.id : null);
+                var v_project    = (obj.budgetproject    ? obj.budgetproject.id    : null);
+                var v_soort      = (obj.costtype         ? obj.costtype.id         : null);
+                var v_company    = (obj.company          ? obj.company.id          : null);
+            }
+        %>
+        <script>
+            var cur_mode = "<%=mode%>"; // = "edit"
+            var mldopdracht_key      = <%=(v_order      || -1)%>;
+            var budgetdiscipline_key = <%=(v_discipline || -1)%>;
+            var budgetproject_key    = <%=(v_project    || -1)%>;
+            var costtype_key         = <%=(v_soort      || -1)%>;
+            var company_key          = <%=(v_company    || -1)%>;
+        </script>
+        <%
        }
        // De opdracht moet wel gewijzigd kunnen worden bij het klonen.
        if (!obj.id)
@@ -182,18 +329,178 @@ function model_fin_factuur()

    this.hook_pre_post = function(params, obj)
    {
-        // Wordt alleen gebruikt bij toevoegen.
+        // Bij toevoegen van een factuur moet prs_kostensoort_key nog gevuld worden.
+        // Gebruik daarvoor die van mld_opdr.
+        setKostensoort(obj);
+        // Is het factuurnummer/volgnummer uniek binnen het project?
+        var v_discipline_key = (typeof obj.budgetdiscipline == "object" ? obj.budgetdiscipline.id : obj.budgetdiscipline);
+        checkUniekFactuurnummer(-1, v_discipline_key, obj.invoice);
+        // Bij een kopiefactuur van een origineel (factuurnummer zonder volgnummer)
+        // moet het originele factuurnummer de toevoeging "/1" krijgen.
+        // De vaste factuurnummers echter niet.
+        var vast_factnr = isVastFactuurnummer(obj.invoice);
+        var is_clone = (getQParamInt("scf_clone", 0) == 1);
+        if (is_clone && !vast_factnr)
+        {
+            // Haal het originele factuurnummer op.
+            var org_fin_key = getQParamInt("id");
+            var sql = "SELECT fin_factuur_nr"
+                    + "  FROM fin_factuur"
+                    + " WHERE fin_factuur_key = " + org_fin_key;
+            var oRs = Oracle.Execute(sql);
+            var fact_nr_org = oRs("fin_factuur_nr").Value;
+            oRs.Close();
+            if (fact_nr_org.indexOf("/") == -1)
+            {
+                // Het originele factuurnummer heeft nog geen volgnummer.
+                // Deze dus alsnog toevoegen.
+                var sql = "UPDATE fin_factuur"
+                        + "   SET fin_factuur_nr = " + safe.quoted_sql(fact_nr_org + "/1")
+                        + " WHERE fin_factuur_key = " + org_fin_key;
+                Oracle.Execute(sql);
+            }
+        }
    }

    this.hook_pre_put = function(params, obj, key)
-    {   //wijzigen factuur: bepaal ook opnieuw de som van de factuurregels.
+    {
+        // Bij wijzigen van factuur moet prs_kostensoort_key nog gevuld worden.
+        // Gebruik daarvoor die van mld_opdr.
+        setKostensoort(obj);
+        // Project-key kan als gevolg van de filtering niet aanwezig zijn.
+        // Haal deze dus maar op met behulp van de factuur-key.
+        var sql = "SELECT pr.ins_discipline_key"
+                + "     , kr.bgt_project_key"
+                + "     , TRUNC(fa.fin_factuur_datum)  factuur_datum"
+                + "     , TRUNC(fa.fin_factuur_advies) advies_datum"
+                + "     , fa.fin_factuur_nr"
+                + "     , fa.fin_factuur_opmerking"
+                + "     , fa.fin_factuur_statuses_key"
+                + "  FROM bgt_project pr"
+                + "     , bgt_kostenrubriek kr"
+                + "     , prs_kostensoortgrp kg"
+                + "     , prs_kostensoort ks"
+                + "     , mld_opdr mo"
+                + "     , fin_factuur fa"
+                + " WHERE pr.bgt_project_key = kr.bgt_project_key"
+                + "   AND kr.bgt_kostenrubriek_key = kg.bgt_kostenrubriek_key"
+                + "   AND kg.prs_kostensoortgrp_key = ks.prs_kostensoortgrp_key"
+                + "   AND ks.prs_kostensoort_key = mo.prs_kostensoort_key"
+                + "   AND mo.mld_opdr_key = fa.mld_opdr_key"
+                + "   AND fa.fin_factuur_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        var v_discipline_key = oRs("ins_discipline_key").Value;
+        var v_project_key = oRs("bgt_project_key").Value;
+        var v_factuur_datum = new Date(oRs("factuur_datum").Value);
+        var v_advies_datum = new Date(oRs("advies_datum").Value);
+        var v_invoice = oRs("fin_factuur_nr").Value;
+        var v_remark = oRs("fin_factuur_opmerking").Value || "";
+        var v_status = oRs("fin_factuur_statuses_key").Value;
+        oRs.Close();
+
+        // Is de combinatie factuurnummer/volgnummer nog steeds uniek?
+        if (obj.invoice != v_invoice)
+            checkUniekFactuurnummer(key, v_discipline_key, obj.invoice);
+
+        // Zet van alle facturen met hetzelfde factuurnummer binnen het project de adviesdatum gelijk.
+        // De vaste factuurnummers worden buiten beschouwing gelaten.
+        var vast_facnr = isVastFactuurnummer(obj.invoice);
+        var v_old_factuurdatum = toDateString(v_factuur_datum, true)
+        var v_new_factuurdatum = toDateString(obj.date.midnight(), true);
+        var v_old_adviesdatum = toDateString(v_advies_datum, true)
+        var v_new_adviesdatum = toDateString(obj.advice.midnight(), true);
+        //
+        var v_diff_datum  = (v_old_factuurdatum != v_new_factuurdatum)
+        var v_diff_advies = (v_old_adviesdatum != v_new_adviesdatum);
+        var v_diff_remark = (v_remark != obj.remark);
+        var v_diff_status = (v_status != obj.status);
+
+        if (!vast_facnr && (v_diff_datum || v_diff_advies || v_diff_remark || v_diff_status))
+        {
+            // We moeten zoeken op factuurnummer zonder volgnummer.
+            var cur_invoice = (obj.invoice.indexOf("/") > -1 ? obj.invoice.substring(0, obj.invoice.indexOf("/")) : obj.invoice);
+            var sql_u = "UPDATE fin_factuur"
+                      + "   SET fin_factuur_advies = " + obj.advice.toSQL()
+                      + "     , fin_factuur_datum = " + obj.date.toSQL()
+                      + "     , fin_factuur_opmerking = " + safe.quoted_sql(obj.remark)
+                      + "     , fin_factuur_statuses_key = " + obj.status
+                      + " WHERE fin_factuur_key IN"
+                            + " (SELECT fin_factuur_key"
+                            + "    FROM fin_factuur f"
+                            + "       , mld_opdr m"
+                            + "       , bgt_v_project_full p"
+                            + "   WHERE f.mld_opdr_key = m.mld_opdr_key"
+                            + "     AND m.prs_kostensoort_key = p.prs_kostensoort_key"
+                            + "     AND p.ins_discipline_key = " + v_discipline_key
+                            + "     AND SUBSTR(f.fin_factuur_nr, 0, INSTR(f.fin_factuur_nr,'/')-1) = " + safe.quoted_sql(cur_invoice)
+                            + " )";
+            Oracle.Execute(sql_u);
+        }
+    }
+
+    function setKostensoort(obj)
+    {
+        var sql = "SELECT o.prs_kostensoort_key"
+                + "  FROM mld_opdr o"
+                + " WHERE mld_opdr_key = " + obj.order;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        obj.costtype = (!oRs.eof ? oRs("prs_kostensoort_key").Value : NULL);
+        oRs.Close();
+    }
+
+    function isVastFactuurnummer(factnr)
+    {
+        // is de huidige factuurnummer iets uit de usrtab, dan deze gewoon laten staan.
+        var sql = "SELECT count(*) aantal"
+                + "  FROM fac_usrdata d"
+                + "     , fac_usrtab t"
+                + " WHERE t.fac_usrtab_key = d.fac_usrtab_key"
+                + "   AND t.fac_usrtab_naam = " + safe.quoted_sql(S("bgt_usrtab_vaste_factuurnummer"))
+                + "   AND d.fac_usrdata_code = " + safe.quoted_sql(factnr);
+        var oRs = Oracle.Execute(sql);
+        var vast_factnr = (oRs("aantal").Value == 1);
+        oRs.Close();
+        return vast_factnr;
+    }
+
+    function checkUniekFactuurnummer(p_factuur_key, p_discipline_key, p_factuurnr)
+    {
+            var sql = "SELECT count(*) aantal"
+                    + "  FROM bgt_project p"
+                    + "     , bgt_kostenrubriek r"
+                    + "     , prs_kostensoortgrp g"
+                    + "     , prs_kostensoort s"
+                    + "     , mld_opdr o"
+                    + "     , fin_factuur f"
+                    + " WHERE p.bgt_project_key = r.bgt_project_key"
+                    + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                    + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                    + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                    + "   AND o.mld_opdr_key = f.mld_opdr_key"
+                    + "   AND p.ins_discipline_key = " + p_discipline_key
+                    + "   AND f.fin_factuur_nr = " + safe.quoted_sql(p_factuurnr)
+                    + "   AND f.fin_factuur_nr NOT IN"
+                            + " (SELECT d.fac_usrdata_code"
+                            + "    FROM fac_usrdata d"
+                            + "       , fac_usrtab t"
+                            + "   WHERE t.fac_usrtab_key = d.fac_usrtab_key"
+                            + "     AND t.fac_usrtab_naam = " + safe.quoted_sql(S("bgt_usrtab_vaste_factuurnummer"))
+                            + " )"
+                    + (p_factuur_key != -1 ? "   AND f.fin_factuur_key <> " + p_factuur_key : "");
+            var oRs = Oracle.Execute(sql);
+            var uniek_factuurnr = (oRs("aantal").Value == 0);
+            oRs.Close();
+            if (!uniek_factuurnr)
+                abort_with_warning("Factuurnummer {0} bestaat al in dit project.".format(p_factuurnr));
    }


    var mld_opdr_key = getQParamInt("opdrachtcommon", -1);
+    var fin_key = getQParamInt("id", -1);
    var ischild = (getQParam("columns", "")=="" ? true : false);
    var xmodel = getQParam("model", "");
-    if (mode == "list" && (xmodel == this.record_name || (ischild && mld_opdr_key == -1) || (!ischild && mld_opdr_key > -1)))
+    if (mode == "list" && (xmodel == this.record_name /* || (ischild && mld_opdr_key == -1) || (!ischild && mld_opdr_key > -1)*/ ))
    {
        this.REST_GET    = generic_REST_GET(this);
    }
@@ -209,21 +516,46 @@ function model_fin_factuur()
                    "mld_opdr"
                ],
                wheres: [
-                    "fin_factuur.prs_kostensoort_key = prs_kostensoort.prs_kostensoort_key",
                    "prs_kostensoort.prs_kostensoortgrp_key = prs_kostensoortgrp.prs_kostensoortgrp_key",
                    "prs_kostensoortgrp.bgt_kostenrubriek_key = bgt_kostenrubriek.bgt_kostenrubriek_key",
                    "bgt_kostenrubriek.bgt_project_key = bgt_project.bgt_project_key",
+                    "mld_opdr.prs_kostensoort_key = prs_kostensoort.prs_kostensoort_key",
                    "mld_opdr.mld_opdr_key = fin_factuur.mld_opdr_key"
                ]
            }
        };
-        if (mld_opdr_key > -1)
+        if (mld_opdr_key > -1 && fin_key == -1)
            gparams.GET.wheres.push("mld_opdr.mld_opdr_key = {0}".format(mld_opdr_key));
-        this.REST_GET = generic_REST_GET(this, gparams);
+
+        var v_budgetdiscipline = getQParamInt("budgetdiscipline", -1);
+        if (v_budgetdiscipline == -1)
+        {
+            gparams.GET.tables.push("ins_tab_discipline");
+            gparams.GET.wheres.push("bgt_project.ins_discipline_key = ins_tab_discipline.ins_discipline_key");
+            gparams.GET.wheres.push(
+                    "bgt_project.ins_discipline_key IN"
+                    + " (SELECT w.ins_discipline_key"
+                    + "    FROM fac_v_webgebruiker w"
+                    + "       , ins_tab_discipline d"
+                    + "   WHERE w.ins_discipline_key = d.ins_discipline_key"
+                    + "     AND w.prs_perslid_key = " + user_key
+                    + "     AND (w.fac_gebruiker_prs_level_read<9 OR w.fac_gebruiker_alg_level_read<9)"
+                    + "     AND d.ins_discipline_module = 'BGT'"
+                    + "     AND d.ins_discipline_verwijder IS NULL"
+                    + " )"
+            );
+        }
+
+        this.REST_GET =  generic_REST_GET(this, gparams);
    }

-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
+    this.REST_PUT = generic_REST_PUT(this);
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    if (canWrite)
+    {
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
 }
 %>
--- a/APPL/API2/model_fin_verkoopfactuur.inc
+++ b/APPL/API2/model_fin_verkoopfactuur.inc
@@ -36,7 +36,7 @@ function model_fin_verkoopfactuurregels()
        "filter": "exact",
        "seq": "fin_s_fin_verkoopfactuur_key"
      },
-      "creation": {
+      "created": {
        "dbs": "fin_verkoopfactuur_aanmaak",
        "label": L("lcl_fin_verkoopfactuur_aanmaak"),
        "typ": "datetime",
@@ -56,7 +56,7 @@ function model_fin_verkoopfactuurregels()
      "invoicedate": {
        "dbs": "fin_verkoopfactuur_datum",
        "label": L("lcl_fin_verkoopfactuur_datum"),
-        "typ": "datetime"  // date?
+        "typ": "date"  // date?
      },
      "description": {
        "dbs": "fin_verkoopfactuur_omschr",
@@ -301,7 +301,7 @@ model_fin_verkoopfactuur = function()

    this.tablesql = "(SELECT fin_verkoopfactuur_id"
                  + "      , fin_verkoopfactuurkop_key"
-                  + "      , fin_verkoopfactuur_datum"
+                  + "      , MAX(fin_verkoopfactuur_datum) fin_verkoopfactuur_datum"
                  + "      , fin_verkoopfactuur_xmlnode"
                  + "      , fin_verkoopfactuur_refkey"
                  + "      , SUM(fin_verkoopfactuur_bedrag) fin_verkoopfactuur_bedrag"
@@ -310,7 +310,6 @@ model_fin_verkoopfactuur = function()
                  + "   FROM FIN_VERKOOPFACTUUR"
                  + "  GROUP BY fin_verkoopfactuur_id"
                  + "         , fin_verkoopfactuurkop_key"
-                  + "         , fin_verkoopfactuur_datum"
                  + "         , fin_verkoopfactuur_xmlnode"
                  + "         , fin_verkoopfactuur_refkey) verkoopfactuur";

@@ -329,7 +328,7 @@ model_fin_verkoopfactuur = function()
        "invoicedate": {
            "dbs": "fin_verkoopfactuur_datum",
            "label": L("lcl_fin_verkoopfactuur_datum"),
-            "typ": "datetime"  // date?
+            "typ": "date"  // date?
        },
        "concerning": {
            "dbs": "fin_verkoopfactuur_xmlnode",
--- a/Show More
+++ b/Show More