commit1b9efb8f79Author: Rene Evertz <rene.evertz@ownsoft.de> Date: Thu Jun 20 12:16:00 2024 +0200 Squashed commit of the following: commitaf28476b76Merge:b76e16946c3b6a1e9cAuthor: Marcel Hirschle <marcel.hirschle@ownsoft.de> Date: Thu Jun 20 11:53:31 2024 +0200 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo # Conflicts: # ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs commitb76e169462Author: Marcel Hirschle <marcel.hirschle@ownsoft.de> Date: Thu Jun 20 11:40:08 2024 +0200 MH: vkm hamm stundenkonto commitc3b6a1e9c0Author: Christian <christian.baeurle@beyondsoft.de> Date: Thu Jun 20 10:58:05 2024 +0200 Mergemarker entfernt commit5ff8fe343bMerge:c1aa61f05fc57725f4Author: Christian <christian.baeurle@beyondsoft.de> Date: Thu Jun 20 10:52:16 2024 +0200 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo commitc1aa61f058Merge:12faccb711c0a94c60Author: Christian <christian.baeurle@beyondsoft.de> Date: Thu Jun 20 10:51:59 2024 +0200 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo # Conflicts: # BeWo/ServiceProxy/Generated.cs # Data/Security/UserRightHelper.cs # Shared/BeWoEntityEnums.cs # Shared/Core/EnumTranslations.cs commit12faccb71bAuthor: Christian <christian.baeurle@beyondsoft.de> Date: Wed Jun 19 16:13:56 2024 +0200 Perseh Hilfeplan Import + KI Prototyp, commit22fea2ec7fAuthor: Rene Evertz <rene.evertz@ownsoft.de> Date: Thu Jun 20 11:50:22 2024 +0200 SentSuccess commit64b77b0d30Merge:022ff3956fc57725f4Author: Rene Evertz <rene.evertz@ownsoft.de> Date: Thu Jun 20 09:36:49 2024 +0200 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo into feature_rene_13_dakota commit022ff3956eAuthor: Rene Evertz <rene.evertz@ownsoft.de> Date: Thu Jun 20 09:25:58 2024 +0200 Test on App8 GkvAbrechnungView Process start commitc04052cde7Author: Rene Evertz <rene.evertz@ownsoft.de> Date: Wed Jun 19 08:55:07 2024 +0200 BeWo Error Window # Conflicts: # Host/Host.csproj.user