ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,220 Commits 13 Branches 0 Tags
7089477f5140300a660ca6f3a403bad021f47cde
Commit Graph

5220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rene Evertz
7089477f51 Merge branch 'master' into feature_rene_13_dakota 
# Conflicts:
#	BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
#	Host/GkvAbrechnungView.aspx.cs
 2024-06-20 12:56:45 +02:00
Rene Evertz
49cd4a6818 Squashed commit of the following: 
commit 1b9efb8f79
Author: Rene Evertz <rene.evertz@ownsoft.de>
Date:   Thu Jun 20 12:16:00 2024 +0200

    Squashed commit of the following:

    commit af28476b76
    Merge: b76e16946 c3b6a1e9c
    Author: 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

    commit b76e169462
    Author: Marcel Hirschle <marcel.hirschle@ownsoft.de>
    Date:   Thu Jun 20 11:40:08 2024 +0200

        MH: vkm hamm stundenkonto

    commit c3b6a1e9c0
    Author: Christian <christian.baeurle@beyondsoft.de>
    Date:   Thu Jun 20 10:58:05 2024 +0200

        Mergemarker entfernt

    commit 5ff8fe343b
    Merge: c1aa61f05 fc57725f4
    Author: 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

    commit c1aa61f058
    Merge: 12faccb71 1c0a94c60
    Author: 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

    commit 12faccb71b
    Author: Christian <christian.baeurle@beyondsoft.de>
    Date:   Wed Jun 19 16:13:56 2024 +0200

        Perseh Hilfeplan Import + KI Prototyp,

commit 22fea2ec7f
Author: Rene Evertz <rene.evertz@ownsoft.de>
Date:   Thu Jun 20 11:50:22 2024 +0200

    SentSuccess

commit 64b77b0d30
Merge: 022ff3956 fc57725f4
Author: 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

commit 022ff3956e
Author: Rene Evertz <rene.evertz@ownsoft.de>
Date:   Thu Jun 20 09:25:58 2024 +0200

    Test on App8 GkvAbrechnungView Process start

commit c04052cde7
Author: Rene Evertz <rene.evertz@ownsoft.de>
Date:   Wed Jun 19 08:55:07 2024 +0200

    BeWo Error Window

# Conflicts:
#	Host/Host.csproj.user
 2024-06-20 12:35:04 +02:00
Rene Evertz
1b9efb8f79 Squashed commit of the following: 
commit af28476b76
Merge: b76e16946 c3b6a1e9c
Author: 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

commit b76e169462
Author: Marcel Hirschle <marcel.hirschle@ownsoft.de>
Date:   Thu Jun 20 11:40:08 2024 +0200

    MH: vkm hamm stundenkonto

commit c3b6a1e9c0
Author: Christian <christian.baeurle@beyondsoft.de>
Date:   Thu Jun 20 10:58:05 2024 +0200

    Mergemarker entfernt

commit 5ff8fe343b
Merge: c1aa61f05 fc57725f4
Author: 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

commit c1aa61f058
Merge: 12faccb71 1c0a94c60
Author: 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

commit 12faccb71b
Author: Christian <christian.baeurle@beyondsoft.de>
Date:   Wed Jun 19 16:13:56 2024 +0200

    Perseh Hilfeplan Import + KI Prototyp,
 2024-06-20 12:16:00 +02:00
Marcel Hirschle
af28476b76 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 
# Conflicts:
#	ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs
 2024-06-20 11:53:31 +02:00
Rene Evertz
22fea2ec7f SentSuccess 2024-06-20 11:50:22 +02:00
Marcel Hirschle
b76e169462 MH: vkm hamm stundenkonto 2024-06-20 11:40:08 +02:00
Christian
c3b6a1e9c0 Mergemarker entfernt 2024-06-20 10:58:05 +02:00
Christian
5ff8fe343b Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2024-06-20 10:52:16 +02:00
Christian
c1aa61f058 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
 2024-06-20 10:51:59 +02:00
