Merge branch 'master' into campaignmanagement

# Conflicts:
#	.aditoprj/project.version
#	aliasDefinition/Data_alias/Data_alias.aod
#	entity/Appointment_entity/Appointment_entity.aod
#	entity/Attribute_entity/Attribute_entity.aod
#	entity/EmployeeRole_entity/EmployeeRole_entity.aod
#	entity/Employee_entity/Employee_entity.aod
#	entity/Person_entity/Person_entity.aod
#	entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

entity/Task_entity/Task_entity.aod

@@ -30,6 +30,7 @@
     <entityField>
       <name>STATUS</name>
       <title>{$TASK_STATUS}</title>
+      <colorProcess>%aditoprj%/entity/Task_entity/entityfields/status/colorProcess.js</colorProcess>
       <consumer>KeywordStates</consumer>
       <mandatory v="true" />
       <groupable v="true" />
@@ -401,6 +402,12 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityField>
+      <name>PRIORITY_ICON</name>
+      <colorProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/colorProcess.js</colorProcess>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority_icon/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Task_entity/entityfields/priority_icon/colorProcess.js

+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+
+switch(vars.getString("$field.PRIORITY"))
+{
+    case $KeywordRegistry.taskPriority$none():
+        result.string("$priority-none");
+        break;
+    case $KeywordRegistry.taskPriority$low():
+        result.string("$priority-low");
+        break;
+    case $KeywordRegistry.taskPriority$medium():
+        result.string("$priority-medium");
+        break;
+    case $KeywordRegistry.taskPriority$high():
+        result.string("$priority-high");
+        break;
+}
+

entity/Task_entity/entityfields/priority_icon/valueProcess.js

+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+
+switch(vars.getString("$field.STATUS"))
+{
+    case $KeywordRegistry.taskStatus$new():
+        result.string("NEON:STATUS_NOT_STARTED");
+        break;
+    case $KeywordRegistry.taskStatus$inProcess():
+        result.string("NEON:STATUS_IN_PROGRESS");
+        break;
+    case $KeywordRegistry.taskStatus$waiting():
+        result.string("NEON:STATUS_WAITING");
+        break;
+    case $KeywordRegistry.taskStatus$ended():
+        result.string("NEON:STATUS_DONE");
+        break;
+}
+

language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod

@@ -3075,6 +3075,24 @@
     <entry>
       <key>Costs</key>
     </entry>
+    <entry>
+      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+    </entry>
+    <entry>
+      <key>file '%0' cannot be read</key>
+    </entry>
+    <entry>
+      <key>Importer</key>
+    </entry>
+    <entry>
+      <key>yyyy-MM-dd HH:mm:ss</key>
+    </entry>
+    <entry>
+      <key>file '%0' does not exist or you have got no permission on this file</key>
+    </entry>
+    <entry>
+      <key>Zip</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -3922,6 +3922,25 @@
       <key>Costs</key>
       <value>Kosten</value>
     </entry>
+    <entry>
+      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+      <value>Webservice nicht erreichbar. URL: %0 %1</value>
+    </entry>
+    <entry>
+      <key>file '%0' cannot be read</key>
+    </entry>
+    <entry>
+      <key>Importer</key>
+    </entry>
+    <entry>
+      <key>yyyy-MM-dd HH:mm:ss</key>
+    </entry>
+    <entry>
+      <key>file '%0' does not exist or you have got no permission on this file</key>
+    </entry>
+    <entry>
+      <key>Zip</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -3108,6 +3108,25 @@
     <entry>
       <key>Costs</key>
     </entry>
+    <entry>
+      <key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
+      <value>Webservice not available. URL: %0 %1</value>
+    </entry>
+    <entry>
+      <key>file '%0' cannot be read</key>
+    </entry>
+    <entry>
+      <key>Importer</key>
+    </entry>
+    <entry>
+      <key>yyyy-MM-dd HH:mm:ss</key>
+    </entry>
+    <entry>
+      <key>file '%0' does not exist or you have got no permission on this file</key>
+    </entry>
+    <entry>
+      <key>Zip</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>

neonContext/AttributeRelation/AttributeRelation.aod

@@ -3,13 +3,8 @@
   <name>AttributeRelation</name>
   <title>Attributes</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterview>AttributeRelationFilter_view</filterview>
   <entity>AttributeRelation_entity</entity>
   <references>
-    <neonViewReference>
-      <name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
-      <view>AttributeRelationFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
       <view>AttributeRelationEdit_view</view>

neonContext/AttributeRelationTree/AttributeRelationTree.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
   <name>AttributeRelationTree</name>
+  <title>Attributes</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <editview>AttributeRelationTreeEdit_view</editview>
   <entity>AttributeRelationTree_entity</entity>
   <references>
     <neonViewReference>

