Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

application/Espo/Modules/Crm/Resources/i18n/en_US/Call.json

@@ -11,7 +11,8 @@
         "users": "Users",
         "contacts": "Contacts",
         "leads": "Leads",
-        "reminders": "Reminders"
+        "reminders": "Reminders",
+        "account": "Account"
     },
     "links": {
     },

application/Espo/Modules/Crm/Resources/i18n/en_US/Meeting.json

@@ -10,7 +10,8 @@
         "users": "Users",
         "contacts": "Contacts",
         "leads": "Leads",
-        "reminders": "Reminders"
+        "reminders": "Reminders",
+        "account": "Account"
     },
     "links": {
     },

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

@@ -48,7 +48,7 @@
         },
         "account": {
             "type": "link",
-            "disabled": true
+            "readOnly": true
         },
         "acceptanceStatus": {
             "type": "enum",

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

@@ -43,7 +43,7 @@
         },
         "account": {
             "type": "link",
-            "disabled": true
+            "readOnly": true
         },
         "acceptanceStatus": {
             "type": "enum",

frontend/client/src/views/site/navbar.js

@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
- ************************************************************************/ 
+ ************************************************************************/
 
 Espo.define('Views.Site.Navbar', 'View', function (Dep) {
 
@@ -60,7 +60,7 @@ Espo.define('Views.Site.Navbar', 'View', function (Dep) {
                 });
             },
         },
-        
+
         getLogoSrc: function () {
             var companyLogoId = this.getConfig().get('companyLogoId');
             if (!companyLogoId) {
@@ -70,7 +70,7 @@ Espo.define('Views.Site.Navbar', 'View', function (Dep) {
         },
 
         setup: function () {
-            this.getRouter().on('routed', function (e) {                
+            this.getRouter().on('routed', function (e) {
                 if (e.controller) {
                     this.selectTab(e.controller);
                 } else {
@@ -84,19 +84,19 @@ Espo.define('Views.Site.Navbar', 'View', function (Dep) {
                 }
                 return true;
             }, this);
-                        
 
-            this.quickCreateList = this.getConfig().get('quickCreateList').filter(function (scope) {
+
+            this.quickCreateList = (this.getConfig().get('quickCreateList') || []).filter(function (scope) {
                 if (this.getMetadata().get('scopes.' + scope + '.acl')) {
                     return this.getAcl().check(scope, 'edit');
                 }
                 return true;
             }, this);
-            
+
             this.createView('notificationsBadge', 'Notifications.Badge', {
                 el: this.options.el + ' .notifications-badge-container'
             });
-            
+
             this.createView('globalSearch', 'GlobalSearch.GlobalSearch', {
                 el: this.options.el + ' .global-search-container'
             });
@@ -152,7 +152,7 @@ Espo.define('Views.Site.Navbar', 'View', function (Dep) {
                 }
 
 
-                var maxWidth = self.$el.width() - 590 - moreWidth;
+                var maxWidth = self.$el.width() - 591 - moreWidth;
 
                 var width = $tabs.width();
                 while (width > maxWidth) {