diff --git a/application/Espo/Modules/Crm/Resources/i18n/de_DE/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/de_DE/Lead.json index 556aefc303..930f6fe148 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/de_DE/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/de_DE/Lead.json @@ -56,6 +56,7 @@ }, "presetFilters": { "active": "Aktiv", + "actual": "Tatsächlich", "converted": "Umgewandelt" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/en_US/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/en_US/Lead.json index d522bbb363..94f6b6e22a 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/en_US/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/en_US/Lead.json @@ -56,6 +56,7 @@ }, "presetFilters": { "active": "Active", + "actual": "Actual", "converted": "Converted" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Lead.json index 46d25df8eb..c50a9f02fc 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Lead.json @@ -50,6 +50,7 @@ } }, "presetFilters": { - "active": "Actif" + "active": "Actif", + "actual": "En cours" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Lead.json index 60094ae64b..2e038b8681 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Lead.json @@ -45,6 +45,7 @@ } }, "presetFilters": { + "actual": "Werkelijke", "active": "Actief" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Lead.json index 4c327167f7..b692802c81 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Lead.json @@ -48,6 +48,7 @@ } }, "presetFilters": { + "actual": "Atual", "active": "Ativo" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Lead.json b/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Lead.json index 2346ef6b7b..0b551cdb09 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Lead.json +++ b/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Lead.json @@ -45,6 +45,7 @@ } }, "presetFilters": { - "active": "Активный" + "actual": "Актуальные", + "active": "Активные" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Task.json b/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Task.json index 5cc7ab6809..99f4cd7774 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Task.json @@ -30,8 +30,8 @@ "Complete": "Завершить" }, "presetFilters": { - "actual": "Actual", - "completed": "Завершена", + "actual": "Актуальные", + "completed": "Завершенные", "todays": "На сегодня", "overdue": "Просроченные" } diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json index b4f7324813..b966230de3 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json +++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json @@ -90,7 +90,7 @@ }, "filterList": [ { - "name":"active" + "name":"actual" }, { "name":"converted", diff --git a/application/Espo/Modules/Crm/SelectManagers/Lead.php b/application/Espo/Modules/Crm/SelectManagers/Lead.php index d35b9e05e5..bb0243854c 100644 --- a/application/Espo/Modules/Crm/SelectManagers/Lead.php +++ b/application/Espo/Modules/Crm/SelectManagers/Lead.php @@ -31,6 +31,13 @@ class Lead extends \Espo\Core\SelectManagers\Base ); } + protected function filterActual(&$result) + { + $result['whereClause'][] = array( + 'status!=' => ['Converted', 'Recycled', 'Dead'] + ); + } + protected function filterConverted(&$result) { $result['whereClause'][] = array( diff --git a/frontend/client/modules/crm/src/views/dashlets/leads.js b/frontend/client/modules/crm/src/views/dashlets/leads.js index 7b56ad7f9d..fa85764ae9 100644 --- a/frontend/client/modules/crm/src/views/dashlets/leads.js +++ b/frontend/client/modules/crm/src/views/dashlets/leads.js @@ -56,7 +56,7 @@ Espo.define('Crm:Views.Dashlets.Leads', 'Views.Dashlets.Abstract.RecordList', fu bool: { onlyMy: true, }, - primary: 'active' + primary: 'actual' }, },