diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index c5b0514ccf24a2ce3c11d8c0128e9731d7a5e923..2b85654461bf2a9f08ca6675efedf17e4cc34da0 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -40,6 +40,15 @@
<name>openOverdueTasks</name>
<onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js</onActionProcess>
</entityActionField>
+ <entityField>
+ <name>TURNOVER_FORECAST</name>
+ <title>My Forecast</title>
+ <valueProcess>%aditoprj%/entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>MYTURNOVER</name>
+ <title>My Turnover</title>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Analyses_entity/documentation.adoc b/entity/Analyses_entity/documentation.adoc
index e7401f00dd53aee9305387c064337530b5bca8da..936ca160d91be72a00d119f4cf802b5df19fb3b6 100644
--- a/entity/Analyses_entity/documentation.adoc
+++ b/entity/Analyses_entity/documentation.adoc
@@ -1,3 +1,3 @@
= Analyses_entity
-Logic and information for the ScoreCard displays openTasks, apointments, ... for the user
\ No newline at end of file
+Logic and information for the ScoreCard displays openTasks, apointments, ... for the logged in user
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
index a0dfa7df8cc8a0a66dedfff78df476f6d4ad1884..8aa5325599c2c82547daca6456d57aebe5269313 100644
--- a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
@@ -1,11 +1,9 @@
-import("system.datetime");
+import("Employee_lib");
import("system.db");
import("system.result");
-import("system.vars");
-import("Date_lib");
-import("Sql_lib");
-import("system.SQLTYPES")
-var opentask = db.cell("select count(STATUS) from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER = 'TaskStatus' and TITLE = 'new' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+var opentask = db.cell("select count(TASKID) "
+ + " from TASK "
+ + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");
-result.string(opentask);
+result.string(opentask);
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
index e1dbd63270723442a80368afbf94557d6f692623..696d1e7e7cf42aea7dd618f8c87b3cca400ce57b 100644
--- a/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
+++ b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
@@ -1,6 +1,9 @@
+import("Employee_lib");
import("system.db");
import("system.neon");
-var taskIds = db.table("select TASKID from TASK join AB_KEYWORD_ENTRY on KEYID = STATUS and CONTAINER = 'TaskStatus' and TITLE = 'new'", "Data_alias")
+var taskIds = db.table("select TASKID "
+ + " from TASK "
+ + " where STATUS = 'NEW' and EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'", "Data_alias");
neon.openContext("Task", "TaskFilter_view", taskIds, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
index b01817317225f10abbfd6d319685fa8132965a62..a4a99abca7e87092c860c0b4345398aaa83615f3 100644
--- a/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
+++ b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Employee_lib");
import("system.vars");
import("system.datetime");
import("system.db");
@@ -6,7 +7,9 @@ import("Date_lib");
import("Sql_lib");
var overduetask = db.table(SqlCondition.begin()
- .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
- .buildSql("select TASKID from TASK", "1=2"), "Data_alias");
+ .andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+ .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
+ .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
+ .buildSql("select TASKID from TASK", "1=2"));
neon.openContext("Task", "TaskFilter_view", overduetask, neon.OPERATINGSTATE_SEARCH, null);
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
index 53c3f09a944fe0289958650a43222d9c005db755..b179962d57663f5da1740a7c60c44832d0483613 100644
--- a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
@@ -1,3 +1,4 @@
+import("Employee_lib");
import("system.db");
import("system.datetime");
import("system.result");
@@ -5,9 +6,10 @@ import("system.vars");
import("Date_lib");
import("Sql_lib");
-
var overduetask = db.cell(SqlCondition.begin()
.andPrepare("TASK.MATURITY_DATE", vars.get("$sys.date"), "# < ?")
+ .and("TASK.EDITOR_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'")
+ .and("TASK.STATUS NOT IN ('ENDED', 'ENDED-DONE', 'ENDED-ABANDONED')")
.buildSql("select count(TASKID) from TASK", "1=2"));
result.string(overduetask);
diff --git a/entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js b/entity/Analyses_entity/entityfields/turnover_forecast/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 8ec7ccfadfbd3816758d997a7a4084255ce87449..bbe44b77a5144041828dc0ce9c87a9db75db3c96 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -46,6 +46,10 @@
<key>Open tasks</key>
<value>Offene Aufgaben</value>
</entry>
+ <entry>
+ <key>My Forecast</key>
+ <value>Mein Forecast</value>
+ </entry>
<entry>
<key>Anonymization</key>
<value>Anonymisierung</value>
@@ -77,6 +81,10 @@
<key>LOW</key>
<value>gering</value>
</entry>
+ <entry>
+ <key>My Turnover</key>
+ <value>Mein Umsatz</value>
+ </entry>
<entry>
<key>NORMAL</key>
<value>normal</value>