Merge 2015.1 Gold B patches

svn path=/Website/trunk/; revision=25229
2015-05-19 11:36:23 +00:00
parent 92807e1f85
commit 7d2b547596
52 changed files with 332 additions and 200 deletions
--- a/APPL/API2/model_reportcolumns.inc
+++ b/APPL/API2/model_reportcolumns.inc
@@ -65,6 +65,11 @@ function model_reportcolumns(usrrap_key, params)
                this.fields.datatype.readonly = true;
                this.fields.filter.LOV = L("lcl_rap_filterLOV"); // die mag alle filters
                break;
+            case "html":
+                this.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G");
+                this.fields.datatype.readonly = true;
+                this.fields.filter.LOV = L("lcl_rap_filterLOV");
+                break;
            case "float":
            case "number":
            case "currency":