admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/Website/trunk/; revision=28013
This commit is contained in:
Erik Groener
2016-02-03 07:12:54 +00:00
parent 3dee888cb5
commit 6ec1f3286e
6 changed files with 105 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
APPL/BES/bes_edit_bestelling.asp
View File

@@ -520,6 +520,16 @@ else // nieuwe bestelling. Defaults bepalen
}
}
}
function onChangeBedrijf(p_key)
{
$("#btw").load("../Shared/loadBtwTabel.asp",
{ bedrijf_key: p_key,
required: true,
emptyOption: ""
}
);
}
</script>
<input type="hidden" id="default_kostenplaats_person_key" value="<%=bes_bestelling.kostenplaats_key%>">
<input type="hidden" id="default_kostenplaats_person_omschr" value="<%=safe.htmlattr(bes_bestelling.kostenplaats_omschr)%>">
@@ -667,7 +677,7 @@ else // nieuwe bestelling. Defaults bepalen
+ " FROM mld_v_afleveradres m"
+ " WHERE m.mld_adres_key = " + bes_bestelling.mld_adres_key
: "")
+ " ORDER BY mld_adres_upper",
+ " ORDER BY mld_adres_upper";
FCLTselector("deliveryAddr", sql,
{ label: L("lcl_delivery_address"),
emptyOption: "",
@@ -730,13 +740,29 @@ else // nieuwe bestelling. Defaults bepalen
label: L("lcl_bes_Supplier"),
filtercode: "Lv",
required: true,
readonly: bes_bestelling.bedrijf_key > 0
readonly: bes_bestelling.bedrijf_key > 0,
onChange: "onChangeBedrijf"
});
RWFIELDTR("srtdeel_nr", "fld", L("lcl_bes_srtdeel_nr"), "", { required: true, maxlength: 32 });
RWFIELDTR("omschrijving", "fld", L("lcl_bes_srtdeel_oms"), "", { required: true, maxlength: 100 })
RWFIELDTR("unit", "fld", L("lcl_bes_unity"), "", { maxlength: 30 })
RWFIELDTR("price", "fld currency", L("lcl_bes_price_per_unity"), "", { requiredor0: true, maxlength: 10 })
RWFIELDTR("aantal_text", "fld", L("lcl_bes_amount"), "", { required: true, maxlength: 10 })
RWFIELDTR("omschrijving", "fld", L("lcl_bes_srtdeel_oms"), "", { required: true, maxlength: 100 });
RWFIELDTR("unit", "fld", L("lcl_bes_unity"), "", { maxlength: 30 });
RWFIELDTR("price", "fld currency", L("lcl_bes_price_per_unity"), "", { requiredor0: true, maxlength: 10 });
var sql_btw = "SELECT w.fin_btwtabelwaarde_perc"
+ " , w.fin_btwtabelwaarde_code"
+ " FROM fin_btwtabelwaarde w"
+ " , fin_btwtabel t"
+ " WHERE t.fin_btwtabel_key = w.fin_btwtabel_key"
+ " AND t.fin_btwtabel_omschrijving = 'NL standaard'";
FCLTselector("btw",
sql_btw ,
{ label: L("lcl_btw_percentage"),
emptyOption: "",
required: true
}
);
RWFIELDTR("aantal_text", "fld", L("lcl_bes_amount"), "", { required: true, maxlength: 10 });
%> <tr id="buttons_tr"><td colspan="2">
<span class='labelextra'>
<img class='details' title='<%=L("lcl_bes_add_btn")%>' src='../Pictures/cartx2.png' onclick="AddFreeArticleItem('<%=urole%>')">
@@ -845,6 +871,7 @@ else // nieuwe bestelling. Defaults bepalen
<th><%=L("lcl_bes_srtdeel")%></th>
<th><%=L("lcl_bes_unity")%></th>
<th style="text-align:right"><%=L("lcl_bes_price_per_unity")%></th>
<th style="text-align:right"><%=L("lcl_btw_percentage")%></th>
<th style="text-align:right"><%=L("lcl_bes_amount")%></th>
<th style="text-align:right" <%=show_price ? "" : " style='display:none;'" %>><%=L("lcl_bes_subtotal")%></th>
</tr>

