diff --git a/APPL/BES/bes_klantmon_search_list.asp b/APPL/BES/bes_klantmon_search_list.asp
index 1c85aa2a32..32ff44b192 100644
--- a/APPL/BES/bes_klantmon_search_list.asp
+++ b/APPL/BES/bes_klantmon_search_list.asp
@@ -403,7 +403,7 @@ GROUP BY bes_srtprod_key;
 
     rst.addColumn(new Column({caption: L("lcl_bes_srtgroup"), content: "bes_srtgroep_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_bes_srtprod"),  content: "bes_srtprod_omschrijving"}));
-    rst.addColumn(new Column({caption: L("lcl_bes_weging"),   content: "bes_bedrijf_srtprod_weging", datatype: "integer"}));
+    rst.addColumn(new Column({caption: L("lcl_bes_weging"),   content: "bes_bedrijf_srtprod_weging", datatype: "number"}));
     if (huidigfact)
         rst.addColumn(new Column({caption: L("lcl_bes_huidigfact"), content: fnHuidigFact, datatype: "currency"}));
 
diff --git a/APPL/BES/bes_list.inc b/APPL/BES/bes_list.inc
index 8d8a6322fb..d7092dd2bc 100644
--- a/APPL/BES/bes_list.inc
+++ b/APPL/BES/bes_list.inc
@@ -784,7 +784,7 @@ function bes_list (pautfunction, params)
           rst.addColumn(new Column({align: "left", caption: (groupbes == 2? L("lcl_dep_name_level1") : L("lcl_dep_name_level2")), content: "afdeling"}));
           if (groupbes2)
             rst.addColumn(new Column({caption: th2, content: "sel2col" }));
-          rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "integer", total: true}));
+          rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "number", total: true}));
           rst.addColumn(new Column({caption: L("lcl_rfo_total_sum_eur"), content: "totaalbedrag", datatype: "currency", total: true}));
           if (S("bes_show_inkprijs") == 1)
             rst.addColumn(new Column({caption: L("lcl_rfo_total_inksum"), content: "inktotaalbedrag", datatype: "currency", total: true}));
@@ -889,7 +889,7 @@ function bes_list (pautfunction, params)
           rst.addColumn(new Column({caption: L("lcl_bes_ordernr"), content: "kostenplaats"}));
           if (groupbes2)
             rst.addColumn(new Column({caption: th2, content: "sel2col" }));
-          rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "integer", total: true}));
+          rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "number", total: true}));
           rst.addColumn(new Column({caption: L("lcl_rfo_total_sum_eur"), content: "totaalbedrag", datatype: "currency", total: true}));
           if (S("bes_show_inkprijs") == 1)
             rst.addColumn(new Column({caption: L("lcl_rfo_total_inksum"), content: "inktotaalbedrag", datatype: "currency", total: true}));
@@ -999,7 +999,7 @@ function bes_list (pautfunction, params)
           rst.addColumn(new Column({caption: th1, content: "dlomschrijving"}));
           if (groupbes2)
             rst.addColumn(new Column({caption: th2, content: "sel2col" }));
-          rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "integer", total: true}));
+          rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "number", total: true}));
           rst.addColumn(new Column({caption: L("lcl_rfo_total_sum_eur"), content: "totaalbedrag", datatype: "currency", total: true}));
           if (S("bes_show_inkprijs") == 1)
             rst.addColumn(new Column({caption: L("lcl_rfo_total_inksum"), content: "inktotaalbedrag", datatype: "currency", total: true}));
@@ -1217,9 +1217,9 @@ function bes_list (pautfunction, params)
           if (groupbes2)
             rst.addColumn(new Column({caption: th2, content: "sel2col" }));
           if (groupbes != 12)
-            rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "integer", total: true}));
+            rst.addColumn(new Column({caption: L("lcl_bes_amount_key"), content: "aantalbes", datatype: "number", total: true}));
           if (groupbes == 12 || groupbes == 5)
-            rst.addColumn(new Column({caption: L("lcl_bes_artamount"), content: "aantalart", datatype: "integer", total: true}));
+            rst.addColumn(new Column({caption: L("lcl_bes_artamount"), content: "aantalart", datatype: "number", total: true}));
           rst.addColumn(new Column({caption: L("lcl_rfo_total_sum_eur"), content: "totaalbedrag", datatype: "currency", total: true}));
           if (S("bes_show_inkprijs") == 1)
             rst.addColumn(new Column({caption: L("lcl_rfo_total_inksum"), content: "inktotaalbedrag", datatype: "currency", total: true}));
