diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index b611eab194f0f9c4c8ef0eab723d9e29b032bde9..a1548f7d853e473527a467b354b53bfb30dc1b86 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -15,7 +15,7 @@
</entityField>
<entityField>
<name>COMMUNICATIONID</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/communicationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>MEDIUM_ID</name>
diff --git a/entity/Communication_entity/entityfields/addr/onValidation.js b/entity/Communication_entity/entityfields/addr/onValidation.js
index 2a4456424e4625d625a04dd9e7adcce7c3443bc2..9a76546b124bf22a16326db9db6a6d7b30a49b41 100644
--- a/entity/Communication_entity/entityfields/addr/onValidation.js
+++ b/entity/Communication_entity/entityfields/addr/onValidation.js
@@ -4,7 +4,7 @@ import("system.net");
import("system.result");
import("system.mail");
import("Keyword_lib");
-import("Comm_lib");
+import("Communication_lib");
import("Util_lib");
import("Entity_lib");
diff --git a/entity/Communication_entity/entityfields/commmediumids_param/code.js b/entity/Communication_entity/entityfields/commmediumids_param/code.js
index fd6b104be9f8fade16f4def36c89d79dfa89a9da..6c37c4e3687ce996227533e8f2f63141f6ba20d9 100644
--- a/entity/Communication_entity/entityfields/commmediumids_param/code.js
+++ b/entity/Communication_entity/entityfields/commmediumids_param/code.js
@@ -1,6 +1,6 @@
import("system.result");
import("system.vars");
-import("Comm_lib")
+import("Communication_lib")
var commCategory = vars.exists("$param.CommCategory_param") ? vars.get("$param.CommCategory_param") : null;
diff --git a/entity/Contact_entity/recordcontainers/db/onDBUpdate.js b/entity/Contact_entity/recordcontainers/db/onDBUpdate.js
index a48732960fe0b34cfbc5a2996bc11690b9d8e53e..2205c50893b4087a774505f507b03588ad93e463 100644
--- a/entity/Contact_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Contact_entity/recordcontainers/db/onDBUpdate.js
@@ -1,6 +1,6 @@
import("system.vars");
import("Pers_lib");
-import("Comm_lib");
+import("Communication_lib");
import("Entity_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
index a371c71fba377126f5fc2580cfd900b297f16767..41ef07ff58ec51eda018bed12cb5b0b2b657c348 100644
--- a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
+++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
-import("Comm_lib");
+import("Communication_lib");
var res = CommUtil.getStandardSubSqlMail();
result.string(res);
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
index 9b0174b05e7bcd2cf63f90d294fc74ecc76f7c44..320ae40ad1ba794b4e759037fa0f382b9af67696 100644
--- a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
+++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
-import("Comm_lib");
+import("Communication_lib");
var res = CommUtil.getStandardSubSqlPhone();
result.string(res);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/image/valueProcess.js b/entity/Organisation_entity/entityfields/image/valueProcess.js
index 8b7a8d62920c0847613ceb70affa76347415119a..ff2e70283d1cbaf1fb96d168a926ea7aec635d2a 100644
--- a/entity/Organisation_entity/entityfields/image/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/image/valueProcess.js
@@ -1,7 +1,7 @@
import("system.result");
import("system.neon");
import("system.vars");
-import("Org_lib");
+import("Organisation_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
{
diff --git a/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js b/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js
index 11e09123569c6a8233becf532098c8266f26fc4c..1e5bcbc94ce25d28f5ad566f69090b2b8098f135 100644
--- a/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
-import("Org_lib");
+import("Organisation_lib");
OrgUtils.openOrgReport(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
index 4716b81b24017602a06d5c9e812b751feb92b88d..38981a5ca047c7ecb1192d0bfcabf831eb7a81c2 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
@@ -1,6 +1,6 @@
import("system.vars");
-import("Org_lib");
-import("Comm_lib");
+import("Organisation_lib");
+import("Communication_lib");
import("Entity_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Container
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
index a371c71fba377126f5fc2580cfd900b297f16767..41ef07ff58ec51eda018bed12cb5b0b2b657c348 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
-import("Comm_lib");
+import("Communication_lib");
var res = CommUtil.getStandardSubSqlMail();
result.string(res);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
index 9b0174b05e7bcd2cf63f90d294fc74ecc76f7c44..320ae40ad1ba794b4e759037fa0f382b9af67696 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js
@@ -1,5 +1,5 @@
import("system.result");
-import("Comm_lib");
+import("Communication_lib");
var res = CommUtil.getStandardSubSqlPhone();
result.string(res);
\ No newline at end of file
diff --git a/entity/Relation_entity/entityfields/image/valueProcess.js b/entity/Relation_entity/entityfields/image/valueProcess.js
index 899580f391af19c211e709efea2bc4e3ec602e8c..bcd36563dcf25931b58454e00676c82b82b07dfc 100644
--- a/entity/Relation_entity/entityfields/image/valueProcess.js
+++ b/entity/Relation_entity/entityfields/image/valueProcess.js
@@ -2,7 +2,7 @@ import("system.result");
import("system.neon");
import("system.vars");
import("Pers_lib");
-import("Org_lib");
+import("Organisation_lib");
import("Relation_lib");
if (vars.get("$field.relationType") == 1) // 1 == org, 2 == pers, 3 == pers
diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js
index a371c71fba377126f5fc2580cfd900b297f16767..41ef07ff58ec51eda018bed12cb5b0b2b657c348 100644
--- a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js
+++ b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js
@@ -1,5 +1,5 @@
import("system.result");
-import("Comm_lib");
+import("Communication_lib");
var res = CommUtil.getStandardSubSqlMail();
result.string(res);
\ No newline at end of file
diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js
index 9b0174b05e7bcd2cf63f90d294fc74ecc76f7c44..320ae40ad1ba794b4e759037fa0f382b9af67696 100644
--- a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js
+++ b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js
@@ -1,5 +1,5 @@
import("system.result");
-import("Comm_lib");
+import("Communication_lib");
var res = CommUtil.getStandardSubSqlPhone();
result.string(res);
\ No newline at end of file
diff --git a/process/Comm_lib/Comm_lib.aod b/process/Communication_lib/Communication_lib.aod
similarity index 78%
rename from process/Comm_lib/Comm_lib.aod
rename to process/Communication_lib/Communication_lib.aod
index f48c5917e11c6b7d8203dadc8dbc98dd85f54f0a..ca8663943061a6bfd5922f61a677dbf4539b324c 100644
--- a/process/Comm_lib/Comm_lib.aod
+++ b/process/Communication_lib/Communication_lib.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
- <name>Comm_lib</name>
+ <name>Communication_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Comm_lib/process.js</process>
+ <process>%aditoprj%/process/Communication_lib/process.js</process>
<variants>
<element>LIBRARY</element>
</variants>
diff --git a/process/Comm_lib/process.js b/process/Communication_lib/process.js
similarity index 98%
rename from process/Comm_lib/process.js
rename to process/Communication_lib/process.js
index a7f379a4d5ff746f7aeb2f95eb017ad08040574e..8be0346dc34c129aa2544f3035e3bd537d59432e 100644
--- a/process/Comm_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -62,7 +62,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
{
//set the new standard comm-record
cond.clear();
- //check commid, relId and medium to prevent data-inconsistency when bad function params are passed by (e.g commid of a different category)
+ //check communicationid, relId and medium to prevent data-inconsistency when bad function params are passed by (e.g communicationid of a different category)
cond.andPrepare("COMMUNICATION.COMMUNICATIONID", pNewStandardCommId).andPrepare("COMMUNICATION.RELATION_ID", pAffectedRowId);
cond.and("MEDIUM_ID in (" + mediumIds.join(", ") + ")");
statements.push(["COMMUNICATION", cols, types, ["1"], cond.build()]);
diff --git a/process/Org_lib/Org_lib.aod b/process/Organisation_lib/Organisation_lib.aod
similarity index 79%
rename from process/Org_lib/Org_lib.aod
rename to process/Organisation_lib/Organisation_lib.aod
index fbe42654791359361804d14c98f0c740f6f9c4e6..5000efd97bc65693e53c530f46451b3cf84122b0 100644
--- a/process/Org_lib/Org_lib.aod
+++ b/process/Organisation_lib/Organisation_lib.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
- <name>Org_lib</name>
+ <name>Organisation_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Org_lib/process.js</process>
+ <process>%aditoprj%/process/Organisation_lib/process.js</process>
<alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
diff --git a/process/Org_lib/process.js b/process/Organisation_lib/process.js
similarity index 99%
rename from process/Org_lib/process.js
rename to process/Organisation_lib/process.js
index 05f9696d8177c68a5011af2158dcbabe5572ba9f..661626657f0170d114d181d38fd5dbc9acb7ca9a 100644
--- a/process/Org_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -162,7 +162,7 @@ OrgUtils.openOrgReport = function(pOrgId)
"INFO" : info
};
- var orgReport = new Report("RPTJ_ORG", params);
+ var orgReport = new Report("RPTJ_ORGANISATION", params);
//add subreport data
orgReport.addSubReportData("subdataComm", commData);
diff --git a/report/RPTJ_ORG/Aufgaben.jrxml b/report/RPTJ_ORGANISATION/Aufgaben.jrxml
similarity index 100%
rename from report/RPTJ_ORG/Aufgaben.jrxml
rename to report/RPTJ_ORGANISATION/Aufgaben.jrxml
diff --git a/report/RPTJ_ORG/Historien.jrxml b/report/RPTJ_ORGANISATION/Historien.jrxml
similarity index 100%
rename from report/RPTJ_ORG/Historien.jrxml
rename to report/RPTJ_ORGANISATION/Historien.jrxml
diff --git a/report/RPTJ_ORG/Kommunikationsdaten.jrxml b/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml
similarity index 100%
rename from report/RPTJ_ORG/Kommunikationsdaten.jrxml
rename to report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml
diff --git a/report/RPTJ_ORG/Kontaktpersonen.jrxml b/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml
similarity index 100%
rename from report/RPTJ_ORG/Kontaktpersonen.jrxml
rename to report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml
diff --git a/report/RPTJ_ORG/RPTJ_ORG.aod b/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod
similarity index 63%
rename from report/RPTJ_ORG/RPTJ_ORG.aod
rename to report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod
index abf4c1b3743719d08ac6ddcfaa28b31ec6fff056..5bb351fd24b94e1c4a1fad7027290ba7b865e4a5 100644
--- a/report/RPTJ_ORG/RPTJ_ORG.aod
+++ b/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.1.5">
- <name>RPTJ_ORG</name>
- <title>Kundenstammblatt</title>
- <description></description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>%aditoprj%/report/RPTJ_ORG/icon.png</icon>
- <iconInactive>%aditoprj%/report/RPTJ_ORG/iconInactive.png</iconInactive>
- <reportData>%aditoprj%/report/RPTJ_ORG/reportData.jrxml</reportData>
- <reportType>JASPER</reportType>
- <subReports>
- <subreport>
- <name>Kontaktpersonen</name>
- <reportData>%aditoprj%/report/RPTJ_ORG/Kontaktpersonen.jrxml</reportData>
- </subreport>
- <subreport>
- <name>Historien</name>
- <reportData>%aditoprj%/report/RPTJ_ORG/Historien.jrxml</reportData>
- </subreport>
- <subreport>
- <name>Aufgaben</name>
- <reportData>%aditoprj%/report/RPTJ_ORG/Aufgaben.jrxml</reportData>
- </subreport>
- <subreport>
- <name>Kommunikationsdaten</name>
- <reportData>%aditoprj%/report/RPTJ_ORG/Kommunikationsdaten.jrxml</reportData>
- </subreport>
- </subReports>
- <images>
- <image>
- <name>myLogo</name>
- <fileName>myLogo.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_ORG/myLogo.png</imageData>
- </image>
- <image>
- <name>icon</name>
- <fileName>icon.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_ORG/icon.png</imageData>
- </image>
- <image>
- <name>iconInactive</name>
- <fileName>iconInactive.png</fileName>
- <imageData>%aditoprj%/report/RPTJ_ORG/iconInactive.png</imageData>
- </image>
- </images>
- <ribbon>
- <name>ribbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_REPORT</name>
- <showNavigationBar v="true" />
- <showZoom v="true" />
- <showExport v="true" />
- <showAux v="true" />
- <icon>REPORT_24</icon>
- <enabled v="true" />
- <layoutPosition>POSITION_TOP</layoutPosition>
- </ribbonTask>
- </ribbonTasks>
- </ribbon>
-</report>
+<?xml version="1.0" encoding="UTF-8"?>
+<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.1.5">
+ <name>RPTJ_ORGANISATION</name>
+ <title>Kundenstammblatt</title>
+ <description></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>%aditoprj%/report/RPTJ_ORGANISATION/icon.png</icon>
+ <iconInactive>%aditoprj%/report/RPTJ_ORGANISATION/iconInactive.png</iconInactive>
+ <reportData>%aditoprj%/report/RPTJ_ORGANISATION/reportData.jrxml</reportData>
+ <reportType>JASPER</reportType>
+ <subReports>
+ <subreport>
+ <name>Kontaktpersonen</name>
+ <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Historien</name>
+ <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Historien.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Aufgaben</name>
+ <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Aufgaben.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Kommunikationsdaten</name>
+ <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml</reportData>
+ </subreport>
+ </subReports>
+ <images>
+ <image>
+ <name>myLogo</name>
+ <fileName>myLogo.png</fileName>
+ <imageData>%aditoprj%/report/RPTJ_ORGANISATION/myLogo.png</imageData>
+ </image>
+ <image>
+ <name>icon</name>
+ <fileName>icon.png</fileName>
+ <imageData>%aditoprj%/report/RPTJ_ORGANISATION/icon.png</imageData>
+ </image>
+ <image>
+ <name>iconInactive</name>
+ <fileName>iconInactive.png</fileName>
+ <imageData>%aditoprj%/report/RPTJ_ORGANISATION/iconInactive.png</imageData>
+ </image>
+ </images>
+ <ribbon>
+ <name>ribbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_REPORT</name>
+ <showNavigationBar v="true" />
+ <showZoom v="true" />
+ <showExport v="true" />
+ <showAux v="true" />
+ <icon>REPORT_24</icon>
+ <enabled v="true" />
+ <layoutPosition>POSITION_TOP</layoutPosition>
+ </ribbonTask>
+ </ribbonTasks>
+ </ribbon>
+</report>
diff --git a/report/RPTJ_ORG/icon.png b/report/RPTJ_ORGANISATION/icon.png
similarity index 100%
rename from report/RPTJ_ORG/icon.png
rename to report/RPTJ_ORGANISATION/icon.png
diff --git a/report/RPTJ_ORG/iconInactive.png b/report/RPTJ_ORGANISATION/iconInactive.png
similarity index 100%
rename from report/RPTJ_ORG/iconInactive.png
rename to report/RPTJ_ORGANISATION/iconInactive.png
diff --git a/report/RPTJ_ORG/myLogo.png b/report/RPTJ_ORGANISATION/myLogo.png
similarity index 100%
rename from report/RPTJ_ORG/myLogo.png
rename to report/RPTJ_ORGANISATION/myLogo.png
diff --git a/report/RPTJ_ORG/reportData.jrxml b/report/RPTJ_ORGANISATION/reportData.jrxml
similarity index 99%
rename from report/RPTJ_ORG/reportData.jrxml
rename to report/RPTJ_ORGANISATION/reportData.jrxml
index 680bfe72fe4a1bf10eb3093e1807f5988b22a563..d6b03f139812d03da7d024c38933b209d0d6c101 100644
--- a/report/RPTJ_ORG/reportData.jrxml
+++ b/report/RPTJ_ORGANISATION/reportData.jrxml
@@ -14,7 +14,7 @@
<parameter name="adito.datasource.subdataComm" class="java.lang.Object"/>
<parameter name="adito.datasource.subdataPers" class="java.lang.Object"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_ORG\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_ORGANISATION\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="adito.datasource.subdataHist" class="java.lang.Object"/>