diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index f794c0c70e59b61746defe6485c29022ab483ccd..3a7cefb053135ca4734036d7bcee95cf1a5bc931 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -3,6 +3,7 @@
<name>Activity_entity</name>
<title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
<iconId>NEON:HISTORY</iconId>
<imageProcess>%aditoprj%/entity/Activity_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer>
@@ -137,7 +138,7 @@
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
- <description>Nur Eigene anzeigen</description>
+ <documentation>%aditoprj%/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc</documentation>
</entityParameter>
<entityField>
<name>DATE_EDIT</name>
@@ -168,7 +169,7 @@
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="false" />
- <description>PARAMETER</description>
+ <documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
</entityParameter>
<entityField>
<name>ObjectId</name>
@@ -184,6 +185,58 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/rowid/valueProcess.js</valueProcess>
</entityField>
+ <entityOutgoingField>
+ <name>ActivityDocument_dfo</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>ActivityDocument_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
+ <entityOutgoingField>
+ <name>ActivityMainDocument_dfo</name>
+ <title>Maindocuments</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>ActivityMainDocuments_dfi</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/documentation.adoc b/entity/Activity_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..f904775731a6512f69c2d443b1293a2919e5f31f
--- /dev/null
+++ b/entity/Activity_entity/documentation.adoc
@@ -0,0 +1,5 @@
+= Activity
+
+An activity describes one part of the communication timeline.
+This could be for example an e-mail or a phone call.
+Every activity can be connected to several other objects like contactpersons, organisations, products, offers, and so on.
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e4bf7585b2ca4628118e46818683fc51bfcf1c5
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..06fe7d36324315ad85bfd6d0099c5aa6b2da98d4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..f39bb16bbc16cc7a0d9f39a6bc549c63a0f16d02
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..3e4bf7585b2ca4628118e46818683fc51bfcf1c5
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("DOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..06fe7d36324315ad85bfd6d0099c5aa6b2da98d4
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..f39bb16bbc16cc7a0d9f39a6bc549c63a0f16d02
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("ACTIVITY");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..431fe9d5b2b2315607dc49c1191ff56d853a7d10
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("MAINDOCUMENT");
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/objectid_param/documentation.adoc b/entity/Activity_entity/entityfields/objectid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..004d34fa79b5bd7c213ddd5935ecf9dca4c5ac28
--- /dev/null
+++ b/entity/Activity_entity/entityfields/objectid_param/documentation.adoc
@@ -0,0 +1,3 @@
+The `ObjectId_param`-param specifies the object type of a `RowId_param`.
+For example if you pass a `RELATIONID` [of a contactperson] as `RowId_param` you've to specify the type[the `ObjObjectId_param`] as contactperson.
+
diff --git a/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc b/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..abd18febe748f73d214ba89835a2abf043029c79
--- /dev/null
+++ b/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc
@@ -0,0 +1 @@
+The `OnlyInnate_param` specifies a filter where only own records (records you created) are displayed.
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 6feb8d1d179951f0100dfc2af3e7a7fef660e761..014b132b6cb27d75a2e3c00c23fb1d3f5087c7f5 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -3,6 +3,7 @@
<name>Address_entity</name>
<title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
<titleProcess>%aditoprj%/entity/Address_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
@@ -23,6 +24,7 @@
</entityField>
<entityField>
<name>ADDR_TYPE</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
<title>Addresstype</title>
<possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
@@ -96,7 +98,7 @@
<entityParameter>
<name>RelId_param</name>
<expose v="true" />
- <description>PARAMETER</description>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/relid_param/documentation.adoc</documentation>
</entityParameter>
<entityIncomingField>
<name>PersAddress_dfi</name>
@@ -126,6 +128,7 @@
<entityIncomingField>
<name>PersOrgsAddresses_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/persorgsaddresses_dfi/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -138,6 +141,7 @@
</entityIncomingField>
<entityField>
<name>IS_STANDARD</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/is_standard/documentation.adoc</documentation>
<contentType>BOOLEAN</contentType>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
</entityField>
@@ -145,7 +149,8 @@
<name>DefaultAddressId_param</name>
<expose v="true" />
<triggerRecalculation v="false" />
- <description>PARAMETER</description>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
+ <description>provide a ADDRESSID-value of the standard address (of a RELATION)</description>
</entityParameter>
</entityFields>
<recordContainers>
diff --git a/entity/Address_entity/documentation.adoc b/entity/Address_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..77153fad79299fdb3bb56c8e7ffa291708283488
--- /dev/null
+++ b/entity/Address_entity/documentation.adoc
@@ -0,0 +1,10 @@
+Address
+=======
+
+----
+an entity for logic behind a postal address
+----
+
+The entity manages storing postal addresses and provides features like validation.
+
+Every `RELATION` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
diff --git a/entity/Address_entity/entityfields/addr_type/documentation.adoc b/entity/Address_entity/entityfields/addr_type/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..89006f557fe82a7c4e09ffc1ab9f9050f8ac0f3a
--- /dev/null
+++ b/entity/Address_entity/entityfields/addr_type/documentation.adoc
@@ -0,0 +1,4 @@
+The `ADDR_TYPE` field represents the type of address (like "shipping address", "private address", etc.)
+
+
+Possible values depend on the type of object it's connect to since a contactperson has different types than a company (organisation).
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc b/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d54b66e0afdacbc26f4fcf8de43ac3fef0892275
--- /dev/null
+++ b/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc
@@ -0,0 +1,3 @@
+`ADDRESSID`-value that specifies which ADDRESSID` is the standard addess of a record. [.small]#See: `IS_STANDARD` field#
+
+There is no validation if the provided value is actually the value of an standard address or a valid `ADDRESSID` at all.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard/documentation.adoc b/entity/Address_entity/entityfields/is_standard/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ec3bda82ac9cf8a6658c0c64c697e6bd0fa5da68
--- /dev/null
+++ b/entity/Address_entity/entityfields/is_standard/documentation.adoc
@@ -0,0 +1,3 @@
+The `IS_STANDARD` field specifies if an ADDRESS is the standard address (see Address_entity documentation)
+
+However that information is not stored directly in the `ADDRESS` database table. Every `RELATION`-record has an own standard address.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/persorgsaddresses_dfi/documentation.adoc b/entity/Address_entity/entityfields/persorgsaddresses_dfi/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..76be4af8062e1333653f1a9abf33e4645eb6caee
--- /dev/null
+++ b/entity/Address_entity/entityfields/persorgsaddresses_dfi/documentation.adoc
@@ -0,0 +1,7 @@
+Dependency for an arbitrary address of
+
+ * `ORG`
+ * `PERS`
+
+
+
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/relid_param/documentation.adoc b/entity/Address_entity/entityfields/relid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..9be1a639304863bfa8b23b659c3a9729cb018a55
--- /dev/null
+++ b/entity/Address_entity/entityfields/relid_param/documentation.adoc
@@ -0,0 +1,4 @@
+`RELATIONID`-value that is associated with
+
+* an existing address (=filtering)
+* an address that shall be created (=inserted)
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index eca9d6dbea3934f1e67eb6e54d18a93d2ab5ed2d..6aa654217083b99364e4b073f28d131c7c6b2931 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -231,11 +231,32 @@
</entityDependency>
</dependencies>
</entityIncomingField>
- <entityActionField>
- <name>downloadEntryAction</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadentryaction/onActionProcess.js</onActionProcess>
- </entityActionField>
+ <entityIncomingField>
+ <name>ActivityDocument_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>d57c0122-3227-4f98-b6a5-2ae45a0c5571</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>ActivityDocument_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ <entityIncomingField>
+ <name>ActivityMainDocuments_dfi</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>056d9a73-c9cd-44f2-828b-e9742b66fa37</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>ActivityMainDocument_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Document_entity/entityfields/downloadentryaction/onActionProcess.js b/entity/Document_entity/entityfields/downloadentryaction/onActionProcess.js
deleted file mode 100644
index a09e33e8f53dbe4fa9bf5ffa49f2eccaeec439dd..0000000000000000000000000000000000000000
--- a/entity/Document_entity/entityfields/downloadentryaction/onActionProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("Document_lib");
-DocumentUtil.downloadSelectedDocuments();
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index d56039b2ba6f4dcef549e9ccff54e4945e7ffd6e..06e172f4e41717f4dd6e6c5179d2edb24bfe3d9e 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -3,6 +3,7 @@
<name>Org_entity</name>
<title>Company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Org_entity/documentation.adoc</documentation>
<iconId>VAADIN:BUILDING</iconId>
<imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess>
<titleProcess>%aditoprj%/entity/Org_entity/titleProcess.js</titleProcess>
@@ -331,6 +332,7 @@
<entityActionField>
<name>openEditDefaultsView</name>
<fieldType>ACTION</fieldType>
+ <documentation>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
<title>Edit defaults</title>
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<iconId>NEON:WRENCH</iconId>
@@ -338,6 +340,7 @@
<entityActionField>
<name>newOffer</name>
<fieldType>ACTION</fieldType>
+ <documentation>%aditoprj%/entity/Org_entity/entityfields/newoffer/documentation.adoc</documentation>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
diff --git a/entity/Org_entity/documentation.adoc b/entity/Org_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..4c424a2c45fbfe95df0f813889e2d13cdd8e2e4c
--- /dev/null
+++ b/entity/Org_entity/documentation.adoc
@@ -0,0 +1,6 @@
+An entity for handling organisations (companies).
+
+Besides storing the main data of a company, standard values can be set:
+
+* setting the standard postal address (field directly connected to the db record container)
+* setting standard comm enties (e.g. standard phone or standard email); this is done by performing additional actions onUpdate
diff --git a/entity/Org_entity/entityfields/newoffer/documentation.adoc b/entity/Org_entity/entityfields/newoffer/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..b699f50fce2636d6210e6a264e0ff3c78019d694
--- /dev/null
+++ b/entity/Org_entity/entityfields/newoffer/documentation.adoc
@@ -0,0 +1 @@
+Opens a new OFFER-entry with the current ORG as preset.
\ No newline at end of file
diff --git a/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc b/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a1972d90772d14e0badfd2f9379258fd4305e50e
--- /dev/null
+++ b/entity/Org_entity/entityfields/openeditdefaultsview/documentation.adoc
@@ -0,0 +1,2 @@
+This action opens a view where standard values can be changed for a ORG.
+For example, this could be a standard mail-address (COMM entries) or the standard (postal) address.
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 9624f5e576168a4c3cda2d802c48e9959b633e15..ac33fd7a1505112c36b1bb376c8a29247725d374 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -144,10 +144,17 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityField>
+ <name>PERS_ID</name>
+ <documentation>%aditoprj%/entity/Pers_entity/entityfields/pers_id/documentation.adoc</documentation>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_id/valueProcess.js</valueProcess>
+ </entityField>
<entityField>
<name>ORG_ID</name>
<title>Firma</title>
<linkedContext>Org_context</linkedContext>
+ <mandatory v="true" />
<outgoingField>PersOrg_dfo</outgoingField>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
@@ -520,6 +527,10 @@
<name>LANGUAGE.value</name>
<recordfield>RELATION.LANGUAGE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERS_ID.value</name>
+ <recordfield>RELATION.PERS_ID</recordfield>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LASTNAME.value</name>
<recordfield>PERS.LASTNAME</recordfield>
diff --git a/entity/Pers_entity/entityfields/org_id/onValueChange.js b/entity/Pers_entity/entityfields/org_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..02a317c7a7181eeb18e761635b1fb6e0ec18e7bb
--- /dev/null
+++ b/entity/Pers_entity/entityfields/org_id/onValueChange.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+
+if(vars.exists("$local.value") && !vars.get("$local.value"))
+{
+ neon.setFieldValue("$field.ORG_ID", "0");
+}
diff --git a/entity/Pers_entity/entityfields/pers_id/documentation.adoc b/entity/Pers_entity/entityfields/pers_id/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e60e1c615bc9bef99e04229d684dc2c9dc0e019f
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_id/documentation.adoc
@@ -0,0 +1 @@
+The main reason why this field is needed is that the `RELATION.PERS_ID` has to be set when a new record is inserted (to keep references correct).
\ 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..7d2324e0ad5514747fa14343ba9e1daea99bf787
--- /dev/null
+++ b/entity/Pers_entity/entityfields/pers_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+//this is needed to set the RELATION-value when a new record is inserted
+result.string(vars.getString("$field.PERSID"));
\ No newline at end of file
diff --git a/neonContext/Salesproject_context/documentation.adoc b/neonContext/Salesproject_context/documentation.adoc
index 51166614a30a5adbc4ab1d5cbfad5b0391622793..2abd8032957ef6622b98c7a8924a66ca5dea82e3 100644
--- a/neonContext/Salesproject_context/documentation.adoc
+++ b/neonContext/Salesproject_context/documentation.adoc
@@ -1,7 +1,10 @@
Salesproject
============
+
== Overview ==
+
A salesproject consists of some modules:
+
- Salesproject itself
- Activity (former History)
- Milestones
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index bb37953370c86eeac1d9f214fe05f1f76ae8502f..983a1dc1ef0e8558b374b41c82f58f6899fa0401 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -19,5 +19,10 @@
<entityField>#ENTITY</entityField>
<view>ActivityDetail_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
+ <entityField>ActivityDocument_dfo</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 2542e87167d89ad681f2c83050baea58e033fd81..23802418fac09a7840b8fdd95c0e4b770509fd6b 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -34,5 +34,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
+ <entityField>ActivityMainDocument_dfo</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DocumentList_view/DocumentList_view.aod b/neonView/DocumentList_view/DocumentList_view.aod
index 7f3073db86821de449597ddb161670741464d8b7..7fd20d35a23101ca2898fa3f3d01a567d04eef8e 100644
--- a/neonView/DocumentList_view/DocumentList_view.aod
+++ b/neonView/DocumentList_view/DocumentList_view.aod
@@ -14,7 +14,7 @@
<titleField>NAME</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconField>ICON</iconField>
- <entryAction>downloadEntryAction</entryAction>
+ <entryAction>downloadFilesAction</entryAction>
<entityField>#ENTITY</entityField>
</actionListViewTemplate>
</children>
diff --git a/others/db_changes/struct/create_pers.xml b/others/db_changes/struct/create_pers.xml
index 6943d73ad9557d0e573406329e3d4d5f0fddfae8..3754a5ab31c55de620345bf6efa861dc44c48d0e 100644
--- a/others/db_changes/struct/create_pers.xml
+++ b/others/db_changes/struct/create_pers.xml
@@ -6,10 +6,14 @@
<constraints primaryKey="true" primaryKeyName="PK_PERS_PERSID"/>
</column>
<column name="DATE_EDIT" type="TIMESTAMP"/>
- <column name="DATE_NEW" type="TIMESTAMP"/>
+ <column name="DATE_NEW" type="TIMESTAMP">
+ <constraints nullable="false"/>
+ </column>
<column name="DATEOFBIRTH" type="DATE"/>
<column name="USER_EDIT" type="NVARCHAR(50)"/>
- <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_NEW" type="NVARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
<column name="FIRSTNAME" type="NVARCHAR(50)"/>
<column name="MIDDLENAME" type="NVARCHAR(50)"/>
<column name="LASTNAME" type="NVARCHAR(50)">
diff --git a/others/guide/how to write JDito code.adoc b/others/guide/how to write JDito code.adoc
index cf528af02c2b45a29292ee444f76610101228589..cd6e8b4d635476ced35c0911c5ce7dff43b6e02e 100644
--- a/others/guide/how to write JDito code.adoc
+++ b/others/guide/how to write JDito code.adoc
@@ -147,7 +147,7 @@ Add @ignore to the comment of the private functions.
== JS-Doc ==
<1> JS-Doc comment: http://usejsdoc.org/
-<2> jsdoc-blocks have to start with /** because the tool to generate docs out of jsdoc only works with /**
+<2> jsdoc-blocks have to start with /** because the tool to generate docs out of jsdoc only works with /**
<3> use the correct form for optional/required parameters: http://usejsdoc.org/tags-param.html
Optional parameter: [alias=the current alias]
Required parameter: alias
@@ -170,7 +170,7 @@ function SqlCondition(pAlias)
<3> examples are useful on more complex functions
<4> constructor function; init properties (do not set functions ("methods") here!)
<5> add functions ("methods") to the prototype, they are available through the prototype chain
-<6> the comments have to start with /** not /* otherwise JSDoc cannot generate a documentation
+<6> the comments have to start with /** not /* otherwise JSDoc cannot generate a documentation
And how to use it (normally you'd want to use preparedStatements but for the sake of an easy example it's a bit shorter here)
See also HowToSqlConditionLib.adoc for a full documentation.
diff --git a/system/default/default.aod b/system/default/default.aod
index 4f2210279f3e24a0dcf93c2c15fc5f6be1c57dc6..064288581422a1931fa2c41c4a17c6db6dcccbbb 100644
--- a/system/default/default.aod
+++ b/system/default/default.aod
@@ -6,5 +6,6 @@
<aditoHomePath>$ADITOHOME</aditoHomePath>
<aditoDataPath>$PROJECTHOME/data</aditoDataPath>
<loginUser>admin</loginUser>
+ <autoLogin v="false" />
<enableJDitoDebug v="true" />
</system>