Merge master into 1035100-AnpassungenMeilensteinen

Conflicts:
	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
	others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
	others/db_changes/data_alias/struct/create_salesproject.xml

neonContext/Salesproject/Salesproject.aod

@@ -26,7 +26,7 @@
       <view>SalesprojectEdit_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>61d4a62d-6166-4594-9fed-f5edb0c22191</name>
+      <name>d7fb7e2b-c932-4b96-be2c-ae5ec3d36beb</name>
       <view>SalesprojectCycle_view</view>
     </neonViewReference>
   </references>

neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod

@@ -4,10 +4,9 @@
   <title>Milestones</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <drawerLayout>
+    <boxLayout>
       <name>layout</name>
-      <layoutCaption>Milestones</layoutCaption>
-    </drawerLayout>
+    </boxLayout>
   </layout>
   <children>
     <neonViewReference>

neonView/SalesprojectMain_view/SalesprojectMain_view.aod

@@ -49,11 +49,6 @@
       <entityField>SalesprojectClassifications</entityField>
       <view>SalesprojectClassificationFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>0acc61f5-f61a-4c93-a4fb-e5ae44a71dae</name>
-      <entityField>SalesprojectForecasts</entityField>
-      <view>SalesprojectForecastFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>c0027b4d-c014-4053-a595-daad9a73ad5c</name>
       <entityField>Timetrackings</entityField>

process/Salesproject_lib/process.js

@@ -68,7 +68,7 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
  */
 Salesproject.notifyToUpdateForecast = function() {
     // TODO: logging.show durch sinnvolle Meldung ersetzen oder ähnlich...
-    logging.show(translate.text("Please update the forecast."));
+   // logging.show(translate.text("Please update the forecast."));
 }
 
 /**