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

VENR#36728 ook Kostenplaats tonen in MI variant

Browse Source 
svn path=/Website/trunk/; revision=30830
This commit is contained in:
Peter Feij
2016-09-22 16:18:55 +00:00
parent fb2e16e5a7
commit ea44f95e05
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/MLD/opdr_list.inc
View File

@@ -328,6 +328,9 @@ function opdr_list (params)
+ " , (SELECT " + S("prs_pers_string")
+ " FROM prs_perslid p"
+ " WHERE p.prs_perslid_key = o.prs_perslid_key) behandelaar"
+ " , (SELECT " + S("prs_kpn_string")
+ " FROM prs_kostenplaats k"
+ " WHERE k.prs_kostenplaats_key = o.prs_kostenplaats_key) kpstring"
+ " , o.mld_opdr_key"
+ " , c.cnt_contract_key"
+ " , c.cnt_contract_nummer"
@@ -1051,21 +1054,27 @@ function opdr_list (params)
}
if (!tiny && S("mld_show_order_details"))
rst.addColumn(new Column({caption: L("lcl_mld_inf_Opmerking"), content: "mld_opdr_opmerking"})); // INKORTEN als niet print??
if (groepering_key == 2 || groepering_key == 16)
{
rst.addColumn(new Column({caption: L("lcl_account"), content: "kpstring"}));
}
if (!tiny)
rst.addColumn(new Column({caption: L("lcl_opdr_kosten") + " (" + S("currency_pref") + ")", content: "mld_opdr_kosten", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_opdr_kosten") + " (" + L("lcl_valutasign") + ")", content: "mld_opdr_kosten", datatype: "currency", total: true}));
if (fronto || backo)
rst.addColumn(new Column({caption: L("lcl_mld_approver"), content: fncolFiatteur}));
if (groepering_key == 16)
{
rst.addColumn(new Column({caption: L("lcl_hours"), content: "mld_opdr_uren", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_hour_rate") + "(" + S("currency_pref") + ")", content: "mld_opdr_uurloon", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_mater_cost") + "(" + S("currency_pref") + ")", content: "mld_opdr_materiaal", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_correct") + "(" + S("currency_pref") + ")", content: "correctie", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_hour_rate") + " (" + L("lcl_valutasign") + ")", content: "mld_opdr_uurloon", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_mater_cost") + " (" + L("lcl_valutasign") + ")", content: "mld_opdr_materiaal", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_correct") + " (" + L("lcl_valutasign") + ")", content: "correctie", datatype: "currency", total: true}));
}
if (groepering_key == 2 || groepering_key == 16)
{
rst.addColumn(new Column({caption: L("lcl_mld_invoiced") + "(" + S("currency_pref") + ")", content: "gefactureerd", datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("lcl_mld_invoiced") + " (" + L("lcl_valutasign") + ")", content: "gefactureerd", datatype: "currency", total: true}));
}
// actions conditioneel maken?