diff --git a/application/Espo/Modules/Crm/Resources/i18n/de_DE/Task.json b/application/Espo/Modules/Crm/Resources/i18n/de_DE/Task.json index 0242818a1f..eea2ed19d9 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/de_DE/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/de_DE/Task.json @@ -39,6 +39,7 @@ "presetFilters": { "actual": "Aktuell", "completed": "Abgeschlossen", + "deferred": "Zurückgestellt", "todays": "Heutige", "overdue": "Überfällig" } diff --git a/application/Espo/Modules/Crm/Resources/i18n/en_US/Task.json b/application/Espo/Modules/Crm/Resources/i18n/en_US/Task.json index ff62b6b169..93d9981b6d 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/en_US/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/en_US/Task.json @@ -40,6 +40,7 @@ "presetFilters": { "actual": "Actual", "completed": "Completed", + "deferred": "Deferred", "todays": "Today's", "overdue": "Overdue" } diff --git a/application/Espo/Modules/Crm/Resources/i18n/es_ES/Task.json b/application/Espo/Modules/Crm/Resources/i18n/es_ES/Task.json index 09623562f7..c0743e1f8b 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/es_ES/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/es_ES/Task.json @@ -39,6 +39,7 @@ "presetFilters": { "actual": "Actuales", "completed": "Completado", + "deferred": "Diferido", "todays": "De Hoy", "overdue": "Atrazadas" } diff --git a/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Task.json b/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Task.json index ba65e454a3..5831433ce1 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/fr_FR/Task.json @@ -37,6 +37,7 @@ "actual": "En cours", "completed": "Terminés", "todays": "Aujourd'hui", + "deferred": "Reporté", "overdue": "En retard" } } diff --git a/application/Espo/Modules/Crm/Resources/i18n/id_ID/Task.json b/application/Espo/Modules/Crm/Resources/i18n/id_ID/Task.json index d0902fd5b8..93e2c77182 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/id_ID/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/id_ID/Task.json @@ -40,6 +40,7 @@ "actual": "Sebenarnya", "completed": "Lengkap", "todays": "hari ini", + "deferred": "Tangguhan", "overdue": "Terlambat" } } \ No newline at end of file diff --git a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Task.json b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Task.json index 586c2c0f31..59b3f66198 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/it_IT/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/it_IT/Task.json @@ -40,6 +40,7 @@ "actual": "Attuale", "completed": "Completato", "todays": "Di Oggi", + "deferred": "Prorogare", "overdue": "In RItardo" } } \ No newline at end of file diff --git a/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Task.json b/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Task.json index 18e5e232c7..8a969af676 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/nl_NL/Task.json @@ -22,8 +22,7 @@ "Not Started": "Niet Gestart", "Started": "Gestart", "Completed": "Voltooid", - "Canceled": "Geannuleerd", - "Deferred": "Deferred" + "Canceled": "Geannuleerd" }, "priority" : { "Low": "Laag", diff --git a/application/Espo/Modules/Crm/Resources/i18n/pl_PL/Task.json b/application/Espo/Modules/Crm/Resources/i18n/pl_PL/Task.json index 51d2e1a807..42c59b1eea 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/pl_PL/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/pl_PL/Task.json @@ -39,6 +39,7 @@ "presetFilters": { "actual": "Bieżący", "completed": "Ukończone", + "deferred": "Opóźniony", "todays": "Dzisiaj", "overdue": "Przegrzane" } diff --git a/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Task.json b/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Task.json index 5cf9c15fdb..b60435d40a 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/pt_BR/Task.json @@ -34,6 +34,7 @@ "actual": "Atual", "completed": "Completa", "todays": "Hoje", + "deferred": "Adiada", "overdue": "Atrasada" } } 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 85fc0b739a..67ceeca92a 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/ru_RU/Task.json @@ -40,6 +40,7 @@ "actual": "Актуальные", "completed": "Завершенные", "todays": "На сегодня", + "deferred": "Отложенные", "overdue": "Просроченные" } } \ No newline at end of file diff --git a/application/Espo/Modules/Crm/Resources/i18n/uk_UA/Task.json b/application/Espo/Modules/Crm/Resources/i18n/uk_UA/Task.json index be6fdabd2d..3e4cfb12c6 100644 --- a/application/Espo/Modules/Crm/Resources/i18n/uk_UA/Task.json +++ b/application/Espo/Modules/Crm/Resources/i18n/uk_UA/Task.json @@ -37,9 +37,10 @@ "Complete": "Завершити" }, "presetFilters": { - "actual": "Актуально", - "completed": "Завершено", - "todays": "Сьогоднішнє", - "overdue": "Прострочено" + "actual": "Актуальні", + "completed": "Завершені", + "todays": "Сьогоднішні", + "deferred": "Відстрочені", + "overdue": "Прострочені" } } diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json index ba3fd3f7e9..2a2512388d 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json +++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/Task.json @@ -55,6 +55,9 @@ { "name":"overdue", "style": "danger" + }, + { + "name":"deferred" } ], "boolFilterList": ["onlyMy"] diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json index c29146e3b8..5a666b7325 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json +++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json @@ -43,7 +43,7 @@ "bool": { "onlyMy": true }, - "primary": "actualNotDeferred" + "primary": "actualStartingNotInPast" } }, "layout": [ diff --git a/application/Espo/Modules/Crm/SelectManagers/Task.php b/application/Espo/Modules/Crm/SelectManagers/Task.php index 0b50bdc894..b2a9a8081a 100644 --- a/application/Espo/Modules/Crm/SelectManagers/Task.php +++ b/application/Espo/Modules/Crm/SelectManagers/Task.php @@ -44,11 +44,18 @@ class Task extends \Espo\Core\SelectManagers\Base protected function filterActual(&$result) { $result['whereClause'][] = array( - 'status!=' => ['Completed', 'Canceled'] + 'status!=' => ['Completed', 'Canceled', 'Deferred'] ); } - protected function filterActualNotDeferred(&$result) + protected function filterDeferred(&$result) + { + $result['whereClause'][] = array( + 'status=' => 'Deferred' + ); + } + + protected function filterActualStartingNotInPast(&$result) { $result['whereClause'][] = array( array(