@@ -1524,7 +1524,7 @@ function bes_list (pautfunction, params)
 
           // Kolommen
           rst.addColumn(new Column({caption: L("lcl_bes_Supplier"), content: "supplier"}));
-          rst.addColumn(new Column({caption: L("lcl_bes_order_amount"), content: "aantal", datatype: "integer", total: true}));
+          rst.addColumn(new Column({caption: L("lcl_bes_order_amount"), content: "aantal", datatype: "number", total: true}));
           rst.addColumn(new Column({caption: L("lcl_rfo_total_sum_eur"), content: "totaalbedrag", datatype: "currency", total: true}));
           if (S("bes_show_inkprijs") == 1)
             rst.addColumn(new Column({caption: L("lcl_rfo_total_inksum"), content: "inktotaalbedrag", datatype: "currency", total: true}));
diff --git a/APPL/BES/bes_retour.asp b/APPL/BES/bes_retour.asp
index f5ad6ac595..341d5bb973 100644
--- a/APPL/BES/bes_retour.asp
+++ b/APPL/BES/bes_retour.asp
@@ -409,10 +409,10 @@ user.auth_required_or_abort(this_bes.canRetourBES);
       // Kolommen
       rst.addColumn(new Column({caption: L("lcl_bes_srtdeel_nr"), content: "catstr"}));
       rst.addColumn(new Column({caption: L("lcl_bes_srtdeel"), content: fncolArtikel}));
-      rst.addColumn(new Column({caption: L("lcl_bes_ordered"), content: "boi_aantal", datatype: "integer"}));
-      rst.addColumn(new Column({caption: L("lcl_bes_retour_so_far"), content: fncolRetourSoFar, datatype: "integer"}));
+      rst.addColumn(new Column({caption: L("lcl_bes_ordered"), content: "boi_aantal", datatype: "number"}));
+      rst.addColumn(new Column({caption: L("lcl_bes_retour_so_far"), content: fncolRetourSoFar, datatype: "number"}));
       rst.addColumn(new Column({caption: L("lcl_bes_retour"), content: fncolRetour}));
-      rst.addColumn(new Column({caption: L("lcl_bes_retour_remaining"), content: fncolRemaining, datatype: "integer"}));
+      rst.addColumn(new Column({caption: L("lcl_bes_retour_remaining"), content: fncolRemaining, datatype: "number"}));
 
       var count = rst.processResultset();
 
diff --git a/APPL/BES/bes_voorraad_list.inc b/APPL/BES/bes_voorraad_list.inc
index 0edec59d64..d31fe0e29b 100644
--- a/APPL/BES/bes_voorraad_list.inc
+++ b/APPL/BES/bes_voorraad_list.inc
@@ -581,14 +581,14 @@ function bes_voorraad_list (pautfunction, params)
       rst.addColumn(new Column({caption: L("lcl_bes_srtdeel_nr"), content: "bes_srtdeel_nr"}));
       rst.addColumn(new Column({caption: L("lcl_bes_srtdeel"), content: "bes_srtdeel_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_bes_notitie"), content: "bes_srtdeel_notitie"}));
-      rst.addColumn(new Column({caption: L("lcl_bes_voorraad") + " (" + L("lcl_mld_intern") + ")", content: fncolVoorraadIntern, datatype: "integer", total: true, thClass: "eenheiddiff", columnClass: function(){return "eenheiddiff";}}));
+      rst.addColumn(new Column({caption: L("lcl_bes_voorraad") + " (" + L("lcl_mld_intern") + ")", content: fncolVoorraadIntern, datatype: "number", total: true, thClass: "eenheiddiff", columnClass: function(){return "eenheiddiff";}}));
       rst.addColumn(new Column({caption: L("lcl_bes_unity"), content: "eenheid_intern", thClass: "eenheiddiff", columnClass: function(){return "eenheiddiff";}}));
