From ef7f9a59bb69ef2f21633791250e491cb6e7c649 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 27 Feb 2019 17:14:39 +0100
Subject: [PATCH] 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 | 2 +-
neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod | 5 ++---
neonView/SalesprojectMain_view/SalesprojectMain_view.aod | 5 -----
process/Salesproject_lib/process.js | 2 +-
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 73048f02d1..1409d56b58 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/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>
diff --git a/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod b/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
index 14e9b59118..0af20f499b 100644
--- a/neonView/SalesprojectCycle_view/SalesprojectCycle_view.aod
+++ b/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>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 28198cc984..c7d28d906b 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/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>
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index 479848b10d..fa2999b7f3 100644
--- a/process/Salesproject_lib/process.js
+++ b/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."));
}
/**
--
GitLab