diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index de8653e996764e51593134a317bc492560b772e6..af48d1ea08991b50c7356451b7706256f78ff963 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -37,6 +37,13 @@
                 <index v="false" />
                 <title></title>
                 <description></description>
+                <dependencies>
+                  <entityDependency>
+                    <name>54cb3c87-3f77-475f-ae3b-e9ac77f82f58</name>
+                    <entityName>RELATION</entityName>
+                    <fieldName>ORG_ID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
                 <name>CUSTOMERCODE</name>
@@ -348,6 +355,13 @@
                 <index v="false" />
                 <title></title>
                 <description></description>
+                <dependencies>
+                  <entityDependency>
+                    <name>2daca400-8bad-4bad-9df3-98c4ca023c19</name>
+                    <entityName>RELATION</entityName>
+                    <fieldName>PERS_ID</fieldName>
+                  </entityDependency>
+                </dependencies>
               </entityFieldDb>
               <entityFieldDb>
                 <name>FIRSTNAME</name>
diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod
index 982d8e74f316a8014be908034cc911d962042065..e62c1ceb31ffff590ba1e71cbe970b7d88286034 100644
--- a/entity/History_entity/History_entity.aod
+++ b/entity/History_entity/History_entity.aod
@@ -6,6 +6,7 @@
   <alias>Data_alias</alias>
   <fromClauseProcess>%aditoprj%/entity/History_entity/fromClauseProcess.js</fromClauseProcess>
   <conditionProcess>%aditoprj%/entity/History_entity/conditionProcess.js</conditionProcess>
+  <onDBInsert>%aditoprj%/entity/History_entity/onDBInsert.js</onDBInsert>
   <recordContainerType>DB</recordContainerType>
   <caption>History</caption>
   <iconId>NEON:HISTORY</iconId>
diff --git a/entity/History_entity/onDBInsert.js b/entity/History_entity/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 840232d2bfce5f4a29520d22c81fde2ec12eee2e..c0b427f24c8ca3f35cfe1f556ef0727c7d2726a7 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -7,6 +7,7 @@
   <fromClauseProcess>%aditoprj%/entity/Org_entity/fromClauseProcess.js</fromClauseProcess>
   <recordContainerType>DB</recordContainerType>
   <caption>Company</caption>
+  <captionProcess>%aditoprj%/entity/Org_entity/captionProcess.js</captionProcess>
   <iconId>VAADIN:BUILDING</iconId>
   <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess>
   <entityFields>
@@ -21,15 +22,22 @@
       <name>ORG_DATE_EDIT</name>
       <tableName>ORG</tableName>
       <columnName>DATE_EDIT</columnName>
-      <resolution>SECOND</resolution>
+      <contentType>DATE</contentType>
       <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ORG_DATE_NEW</name>
       <tableName>ORG</tableName>
       <columnName>DATE_NEW</columnName>
-      <resolution>SECOND</resolution>
+      <contentType>DATE</contentType>
       <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
     </entityField>
     <entityField>
       <name>INFO</name>
@@ -53,25 +61,31 @@
       <name>ORG_USER_EDIT</name>
       <tableName>ORG</tableName>
       <columnName>USER_EDIT</columnName>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>ORG_USER_NEW</name>
       <tableName>ORG</tableName>
       <columnName>USER_NEW</columnName>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>REL_DATE_EDIT</name>
       <tableName>RELATION</tableName>
       <columnName>DATE_EDIT</columnName>
-      <resolution>SECOND</resolution>
+      <contentType>DATE</contentType>
       <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>REL_DATE_NEW</name>
       <tableName>RELATION</tableName>
       <columnName>DATE_NEW</columnName>
-      <resolution>SECOND</resolution>
+      <contentType>DATE</contentType>
       <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>LANGUAGE</name>
@@ -84,6 +98,7 @@
       <name>ORG_ID</name>
       <tableName>RELATION</tableName>
       <columnName>ORG_ID</columnName>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_id/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>RELATIONID</name>
