From 81ccf2a860285fa865da01f5d0f4fc076477465f Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 11 Sep 2020 13:32:12 +0300 Subject: [PATCH] acceptance status fix --- .../Crm/Resources/metadata/entityDefs/Contact.json | 4 ++-- .../Crm/Resources/metadata/entityDefs/Lead.json | 10 ++++++++-- .../Espo/Resources/metadata/entityDefs/User.json | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json index eb34a4986f..0c1476706d 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json @@ -616,7 +616,7 @@ "layoutRelationshipsDisabled": true, "audited": true, "columnAttributeMap": { - "status": "acceptanceStatusMeetings" + "status": "acceptanceStatus" } }, "calls": { @@ -626,7 +626,7 @@ "layoutRelationshipsDisabled": true, "audited": true, "columnAttributeMap": { - "status": "acceptanceStatusCalls" + "status": "acceptanceStatus" } }, "tasks": { diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json index 9eea9a3146..f126e01592 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json @@ -245,14 +245,20 @@ "entity": "Meeting", "foreign": "leads", "layoutRelationshipsDisabled": true, - "audited": true + "audited": true, + "columnAttributeMap": { + "status": "acceptanceStatus" + } }, "calls": { "type": "hasMany", "entity": "Call", "foreign": "leads", "layoutRelationshipsDisabled": true, - "audited": true + "audited": true, + "columnAttributeMap": { + "status": "acceptanceStatus" + } }, "tasks": { "type": "hasChildren", diff --git a/application/Espo/Resources/metadata/entityDefs/User.json b/application/Espo/Resources/metadata/entityDefs/User.json index c28061048c..4f02a32733 100644 --- a/application/Espo/Resources/metadata/entityDefs/User.json +++ b/application/Espo/Resources/metadata/entityDefs/User.json @@ -393,7 +393,7 @@ "entity": "Meeting", "foreign": "users", "columnAttributeMap": { - "status": "acceptanceStatusMeetings" + "status": "acceptanceStatus" } }, "calls": { @@ -401,7 +401,7 @@ "entity": "Call", "foreign": "users", "columnAttributeMap": { - "status": "acceptanceStatusCalls" + "status": "acceptanceStatus" } }, "emails": {