-      rst.addColumn(new Column({caption: L("lcl_bes_aantal_in"), content: "aantal_geleverd", datatype: "integer", total: true}));
-      rst.addColumn(new Column({caption: L("lcl_bes_aantal_uit"), content: "aantal_extern_uit", datatype: "integer", total: true}));
-      rst.addColumn(new Column({caption: L("lcl_bes_voorraad"), content: "voorraad", datatype: "integer", total: true}));
+      rst.addColumn(new Column({caption: L("lcl_bes_aantal_in"), content: "aantal_geleverd", datatype: "number", total: true}));
+      rst.addColumn(new Column({caption: L("lcl_bes_aantal_uit"), content: "aantal_extern_uit", datatype: "number", total: true}));
+      rst.addColumn(new Column({caption: L("lcl_bes_voorraad"), content: "voorraad", datatype: "number", total: true}));
       rst.addColumn(new Column({caption: L("lcl_bes_unity"), content: "eenheid_extern"}));
-      rst.addColumn(new Column({caption: L("lcl_bes_lopend"), content: "aantal_open_order", datatype: "integer", total: true}));
-      rst.addColumn(new Column({caption: L("lcl_bes_bestellen"), content: fncolTeBestellen, datatype: "integer", total: true}));
+      rst.addColumn(new Column({caption: L("lcl_bes_lopend"), content: "aantal_open_order", datatype: "number", total: true}));
+      rst.addColumn(new Column({caption: L("lcl_bes_bestellen"), content: fncolTeBestellen, datatype: "number", total: true}));
 
       // Acties
       // Geen acties
diff --git a/APPL/BEZ/bez_list.inc b/APPL/BEZ/bez_list.inc
index 1384135e2f..1d49da07e0 100644
--- a/APPL/BEZ/bez_list.inc
+++ b/APPL/BEZ/bez_list.inc
@@ -1079,8 +1079,8 @@ function bez_list(pautfunction, params)
 
         }
         rst.addColumn(new Column({caption: captionGroup, content: "alg_omschr"}));
-        rst.addColumn(new Column({caption: L("lcl_vis_number_vis"), content: "sum_visitors", datatype: "integer"}));
-        rst.addColumn(new Column({caption: L("lcl_vis_number_park"), content: "sum_parking", datatype: "integer"}));
+        rst.addColumn(new Column({caption: L("lcl_vis_number_vis"), content: "sum_visitors", datatype: "number"}));
+        rst.addColumn(new Column({caption: L("lcl_vis_number_park"), content: "sum_parking", datatype: "number"}));
       }
 
       // Acties, niet bij tiny (keuze) en minfo
diff --git a/APPL/CAD/rap_move.asp b/APPL/CAD/rap_move.asp
index 3fde410913..43242928c7 100644
--- a/APPL/CAD/rap_move.asp
+++ b/APPL/CAD/rap_move.asp
@@ -211,7 +211,7 @@ else
 
     rst.addColumn(new Column({caption: L("lcl_workplace"), content: ShowWP}));
     if (S("prs_werkplek_implicit") == 0)
-      rst.addColumn(new Column({caption: L("lcl_occupation_perc"), content: "prs_perslidwerkplek_bezetting", datatype: "integer"}));
+      rst.addColumn(new Column({caption: L("lcl_occupation_perc"), content: "prs_perslidwerkplek_bezetting", datatype: "number"}));
     rst.addColumn(new Column({caption: L("lcl_prj_draggable_name"), content: DraggableName, title: L("lcl_draggable")}));
     rst.addColumn(new Column({caption: L("lcl_prs_organisatie"), content: "afd"}));
     rst.addColumn(new Column({caption: L("lcl_fg_func_names"), content: "prs_srtperslid_omschrijving"}));
