SVRZ#35236 BES: BTW-veld bieden voor vrije inkooporders

svn path=/Website/trunk/; revision=28032

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 ,

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;