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

PCHD#53634 Uitvoerende selecteren bij Fiatteren facturen

Browse Source 
svn path=/Website/trunk/; revision=41071
This commit is contained in:
Alex Tiehuis
2019-02-20 13:42:42 +00:00
parent 2948a34f84
commit 5619fe8f63
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_invoices.inc
View File

@@ -45,6 +45,8 @@ function model_invoices(fin_key, params)
sql: "COALESCE(mld_opdr.mld_uitvoerende_keys, bes_bestelopdr.prs_bedrijf_key, cnt_contract.cnt_prs_bedrijf_key)" },
/*readonly*/ "referencetype" : { dbs: "dummy", typ: "varchar", filter: "exact",
sql: "DECODE(fin_factuur.mld_opdr_key, NULL, DECODE(fin_factuur.bes_bestelopdr_key, NULL, DECODE(fin_factuur.cnt_contract_key, NULL, '?', 'C'), 'B'), 'O')" },
/*readonly*/ "accountholder" : { dbs: "prs_perslid_key", typ: "key", foreign: "prs_perslid", track: true, label: L("lcl_prs_budgethouder"), filter: "exact",
sql: "fin.getfiatteur(fin_factuur.fin_factuur_key)" },
"name" : { dbs: "fin_factuur_nr", typ: "varchar", track: true, label: L("lcl_fin_invoice_nr_extern"), filter: "exact" },
"order" : { dbs: "mld_opdr_key", typ: "key", foreign: "mld_opdr", filter: "exact"},
"contract" : { dbs: "cnt_contract_key", typ: "key", foreign: "cnt_contract", filter: "exact"},

16
APPL/FIN/fin_search.asp
View File

@@ -196,8 +196,14 @@ var isContactpersoon = user.isContactpersoon();
volgnr: 2
});
//<!-- Uitvoerende -->
FCLTbedrijfselector("handler","handler",
%> <!-- Uitvoerende -->
<tr class="primsearch onlyxd hidden">
<td class="label"><label for="uitvoerendetekst"><%=L("lcl_handler")%>:</label></td>
<td>
<input type="text" class="fldsrch wildcard" name="uitvoerendetekst" value="">
</td>
</tr>
<% FCLTbedrijfselector("handler","handler",
{ companyKey: handler_key,
label: L("lcl_handler"),
filtercode: (isContactpersoon && authparamsFINUSE && !authparamsFINFOF && !authparamsFINBOF? "CP" : "X"),
@@ -353,6 +359,12 @@ var isContactpersoon = user.isContactpersoon();
<input type="text" class="fldopdrnr" name="opdrnr" <%=(opdrnr != -1) ? "value='" + opdrnr + "'" : ""%>>
</td>
</tr>
<tr class="primsearch onlyxd hidden">
<td class="label"><label for="budgethoudertekst"><%=L("lcl_prs_budgethouder")%>:</label></td>
<td>
<input type="text" class="fldsrch wildcard" name="budgethoudertekst" value="">
</td>
</tr>
<%
// Persoon
FCLTpersoonselector("budh_key", // budgethouders

10
APPL/FIN/fin_search_list_xd.asp
View File

@@ -42,6 +42,8 @@ var sumbelow = getQParamFloat("sumbelow", ""); // Factuurbedrag boven
var fin_actual = (getQParam("fin_actual", "off") == "on"); // Actuele facturen
var fin_deleted = (getQParam("fin_deleted", "off") == "on"); // Verwijderde facturen
var goedkeurdertekst = getQParam("goedkeurdertekst", "");
var uitvoerendetekst = getQParam("uitvoerendetekst", "");
var budgethoudertekst = getQParam("budgethoudertekst", "");
var params = {name: finnum,
start_invoicedate: findate_from,
@@ -54,7 +56,9 @@ var params = {name: finnum,
end_total: sumbelow,
fin_actual: fin_actual,
fin_deleted: fin_deleted,
goedkeur: goedkeurdertekst}
goedkeur: goedkeurdertekst,
uitvoerende: uitvoerendetekst,
budgethouder: budgethoudertekst}
FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"]});
FCLTHeader.Title(L("lcl_xd_invoices"));
@@ -99,6 +103,8 @@ for (var cid in xd.SecundaryDomains) {
if (fin_bron_key!=-1) url += "&invoicesource="+safe.url(fin_bron_key);
if (fin_type!=-1) url += "&referencetype="+safe.url(fin_type);
if (goedkeurdertekst) url += "&validater=~" + safe.url(goedkeurdertekst);
if (uitvoerendetekst) url += "&creditor=~" + safe.url(uitvoerendetekst);
if (budgethoudertekst) url += "&accountholder=~" + safe.url(budgethoudertekst);
// if (fin_actual) url += ??
// if (fin_deleted) url += ??
@@ -145,6 +151,7 @@ for(var cid in gottenitems){ // per omgeving
vat: thisdata.vat,
bedrag_incl_BTW: thisdata.total+thisdata.vat,
fin_factuur_opmerking: thisdata.remark,
accountholder: thisdata.accountholder,
finstatus: thisdata.finstatus.name
});
}
@@ -181,6 +188,7 @@ var rst = new ResultsetTable({ dataset: dataset,
rst.addColumn(new Column({caption: L("lcl_fin_total_sum"), content: "bedrag_incl_BTW", datatype: "currency", combine:true}));
rst.addColumn(new Column({caption: L("lcl_fin_fin_status"), content: "finstatus"}));
rst.addColumn(new Column({caption: L("lcl_fin_remark"), content: "fin_factuur_opmerking"}));
rst.addColumn(new Column({caption: L("lcl_prs_budgethouder"), content: "accountholder"}));
rst.addColumn(new Column({caption: L("lcl_xd_custid"), content:"custid", purpose: PRINTING_ONLY }));
rst.addAction({ action: "xd_edit", caption: L("lcl_edit"), isDefault: true } );