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

MARX#36199: INC1602918: IO nummer in Factuur afhandeling scherm toevoegen.

Browse Source 
svn path=/Website/trunk/; revision=30017
This commit is contained in:
Maykel Geerdink
2016-07-12 07:21:55 +00:00
parent 1dcb9fe96b
commit 1a42bd8272
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FIN/fin.inc
View File

@@ -657,6 +657,7 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
+ " , m.mld_alg_onroerendgoed_keys alg_key"
+ " , sd.ins_srtdiscipline_prefix"
+ " , o.mld_opdr_omschrijving"
+ " , o.mld_opdr_id"
+ " , COALESCE((SELECT DISTINCT 1"
+ " FROM ins_tab_discipline itd"
+ " , ins_srtdiscipline sd"
@@ -711,6 +712,7 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
loc_key: oRs("loc_key").Value,
alg_key: oRs("alg_key").Value,
opdr_omschr: oRs("mld_opdr_omschrijving").Value,
opdr_id: oRs("mld_opdr_id").Value,
show_omschr: (oRs("show_omschr").Value == 1),
typeopdr_omschr: oRs("mld_typeopdr_omschrijving").Value,
btwtabel_key: oRs("btwtabel_key").Value

7
APPL/FIN/fin_edit_factuur.asp
View File

@@ -383,7 +383,12 @@ var fin_btwtabel_key = oRs("fin_btwtabel_key").value; // Standaard btw tabel key
<input class="fld" id="refopdrtype" readonly value="<%=(ref_info.ref_type == 'O'? safe.htmlattr(ref_info.typeopdr_omschr) : '')%>">
</td>
</tr>
<% RWFIELDTR("lev_uit", "fld", L("lcl_cnt_contractant"), (ref_info.lev_uit? ref_info.lev_uit : ""), { readonly: true }); // Leverancier/Uitvoerder
<% // Opdrachtid. Alleen als ref_type is "O" (opdrachten)
%> <tr id="tr_opdr_id" <%=(ref_info.ref_type == 'O') ? "" : "style='display:none'"%>>
<td class="label"><label><%=L("lcl_opdr_id")%>:</label></td>
<td><div class="fld" id="opdr_id"><%=ref_info.opdr_id && ref_info.opdr_id? safe.html(ref_info.opdr_id) : ""%></div></td>
</tr>
<% RWFIELDTR("lev_uit", "fld", L("lcl_cnt_contractant"), (ref_info.lev_uit? ref_info.lev_uit : ""), { readonly: true }); // Leverancier/Uitvoerder
%> <input type="hidden" name="lev_uit_key" id="lev_uit_key" value="<%=ref_info.lev_uit_key? ref_info.lev_uit_key : ""%>"><%
RWFIELDTR("lev_typ", "fld", L("lcl_prs_relatietype"), (ref_info.reltype_oms? ref_info.reltype_oms : ""), {readonly: true}); // Relatietype leverancier.
RWFIELDTR("lev_opm", "fldremark", L("lcl_prs_company_remark"), ref_info.lev_opm? safe.html(ref_info.lev_opm) : "", { trid: "tr_lev_opm", readonly: true }); // Opmerking leverancier.

12
APPL/FIN/fin_edit_factuur.js
View File

@@ -124,6 +124,7 @@ function clearRefDetails()
$("#termbedrag").val("");
$("#gefactureerd").val("");
$("#gefactureerd_jaar").val("");
$("#opdr_id").html("");
$("#opdr_omschr").html("");
$("#tr_opdr_omschr").hide();
$("#loc_omschr").html("");
@@ -254,6 +255,17 @@ function FcltGetRefInfoCallback(json)
$("#tr_lev_opm").hide();
}
if (json.opdr_id)
{
$("#opdr_id").html(json.opdr_id);
$("#tr_opdr_id").show();
}
else
{
$("#opdr_id").val("");
$("#tr_opdr_id").hide();
}
if (json.show_omschr)
{
$("#opdr_omschr").html(json.opdr_omschr);

3
APPL/FIN/fin_show_factuur.asp
View File

@@ -143,7 +143,10 @@ var urlMail = "../shared/queuemail.asp?pcode=FINMAI&defemail_key=-1&key=" + fin_
};
ROFIELDTR("fld", refoms, reftitle, params); // Melding
if (ref_info.ref_type == "O")
{
ROFIELDTR("fld", L("lcl_mld_typeopdr"), ref_info.typeopdr_omschr); // Opdrachttype melding
ROFIELDTR("fld", L("lcl_opdr_id"), ref_info.opdr_id); // Opdrachttype melding
}
params = {};
if (this_fin.canReqRelDetails)
{