Commit Graph

285 Commits

Author SHA1 Message Date
Christian
35bd46a1bb Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	Service/Plugins/PluginLoader.cs
2021-12-15 11:06:19 +01:00
Christian
f66b9a1add CB 2021-12-15 11:05:34 +01:00
Marcel Hirschle
fefe61f56b MH: Anpassung für BHV Bergische Hauspflege (Abwesenheit, die nicht Soll beeinflusst 2021-12-15 09:51:04 +01:00
Christian
2a2753169b Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	ReportImp/BeWoRimbach/ServiceInvoiceReport.Designer.cs
#	ReportImp/BeWoRimbach/ServiceInvoiceReport.cs
#	ReportImp/BeWoRimbach/ServiceInvoiceReport.resx
2021-12-10 10:22:39 +01:00
Christian
418f40606f cb 2021-12-09 15:51:43 +01:00
Alexandra
f80bf44e4f Neukunden und BeWoSchilling 2021-12-09 14:25:27 +01:00
Christian
be6732e5e8 CB, Storno und Reports 2021-12-05 19:21:17 +01:00
Christian
edde5e1a31 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs
#	ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs
2021-11-30 13:33:46 +01:00
Christian
0775c566e5 cb 2021-11-29 19:31:36 +01:00
Christian
f51561e5bf cb 2021-11-24 17:12:03 +01:00
Christian
616d5e63c2 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2021-11-22 16:15:23 +01:00
Christian
d42c932ef0 cb 2021-11-22 16:15:15 +01:00
Alexandra
028a135ffb Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2021-11-18 09:59:55 +01:00
Alexandra
39b0ab153d Firmenname von ABC zu Schubkraft, Unterschrift auf Rg bei WahlEv 2021-11-18 09:59:38 +01:00
Christian
9af997c3da cb 2021-11-17 11:50:24 +01:00
Christian
0cdbf53408 cb 2021-11-16 10:56:40 +01:00
Marcel Hirschle
0450b68096 MH: Anpassung für Wahl e.V. + Anpassung der Legende im RosterReport 2021-11-10 13:16:40 +01:00
Christian
a874692529 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo 2021-11-08 16:43:54 +01:00
Christian
5206a72da6 cb 2021-11-08 16:43:43 +01:00
Alexandra
f3d147f0f1 Korrektur letzter Checkin
Der hat das alles eingecheckt und nicht nur das was ich wollte :-(
2021-11-05 12:58:00 +01:00
Alexandra
619cb2a3cd Hoffentlich gelöst
# Conflicts:
#	BeWoAllReports.sln
#	ReportImp/TrialogReports/SettlementReport.Designer.cs
#	ReportImp/TrialogReports/SettlementReportAlt.Designer.cs
#	Service/Plugins/PluginLoader.cs
2021-11-05 12:32:48 +01:00
Alexandra
c29fd32a21 Reports Trialog und Pusteblume 2021-11-05 11:57:09 +01:00
Marcel Hirschle
b0cdf19f0f Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master
# Conflicts:
#	Service/Plugins/PluginLoader.cs
2021-11-02 12:55:11 +01:00
Marcel Hirschle
27ee1130ce MH: Anpassung Ist-Druck für Wahl eV 2021-11-02 12:50:37 +01:00
Christian
c52ec80497 cb 2021-10-30 20:05:24 +02:00
Christian
1fceea28f2 cb 2021-10-29 14:40:10 +02:00
Christian
5d62ed4f96 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	BeWoAllReports.sln
#	Service/Plugins/PluginLoader.cs
2021-10-28 12:19:19 +02:00
Christian
a0df120622 cb: Reports 2021-10-28 12:07:51 +02:00
Marcel Hirschle
6491dc5e6f Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo into master 2021-10-28 11:17:10 +02:00
Marcel Hirschle
bef66b0f67 MH: Testcommit 2021-10-28 11:16:54 +02:00
Alexandra
cc283e7dc4 Neukunde Claudia Charisius 2021-10-22 14:16:50 +02:00
Alexandra
e12bf57b96 ZAD-Nr geändert 2021-10-22 10:14:02 +02:00
Christian
d5a0cd38b5 cb bugfixing V3.5 2021-10-18 00:43:47 +02:00
Christian
6e2b34d6fc cb 2021-10-15 17:32:32 +02:00
Christian
f22d93c5eb Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	Service/Plugins/PluginLoader.cs
2021-10-13 14:51:21 +02:00
Christian
360df71632 CB 2021-10-13 14:38:51 +02:00
Alexandra
07dd2261f3 Neukunde PZD und VARO Änderungen 2021-10-08 14:51:28 +02:00
Alexandra
0d83711093 Anlegen neues Projekt für LebensWert und Logo bei VaroSozialagentur.Quittierungsbeleg 2021-10-07 13:10:09 +02:00
Alexandra
2aebf1668e PluginLoader 2021-10-06 17:37:43 +02:00
Alexandra
b5557ee58f Erstellung Sammelrechnung Bezirk (stationär) 2021-10-06 17:32:14 +02:00
Alexandra
54e6a80e33 Anpassung in Spitzabrechnung 2021-10-05 15:00:54 +02:00
Alexandra
b07ccc8313 Änderungen an Rechnungen IFF und HPFF 2021-10-05 13:30:20 +02:00
Christian
908ce1ea7f Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	Service/Plugins/PluginLoader.cs
2021-10-01 18:38:39 +02:00
Christian
8b8177fcdc cb 2021-10-01 16:49:37 +02:00
Alexandra
b489d9c46d Änderungen LHDuisburgAtz 2021-09-28 19:03:51 +02:00
Christian
e101738421 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	BeWoAllReports.sln
#	Service/Plugins/PluginLoader.cs
2021-09-27 21:44:38 +02:00
Christian
73f5092b67 cb 2021-09-27 21:33:04 +02:00
Alexandra
3481027915 Neukunde CarlSonnenscheinHaus Reports Briefkopf 2021-09-27 11:16:13 +02:00
Christian
c7dde64d67 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
#	BeWoAllReports.sln
#	ReportImp/DomizielAnsbach/DomizielAnsbach.csproj
#	Service/Plugins/PluginLoader.cs
2021-09-23 20:41:13 +02:00
Christian
3d03e0cf25 cb: reports 2021-09-23 18:44:18 +02:00