Skip to content

Commit

Permalink
Merge pull request #285 from micromata/Release-8.1-SNAPSHOT
Browse files Browse the repository at this point in the history
- CsrfService simplified (and long known bug resolved?)
- FileHelper -> FilenameUtils/FileUtils, Forecast: filenames,
- ForecastTemplate-Excel...
  • Loading branch information
kreinhard authored Feb 5, 2025
2 parents a72cc00 + 2955991 commit d328968
Show file tree
Hide file tree
Showing 14 changed files with 668 additions and 740 deletions.
2 changes: 1 addition & 1 deletion projectforge-application/src/main/resources/i18nKeys.json
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@
{"i18nKey":"fibu.auftrag.filter.type.nochNichtVollstaendigFakturiert","bundleName":"I18nResources","translation":"not completely invoiced","translationDE":"noch nicht vollständig fakturiert","usedInClasses":["org.projectforge.business.fibu.AuftragFakturiertFilterStatus"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.filter.type.vollstaendigFakturiert","bundleName":"I18nResources","translation":"completely invoiced","translationDE":"vollständig fakturiert","usedInClasses":["org.projectforge.business.fibu.AuftragFakturiertFilterStatus"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.filter.type.zuFakturieren","bundleName":"I18nResources","translation":"to be invoiced","translationDE":"zu fakturieren","usedInClasses":["org.projectforge.business.fibu.AuftragFakturiertFilterStatus"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.forecast","bundleName":"I18nResources","translation":"Forecast","translationDE":"Forecast","usedInClasses":["org.projectforge.business.fibu.ForecastOrderAnalysis"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.forecast","bundleName":"I18nResources","translation":"Forecast","translationDE":"Forecast","usedInClasses":["org.projectforge.business.fibu.ForecastOrderAnalysis","org.projectforge.web.wicket.HtmlPreviewModalDialog"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.forecast.lostBudgetWarning","bundleName":"I18nResources","translation":"{0} Budget Loss Warning: The budget is expected to be undershot by {1}% (more than {2}%). For analysis details see the order editing page.","translationDE":"{0} Budget-Verlust-Warnung: Das Budget wird um voraussichtlich {1}% unterschritten (mehr als {2}%). Für Analysedetails siehe Auftrageditierseite.","usedInClasses":["org.projectforge.business.fibu.ForecastExport"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.forecastExportAsXls","bundleName":"I18nResources","translation":"Forecast","translationDE":"Forecast","usedInClasses":["org.projectforge.web.fibu.AuftragListPage"],"usedInFiles":[]},
{"i18nKey":"fibu.auftrag.forecastExportAsXls.tooltip","bundleName":"I18nResources","translation":"Forecast export for actual orderbook list. The start date will be taken from the period of performance begin. If not present it uses 01/01/[actual year].","translationDE":"Export des Forecasts für die aktuelle Auftragsliste. Das Startdatum wird aus dem Leistungszeitraum Start Filter verwendet. Wenn nicht angegeben wird der 01.01.[aktuelles Jahr] verwendet.","usedInClasses":["org.projectforge.web.fibu.AuftragListPage"],"usedInFiles":[]},
Expand Down
Loading

0 comments on commit d328968

Please sign in to comment.