4
APPL/BES/bes_edit_bestelling_save.asp
View File

@@ -20,6 +20,7 @@
<!-- #include file="../Shared/kpl_ksrt_validate.inc" -->
<!-- #include file="../Shared/kenmerk_common.inc" -->
<!-- #include file="../Shared/budget.inc" -->
<!-- #include file="../Shared/json2.js" -->
<%
var bes_key = getQParamInt("bes_key", -1);
@@ -58,12 +59,13 @@ if (bes_disc_info.isFreeArticle)
srtdeel_omschrijving: getFParam("srtdeel_omschrijving_" + item_keys_unsafe[itemregelnr]),
srtdeel_prijs: getFParamFloat("price_" + item_keys_unsafe[itemregelnr]),
srtdeel_eenheid: getFParam("eenheid_" + item_keys_unsafe[itemregelnr], ""),
srtdeel_btw: 21,
srtdeel_btw: getFParamFloat("btw_" + item_keys_unsafe[itemregelnr], 21),
bedrijf_key: getFParamInt("lev_key_" + item_keys_unsafe[itemregelnr]),
srtdeel_opmerking: "" //opmerking
};
try
{
__Log(data);
var bes_srtdeel_key = bes.upsert_deel(dis_key, data);
}
catch (e)

1
APPL/BES/bes_show_bestelling.asp
View File

@@ -277,6 +277,7 @@ function bes_reject()
<th><%=L("lcl_bes_srtdeel")%></th>
<th><%=L("lcl_bes_unity")%></th>
<th style="text-align:right"><%=L("lcl_bes_price_per_unity")%></th>
<th style="text-align:right"><%=L("lcl_btw_percentage")%></th>
<th style="text-align:right"><%=L("lcl_bes_amount")%></th>
<th style="text-align:right"><%=L("lcl_bes_geleverd")%></th>
<th style="text-align:right" <% = show_price ? "" : " style='display:none;'" %> ><%=L("lcl_bes_subtotal")%></th>

3
APPL/BES/details.inc
View File

@@ -31,6 +31,7 @@ function generateDetails(bes_key, edit, psrt_keys, pamounts)
+ (edit
? " , COALESCE(bes.getsrtdeelprijs(i.bes_srtdeel_key, null) , 0)"
: " , i.bes_bestelling_item_prijs") + " prijs" // pak bestelling prijs inclusief kortingen
+ " , s.bes_srtdeel_btw"
+ " , s.bes_srtdeel_veelvoud"
+ " , bes_bestelling_item_aantalontv"
+ " , i.bes_bestelling_item_key"
@@ -70,6 +71,7 @@ function generateDetails(bes_key, edit, psrt_keys, pamounts)
+ " , bes_srtdeel_details_loc"
+ ", " + lcl.xsqla('g.bes_srtgroep_omschrijving', 'g.bes_srtgroep_key')
+ " , bes.getsrtdeelprijs (s.bes_srtdeel_key, NULL) prijs"
+ " , s.bes_srtdeel_btw"
+ " , s.bes_srtdeel_veelvoud"
+ " , -1 bes_bestelling_item_aantalontv"
+ " , -ROWNUM-1 bes_bestelling_item_key" // uniek maar niet bestaand
@@ -192,6 +194,7 @@ function generateDetails(bes_key, edit, psrt_keys, pamounts)
srtgroup_text: "<%=safe.jsstring(oRs("bes_srtgroep_omschrijving").value)%>",
amount: <%=amount%>,
price: <%=safe.jsfloat(oRs("prijs").value || 0)%>,
btw: <%=safe.jsfloat(oRs("bes_srtdeel_btw").value || 0)%>,
eenheid: "<%=safe.jsstring(oRs("bes_srtdeel_eenheid").value)%>",
veelvoud: <%=oRs("bes_srtdeel_veelvoud").value || 1%>,
received: <%=oRs("bes_bestelling_item_aantalontv").value || 0%>,

