From 799b91a6d8156ec912ab896b69559a5c2e83e37f Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Thu, 27 May 2021 11:40:32 +0000
Subject: [PATCH] Cherrypick 1081044 into 2021.1.0
---
.../basic/2021.1.0/alterPlanningMonthData.xml | 12 ++++++++++++
.liquibase/Data_alias/basic/2021.1.0/changelog.xml | 6 +++---
.../jditodynamicmultidatachart/contentProcess.js | 5 +++--
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
process/Turnover_lib/process.js | 10 +++++-----
5 files changed, 24 insertions(+), 10 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2021.1.0/alterPlanningMonthData.xml
diff --git a/.liquibase/Data_alias/basic/2021.1.0/alterPlanningMonthData.xml b/.liquibase/Data_alias/basic/2021.1.0/alterPlanningMonthData.xml
new file mode 100644
index 00000000000..3bc2dd381f5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.1.0/alterPlanningMonthData.xml
@@ -0,0 +1,12 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.luginger" id="070e05ce-5afe-4738-8448-7c08b9961d78">
+
+ <update tableName="PLANNING_MONTH">
+ <column name="MONTH_FACTOR" valueNumeric="8.34"/>
+ <where>MONTH_NUMBER in (1, 2, 3, 4)</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.1.0/changelog.xml b/.liquibase/Data_alias/basic/2021.1.0/changelog.xml
index 6a4ca39ed95..6d3bb24829c 100644
--- a/.liquibase/Data_alias/basic/2021.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.1.0/changelog.xml
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="alterPlanningMonthData.xml"/>
<include relativeToChangelogFile="true" file="create_standardWorkflow.xml"/>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog></databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/contentProcess.js b/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/contentProcess.js
index 80bd839c8eb..1fcebb28452 100644
--- a/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jditodynamicmultidatachart/contentProcess.js
@@ -26,8 +26,9 @@ if( vars.exists("$local.grouped"))
var sqlHelper = new SqlMaskingUtils();
- var select = newSelect("count(*), results.uid, results.groupField, sum(results.sum_planning), "
- + "sum(results.sum_forecast), sum(results.sum_turnover), sum(results.sum_forecast_weighted) ")
+ var select = newSelect("count(*), results.uid, results.groupField, " + sqlHelper.cast("sum(results.sum_planning)", SQLTYPES.INTEGER) + ", "
+ + sqlHelper.cast("sum(results.sum_forecast)", SQLTYPES.INTEGER) + ", " + sqlHelper.cast("sum(results.sum_turnover)", SQLTYPES.INTEGER)
+ + "," + sqlHelper.cast("sum(results.sum_forecast_weighted)", SQLTYPES.INTEGER))
.from("(" + fromSql.toString() + ") results")
.groupBy("results.uid, results.groupField");
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index b53cdc8b99d..b49864ce47d 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -11220,6 +11220,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Buying center and internal project team</key>
+ <value>Buying center und internes Projektteam</value>
</entry>
<entry>
<key>Starts the serverprocess manually, which will recalculate all (potentially) outdated classifications. Use this after changes to the configuration of classifications.</key>
diff --git a/process/Turnover_lib/process.js b/process/Turnover_lib/process.js
index 4ce2665e328..3193c9e5038 100644
--- a/process/Turnover_lib/process.js
+++ b/process/Turnover_lib/process.js
@@ -192,7 +192,7 @@ TurnoverDynamicChart.prototype.getPlanningFromSql = function ()
+ " (" + this.getGroupFieldDisplayValue(this.idxPlanning) + ") as groupField, ";
}
- select += sqlHelper.cast("FORECAST.VOLUME/100*PLANNING_MONTH.MONTH_FACTOR", SQLTYPES.INTEGER) + " as sum_planning, "
+ select += "FORECAST.VOLUME*PLANNING_MONTH.MONTH_FACTOR/100 as sum_planning, "
+ "0 as sum_forecast, 0 as sum_turnover, 0 as sum_forecast_weighted ";
return newSelect(select)
@@ -226,7 +226,7 @@ TurnoverDynamicChart.prototype.getForecastFromSql = function (pIsWeighted)
select = this.groupMapping[this.groupedField]["forGrouping"][this.idxForecast] + " as uid, "
+ "(" + this.getGroupFieldDisplayValue(this.idxForecast) + ") as groupField,";
}
- var volumeColumns = " 0 as sum_planning, " + sqlHelper.cast("FORECAST.VOLUME", SQLTYPES.INTEGER)
+ var volumeColumns = " 0 as sum_planning, FORECAST.VOLUME"
+ " as sum_forecast, 0 as sum_turnover, 0 as sum_forecast_weighted";
if(pIsWeighted)
@@ -237,7 +237,7 @@ TurnoverDynamicChart.prototype.getForecastFromSql = function (pIsWeighted)
}
volumeColumns = " 0 as sum_planning, 0 as sum_forecast, 0 as sum_turnover, "
- + sqlHelper.cast("(FORECAST.VOLUME/100*SALESPROJECT.PROBABILITY)", SQLTYPES.INTEGER)
+ + "(FORECAST.VOLUME/100*SALESPROJECT.PROBABILITY)"
+ " as sum_forecast_weighted";
}
@@ -273,9 +273,9 @@ TurnoverDynamicChart.prototype.getTurnoverFromSql = function ()
}
select += " 0 as sum_planning, 0 as sum_forecast, "
- + sqlHelper.cast("((SALESORDERITEM.PRICE * SALESORDERITEM.QUANTITY * (100 - " + sqlHelper.isNull("SALESORDERITEM.DISCOUNT", 0)
+ + "((SALESORDERITEM.PRICE * SALESORDERITEM.QUANTITY * (100 - " + sqlHelper.isNull("SALESORDERITEM.DISCOUNT", 0)
+ ") / 100) + (SALESORDERITEM.PRICE * SALESORDERITEM.QUANTITY * (100 - " + sqlHelper.isNull("SALESORDERITEM.DISCOUNT", 0)
- + ") / 100 * " + sqlHelper.isNull("SALESORDERITEM.VAT", 0) + " / 100))", SQLTYPES.INTEGER) + " as sum_turnover"
+ + ") / 100 * " + sqlHelper.isNull("SALESORDERITEM.VAT", 0) + " / 100)) as sum_turnover"
+ ", 0 as sum_forecast_weighted";
return newSelect(select)
--
GitLab