From df68d4622b0a803b1d8d57b53c9ed56d604d24bd Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 9 Jul 2024 01:04:49 +0200 Subject: [PATCH] Diverse Bugfixes, VacationService, Arbeitszeitmodul im Stundenkonto, Spitzabrechnung BfpDus --- BeWo/BeWo.csproj | 4 +- .../SettlementInvoiceItemEditView2.xaml | 7 +- .../Detail/Report/AbwesenheitsView.xaml.cs | 9 +- BeWo/ViewModel/InvoiceItemVM.cs | 13 + Data/Entities/ApplicationUser.cs | 20 +- .../MitarbeiterstundenkontoBerechnung.cs | 41 +- ...eiterstundenkontoBerechnungTagesansicht.cs | 18 +- .../Invoicing/PoolInvoiceCreation.cs | 4 +- ReportImp/BfpDus/BfpDus.csproj | 1 + ReportImp/BfpDus/Briefkopf.Designer.cs | 126 +-- ReportImp/BfpDus/Briefkopf.resx | 59 +- ReportImp/BfpDus/Properties/licenses.licx | 1 + .../BfpDus/ServiceInvoiceReport.Designer.cs | 270 +---- ReportImp/BfpDus/ServiceInvoiceReport.resx | 3 - ReportImp/BfpDus/SettlementReport.Designer.cs | 96 +- ReportImp/BfpDus/SettlementReport.resx | 5 +- .../BfpDus/SettlementReport2.Designer.cs | 965 +++++++++--------- ReportImp/BfpDus/SettlementReport2.cs | 55 +- ReportImp/BfpDus/SettlementReport2.resx | 9 - Service/Plugins/ServiceRecordValidator.cs | 165 ++- Service/Plugins/VacationService.cs | 32 +- 21 files changed, 901 insertions(+), 1002 deletions(-) diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 82c471f1a..1da2cef25 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.243 + 2.0.1.247 true publish.htm false true - 244 + 248 2.0.1.%2a false true diff --git a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml index c8e922559..4fbd8bd12 100644 --- a/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml +++ b/BeWo/View/Detail/Accounting/SettlementInvoiceItemEditView2.xaml @@ -205,7 +205,12 @@ - + + + + + +