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

AAIT#37411 support voor factuurschema

Browse Source 
svn path=/Website/trunk/; revision=31685
This commit is contained in:
Peter Feij
2016-11-25 16:56:35 +00:00
parent d1a407cb4d
commit 59b3aa2b82
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
APPL/FIN/fin_list.inc
View File

@@ -105,6 +105,7 @@ function fin_list (params)
var loc_key = params.loc_key;
var bld_key = params.bld_key;
var verantw_key = params.verantw_key;
%>
<html>
<head>
@@ -117,6 +118,8 @@ function fin_list (params)
<% // Lijst van vervangers + user_key opvragen.
var prsKeys = user.collegakeylist(); // "user_key, vervangers"
// Query factuurlijst opbouwen.
sql = "SELECT f.fin_factuur_key factuurnr_intern"
+ " , fin_factuur_verwijder"
@@ -127,10 +130,9 @@ function fin_list (params)
+ " (SELECT " + S("prs_dep_string")
+ " FROM prs_v_afdeling d"
+ " WHERE d.prs_afdeling_key = c.cnt_prs_afdeling_key),"
+ " (SELECT " + S("prs_pers_string")
+ " FROM prs_perslid p"
+ " WHERE p.prs_perslid_key = c.cnt_prs_perslid_key)"
+ " ) uitvoerende"
+ " (SELECT pf.prs_perslid_naam_full"
+ " FROM prs_v_perslid_fullnames_all pf"
+ " WHERE pf.prs_perslid_key = c.cnt_prs_perslid_key)) uitvoerende"
+ " , (SELECT b.prs_leverancier_nr FROM prs_bedrijf b WHERE prs_bedrijf_key = COALESCE (o.mld_uitvoerende_keys, c.cnt_prs_bedrijf_key, bo.prs_bedrijf_key)) leverancier_nr"
+ " , fin_factuur_nr factuurnr_extern"
+ " , f.mld_opdr_key "
@@ -150,21 +152,22 @@ function fin_list (params)
+ " , f.fin_factuur_bron"
+ " , f.fin_factuur_totaal + f.fin_factuur_totaal_btw bedrag_incl_BTW"
+ " , f.fin_factuur_totaal bedrag_excl_BTW"
+ " , f.fin_factuur_boekmaand boekmaand"
+ " , f.fin_factuur_statuses_key"
+ " , f.fin_factuur_opmerking"
+ " , fin.matchfactuur(f.fin_factuur_key) roodgroen"
+ " , budgethouder"
+ " , (SELECT " + S("prs_pers_string")
+ " FROM prs_perslid p"
+ " WHERE prs_perslid_key = budgethouder) budgethoudernaam"
+ " , (SELECT pf.prs_perslid_naam_full"
+ " FROM prs_v_perslid_fullnames_all pf"
+ " WHERE pf.prs_perslid_key = budgethouder) budgethoudernaam"
+ " , c.prs_perslid_key_eig"
+ " , prs_perslid_key_goedkeur"
+ " , (SELECT max(fin_factuur_note_aanmaak)"
+ " FROM fin_factuur_note fn"
+ " WHERE fn.fin_factuur_key = f.fin_factuur_key) notitie"
+ " , (SELECT " + S("prs_pers_string")
+ " FROM prs_perslid p"
+ " WHERE p.prs_perslid_key = bb.prs_perslid_key) besteller"
+ " , (SELECT pf.prs_perslid_naam_full"
+ " FROM prs_v_perslid_fullnames_all pf"
+ " WHERE pf.prs_perslid_key = bb.prs_perslid_key) besteller"
+ " , bb.bestelopdr_totaal"
+ " , bb.bestelopdr_besteld"
+ " , bb.bestelopdr_geleverd";
@@ -263,7 +266,7 @@ function fin_list (params)
+ " o.prs_kostenplaats_key, "
+ " m.prs_kostenplaats_key) ";
sql += "WHERE 1=1"; // Nu de where clause bouwen
sql += " WHERE 1=1"; // Nu de where clause bouwen
if (asContactpersoon)
sql +=" AND (o.mld_uitvoerende_keys IN (SELECT cp.prs_bedrijf_key"
@@ -744,6 +747,10 @@ function fin_list (params)
}
buttons = [];
if (embedded)
{
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
}
if (!embedded && ((authparamsFINFOF && authparamsFINFOF.PRSwritelevel < 9) || (authparamsFINUSE && authparamsFINUSE.PRSwritelevel < 9)))
{
var addurl = "appl/fin/fin_factuur.asp?fin_key=-1";
@@ -804,7 +811,7 @@ function fin_list (params)
function fnnote(oRs)
{
if (oRs("notitie").Value != null)
return "(" + L("lcl_fin_note") + ")";
return (outputmode == 0? I("fa-comment") : oRs("notitie").Value);
else return "";
}
@@ -863,26 +870,32 @@ function fin_list (params)
});
rst.addColumn(new Column({caption: L("lcl_fin_nr"), content: "factuurnr_intern"}));
rst.addColumn(new Column({caption: L("lcl_fin_date"), content: "factuur_datum", datatype: "date"}));
rst.addColumn(new Column({caption: L("lcl_handler"), content: "uitvoerende"}));
rst.addColumn(new Column({caption: L("lcl_fin_date"), content: "factuur_datum", datatype: "date", hasActions: true, nowrap: true}));
rst.addColumn(new Column({caption: L("lcl_handler"), content: "uitvoerende",
purpose:(params.cnt_key||params.opdr_key||params.bes_key ? PRINTING_ONLY : PRINT_AND_VIEW)}));
if (outputmode != 0)
rst.addColumn(new Column({caption: L("lcl_prs_companies_leverancier_nr"), content: "leverancier_nr"}));
rst.addColumn(new Column({caption: L("lcl_fin_invoice_nr_extern"), content: "factuurnr_extern"}));
rst.addColumn(new Column({caption: L("lcl_fin_type"), content: fnOpdrtype}));
rst.addColumn(new Column({caption: "", content: fnOpdrtypeOms, combine: true}));
rst.addColumn(new Column({caption: L("lcl_fin_type"), content: fnOpdrtype,
purpose:(params.cnt_key||params.opdr_key||params.bes_key ? PRINTING_ONLY : PRINT_AND_VIEW)}));
rst.addColumn(new Column({caption: "", content: fnOpdrtypeOms, combine: true,
purpose:(params.cnt_key||params.opdr_key||params.bes_key ? PRINTING_ONLY : PRINT_AND_VIEW)}));
rst.addColumn(new Column({caption: L("lcl_fin_invoice_source"), content: fnBron}));
rst.addColumn(new Column({caption: L("lcl_fin_opdrachtnr"), content: "opdrachtnr", tooltip: fntotaalgeleverd}));
rst.addColumn(new Column({caption: L("lcl_fin_opdrachtnr"), content: "opdrachtnr", tooltip: fntotaalgeleverd,
purpose:(params.cnt_key||params.opdr_key||params.bes_key ? PRINTING_ONLY : PRINT_AND_VIEW)}));
if (excel)
rst.addColumn(new Column({caption: L("lcl_fin_bestelopdr_totaal"), content: "bestelopdr_totaal", datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_fin_total_sum_exBTW"), content: "bedrag_excl_BTW", datatype: "currency"}));
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: fnstatusOms, tooltip: fnnotedate}));
rst.addColumn(new Column({caption: L("lcl_fin_fin_status"), content: fnstatusOms, tooltip: fnnotedate, nowrap: true}));
if (excel)
rst.addColumn(new Column({caption: L("lcl_fin_bestelopdr_volledig"), content: fnvolledig}));
rst.addColumn(new Column({caption: "("+L("lcl_fin_note")+")", content: outputmode==0?fnnote:fnnotedate, combine: outputmode==0}));
rst.addColumn(new Column({caption: L("lcl_fin_besteller"), content: "besteller"}));
rst.addColumn(new Column({caption: L("lcl_fin_note"), content: outputmode==0?fnnote:fnnotedate, combine: outputmode==0}));
rst.addColumn(new Column({caption: L("lcl_fin_divide_period"), content: "boekmaand"}));
if (!fin_type || fin_type == "B")
rst.addColumn(new Column({caption: L("lcl_fin_besteller"), content: "besteller"}));
if (!embedded)
{
rst.addColumn(new Column({caption: L("lcl_prs_budgethouder"), content: "budgethoudernaam"}));