diff --git a/APPL/FAC/fac_usrrap_list.asp b/APPL/FAC/fac_usrrap_list.asp
index 32f9ed33d0..bf232c939a 100644
--- a/APPL/FAC/fac_usrrap_list.asp
+++ b/APPL/FAC/fac_usrrap_list.asp
@@ -372,7 +372,7 @@ else { // In alle andere gevallen, dus normaliter (bij gevulde oRs) zijn dat nog
 
                 if (kolomtype == adInteger || kolomtype == adDecimal)
                 {
-                   colpar.datatype = 'integer';
+                   colpar.datatype = 'number';
                    colpar.total = true;
                 }
                 else if (kolomnaam.substring(0,7).toUpperCase() == "FCLT_C_") // Currency
diff --git a/APPL/MLD/mld_groep_list.inc b/APPL/MLD/mld_groep_list.inc
index 60e386e296..13e825a8d6 100644
--- a/APPL/MLD/mld_groep_list.inc
+++ b/APPL/MLD/mld_groep_list.inc
@@ -747,13 +747,13 @@ function mld_groep_list (pautfunction, params)
 
       rst.addColumn(new Column({caption: caption, content: content}));
       if (toon_opdr_overz)
-        rst.addColumn(new Column({caption: L("lcl_mld_aantal_opdrachten"), content: "aantal_opdrachten", datatype: "integer", total: true}));
+        rst.addColumn(new Column({caption: L("lcl_mld_aantal_opdrachten"), content: "aantal_opdrachten", datatype: "number", total: true}));
       else
       {
-        rst.addColumn(new Column({caption: L("lcl_mld_aantal_meldingen"), content: "aantal_meldingen", datatype: "integer", total: true}));
+        rst.addColumn(new Column({caption: L("lcl_mld_aantal_meldingen"), content: "aantal_meldingen", datatype: "number", total: true}));
       }
       if (groepering_key == 5)
-        rst.addColumn(new Column({caption: L("lcl_mld_aantal_opdrachten"), content: "aantal_opdrachten", datatype: "integer", total: true}));
+        rst.addColumn(new Column({caption: L("lcl_mld_aantal_opdrachten"), content: "aantal_opdrachten", datatype: "number", total: true}));
       if (!perform)
       {
         rst.addColumn(new Column({caption: L("lcl_mld_totaal_kosten"), content: "totaal_kosten", datatype: "currency", total: true}));
@@ -763,7 +763,7 @@ function mld_groep_list (pautfunction, params)
       {
         if (!toon_opdr_overz)
         {
-          rst.addColumn(new Column({caption: L("lcl_mld_accepted_in_time"), content: "acceptoptijd", datatype: "integer", total: true}));
+          rst.addColumn(new Column({caption: L("lcl_mld_accepted_in_time"), content: "acceptoptijd", datatype: "number", total: true}));
           rst.addColumn(new Column({caption: L("lcl_mld_percentage"), content: fnacceptopTijdP, datatype: "float", total: true}));
           rst.addColumn(new Column({caption: L("lcl_mld_handled_in_time_sla"), content: fnUitvoeringOpTijdSlaP, datatype: "float", total: true}));
         }
diff --git a/APPL/MLD/mld_list.inc b/APPL/MLD/mld_list.inc
index 0c47d40d2a..c054afddca 100644
--- a/APPL/MLD/mld_list.inc
+++ b/APPL/MLD/mld_list.inc
@@ -774,7 +774,7 @@ function mld_list (pautfunction, params)
       if (S('mld_melding_flags') > 0 && !frontend)
         rst.addColumn(new Column({caption: "o", content: fncolFlags, align: "center"}));
       rst.addColumn(new Column({caption: "!", content: fncolSpoed, hasActions: true}));
-      rst.addColumn(new Column({caption: L("lcl_mld_number"), datatype: "integer", content: fncolKey }));
+      rst.addColumn(new Column({caption: L("lcl_mld_number"), datatype: "number", content: fncolKey }));
       if (!minfo)
       {
         rst.addColumn(new Column({caption: L("lcl_vakgroup"), content: "ins_discipline_omschrijving", combine: false}));
diff --git a/APPL/MLD/mld_stdmelding_search_list.asp b/APPL/MLD/mld_stdmelding_search_list.asp
index f433e9c983..a06141ef31 100644
--- a/APPL/MLD/mld_stdmelding_search_list.asp
+++ b/APPL/MLD/mld_stdmelding_search_list.asp
@@ -195,7 +195,7 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
                                    buttons: buttons
                                  });
 
-    rst.addColumn(new Column({caption: "Key", datatype: "integer", content: "mld_stdmelding_key"}));
+    rst.addColumn(new Column({caption: "Key", datatype: "number", content: "mld_stdmelding_key"}));
     rst.addColumn(new Column({caption: L("lcl_mld_vakgroeptype"), content: "vakgroeptype"}));
     rst.addColumn(new Column({caption: L("lcl_mld_vakgroep"), content: "vakgroep"}));
     rst.addColumn(new Column({caption: L("lcl_complain"), content: "stdmelding"}));
diff --git a/APPL/MRK/mrk_list.inc b/APPL/MRK/mrk_list.inc
index 8e68e125cc..e817493263 100644
--- a/APPL/MRK/mrk_list.inc
+++ b/APPL/MRK/mrk_list.inc
@@ -147,7 +147,7 @@ function mrk_list (pautfunction, params)
                                    });
 
       // Kolommen
