diff --git a/APPL/API2/model_fac_srtnotificatie.inc b/APPL/API2/model_fac_srtnotificatie.inc index 9fd02b434a..a676d4937f 100644 --- a/APPL/API2/model_fac_srtnotificatie.inc +++ b/APPL/API2/model_fac_srtnotificatie.inc @@ -110,12 +110,7 @@ function model_fac_srtnotificatie(cust) "label": L("fac_srtnotificatie_srtkenmerk"), "typ": "key", "foreign": { - "tbl": "(select sk.mld_srtkenmerk_key srtkenmerk_key" - + " , sk.mld_srtkenmerk_omschrijving omschrijving" - + " from mld_srtkenmerk sk" - + " where sk.mld_srtkenmerk_verwijder is null" - + " and sk.mld_srtkenmerk_kenmerktype in ('M', 'F')" // -- 'E', 'X') - + " order by sk.mld_srtkenmerk_omschrijving)", + "tbl": "(" + xxx_srtkenmerk_sql() + ")", "key": "srtkenmerk_key", "desc": "omschrijving" }, @@ -186,7 +181,7 @@ function model_fac_srtnotificatie(cust) function xxx_srtkenmerk_sql() { var sql = "(select sk.mld_srtkenmerk_key srtkenmerk_key" - + " , sk.mld_srtkenmerk_omschrijving omschrijving" + + " , sk.mld_srtkenmerk_omschrijving || ' (' || sk.mld_srtkenmerk_key || ')' omschrijving" + " from mld_srtkenmerk sk" + " where sk.mld_srtkenmerk_verwijder is null" + " and sk.mld_srtkenmerk_kenmerktype in ('M', 'F')" // -- 'E', 'X') diff --git a/UTILS/PutOrders/puo_notifications.js b/UTILS/PutOrders/puo_notifications.js index b27a6f06bd..ba573db649 100644 --- a/UTILS/PutOrders/puo_notifications.js +++ b/UTILS/PutOrders/puo_notifications.js @@ -171,6 +171,7 @@ function notificationMail(rec, p_notificationXSL, params) , "" , { attachFileName: "" , attachFolder: "" + , attachSubFolder: "" , attachments: [] } );