neonView/ActivityEdit_view/ActivityEdit_view.aod

@@ -21,7 +21,7 @@
           <entityField>SUBJECT</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>1d34b348-3f43-4998-bdf9-538fb25d716f</name>
+          <name>b90a5d96-9d1f-4eeb-b42c-0debeb7cf260</name>
           <entityField>INFO</entityField>
         </entityFieldLink>
         <entityFieldLink>

neonView/ActivityFilter_view/ActivityFilter_view.aod

@@ -91,12 +91,33 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeViewTemplate>
-      <name>ActivitiesTreetable</name>
-      <titleField>SUBJECT_DETAILS</titleField>
-      <descriptionField>INFO</descriptionField>
-      <iconField>#IMAGE</iconField>
+    <treeTableViewTemplate>
+      <name>ActivitiesTreeTable</name>
       <entityField>#ENTITY</entityField>
-    </treeViewTemplate>
+      <columns>
+        <neonTableColumn>
+          <name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
+          <entityField>ICON</entityField>
+          <width v="75" />
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
+          <entityField>SUBJECT</entityField>
+          <width v="75" />
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
+          <entityField>ENTRYDATE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
+          <entityField>DIRECTION</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
+          <entityField>CATEGORY</entityField>
+        </neonTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>

neonView/ActivityMain_view/ActivityMain_view.aod

@@ -29,11 +29,6 @@
       <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>8ffd03a7-a841-4674-96bf-04689d46cf48</name>
-      <entityField>Attributes</entityField>
-      <view>AttributeRelationFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>f57fb116-d356-47c7-8da6-ee64b4a01b46</name>
       <entityField>AttributeTree</entityField>

neonView/AddressList_view/AddressList_view.aod

@@ -22,14 +22,6 @@
           <name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
           <entityField>COUNTRY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
-          <entityField>ADDRESS</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
-          <entityField>BUILDINGNO</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>0336ea99-c4a1-4f39-b5aa-a520a7dcbaab</name>
           <entityField>ZIP</entityField>
@@ -38,10 +30,6 @@
           <name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
           <entityField>CITY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>af515eed-da89-49dc-ba3a-30958bd4fedd</name>
-          <entityField>DISTRICT</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
           <entityField>REGION</entityField>
@@ -50,6 +38,14 @@
           <name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
           <entityField>STATE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
+          <entityField>ADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>935bcecf-fdd9-4e82-a53f-3c3082c85340</name>
+          <entityField>BUILDINGNO</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>6af52273-25bf-4286-83cc-217aea94ad09</name>
           <entityField>ADDRIDENTIFIER</entityField>

neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod

@@ -24,10 +24,6 @@
           <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
           <entityField>COUNTRY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>4035d833-ece7-4562-8acf-51c7a01b8497</name>
-          <entityField>DISTRICT</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>05bb9d3b-0e90-4a1a-bfe8-03b7dab6ed01</name>
           <entityField>REGION</entityField>

neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod

@@ -20,14 +20,6 @@
           <name>435f10b8-b6ef-4187-bffc-fc6104a6130c</name>
           <entityField>COUNTRY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>ac71d5eb-7ce7-41a0-91aa-5594f2238788</name>
-          <entityField>ADDRESS</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
-          <entityField>BUILDINGNO</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>c1372a93-cf83-4c55-90e6-3b6b352abebf</name>
           <entityField>ZIP</entityField>
@@ -36,10 +28,6 @@
           <name>2e7ba632-36ad-4852-bcca-d75bcf3f7de1</name>
           <entityField>CITY</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>e25f4140-0772-4417-85f0-41052b413c30</name>
-          <entityField>DISTRICT</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>b62515bf-e89d-44a9-94ff-933766657fe5</name>
           <entityField>REGION</entityField>
@@ -48,6 +36,14 @@
           <name>66ae75ca-7a5c-4cf0-b768-6c2900f7b7c6</name>
           <entityField>STATE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>ac71d5eb-7ce7-41a0-91aa-5594f2238788</name>
+          <entityField>ADDRESS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>61261845-740e-4f4b-a1f8-5e6aeac2deba</name>
+          <entityField>BUILDINGNO</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>443b9d7d-dac2-40b2-bb2b-d5e0091877a9</name>
           <entityField>ADDRIDENTIFIER</entityField>

neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>AttributeRelationFilter_view</name>
-  <title>Attributes</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
-  <layout>
-    <boxLayout>
-      <name>layout</name>
-    </boxLayout>
-  </layout>
-  <children>
-    <tableViewTemplate>
-      <name>RelationsTable</name>
-      <autoNewRow v="true" />
-      <entityField>#ENTITY</entityField>
-      <columns>
-        <neonTableColumn>
-          <name>b37d207a-6119-454a-8fc6-073e9d54b1d3</name>
-          <entityField>AB_ATTRIBUTE_ID</entityField>
-        </neonTableColumn>
-        <neonTableColumn>
-          <name>83a10d52-9eaf-4901-935e-2a7410831861</name>
-          <entityField>valueProxy</entityField>
-        </neonTableColumn>
-      </columns>
-    </tableViewTemplate>
-  </children>
-</neonView>

neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod

@@ -11,6 +11,7 @@
     <treeTableViewTemplate>
       <name>TreeTable</name>
       <parentField>PARENT_ID</parentField>
+      <favoriteActionGroup1>alter</favoriteActionGroup1>
       <showChildrenCount v="false" />
       <entityField>#ENTITY</entityField>
       <columns>

neonView/EmployeeMain_view/EmployeeMain_view.aod

@@ -19,11 +19,6 @@
       <entityField>EmployeeRoles</entityField>
       <view>EmployeeRoleFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>7164f8cd-3892-4694-92ad-fc45afac68f1</name>
-      <entityField>Attributes</entityField>
-      <view>AttributeRelationFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>68e54801-e68f-4797-97d2-368b4b82a7e4</name>
       <entityField>AttributeTree</entityField>

neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod

@@ -9,15 +9,23 @@
     </groupLayout>
   </layout>
   <children>
-    <treeViewTemplate>
-      <name>EntriesTreetable</name>
-      <titleField>TITLE</titleField>
-      <descriptionField>KEYID</descriptionField>
+    <treeTableViewTemplate>
+      <name>EntriesTreeTable</name>
       <defaultGroupFields>
         <element>CONTAINER</element>
       </defaultGroupFields>
       <entityField>#ENTITY</entityField>
-    </treeViewTemplate>
+      <columns>
+        <neonTableColumn>
+          <name>aa5612b4-997e-4f0f-8fb1-91e18e32051d</name>
+          <entityField>TITLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>6100879d-dc6a-4c7e-b750-f5b7e627f48a</name>
+          <entityField>KEYID</entityField>
+        </neonTableColumn>
+      </columns>
+    </treeTableViewTemplate>
     <tableViewTemplate>
       <name>EntriesTable</name>
       <entityField>#ENTITY</entityField>

neonView/OfferPreview_view/OfferPreview_view.aod

@@ -12,7 +12,7 @@
     <cardViewTemplate>
       <name>Header</name>
       <iconField>IMAGE</iconField>
-      <titleField>Offer_OfferCode_VersNr_fieldgroup</titleField>
+      <titleField>OfferCode_VersNr_fieldgroup</titleField>
       <descriptionField>CONTACT_ID</descriptionField>
       <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>

neonView/OfferitemFilter_view/OfferitemFilter_view.aod

@@ -9,48 +9,48 @@
     </boxLayout>
   </layout>
   <children>
-    <tableViewTemplate>
-      <name>Offeritems</name>
-      <autoNewRow v="true" />
+    <treeTableViewTemplate>
+      <name>OfferitemsTreeTable</name>
+      <parentField>ASSIGNEDTO</parentField>
       <entityField>#ENTITY</entityField>
       <columns>
         <neonTableColumn>
-          <name>8c74810d-d127-4e64-8fbf-1b3db1835232</name>
+          <name>91e85f61-5e5d-48f8-aeb1-a5740ec07e25</name>
           <entityField>ITEMPOSITION</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>545f79bf-2fee-4112-9541-0889d0e514eb</name>
+          <name>0d896874-cdb1-42bb-8a47-8ee61def6177</name>
           <entityField>PRODUCT_ID</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>2a907da4-b48d-4933-bc17-a40e7d4556f9</name>
+          <name>0b493fd0-d94d-4bfa-8533-ff2ad4af7ffb</name>
           <entityField>QUANTITY</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
+          <name>917406b8-f030-417d-a961-f391655526ec</name>
           <entityField>UNIT</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
+          <name>14da5a9f-4fed-4977-aec0-823ab665e1cb</name>
           <entityField>PRICE</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
+          <name>25d9f682-eb5f-4d96-a040-c3f4522affe7</name>
           <entityField>DISCOUNT</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+          <name>9e2bcb7e-b042-4f13-946c-0a6422412975</name>
           <entityField>VAT</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
+          <name>7a3b3ce6-a651-4a2a-acfa-0e990fb0b041</name>
           <entityField>OPTIONAL</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>60a36c38-103f-4fdb-9e8a-b8fd6d441f14</name>
+          <name>e43213db-8867-495f-8305-3472a8906222</name>
           <entityField>TotalPrice</entityField>
         </neonTableColumn>
       </columns>
-    </tableViewTemplate>
+    </treeTableViewTemplate>
   </children>
 </neonView>