9
APPL/BES/sel_items_tab.js
View File

@@ -93,6 +93,7 @@ function AddFreeArticleItem(urole)
//"srtdeel_image":"https://cos.euroflorist.com/uwv/Products/ARR06_03.jpg",
"veelvoud":1,
"price":parseFloat(String($("#price").val()).replace(',', '.')) || 0.0,
"btw":parseFloat(String($("#btw").val()).replace(',', '.')),
"eenheid":$("#unit").val(),
"num_prop":0,
"staffelgroep":-1,
@@ -175,6 +176,7 @@ function AddItem(bes_item_info, aantal, urole, doCheckAmount)
$('#srtdeel_nr').val("");
$('#omschrijving').val("");
$("#price").val("");
$("#btw").val("");
$("#unit").val("");
}
// De artikel gegevens zijn gewist. Dan ook de srtdeel_key op -1 zetten.
@@ -302,6 +304,7 @@ function CreateRow(bes_item_info, aantal, received, editable, objFlex, urole)
cell.innerHTML += "<input type='hidden' name='srtdeel_nr_" + bes_item_info.item_key + "' value='" + bes_item_info.srtdeel_nr + "'>";
cell.innerHTML += "<input type='hidden' name='srtdeel_omschrijving_" + bes_item_info.item_key + "' value='" + bes_item_info.srtdeel_omschrijving + "'>";
cell.innerHTML += "<input type='hidden' name='price_" + bes_item_info.item_key + "' value='" + bes_item_info.price + "'>";
cell.innerHTML += "<input type='hidden' name='btw_" + bes_item_info.item_key + "' value='" + bes_item_info.btw + "'>";
cell.innerHTML += "<input type='hidden' name='eenheid_" + bes_item_info.item_key + "' value='" + bes_item_info.eenheid + "'>";
}
@@ -366,6 +369,12 @@ function CreateRow(bes_item_info, aantal, received, editable, objFlex, urole)
cell.vAlign = 'top';
cell.align = 'right';
// Create BTW field
cell = tr.insertCell(-1);
cell.innerHTML = "<nobr>" + bes_item_info.btw + "</nobr>";
cell.vAlign = 'top';
cell.align = 'right';
// Create amount field
cell = tr.insertCell(-1);
cell.innerHTML = "<nobr>"

56
APPL/Shared/loadBtwTabel.asp Normal file
View File

@@ -0,0 +1,56 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
*/ %>
<%
DOCTYPE_Disable = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<%
// Build a group list
var bedrijf_key = getFParam("bedrijf_key", "-1");
var emptyOption = getFParam("emptyOption", null);
var required = (getFParam("required", 0) == 1);
var btwtabel_key = -1;
var sql = "SELECT b.fin_btwtabel_key"
+ " FROM prs_bedrijf b"
+ " WHERE b.prs_bedrijf_key = " + bedrijf_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
btwtabel_key = oRs("fin_btwtabel_key").Value || -1;
oRs.Close();
if (btwtabel_key == -1)
{
sql = "SELECT f.fin_btwtabel_key"
+ " FROM fin_btwtabel f"
+ " WHERE f.fin_btwtabel_omschrijving = 'NL standaard'";
oRs = Oracle.Execute(sql);
if (!oRs.eof)
btwtabel_key = oRs("fin_btwtabel_key").Value || -1;
oRs.Close();
}
var sql = "SELECT fin_btwtabelwaarde_perc"
+ " , fin_btwtabelwaarde_code"
+ " FROM fin_btwtabelwaarde w"
+ " WHERE w.fin_btwtabel_key = " + btwtabel_key;
var params = { initKey: -1,
required: required
}
if (emptyOption != null)
params.emptyOption = emptyOption;
//if (selectfirstone)
params.selectfirstone = true; //selectfirstone;
FCLTselectorOptions(sql,
params);
%>