@@ -101,11 +116,14 @@
       <name>REL_USER_EDIT</name>
       <tableName>RELATION</tableName>
       <columnName>USER_EDIT</columnName>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>REL_USER_NEW</name>
       <tableName>RELATION</tableName>
       <columnName>USER_NEW</columnName>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>TYPE</name>
@@ -160,6 +178,10 @@
         <element>CUSTOMERCODE</element>
       </fields>
     </entityFieldGroup>
+    <entityIncomingField>
+      <name>Org_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+    </entityIncomingField>
   </entityFields>
   <linkInformation>
     <linkInformation>
diff --git a/entity/Org_entity/captionProcess.js b/entity/Org_entity/captionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dffd0bd73b994f31efe37f60430ab35fe4150c02
--- /dev/null
+++ b/entity/Org_entity/captionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.NAME"))
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/org_date_edit/valueProcess.js b/entity/Org_entity/entityfields/org_date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..00e95d744eab3b281e0f6ae5ee325cee91419534
--- /dev/null
+++ b/entity/Org_entity/entityfields/org_date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/org_date_new/valueProcess.js b/entity/Org_entity/entityfields/org_date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..97857fcc5a5eb0e57e6f244b4d4c9547dc0ff2f1
--- /dev/null
+++ b/entity/Org_entity/entityfields/org_date_new/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+logging.log("stateDateNew: " + vars.get("$sys.operatingstate"))
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
+
diff --git a/entity/Org_entity/entityfields/org_id/valueProcess.js b/entity/Org_entity/entityfields/org_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5786c3b49098ed22359083ea828fccb8f37f9558
--- /dev/null
+++ b/entity/Org_entity/entityfields/org_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.ORGID"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/org_user_edit/valueProcess.js b/entity/Org_entity/entityfields/org_user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67c86b14ca987054658978c88cecf6bd03fa44af
--- /dev/null
+++ b/entity/Org_entity/entityfields/org_user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/org_user_new/valueProcess.js b/entity/Org_entity/entityfields/org_user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2
--- /dev/null
+++ b/entity/Org_entity/entityfields/org_user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js b/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..00e95d744eab3b281e0f6ae5ee325cee91419534
--- /dev/null
+++ b/entity/Org_entity/entityfields/rel_date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/rel_date_new/valueProcess.js b/entity/Org_entity/entityfields/rel_date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ace62531432fbfb08b15fc33e25d271dc34bd6a
--- /dev/null
+++ b/entity/Org_entity/entityfields/rel_date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js b/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67c86b14ca987054658978c88cecf6bd03fa44af
--- /dev/null
+++ b/entity/Org_entity/entityfields/rel_user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/rel_user_new/valueProcess.js b/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2
--- /dev/null
+++ b/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index d56c758f7925b5f12abbedb17ff4a8fb69c98c08..dbdfa0553e05695cc159cb75d7d69b1d2dc5a978 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -21,18 +21,21 @@
       <outputFormat>dd.MM.yyyy</outputFormat>
     </entityField>
     <entityField>
-      <name>DATE_EDIT</name>
+      <name>PERS_DATE_EDIT</name>
       <tableName>PERS</tableName>
       <columnName>DATE_EDIT</columnName>
       <contentType>DATE</contentType>
-      <outputFormat>dd.MM.yyyy hh:mm</outputFormat>
+      <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>DATE_NEW</name>
+      <name>PERS_DATE_NEW</name>
       <tableName>PERS</tableName>
       <columnName>DATE_NEW</columnName>
       <contentType>DATE</contentType>
-      <outputFormat>dd.MM.yyyy hh:mm</outputFormat>
+      <outputFormat>yyyy-MM-dd&amp;apos;T&amp;apos;HH:mm:ssZ</outputFormat>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>FIRSTNAME</name>
@@ -82,14 +85,17 @@
       <columnName>TITLESUFFIX</columnName>
     </entityField>
     <entityField>