-      rst.addColumn(new Column({caption: "", content: "mrk_bericht_key", datatype: "integer"}));
+      rst.addColumn(new Column({caption: "", content: "mrk_bericht_key", datatype: "number"}));
       rst.addColumn(new Column({caption: L("lcl_mrk_categorie"), content: "ins_discipline_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_mrk_onderwerp"), content: "mrk_bericht_titel"}));
       rst.addColumn(new Column({caption: L("lcl_mrk_omschrijving"), content: "mrk_bericht_omschrijving", combine:true, xpurpose: PRINTING_ONLY}));
diff --git a/APPL/PDA/resultset_table.inc b/APPL/PDA/resultset_table.inc
index 6645f2458f..2b37df5f19 100644
--- a/APPL/PDA/resultset_table.inc
+++ b/APPL/PDA/resultset_table.inc
@@ -265,7 +265,6 @@ ResultsetTable.formatValue = function (val, params) //datatype, decimals)
                          }
         case "currency": return safe.curr(val);
         case "float"   : return safe.displayfloat(val, params.decimals);
-        case "integer" : return val;
         case "number"  : return val;
         case "html"    : return val;
     }
diff --git a/APPL/PRJ/rap_prj6.asp b/APPL/PRJ/rap_prj6.asp
index ab56936093..bdfaa844c3 100644
--- a/APPL/PRJ/rap_prj6.asp
+++ b/APPL/PRJ/rap_prj6.asp
@@ -414,7 +414,7 @@ sql =  "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
       rst.addColumn(new Column({caption: L("lcl_prj_draggable_wp"), content: DraggableWP, title: L("lcl_draggable")}));
       rst.addColumn(new Column({caption: "", content: DetachWP}));
       if (S("prs_werkplek_implicit") == 0)
-        rst.addColumn(new Column({caption: L("lcl_prj_bezettingpct"), content: "prj_perslidwerkplek_bezetting", datatype: "integer"}));
+        rst.addColumn(new Column({caption: L("lcl_prj_bezettingpct"), content: "prj_perslidwerkplek_bezetting", datatype: "number"}));
       rst.addColumn(new Column({caption: L("lcl_prj_draggable_name"), content: DraggableName, title: L("lcl_draggable")}));
       rst.addColumn(new Column({caption: L("lcl_department"), content: "afdnaam"}));
       rst.addColumn(new Column({caption: L("lcl_prj_buffered_at"), content: "prj_selectie_aanmaak", datatype: "datetime"}));
diff --git a/APPL/PRJ/rap_prj9.asp b/APPL/PRJ/rap_prj9.asp
index 66b110a89f..31af73a863 100644
--- a/APPL/PRJ/rap_prj9.asp
+++ b/APPL/PRJ/rap_prj9.asp
@@ -214,8 +214,8 @@ sql = " SELECT p.prs_perslid_key, "+ S("prs_pers_string") +" naam,"
 
       rst.addColumn(new Column({caption: L("lcl_prj_draggable_name"), content: DraggableName, title: L("lcl_draggable")}));
       if (S("prs_werkplek_implicit") == 0)
-        rst.addColumn(new Column({caption: L("lcl_prj_to_assign_perc"), content: DraggablePercent, datatype: "integer"}));
-      rst.addColumn(new Column({caption: L("lcl_prs_person_dienstverband_perc"), content: "prs_perslid_dienstverband", datatype: "integer"}));
+        rst.addColumn(new Column({caption: L("lcl_prj_to_assign_perc"), content: DraggablePercent, datatype: "number"}));
+      rst.addColumn(new Column({caption: L("lcl_prs_person_dienstverband_perc"), content: "prs_perslid_dienstverband", datatype: "number"}));
       rst.addColumn(new Column({caption: L("lcl_phone"), content: "prs_perslid_telefoonnr"}));
       rst.addColumn(new Column({caption: L("lcl_prs_organisatie"), content: "afd"}));
       rst.addColumn(new Column({caption: L("lcl_fg_func_names"), content: "prs_srtperslid_omschrijving"}));
