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

FCLT#56936 2019.1 Groeperen op bv maand werkt niet in rapporten

Browse Source 
svn path=/Website/trunk/; revision=41566
This commit is contained in:
Alex Tiehuis
2019-03-14 14:06:18 +00:00
parent 15fd9b09ce
commit 60f954c32f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/api2.inc
View File

@@ -508,7 +508,7 @@ api2 = {
// Als filter een functie is dan de functie aanroepen.
if (typeof filter == 'function')
wheres.push(filter(safe_val));
else if (field.sql && field.filterdefault == "")
else if (field.sql && field.manual) // in case the field is added manually with a sql expression
wheres.push(dbs.replace(dbsfld, '('+field.sql+')') + operand + safe_val);
else
wheres.push(dbs + operand + safe_val);

1
APPL/API2/model_reports.inc
View File

@@ -253,6 +253,7 @@ function model_reports(fac_usrrap_key)
label: label,
orglabel: label,
fixedlabel: fixedlabel,
manual: (usrrap.columns[i].expression ? true : false),
sql: usrrap.columns[i].expression,
typ: usrrap.columns[i].datatype.id,
orgtyp: usrrap.columns[i].datatype.id,