9.2.2

.gitignore

@@ -7,6 +7,7 @@
 /data/config-internal.php
 /data/config-override.php
 /data/config-internal-override.php
+/data/state.php
 /data/tmp/*
 /build
 /node_modules

application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json

@@ -227,6 +227,7 @@
             "type": "enum",
             "notStorable": true,
             "orderDisabled": true,
+            "directUpdateDisabled": true,
             "layoutMassUpdateDisabled": true,
             "layoutDetailDisabled": true,
             "layoutAvailabilityList": ["listForContact"],

application/Espo/Resources/metadata/entityDefs/Notification.json

@@ -86,7 +86,11 @@
         },
         "user": {
             "type": "index",
-            "columns": ["userId", "createdAt"]
+            "columns": ["userId", "number"]
+        },
+        "userIdReadRelatedParentType": {
+            "type": "index",
+            "columns": ["userId", "deleted", "read", "relatedParentType"]
         }
     }
 }

application/Espo/Tools/LabelManager/LabelManager.php

@@ -216,7 +216,7 @@ class LabelManager implements
             }
         }
 
-        return json_decode(Json::encode($finalData));
+        return json_decode(Json::encode((object) $finalData));
     }
 
     /**

client/src/loader.js

@@ -69,7 +69,6 @@
      * @property {string|null} exportsAs
      * @property {string} [url]
      * @property {boolean} [useCache]
-     * @property {boolean} [suppressAmd]
      */
 
     /**
@@ -570,7 +569,6 @@
             let dataType, type, path, exportsTo, exportsAs;
 
             let realName = id;
-            let suppressAmd = false;
 
             if (id.indexOf('lib!') === 0) {
                 dataType = 'script';
@@ -601,14 +599,6 @@
                     type = 'amd';
                 }
 
-                if (!isDefinedLib && id.slice(-3) === '.js') {
-                    suppressAmd = true;
-                }
-
-                if (exportsAs) {
-                    suppressAmd = true;
-                }
-
                 if (path.indexOf(':') !== -1) {
                     console.error(`Not allowed path '${path}'.`);
 
@@ -698,7 +688,6 @@
                 errorCallback: errorCallback,
                 exportsAs: exportsAs,
                 exportsTo: exportsTo,
-                suppressAmd: suppressAmd,
             };
 
             if (path in this._pathsBeingLoaded) {
@@ -736,19 +725,11 @@
 
                 const fullUrl = urlObj.toString();
 
-                if (suppressAmd) {
-                    define.amd = false;
-                }
-
                 if (type === 'amd') {
                     this._urlIdMap[fullUrl] = id;
                 }
 
                 this._addScript(fullUrl, () => {
-                    if (suppressAmd) {
-                        define.amd = true;
-                    }
-
                     let value;
 
                     if (type === 'amd') {

client/src/views/admin/entity-manager/edit.js

@@ -44,6 +44,12 @@ class EntityManagerEditView extends View {
     additionalParams
     defaultParamLocation = 'scopes'
 
+    /**
+     * @private
+     * @type {string[]}
+     */
+    enumFieldList
+
     data() {
         return {
             isNew: this.isNew,
@@ -131,7 +137,8 @@ class EntityManagerEditView extends View {
         }
 
         if (scope) {
-            const fieldDefs = this.getMetadata().get('entityDefs.' + scope + '.fields') || {};
+            /** @type {Record.<string, Record>} */
+            const fieldDefs = this.getMetadata().get(`entityDefs.${scope}.fields`) || {};
 
             this.orderableFieldList = Object.keys(fieldDefs)
                 .filter(item => {
@@ -180,13 +187,19 @@ class EntityManagerEditView extends View {
 
             this.enumFieldList = Object.keys(fieldDefs)
                 .filter(item => {
-                    if (fieldDefs[item].disabled) {
-                        return;
+                    if (
+                        fieldDefs[item].disabled ||
+                        fieldDefs[item].utility ||
+                        fieldDefs[item].directUpdateDisabled
+                    ) {
+                        return false;
                     }
 
                     if (fieldDefs[item].type === 'enum') {
                         return true;
                     }
+
+                    return false;
                 })
                 .sort((v1, v2) => {
                     return this.translate(v1, 'fields', scope)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "espocrm",
-  "version": "9.2.0",
+  "version": "9.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "espocrm",
-      "version": "9.2.0",
+      "version": "9.2.2",
       "hasInstallScript": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "espocrm",
-  "version": "9.2.0",
+  "version": "9.2.2",
   "description": "Open-source CRM.",
   "repository": {
     "type": "git",