diff --git a/APPL/RES/res.inc b/APPL/RES/res.inc
index 03051ae9cb..18255bc400 100644
--- a/APPL/RES/res.inc
+++ b/APPL/RES/res.inc
@@ -115,7 +115,7 @@ res = {
                           break;
            case "update": track = L("lcl_res_artupdate") + ": " + art_oms
                                 + (params.old_number != params.new_number
-                                  ? "\n" + buildTrackText("integer", params.old_number, params.new_number, { nodiff: true })
+                                  ? "\n" + buildTrackText("number", params.old_number, params.new_number, { nodiff: true })
                                   : "")
                                 + (params.old_price != params.new_price
                                   ? "\n" + buildTrackText("float", params.old_price, params.new_price, { nodiff: true })
diff --git a/APPL/RES/res_list.inc b/APPL/RES/res_list.inc
index 6636d99429..14c17b4905 100644
--- a/APPL/RES/res_list.inc
+++ b/APPL/RES/res_list.inc
@@ -962,7 +962,7 @@ function res_list (pautfunction, params)
         rst.addColumn(new Column({caption: L("lcl_from"), content: fncolVan, datatype: "time", nowrap: true}));
         rst.addColumn(new Column({caption: L("lcl_to"), content: fncolTot, datatype: "time"}));
         rst.addColumn(new Column({caption: L("lcl_room_status"), content: fncolStatus}));
-        rst.addColumn(new Column({caption: L("lcl_res_pers_n"), content: fnrowVisitorsF, datatype: "integer"}));
+        rst.addColumn(new Column({caption: L("lcl_res_pers_n"), content: fnrowVisitorsF, datatype: "number"}));
         if (S("res_allow_for_others"))
         {
           rst.addColumn(new Column({caption: L("lcl_host"), content: "gastheer"}));
@@ -1571,7 +1571,7 @@ function res_list (pautfunction, params)
         { // locatie
           res_keyColumn = "alg_locatie_key";
           res_columns[res_columns.length] = new columnData(L("lcl_location"), "locatie")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = "SELECT l.alg_locatie_key " + res_keyColumn
@@ -1590,7 +1590,7 @@ function res_list (pautfunction, params)
         { // gebouw
           res_keyColumn = "alg_gebouw_key";
           res_columns[res_columns.length] = new columnData(L("lcl_building"), "gebouw")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = " SELECT g.alg_gebouw_key " + res_keyColumn
@@ -1611,7 +1611,7 @@ function res_list (pautfunction, params)
         { // activiteit
           res_keyColumn = "res_activiteit_key";
           res_columns[res_columns.length] = new columnData(L("lcl_activity"), "activiteit")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = " SELECT a.res_activiteit_key " + res_keyColumn
@@ -1630,7 +1630,7 @@ function res_list (pautfunction, params)
         { // kostensoort
           res_keyColumn = "prs_kostensoort_key";
           res_columns[res_columns.length] = new columnData(L("lcl_charge_type"), "kostensoort")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = " SELECT COALESCE(res.prs_kostensoort_key, 0) " + res_keyColumn
@@ -1647,7 +1647,7 @@ function res_list (pautfunction, params)
         { // kostensoortgrp
           res_keyColumn = "prs_kostensoortgrp_key";
           res_columns[res_columns.length] = new columnData(L("lcl_charge_type_group"), "kostensoortgrp")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = " SELECT COALESCE(res.prs_kostensoortgrp_key, 0) " + res_keyColumn
@@ -1666,7 +1666,7 @@ function res_list (pautfunction, params)
           res_columns[res_columns.length] = new columnData(L("lcl_res_art_desc"), "artikelomschrijving")
           res_columns[res_columns.length] = new columnData(L("lcl_res_item_price"), "artikelprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_btw_percentage"), "artikelbtw", "float", false)
-          res_columns[res_columns.length] = new columnData(L("lcl_res_art_nr"), "artikelaantal", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_art_nr"), "artikelaantal", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           sql = " SELECT res.artikel_key " + res_keyColumn
               + ", res.res_voorziening artikelomschrijving"
@@ -1686,7 +1686,7 @@ function res_list (pautfunction, params)
         { // artikelnummer
           res_keyColumn = "artikel_key";
           res_columns[res_columns.length] = new columnData(L("lcl_res_art_number"), "artikel")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_art_nr"), "artikelaantal", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_art_nr"), "artikelaantal", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           sql = " SELECT res.artikel_key " + res_keyColumn
               + ", res.artikelnummer || ' - ' ||"
@@ -1719,7 +1719,7 @@ function res_list (pautfunction, params)
             res_columns[res_columns.length] = new columnData(L("lcl_department"), "organisatie")
           }
           res_columns[res_columns.length] = new columnData(L("lcl_res_account"), "kostenplaats")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = " SELECT COALESCE(res.kostenplaats_key, 0) kostenplaats_key"
@@ -1740,7 +1740,7 @@ function res_list (pautfunction, params)
         { // district
           res_keyColumn = "alg_district_key";
           res_columns[res_columns.length] = new columnData(L("lcl_district"), "district")
-          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "integer", true)
+          res_columns[res_columns.length] = new columnData(L("lcl_res_res_nr"), "aantalres", "number", true)
           res_columns[res_columns.length] = new columnData(L("lcl_total"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new columnData(L("lcl_res_oordeel"), fncolOordeelAvg, "float", true, 1)
           sql = "SELECT d.alg_district_key " + res_keyColumn
@@ -1778,7 +1778,7 @@ function res_list (pautfunction, params)
           res_columns[res_columns.length] = new columnData(L("lcl_descr"), "omschrijving")
           res_columns.push (new Column({caption: L("lcl_config_instance"), content: fnrowConfiguration, keepKeyRepeat: true}));
           res_columns[res_columns.length] = new columnData(L("lcl_remark"), "opmerking")
-          res_columns.push (new Column({caption: L("lcl_res_pers_n"), content: fnrowVisitorsF, datatype: "integer", total: true}));
+          res_columns.push (new Column({caption: L("lcl_res_pers_n"), content: fnrowVisitorsF, datatype: "number", total: true}));
           res_columns[res_columns.length] = new columnData(L("lcl_res_no_show"), "noshow")
           res_columns[res_columns.length] = new columnData(L("lcl_res_rsv_kosten"), "totaalprijs", "currency", true)
           res_columns[res_columns.length] = new Column( {caption: L("lcl_res_oordeel"), content: fncolOordeel, total: true})
diff --git a/APPL/RES/res_list_ppi.inc b/APPL/RES/res_list_ppi.inc
index 085e9ea525..1b063ee529 100644
--- a/APPL/RES/res_list_ppi.inc
+++ b/APPL/RES/res_list_ppi.inc
@@ -380,7 +380,7 @@ function forhours(fn)
       if (dayschedule)
       {
         res_colums =  [ [L("lcl_location"), "locatie", "string", false],
-                        [L("lcl_res_nr_of_rooms"), "aantal_ruimten", "integer", true]];
+                        [L("lcl_res_nr_of_rooms"), "aantal_ruimten", "number", true]];
 
         res_colums = res_colums.concat(forhours(function (h) { return [String(h) + ":00", "t" + String(h), "float", true]; }));
 
@@ -390,7 +390,7 @@ function forhours(fn)
       else
       {
         res_colums = [ [L("lcl_location"), "locatie", "string", false],
-                       [L("lcl_res_nr_of_rooms"), "aantal_ruimten", "integer", true],
+                       [L("lcl_res_nr_of_rooms"), "aantal_ruimten", "number", true],
                        [L("lcl_res_load_in_hours"), "gebruik_uren", "float", true],
                        [L("lcl_res_available_in_hours"), "beschikbaar_uren", "float", true],
                        [L("lcl_occupation_perc"), "bezetting", "float", true] ];
diff --git a/APPL/SCF/scaffolding_list.inc b/APPL/SCF/scaffolding_list.inc
index 9ce604f09e..3728c5ea60 100644
--- a/APPL/SCF/scaffolding_list.inc
+++ b/APPL/SCF/scaffolding_list.inc
@@ -298,7 +298,7 @@ function scaffolding_list(model, scf_params)
                 coldata.datatype = 'varchar';
             else
                 if (field.typ == 'number' || field.typ == 'key')
-                    coldata.datatype = 'integer'; // Zo verwacht resultsettable dat (/nog)
+                    coldata.datatype = 'number'; // Zo verwacht resultsettable dat
 
             if (field.autofloat) // Vanuit model_reports hebben we niet altijd correct autodetect
             {                    // van het datatype 'float' gedaan. Daarom hier autofloat
diff --git a/APPL/SLE/sle_edit_srtdeel.asp b/APPL/SLE/sle_edit_srtdeel.asp
index cf78ade3f4..e2cfbc0b29 100644
--- a/APPL/SLE/sle_edit_srtdeel.asp
+++ b/APPL/SLE/sle_edit_srtdeel.asp
@@ -136,7 +136,7 @@ if (!oRs.eof) uitleen_flex_present = true;
           RWFIELDTR("sleaantal", "fldnum", L("lcl_sle_sleaantal"), 1,
                     { required: true,
                       maxlength: 3,
-                      datatype: "integer"
+                      datatype: "number"
                     });
         }
         BLOCK_END();
diff --git a/APPL/SLE/sle_list.inc b/APPL/SLE/sle_list.inc
index 369d2b5748..fe21cda3a9 100644
--- a/APPL/SLE/sle_list.inc
+++ b/APPL/SLE/sle_list.inc
@@ -646,9 +646,9 @@ function sle_list (params)
       rst.addColumn(new Column({caption: L("lcl_sle_code"), content: "ins_srtdeel_code"}));
       rst.addColumn(new Column({caption: L("lcl_sle_sleutel_omsch"), content: "ins_srtdeel_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_sle_toegang"), content: "plaats"})); // Op welke ruimten/terreinen hebben de sleutels of cilinders toegang toe
-      rst.addColumn(new Column({caption: L("lcl_count"), content: "aantal", datatype: "integer"}));
-      rst.addColumn(new Column({caption: L("lcl_sle_lent_out"), content: "aantal_uitgegeven", datatype: "integer"}));
-      rst.addColumn(new Column({caption: L("lcl_sle_available"), content: fnBeschikbaar, datatype: "integer"}));
+      rst.addColumn(new Column({caption: L("lcl_count"), content: "aantal", datatype: "number"}));
+      rst.addColumn(new Column({caption: L("lcl_sle_lent_out"), content: "aantal_uitgegeven", datatype: "number"}));
+      rst.addColumn(new Column({caption: L("lcl_sle_available"), content: fnBeschikbaar, datatype: "number"}));
 
       // Acties
       rst.addAction({ action: "sleEdit", caption: L("lcl_change"), isDefault: true});
diff --git a/APPL/Shared/resultset_table_v2.inc b/APPL/Shared/resultset_table_v2.inc
index abdbbf4044..2bb310dd95 100644
--- a/APPL/Shared/resultset_table_v2.inc
+++ b/APPL/Shared/resultset_table_v2.inc
@@ -1050,7 +1050,7 @@ function __rsMakeTableHeader(oRs, oRsFlexData, anyMultiActions)
               var sort_class = "";
               if (columns[i].datatype == "currency" ||
                   columns[i].datatype == "float" ||
-                  columns[i].datatype == "integer")
+                  columns[i].datatype == "number")
               {
                   html += " style='text-align:right;'";
                   if (safe.curr(1.5).indexOf(",") == -1)
@@ -1265,7 +1265,7 @@ function __rsMakeTableRow(oRs, oRsFlexData, cnt, anyMultiActions, noFlexResult)
               {
                  if (columns[i].datatype == "currency" ||
                      columns[i].datatype == "float" ||
-                     columns[i].datatype == "integer")
+                     columns[i].datatype == "number")
                      align = " style='text-align:right;'";
               }
 
@@ -1377,7 +1377,7 @@ function __rsMakeTableFootnote(anyMultiActions)
               {
                  if (columns[i].datatype == "currency" ||
                      columns[i].datatype == "float" ||
-                     columns[i].datatype == "integer")
+                     columns[i].datatype == "number")
                      align = " style='text-align:right;'";
               }
               var hidden = columns[i].hidden ? (" style='display:none'") : "";
@@ -1563,7 +1563,7 @@ ResultsetTable.formatValue = function (val, params) //datatype, decimals)
                          }
         case "currency": return safe.curr(val);
         case "float"   : return safe.displayfloat(val, params.decimals);
-        case "integer" : return val;
+        case "number"  : return val;
         case "html"    : return val;
     }