diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js index 48cfc6320620c6baf8bba6379b6dffe9f3cc6e15..3bd92b4f6f69e42d1a38d3123c35175e1c38e12a 100644 --- a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js +++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js @@ -8,6 +8,6 @@ import("system.SQLTYPES") var forecast = db.cell(SqlCondition.begin() .andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER) - .buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2")); + .buildSql("select sum(VOLUME) from SALESPROJECT_FORECAST", "1=2")); result.string(forecast); \ No newline at end of file diff --git a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js index a85f1176a29643305d67fad51f1203686754a367..f7b76c335483a7410366d5c56db6ae8ba7917091 100644 --- a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js +++ b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js @@ -1,4 +1,4 @@ import("system.result"); import("system.translate"); -result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}") + ")"); \ No newline at end of file +result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${EURO_SIGN}") + ")"); \ No newline at end of file diff --git a/process/Turnover_lib/process.js b/process/Turnover_lib/process.js index 0a3a6fa24c6d861ce90733c86d86ab15615b5338..3e61ef64230b04645ea8f06d36784182cd454788 100644 --- a/process/Turnover_lib/process.js +++ b/process/Turnover_lib/process.js @@ -59,7 +59,7 @@ TurnoverUtil.getForecastData = function (pMaxYear, pYearCount) var data = db.table(SqlCondition.begin() .andPrepare("SALESPROJECT_FORECAST.DATE_START", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER) .andPrepare("SALESPROJECT_FORECAST.DATE_START", minYear, "year(#) >= ?", SQLTYPES.INTEGER) - .buildSql("select '" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME * 1000) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName from SALESPROJECT_FORECAST", "1=2", " group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum")) + .buildSql("select '" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName from SALESPROJECT_FORECAST", "1=2", " group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum")) return data; }