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

TWYN#55514 gegevens verdwijnen bij wijzigen factuur mmw

Browse Source 
svn path=/Website/branches/v2018.2/; revision=39992
This commit is contained in:
Erik Groener
2018-11-28 09:12:31 +00:00
parent 85916629d6
commit 64df6b885b
3 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/API2/model_fin_factuur.inc
View File

@@ -168,7 +168,8 @@ function model_fin_factuur()
"label": L("lcl_fin_CO_sum"),
"typ": "float",
"iscurrency": true,
"total": true
"total": true,
"clone": false
},
"totalvat": {
"dbs": "fin_factuur_totaal_btw",
@@ -276,9 +277,13 @@ function model_fin_factuur()
obj.invoice = invoice;
}
var v_company = obj.company.id;
var v_project = getQParamInt("budgetproject", -1);
var v_isclone = getQParamInt("scf_clone", 0);
%>
<script>
var company_key = <%=(v_company || -1)%>;
var company_key = <%=(v_company || -1)%>;
var budgetproject_key = <%=(v_project || -1)%>;
var is_clone = <%=v_isclone%>;
</script>
<%
}

36
APPL/BGT/fin_factuur.js
View File

@@ -4,6 +4,7 @@ $(function ()
});
var kostensoort_btw = ((typeof btw_data != "undefined") && btw_data.btw_val ? btw_data.btw_val : 0);
var v_isclone = (typeof is_clone == "undefined" ? 0 : is_clone);
function init_factuur()
{
@@ -19,13 +20,24 @@ function init_factuur()
// en worden dan als readonly velden getoond.
if (typeof mldopdracht_key == "undefined")
{ // rechtstreeks vanuit fin_factuur
var v_budgetdiscipline = (typeof $("#budgetdiscipline").val() == "undefined" ? -1 : $("#budgetdiscipline").val() );
var v_budgetproject = (typeof $("#budgetproject").val() == "undefined" ? -1 : $("#budgetproject").val() );
var v_company = (typeof $("#company").val() == "undefined" ? (typeof company_key == "undefined" ? -1 : company_key) : $("#company").val() );
var v_order = (typeof $("#order").val() == "undefined" ? -1 : $("#order").val() );
if (v_isclone == 1)
{
var v_budgetdiscipline = -1;
var v_budgetproject = budgetproject_key;
var v_costtype = -1;
var v_company = -1;
var v_order = -1;
}
else
{
var v_budgetdiscipline = (typeof $("#budgetdiscipline").val() == "undefined" ? -1 : $("#budgetdiscipline").val() );
var v_budgetproject = (typeof $("#budgetproject").val() == "undefined" ? -1 : $("#budgetproject").val() );
var v_company = (typeof $("#company").val() == "undefined" ? (typeof company_key == "undefined" ? -1 : company_key) : $("#company").val() );
var v_order = (typeof $("#order").val() == "undefined" ? -1 : $("#order").val() );
v_order = ( (v_order == null && typeof(order_key) == "number") ? order_key : v_order );
var v_costtype = (typeof(costtype_key) == "number" ? costtype_key : -1);
v_order = ( (v_order == null && typeof(order_key) == "number") ? order_key : v_order );
var v_costtype = (typeof(costtype_key) == "number" ? costtype_key : -1);
}
}
else
{ // fin_factuur vanuit mld_opdr
@@ -40,9 +52,9 @@ function init_factuur()
var init_key = -1;
if (v_budgetdiscipline != -1) { init_niveau = "D"; init_key = v_budgetdiscipline; }
if (v_budgetproject != -1) { init_niveau = "P"; init_key = v_budgetproject; }
if (v_costtype != -1) { init_niveau = "S"; init_key = v_costtype; }
if (v_company != -1) { init_niveau = "B"; init_key = v_company; }
if (v_order != -1) { init_niveau = "O"; init_key = v_order; }
if (v_costtype != -1) { init_niveau = "S"; init_key = v_costtype; }
if (init_key > 0)
{
@@ -74,9 +86,9 @@ function re_init_soort(data)
{
fill_rubriekselector("D", -1 , -1, data.parents.D);
fill_rubriekselector("P", data.parents.D, -1, data.parents.P);
fill_rubriekselector("S", data.parents.G, data.parents.S, data.parents.S);
fill_rubriekselector("B", -1 , data.parents.P, data.parents.B);
fill_rubriekselector("O", data.parents.P, data.parents.B, data.parents.O);
fill_rubriekselector("S", data.parents.G, data.parents.S, data.parents.S);
}
function change_discipline()
@@ -114,6 +126,13 @@ function change_opdracht()
if (kostensoort_key)
{
fill_rubriekselector("S", kostengroep_key, kostensoort_key, kostensoort_key);
if ((typeof $("#company") != "undefined"))
{
// Er is eerst eerst een opdracht gekozen. Vul de bijbehorende bedrijf in.
var v_bedr_key = $("#order option:selected").attr("bedr_key");
if (v_bedr_key)
$("#company").val(v_bedr_key)
}
}
var btw_perc = parseFloat($("#order option:selected").attr("perc_btw").replace(/,/g,"."));
if ($("#total").val() && btw_perc != kostensoort_btw)
@@ -214,6 +233,7 @@ function process_info(data)
$new_lov.attr("perc_btw", opt.atr.btw_val);
$new_lov.attr("grp_key", opt.atr.grp_key);
$new_lov.attr("cost_key", opt.atr.srt_key);
$new_lov.attr("bedr_key", opt.atr.bdr_key);
}
select.append($new_lov);
}

11
APPL/BGT/get_bgt_info_ajax.asp
View File

@@ -246,6 +246,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , NULL kpn_key"
+ " , NULL bdr_key"
+ " FROM ins_tab_discipline d"
+ " , bgt_disc_params p"
+ " WHERE p.bgt_ins_discipline_key = d.ins_discipline_key"
@@ -273,6 +274,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , p.prs_kostenplaats_key kpn_key"
+ " , NULL bdr_key"
+ " FROM bgt_project p"
+ " WHERE p.bgt_project_verwijder IS NULL"
+ " AND p.ins_discipline_key = " + parent_key;
@@ -295,6 +297,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , NULL kpn_key"
+ " , NULL bdr_key"
+ " FROM bgt_kostenrubriek r"
+ " WHERE r.bgt_project_key = " + parent_key;
break;
@@ -315,6 +318,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , NULL kpn_key"
+ " , NULL bdr_key"
+ " FROM prs_kostensoortgrp g"
+ " WHERE g.bgt_kostenrubriek_key = " + parent_key;
break;
@@ -331,6 +335,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , COALESCE(s.prs_kostenplaats_key, p.prs_kostenplaats_key, -1) kpn_key"
+ " , NULL bdr_key"
+ " FROM prs_kostensoort s"
+ " , prs_kostensoortgrp g"
+ " , bgt_kostenrubriek r"
@@ -354,6 +359,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , NULL kpn_key"
+ " , NULL bdr_key"
+ " FROM prs_kostenplaats kp"
+ " , ins_tab_discipline d"
+ " , bgt_project p"
@@ -372,6 +378,7 @@ switch (req_info)
+ " , NULL grp_key"
+ " , NULL srt_key"
+ " , NULL kpn_key"
+ " , NULL bdr_key"
+ " FROM bgt_project p"
+ " , bgt_kostenrubriek r"
+ " , prs_kostensoortgrp g"
@@ -400,6 +407,7 @@ switch (req_info)
+ " , s.prs_kostensoortgrp_key grp_key"
+ " , o.prs_kostensoort_key srt_key"
+ " , NULL kpn_key"
+ " , " + (child_key > 0 ? "NULL" : "o.mld_uitvoerende_keys") + " bdr_key"
+ " , o.mld_opdr_ordernr"
+ " , o.mld_opdr_bedrijfopdr_volgnr"
+ " FROM bgt_project p"
@@ -430,7 +438,8 @@ switch (req_info)
btw_val: oRs("btw_val").Value,
grp_key: oRs("grp_key").Value,
srt_key: oRs("srt_key").Value,
kpn_key: oRs("kpn_key").Value
kpn_key: oRs("kpn_key").Value,
bdr_key: oRs("bdr_key").Value
}
});
oRs.MoveNext();