Rene Evertz
64b77b0d30 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo into feature_rene_13_dakota 2024-06-20 09:36:49 +02:00
Rene Evertz
022ff3956e Test on App8 GkvAbrechnungView Process start 2024-06-20 09:25:58 +02:00
Alexandra
fc57725f46 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-19 16:56:18 +02:00
Alexandra
46fd0ebcb0 Merge Conflict SKM Aachen gelöst und Änderungen InvoiceNumberGenerator 2024-06-19 16:56:08 +02:00
Alexandra
4b06ea0183 Wabe - Neueinrichtung 2024-06-19 16:54:35 +02:00
Christian
12faccb71b Perseh Hilfeplan Import + KI Prototyp, 2024-06-19 16:13:56 +02:00
Marcel Hirschle
1c0a94c600 MH: Die Brücke Niedersachsenanpassung 2024-06-19 10:22:51 +02:00
Rene Evertz
c04052cde7 BeWo Error Window 2024-06-19 08:55:07 +02:00
Marcel Hirschle
2e2688917a Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-18 19:48:54 +02:00
Marcel Hirschle
8613d624ce MH: WahlEV Rechnungserstellung Fix 2024-06-18 19:48:46 +02:00
Alexandra
bdb11462fc Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-18 17:09:34 +02:00
Alexandra
da06d9f8cc WismarerWerkstaettenGmbH - Invoicing und Export 2024-06-18 17:09:17 +02:00
Alexandra
7b1511ea9d HausDuelken/Mitarbeiterstundenkonto - Sonderspalten Relation 2024-06-18 17:08:45 +02:00
Alexandra
4a7e60b21e BeWoDirekt/Quittierungsbeleg nach LVR Standard ab Juli 2024-06-18 17:08:14 +02:00
Rene Evertz
bae6c09d0c Merge conflicts.... 2024-06-18 14:01:32 +02:00
Rene Evertz
5151c8ee44 Merge Error 2024-06-18 13:46:27 +02:00
Rene Evertz
ade028d9e7 Merge Dakota 2024-06-18 13:40:46 +02:00
Rene Evertz
850098aef3 - Fehler aus XML File 
- Converter: GkvState2StringConverter
- Exception Handling
 2024-06-18 13:29:18 +02:00
Marcel Hirschle
635c918037 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-18 12:22:47 +02:00
Marcel Hirschle
6843776600 MH: Lebenswert Anpassung Hildesheim 2024-06-18 12:22:24 +02:00
Alexandra
2f874b0686 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-17 15:51:25 +02:00
Alexandra
4597804ea8 VereinBeratungTherapie/Invoicing/CollectiveInvoiceCreation - Rundung für QA anders 2024-06-17 15:50:34 +02:00
Alexandra
a7fcc666a0 ReportImp/SprungbrettTheresia/Invoicing/CustomInvoiceCreation - Abrechnung immer auf bew. FLS pauschal 2024-06-17 15:50:11 +02:00
Alexandra
1e5ba277dd SKMAachen/Invoicing/CustomInvoiceNumberGenerator - Rechnungskreise pro Hauptbetreuer 2024-06-17 15:49:27 +02:00
Alexandra
c6101f0453 DomizielAnsbach/RechnungZVTN - Format für Rg Teilnehmer 2024-06-17 15:48:43 +02:00
Marcel Hirschle
8086c47817 MH: WahlEV Pauschalenkorrektur + neue Sonderzahlung 2024-06-17 13:43:56 +02:00
Marcel Hirschle
b4f484235a MH: Wahl EV Pauschale für bestimmten Kostenträger 2024-06-14 15:25:01 +02:00
Marcel Hirschle
52733ff0e0 Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-14 14:38:59 +02:00
Marcel Hirschle
b457e09c74 MH: Christian Luft Rechnungstext 2024-06-14 14:38:54 +02:00
Kojo
da0b5b723f BeWoImFlow: QB Monatsunterschrift Klient raus, Text Monatsunterschrift Mitarbeiter angepasst, nicht verwendeten QB entfernt 2024-06-14 14:24:12 +02:00
Kojo
69a02271e6 EvangelischeKirchengemeindeBottrop: Änderung Mail + Fax Budgetnachweis 2024-06-14 14:24:12 +02:00
Kojo
8fe26de57d AufEigenenFuessenStehen: Soziotherapie-Leistungsnachweis + -rechnung 
to be tested
 2024-06-14 14:24:11 +02:00
Kojo
86843bec1e AlphaEv: Für Stadt Wuppertal (& Co, nicht LVR) bei der Spitzabrechnungserstellung Stunden auf zwei Nachkommastellen runden 2024-06-14 14:24:11 +02:00
Marcel Hirschle
ee405f9f7d MH: Alzey Stundensätze auf Sozio QB 2024-06-14 14:16:38 +02:00
Marcel Hirschle
f26db1b846 MH: VKM Hamm Spitzabrechnung 2024-06-14 09:22:07 +02:00
Marcel Hirschle
8e55110a46 MH: SKF Alsdorf Rechnung Adresse 2024-06-14 08:57:06 +02:00
Marcel Hirschle
6dbfb8d4b5 MH: BeWo Leverkusen Rand verbreitert 2024-06-14 07:21:37 +02:00
Rene Evertz
2244c6f283 fehlerdc 2024-06-13 13:28:00 +02:00
Marcel Hirschle
4b2510dd2a MH: KlinikumWerraMeissner neue Leistungskategorie 2024-06-13 12:42:12 +02:00
Marcel Hirschle
f1aee80a1f Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo 2024-06-13 10:42:39 +02:00
Marcel Hirschle
1a0db91440 MH: PlatzhalterVM in csproj 2024-06-13 10:42:34 +02:00