Merge branch 'master' of gitlab.adito.de:xrm/basic

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

neonView/PersEdit_view/PersEdit_view.aod

@@ -59,6 +59,11 @@
       <entityField>PersAddress_dfo</entityField>
       <view>AdressMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>6dc468f4-661d-4d0a-83ff-70b90a3e2ddf</name>
+      <entityField>OrgAddress_dfo</entityField>
+      <view>AdressMultiEdit_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
       <entityField>PersComm_dfo</entityField>

process/Keyword_lib/process.js

@@ -113,7 +113,7 @@ function KeywordUtils(){
                      createKeywordEntry("0", translate.text("Customer"))
                     ,createKeywordEntry("1", translate.text("Prospect"))
                     ,createKeywordEntry("2", translate.text("Supplier"))
-                    ,createKeywordEntry("3", translate.text("Other"))//TODO: key as ${}
+                    ,createKeywordEntry("3", translate.text("${ORGTYPE_OTHER}"))
                 ]);
                 break;
             case "PERS.GENDER":