-      <name>USER_EDIT</name>
+      <name>PERS_USER_EDIT</name>
       <tableName>PERS</tableName>
       <columnName>USER_EDIT</columnName>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
-      <name>USER_NEW</name>
+      <name>PERS_USER_NEW</name>
       <tableName>PERS</tableName>
       <columnName>USER_NEW</columnName>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PREVIEWTITLE</name>
@@ -112,6 +118,7 @@
       <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
       <description>FIELDGROUP</description>
       <fields>
+        <element>SALUTATION</element>
         <element>FIRSTNAME</element>
         <element>LASTNAME</element>
       </fields>
@@ -149,6 +156,52 @@
         </entityDependency>
       </dependencies>
     </entityIncomingField>
+    <entityField>
+      <name>PERS_ID</name>
+      <tableName>RELATION</tableName>
+      <columnName>PERS_ID</columnName>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ORG_ID</name>
+      <tableName>RELATION</tableName>
+      <columnName>ORG_ID</columnName>
+      <caption>OrgId</caption>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>REL_USER_NEW</name>
+      <tableName>RELATION</tableName>
+      <columnName>USER_NEW</columnName>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>REL_USER_EDIT</name>
+      <tableName>RELATION</tableName>
+      <columnName>DATE_EDIT</columnName>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>REL_DATE_NEW</name>
+      <tableName>RELATION</tableName>
+      <columnName>DATE_NEW</columnName>
+      <contentType>DATE</contentType>
+      <state>READONLY</state>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>REL_DATE_EDIT</name>
+      <tableName>RELATION</tableName>
+      <columnName>DATE_EDIT</columnName>
+      <contentType>DATE</contentType>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>ORGNAME</name>
+      <caption>Firma</caption>
+      <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <linkInformation>
     <linkInformation>
diff --git a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
index c2324874401ddad22716417f220710e3bcca13bd..6bbb34256dbb4cd24db4643bd33c74245b79e3d0 100644
--- a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
+++ b/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
+result.string(vars.get("$field.SALUTATION") + " " + vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/org_id/valueProcess.js b/entity/Pers_entity/entityfields/org_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff29c229079213bd88ddc05fe66dcc84eb9b67a0
--- /dev/null
+++ b/entity/Pers_entity/entityfields/org_id/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+    if(vars.exists("$param.OrgId_param"))
+        result.string(vars.getString("$param.OrgId_param"));    
+    else if(vars.get("$field.ORG_ID") == null)
+        result.string("0");
+}
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/orgname/valueProcess.js b/entity/Pers_entity/entityfields/orgname/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce920204d2b672ee11420bd556f99bb2a0e33a38
--- /dev/null
+++ b/entity/Pers_entity/entityfields/orgname/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("system.neon");
+
+var ret = "";
+var orgid = vars.getString("$field.ORG_ID");
+if( orgid != "")
+{
+    ret = db.cell("select NAME from ORG where ORGID = '" + orgid + "'");
+}
+result.string (ret);
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js b/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..00e95d744eab3b281e0f6ae5ee325cee91419534
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js b/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ace62531432fbfb08b15fc33e25d271dc34bd6a
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/pers_id/valueProcess.js b/entity/Pers_entity/entityfields/pers_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..53099fc99d63b97777f90fc9608687b5ba8b8501
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.PERSID"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js b/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67c86b14ca987054658978c88cecf6bd03fa44af
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js b/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js b/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..00e95d744eab3b281e0f6ae5ee325cee91419534
--- /dev/null
+++ b/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js b/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ace62531432fbfb08b15fc33e25d271dc34bd6a
--- /dev/null
+++ b/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js b/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67c86b14ca987054658978c88cecf6bd03fa44af
--- /dev/null
+++ b/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js b/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..81966a3fbcd9b3cf25a186c93baa1928abc9d6d2
--- /dev/null
+++ b/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/neonView/HistoryEdit_view/HistoryEdit_view.aod b/neonView/HistoryEdit_view/HistoryEdit_view.aod
index 2c2b05ecfac741d36c9f9736c2a2b01ff0a90202..2847bee4afe1f4475270f4ccd31b76724be14b8f 100644
--- a/neonView/HistoryEdit_view/HistoryEdit_view.aod
+++ b/neonView/HistoryEdit_view/HistoryEdit_view.aod
@@ -10,6 +10,7 @@
   <children>
     <genericViewTemplate>
       <name>Edit_template</name>
