diff --git a/APPL/BES/bes_edit_bestelling.asp b/APPL/BES/bes_edit_bestelling.asp index 44a4308661..351a8cd36b 100644 --- a/APPL/BES/bes_edit_bestelling.asp +++ b/APPL/BES/bes_edit_bestelling.asp @@ -752,7 +752,8 @@ else // nieuwe bestelling. Defaults bepalen var sql_btw = "SELECT w.fin_btwtabelwaarde_perc" + " , w.fin_btwtabelwaarde_oms" + " FROM fin_btwtabelwaarde w" - + " WHERE w.fin_btwtabel_key = " + S("fin_btwtabel_default") + + " WHERE w.fin_btwtabel_verwijder IS NULL" + + " AND w.fin_btwtabel_default = 1" + " ORDER BY w.fin_btwtabelwaarde_perc"; FCLTselector("btw", sql_btw , diff --git a/APPL/Shared/loadBtwTabel.asp b/APPL/Shared/loadBtwTabel.asp index 51f92d2ac5..a528be04df 100644 --- a/APPL/Shared/loadBtwTabel.asp +++ b/APPL/Shared/loadBtwTabel.asp @@ -31,7 +31,8 @@ if (btwtabel_key == -1) { sql = "SELECT f.fin_btwtabel_key" + " FROM fin_btwtabel f" - + " WHERE f.fin_btwtabel_key = " + S("fin_btwtabel_default"); + + " WHERE w.fin_btwtabel_verwijder IS NULL" + + " AND w.fin_btwtabel_default = 1" oRs = Oracle.Execute(sql); if (!oRs.eof) btwtabel_key = oRs("fin_btwtabel_key").Value || -1;