From a91587b9647761ad031d826367f19b746b655b55 Mon Sep 17 00:00:00 2001 From: "S.Leierseder" <S.Leierseder@SLeierseder.aditosoftware.local> Date: Thu, 18 Jul 2019 08:12:09 +0200 Subject: [PATCH] amendment salesproject mainview and translations --- language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++ language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 9 +++++++++ language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 ++++++ .../SalesprojectClassificationAttribute_view.aod | 4 +--- .../SalesprojectClassificationDrawer_view.aod | 2 +- .../SalesprojectForecastDrawer_view.aod | 1 + .../SalesprojectMemberActivity_view.aod | 2 +- .../SalesprojectMilestoneChart_view.aod | 2 +- .../SalesprojectMilestoneSource_view.aod | 2 +- .../SalesprojectMilestone_view.aod | 2 +- .../SalesprojectOfferForecastChart_view.aod | 6 +++--- .../SalesprojectOverview_view.aod | 1 - 12 files changed, 31 insertions(+), 12 deletions(-) diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 24cd67570e9..7ed7b75c18d 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -4983,6 +4983,12 @@ <entry> <key>NORMAL</key> </entry> + <entry> + <key>Categorization</key> + </entry> + <entry> + <key>Phase progression</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index ecef5fda9f2..01c18ad8467 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -72,6 +72,7 @@ </entry> <entry> <key>Categorization</key> + <value>Einordnung</value> </entry> <entry> <key>Names</key> @@ -3356,6 +3357,10 @@ <key>Virgin Islands (U.S.)</key> <value>Jungferninseln (US)</value> </entry> + <entry> + <key>Occurrence</key> + <value>Ereignis</value> + </entry> <entry> <key>New Zealand</key> <value>Neuseeland</value> @@ -3925,6 +3930,10 @@ <key>Partner</key> <value>Partner</value> </entry> + <entry> + <key>Occurrences</key> + <value>Ereignisse</value> + </entry> <entry> <key>Protected</key> <value>Geschützt</value> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 330e6745358..b171cf67ae3 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -5032,6 +5032,12 @@ <entry> <key>NORMAL</key> </entry> + <entry> + <key>Categorization</key> + </entry> + <entry> + <key>Phase progression</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod index 337b97ad1f1..9c6d7cfa968 100644 --- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod +++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod @@ -1,13 +1,11 @@ <?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>SalesprojectClassificationAttribute_view</name> - <title>Classification</title> + <title>Categorization</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> <name>layout</name> - <direction>VERTICAL</direction> - <autoHeight v="false" /> </boxLayout> </layout> <children> diff --git a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod b/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod index 1ea958aa184..ef8deec39c9 100644 --- a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod +++ b/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod @@ -6,7 +6,7 @@ <drawerLayout> <name>layout</name> <layoutCaption>Classification</layoutCaption> - <fixedDrawer v="false" /> + <fixedDrawer v="true" /> </drawerLayout> </layout> <children> diff --git a/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod b/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod index ca358412769..fdb3fc8a71c 100644 --- a/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod +++ b/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod @@ -6,6 +6,7 @@ <drawerLayout> <name>layout</name> <layoutCaption>Forecast</layoutCaption> + <fixedDrawer v="true" /> </drawerLayout> </layout> <children> diff --git a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod index 97d0bf8e350..c91774551d5 100644 --- a/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod +++ b/neonView/SalesprojectMemberActivity_view/SalesprojectMemberActivity_view.aod @@ -1,7 +1,7 @@ <?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>SalesprojectMemberActivity_view</name> - <title>Activities</title> + <title>Project</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> diff --git a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod b/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod index c109bafcabf..d1f4aa8521c 100644 --- a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod +++ b/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod @@ -5,7 +5,7 @@ <layout> <drawerLayout> <name>layout</name> - <layoutCaption>Milestone</layoutCaption> + <layoutCaption>Milestones</layoutCaption> <fixedDrawer v="true" /> </drawerLayout> </layout> diff --git a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod index d6fe201f6f8..192485975be 100644 --- a/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod +++ b/neonView/SalesprojectMilestoneSource_view/SalesprojectMilestoneSource_view.aod @@ -1,7 +1,7 @@ <?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>SalesprojectMilestoneSource_view</name> - <title>Milestones</title> + <title>Occurrences</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> diff --git a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod index 0eec94ee7c0..7546c68acb3 100644 --- a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod +++ b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod @@ -1,7 +1,7 @@ <?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>SalesprojectMilestone_view</name> - <title>Milestones</title> + <title></title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> diff --git a/neonView/SalesprojectOfferForecastChart_view/SalesprojectOfferForecastChart_view.aod b/neonView/SalesprojectOfferForecastChart_view/SalesprojectOfferForecastChart_view.aod index 0d86d703456..0dc7789a13c 100644 --- a/neonView/SalesprojectOfferForecastChart_view/SalesprojectOfferForecastChart_view.aod +++ b/neonView/SalesprojectOfferForecastChart_view/SalesprojectOfferForecastChart_view.aod @@ -1,7 +1,7 @@ <?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>SalesprojectOfferForecastChart_view</name> - <title>Forecast</title> + <title>Prognose</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> <boxLayout> @@ -11,9 +11,9 @@ </layout> <children> <neonViewReference> - <name>d37e05d3-659f-4d96-9d86-277b4d95090b</name> + <name>03ee8624-3c62-40e4-90ff-f47e10ce1189</name> <entityField>#ENTITY</entityField> - <view>SalesprojectOfferForecast_view</view> + <view>SalesprojectForecastDrawer_view</view> </neonViewReference> <neonViewReference> <name>72e09476-f603-4bc8-ae97-4525c44fab3c</name> diff --git a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod index 64da4f86a41..4e9c59faff3 100644 --- a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod +++ b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod @@ -6,7 +6,6 @@ <layout> <boxLayout> <name>layout</name> - <autoHeight v="false" /> </boxLayout> </layout> <children> -- GitLab