+      <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
diff --git a/neonView/OrgEdit_view/OrgEdit_view.aod b/neonView/OrgEdit_view/OrgEdit_view.aod
index 13e183b65f5f0774a5f35c50bd5268b7e9bb4ba6..8f7ef2c2f9e648c096745268580d72d697cd7bda 100644
--- a/neonView/OrgEdit_view/OrgEdit_view.aod
+++ b/neonView/OrgEdit_view/OrgEdit_view.aod
@@ -10,6 +10,7 @@
   <children>
     <genericViewTemplate>
       <name>Edit_template</name>
+      <editMode v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
diff --git a/neonView/OrgPreview_view/OrgPreview_view.aod b/neonView/OrgPreview_view/OrgPreview_view.aod
index 8cef03d470fe605cbbe7dc852324c64635a0d7fd..276ed3e4b3384276312d42c29ecb06d1ebb2b6e7 100644
--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrgPreview_view/OrgPreview_view.aod
@@ -15,5 +15,28 @@
       <descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <genericViewTemplate>
+      <name>OrgInfo_template</name>
+      <showDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>4bad7219-1a3a-4e6e-ae5a-533d3acb6845</name>
+          <entityField>LANGUAGE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5a397737-2768-4e16-8c58-890b8a26b4a2</name>
+          <entityField>STATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>89e9aa74-1568-4f74-b42a-a02b13752802</name>
+          <entityField>TYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>180e8467-4eb2-4f89-a59f-ff76b8810925</name>
+          <entityField>INFO</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod
index f05604bfa0785038a66968c8fc087e3aa42224c9..c4212714cf9c0a61e665a136c76f3f16653d0337 100644
--- a/neonView/PersEdit_view/PersEdit_view.aod
+++ b/neonView/PersEdit_view/PersEdit_view.aod
@@ -12,6 +12,8 @@
   <children>
     <genericViewTemplate>
       <name>PersEdit_generic</name>
+      <editMode v="true" />
+      <showDrawer v="false" />
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
@@ -42,6 +44,10 @@
           <name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
           <entityField>DATEOFBIRTH</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>3826c0af-dad4-419c-ac53-a644a83e6738</name>
+          <entityField>ORGNAME</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index ad409a049bef951d47dc185433504a74d051d800..095e75bfbf77f9b050fdeb6a58c804aa193e9eaa 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -12,8 +12,31 @@
       <name>PersHeader_template</name>
       <iconField>IMAGE</iconField>
       <titleField>NAME_fieldGroup</titleField>
-      <descriptionField>GENDER</descriptionField>
+      <descriptionField>ORGNAME</descriptionField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <genericViewTemplate>
+      <name>PersInfo_template</name>
+      <showDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>c12f22ff-3536-45b6-b26f-1d8de6b5aea0</name>
+          <entityField>TITLE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>a224aada-e6cf-4357-b563-d7ccf313d32d</name>
+          <entityField>MIDDLENAME</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f9875d78-3d72-47d3-b729-9cf80d236f6e</name>
+          <entityField>GENDER</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>5d4e0828-b7fe-4f54-a47a-f9b5838fb1ae</name>
+          <entityField>DATEOFBIRTH</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>