Skip to content
Snippets Groups Projects
Commit 736843b0 authored by Sophia Leierseder's avatar Sophia Leierseder
Browse files

adaptations to salesproject dashboard elements

parent f0ac60e3
No related branches found
No related tags found
No related merge requests found
Showing
with 44 additions and 14 deletions
......@@ -522,13 +522,15 @@
<title>Turnover actual year</title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
<titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OVERALL_FORECAST</name>
<title>Forecast actual year </title>
<title>Forecast actual year</title>
<contentType>NUMBER</contentType>
<state>READONLY</state>
<titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
</entityField>
<entityField>
......
import("system.vars");
import("system.result");
import("system.translate");
import("system.datetime");
result.string(translate.text("Forecast") + " " + datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
import("system.vars");
import("system.result");
import("system.translate");
import("system.datetime");
result.string(translate.text("Turnover") + " " + datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
......@@ -2742,6 +2742,9 @@
<entry>
<key>Salesproject phases</key>
</entry>
<entry>
<key>Key figures</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
......@@ -1596,6 +1596,10 @@
<entry>
<key>Kundenstammblatt</key>
</entry>
<entry>
<key>Key figures</key>
<value>Kennzahlen</value>
</entry>
<entry>
<key>Person</key>
</entry>
......@@ -3519,9 +3523,14 @@
</entry>
<entry>
<key>Turnover actual year</key>
<value>Umsatz aktuelles Jahr</value>
</entry>
<entry>
<key>Forecast actual year</key>
<value>Forecast aktuelles Jahr</value>
</entry>
<entry>
<key>Salesproject Phases</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
......
......@@ -2773,6 +2773,9 @@
<entry>
<key>Salesproject phases</key>
</entry>
<entry>
<key>Key figures</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
......@@ -16,16 +16,16 @@
<configName>OpenSalesprojectsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
<yPos v="0" />
<colspan v="1" />
<xPos v="1" />
<yPos v="5" />
<colspan v="2" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
<name>Dashlet2</name>
<viewName>OfferFilter_view</viewName>
<configName>SendOffersDashlet</configName>
<viewName>SalesprojectScoreCard_view</viewName>
<configName>KeyFigures</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
......@@ -36,8 +36,8 @@
</neonDashlet>
<neonDashlet>
<name>Dashlet3</name>
<viewName>ContractFilter_view</viewName>
<configName>AllContractsDashlet</configName>
<viewName>SalesprojectChart_view</viewName>
<configName>Salesproject phases</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
......@@ -64,9 +64,9 @@
<configName>TurnoverDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="1" />
<yPos v="5" />
<colspan v="2" />
<xPos v="0" />
<yPos v="0" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
......
......@@ -5,7 +5,7 @@
<dashletConfigurations>
<neonDashletConfiguration>
<name>Salesproject phases</name>
<title>Salesproject Phases</title>
<title>Salesproject phases</title>
<description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
<fragment>SalesprojectChart/full</fragment>
<singleton v="true" />
......
......@@ -8,7 +8,7 @@
<title>Key figures</title>
<description>Kennzahlen</description>
<fragment>Salesproject/full</fragment>
<singleton v="false" />
<singleton v="true" />
<icon>VAADIN:GRID_BIG</icon>
<categories>
<neonDashletCategory>
......
......@@ -3,6 +3,7 @@
<name>TimetrackingFilter_view</name>
<title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
......
......@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>xRM-Basic2019</projectName>
<projectName>basic</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment