diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index aa599c87b..702658535 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -63,7 +63,7 @@ TRACE;DEBUG prompt 4 - x86 + AnyCPU AllRules.ruleset true false diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index 37621e971..f3681c1d7 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -1578,7 +1578,9 @@ namespace BeWo.Scheduler.View var mitarbeiterliste = appointment.CF_EmployeeList(); var istErsteller = ersteller?.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ?? false; - if(!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !appointment.CF_CanBeEdited()) + bool canBeEdited = appointment.CF_CanBeEdited(); + + if (!istErsteller && appointment.CF_IsPrivate() && !mitarbeiterliste.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)) || !canBeEdited) { darfTerminDetailsSehen = false; } @@ -1946,8 +1948,13 @@ namespace BeWo.Scheduler.View var customerList = appointment.CF_CustomerList(); var employeeList = employee2SchedulerAppointmentList.Select(employee2SchedulerAppointment => employee2SchedulerAppointment.Employee).ToList(); + String notice = appointment.Description; + if (String.IsNullOrEmpty(notice)) + { + notice = appointment.Subject; + } - BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, appointment.Subject, appointment, serviceRecords => + BeWoUtils.CreateZeiterfassung(appointment.Start, appointment.End, customerList, employeeList, notice, appointment, serviceRecords => { try { diff --git a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs index 6f78af236..d190fa5a9 100644 --- a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs +++ b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs @@ -141,6 +141,10 @@ namespace BeWo.Scheduler.ViewModel _AbsenceTimeEnd = pAppointment.AbsenceTimeEnd; HasServiceRecordEntry = pAppointment.HasServiceRecordEntry; + if (Subject.Contains("Flingern")) + { + int test = 0; + } CanBeEdited = pAppointment.CanBeEdited; AbsenceTimeOid = pAppointment.AbsenceTimeOid; diff --git a/BeWo/ownChat/ChatDokumentationsView.xaml.cs b/BeWo/ownChat/ChatDokumentationsView.xaml.cs index d7a3e96f5..68031b05a 100644 --- a/BeWo/ownChat/ChatDokumentationsView.xaml.cs +++ b/BeWo/ownChat/ChatDokumentationsView.xaml.cs @@ -192,8 +192,13 @@ namespace BeWo.ownChat if(vm.PrototypeVM.SortedCategories != null && vm.PrototypeVM.SortedCategories.Count > 0) { var cat1 = vm.PrototypeVM.SortedCategories[0]; - - dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0]; + if (vm.PrototypeVM.Category2Services.ContainsKey(cat1)) + { + if (vm.PrototypeVM.Category2Services[cat1].Count > 0) + { + dc.ServiceDescription = vm.PrototypeVM.Category2Services[cat1][0]; + } + } } _ServiceRecord = new ServiceRecordVM(dc, vm.PrototypeVM.Category2Services, vm.PrototypeVM.AllGoalCategories, vm.PrototypeVM.AllGoals) diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 1a2ce855a..b1f0518cc 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -24,7 +24,7 @@ - false + true 4.3 @@ -74,6 +74,7 @@ True + x64 @@ -316,6 +317,7 @@ + @@ -325,7 +327,6 @@ - diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index 197827697..04bb23357 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -2,13 +2,13 @@ false - false + true - Release|Any CPU + Debug|Any CPU ProjectFiles 600 MvcControllerEmptyScaffolder diff --git a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs index 70862f4a8..80733ca9f 100644 --- a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs +++ b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs @@ -66,7 +66,7 @@ namespace BeWoPlanerMobil.Controllers } else { - model.SessionModel = (ISessionModel)Session[sessionkey]; + model.SessionModel = (BaseSessionModel)Session[sessionkey]; } } } diff --git a/BeWoPlanerMobil/Controllers/CustomerController.cs b/BeWoPlanerMobil/Controllers/CustomerController.cs index 58473a40d..d7bd42ba0 100644 --- a/BeWoPlanerMobil/Controllers/CustomerController.cs +++ b/BeWoPlanerMobil/Controllers/CustomerController.cs @@ -983,8 +983,9 @@ namespace BeWoPlanerMobil.Controllers var zahlung = kassenbuch?.Bargeldtransaktionen.FirstOrDefault(bargeldtransaktion => bargeldtransaktion.BargeldtransaktionOid.Equals(transaktionsOid)); Model.SelectedBargeldtransaktion = zahlung; + Model.SelectedBargeldtransaktionOid = zahlung?.BargeldtransaktionOid; - if(zahlung != null) + if (zahlung != null) { Model.SelectedTransaktionsart = (int) zahlung.Zahlungstyp; } @@ -1018,6 +1019,7 @@ namespace BeWoPlanerMobil.Controllers } Model.SelectedBargeldtransaktion = null; + Model.SelectedBargeldtransaktionOid = null; Model.SelectedTransaktionsart = 0; Model.SelectedBargeldkasseOid = bargeldkassenOid; @@ -1088,6 +1090,7 @@ namespace BeWoPlanerMobil.Controllers OperationsService.UpdateBargeldkasse(bargeldkasse); Model.SelectedBargeldkasseOid = null; + Model.SelectedBargeldtransaktionOid = null; ReloadBargeldkassen(); diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs index 8c4933224..e0a9f77c4 100644 --- a/BeWoPlanerMobil/Controllers/MainController.cs +++ b/BeWoPlanerMobil/Controllers/MainController.cs @@ -289,7 +289,7 @@ namespace BeWoPlanerMobil.Controllers if(Model.IsInEditingMode && Model.SelectedServiceRecordOid.HasValue) { - Model.SelectedServiceRecord = Model.ServiceRecords.FirstOrDefault(sr => sr.ServiceRecordOid.Equals(Model.SelectedServiceRecordOid.Value)); + Model.SelectedServiceRecord = GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false); } } @@ -1125,7 +1125,7 @@ namespace BeWoPlanerMobil.Controllers var date = DateTime.Parse(formCollection[FormCollectionConstants.ServiceRecordSignatureDateKey]); long.TryParse(formCollection[FormCollectionConstants.ServiceRecordSignatureRecordOidKey], out var serviceRecordOid); - var serviceRecord = Model.ServiceRecords.FirstOrDefault(sr => sr.ServiceRecordOid.HasValue && sr.ServiceRecordOid.Value.Equals(serviceRecordOid)); + var serviceRecord = GetServiceRecordDC(serviceRecordOid, false); if (serviceRecordOid < 1 || serviceRecord is null) { @@ -2336,7 +2336,7 @@ namespace BeWoPlanerMobil.Controllers if(Model.ServiceRecordOidToDelete != null && Model.ServiceRecordOidToDelete > 0 && LoggedInUser.UserGroups.Any(a => a.Rights.Any(f => f.Equals(UserRightType.ServiceRecordView_Delete)))) { - var serviceRecordDC = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid != null && f.ServiceRecordOid.Value.Equals(Model.ServiceRecordOidToDelete)); + var serviceRecordDC = GetServiceRecordDC(Model.ServiceRecordOidToDelete.Value, false); var version = serviceRecordDC?.ServiceRecordVersion; if(version != null && Model.IsAllowedToDeleteServiceRecord(serviceRecordDC)) @@ -2675,7 +2675,7 @@ namespace BeWoPlanerMobil.Controllers if(Model.SelectedServiceRecordOid.HasValue) { - result = SerializeObject(Model.ServiceRecords.First(f => f.ServiceRecordOid == Model.SelectedServiceRecordOid)); + result = SerializeObject(GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false)); } return result; @@ -2690,7 +2690,7 @@ namespace BeWoPlanerMobil.Controllers return LeerzeichenFuerGetMethoden; } - var serviceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(oid)) ?? OperationsService.GetServiceRecordById(oid); + var serviceRecord = GetServiceRecordDC(oid, false); if(serviceRecord?.ServiceRecordOid is null) { @@ -2764,9 +2764,9 @@ namespace BeWoPlanerMobil.Controllers } var checkServiceRecord = new ServiceRecordDC(); - if(inEditMode) + if(inEditMode && Model.SelectedServiceRecordOid.HasValue) { - checkServiceRecord = Model.ServiceRecords.FirstOrDefault(f => f.ServiceRecordOid.HasValue && f.ServiceRecordOid.Value.Equals(Model.SelectedServiceRecordOid)); + checkServiceRecord = GetServiceRecordDC(Model.SelectedServiceRecordOid.Value, false); } if(checkServiceRecord is null) diff --git a/BeWoPlanerMobil/Models/AbstractModel.cs b/BeWoPlanerMobil/Models/AbstractModel.cs index 6907ee331..9ed527393 100644 --- a/BeWoPlanerMobil/Models/AbstractModel.cs +++ b/BeWoPlanerMobil/Models/AbstractModel.cs @@ -27,7 +27,7 @@ namespace BeWoPlanerMobil.Models public bool HasRightToViewEmployeeAppointments => CheckRight(UserRightType.KalenderMitarbeitertermineAnsehen) || CheckRight(UserRightType.ViewAll); public bool HasRightToViewAllResourceAppointments => CheckRight(UserRightType.KalenderRessourcentermineAnsehen) || CheckRight(UserRightType.ViewAll); - public ISessionModel SessionModel { get; internal set; } + public BaseSessionModel SessionModel { get; internal set; } public UserDC LoggedInUser { get; set; } @@ -252,7 +252,7 @@ namespace BeWoPlanerMobil.Models public List Customers { get; set; } = new List(); - public Dictionary Collapsibles2IsShown { get; set; } = new Dictionary(); + public Dictionary Collapsibles2IsShown { get { return SessionModel.Collapsibles2IsShown; } set {SessionModel.Collapsibles2IsShown = value;} } public bool ShowDifferentQBInterval { diff --git a/BeWoPlanerMobil/Models/BaseSessionModel.cs b/BeWoPlanerMobil/Models/BaseSessionModel.cs new file mode 100644 index 000000000..373b4f390 --- /dev/null +++ b/BeWoPlanerMobil/Models/BaseSessionModel.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Web.Mvc; +using BeWo.View.Navigation.Filter; +using BeWoPlanerMobil.Controllers; +using BeWoPlanerMobil.Service; +using BeWoPlanerMobil.Util; +using BS.Shared; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using DevExpress.XtraReports.UI; + +namespace BeWoPlanerMobil.Models +{ + [Serializable] + public abstract class BaseSessionModel + { + public Dictionary Collapsibles2IsShown { get; set; } = new Dictionary(); + + public virtual void ResetValues() + { + Collapsibles2IsShown = new Dictionary(); + } + } +} \ No newline at end of file diff --git a/BeWoPlanerMobil/Models/CustomerSessionModel.cs b/BeWoPlanerMobil/Models/CustomerSessionModel.cs index ae8e2e361..149059094 100644 --- a/BeWoPlanerMobil/Models/CustomerSessionModel.cs +++ b/BeWoPlanerMobil/Models/CustomerSessionModel.cs @@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI; namespace BeWoPlanerMobil.Models { [Serializable] - public class CustomerSessionModel : ISessionModel + public class CustomerSessionModel : BaseSessionModel { public long? SelectedCustomerOid { get; set; } @@ -35,8 +35,10 @@ namespace BeWoPlanerMobil.Models public int SelectedTransaktionsart { get; set; } - public void ResetValues() + public override void ResetValues() { + base.ResetValues(); + SelectedCustomerOid = null; //SelectedCustomerFilter = CustomerFilterEnum.All; //SelectedReportType = CustomerReportType.Medikamentenliste; diff --git a/BeWoPlanerMobil/Models/ISessionModel.cs b/BeWoPlanerMobil/Models/ISessionModel.cs deleted file mode 100644 index ec84e0c65..000000000 --- a/BeWoPlanerMobil/Models/ISessionModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -using BeWoPlanerMobil.Service; - -namespace BeWoPlanerMobil.Models -{ - public interface ISessionModel - { - void ResetValues(); - } -} \ No newline at end of file diff --git a/BeWoPlanerMobil/Models/MainSessionModel.cs b/BeWoPlanerMobil/Models/MainSessionModel.cs index 717553c6c..ccecfbce7 100644 --- a/BeWoPlanerMobil/Models/MainSessionModel.cs +++ b/BeWoPlanerMobil/Models/MainSessionModel.cs @@ -6,7 +6,7 @@ using BeWoPlanerMobil.Util; namespace BeWoPlanerMobil.Models { [Serializable] - public class MainSessionModel : ISessionModel + public class MainSessionModel : BaseSessionModel { public bool SessionInitialized { get; internal set; } public long? SelectedSupportConceptOid { get; internal set; } @@ -38,9 +38,12 @@ namespace BeWoPlanerMobil.Models public bool IsInTransferMode { get; internal set; } public IList SelectedGoals { get; internal set; } public List SupportConceptOids { get; set; } + public MokServiceRecord SelectedServiceRecord { get; internal set; } - public void ResetValues() + public override void ResetValues() { + base.ResetValues(); + SessionInitialized = false; SelectedSupportConceptOid = null; SelectedCostBearerSupportConceptOid = null; @@ -84,6 +87,7 @@ namespace BeWoPlanerMobil.Models SelectedGoals = new List(); SupportConceptOids = new List(); + SelectedServiceRecord = null; } } } \ No newline at end of file diff --git a/BeWoPlanerMobil/Models/MokServiceRecord.cs b/BeWoPlanerMobil/Models/MokServiceRecord.cs index e4bf29445..2afeef0b6 100644 --- a/BeWoPlanerMobil/Models/MokServiceRecord.cs +++ b/BeWoPlanerMobil/Models/MokServiceRecord.cs @@ -1,3 +1,4 @@ +using BS.Shared; using BS.Shared.DataContracts.Compact; using BS.Shared.DataContracts.Invoicing; using System; @@ -10,7 +11,11 @@ namespace BeWoPlanerMobil.Models [Serializable] public class MokServiceRecord { - public long Oid { get; set; } + public long? Oid { get; set; } + + public ServiceRecordTypeId ServiceRecordType { get; set; } + + public int? DistanceInMeter { get; set; } public DateTime? Start { get; set; } diff --git a/BeWoPlanerMobil/Models/ReportSessionModel .cs b/BeWoPlanerMobil/Models/ReportSessionModel .cs index c41bb5f86..d19aed200 100644 --- a/BeWoPlanerMobil/Models/ReportSessionModel .cs +++ b/BeWoPlanerMobil/Models/ReportSessionModel .cs @@ -16,7 +16,7 @@ using DevExpress.XtraReports.UI; namespace BeWoPlanerMobil.Models { [Serializable] - public class ReportSessionModel : ISessionModel + public class ReportSessionModel : BaseSessionModel { public long? SelectedCustomerOid { get; set; } public long? SelectedEmployeeOid { get; set; } @@ -37,8 +37,10 @@ namespace BeWoPlanerMobil.Models public List SelectedConfirmationReceiptSignatures { get; internal set; } public QbSignatureIntervalSelection SelectedIntervalSelection { get; internal set; } - public void ResetValues() + public override void ResetValues() { + base.ResetValues(); + SelectedCustomerOid = null; SelectedEmployeeOid = null; SelectedTeamOid = null; diff --git a/BeWoPlanerMobil/Models/ReportViewerSessionModel.cs b/BeWoPlanerMobil/Models/ReportViewerSessionModel.cs index 2db225d3d..05f747be0 100644 --- a/BeWoPlanerMobil/Models/ReportViewerSessionModel.cs +++ b/BeWoPlanerMobil/Models/ReportViewerSessionModel.cs @@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI; namespace BeWoPlanerMobil.Models { [Serializable] - public class ReportViewerSessionModel : ISessionModel + public class ReportViewerSessionModel : BaseSessionModel { public long? SelectedEmployeeOid { get; set; } public long? SelectedTeamOid { get; set; } @@ -24,8 +24,10 @@ namespace BeWoPlanerMobil.Models public ReportType SelectedReportType { get; internal set; } public long? SelectedQueryOid { get; internal set; } - public void ResetValues() + public override void ResetValues() { + base.ResetValues(); + SelectedEmployeeOid = null; SelectedTeamOid = null; SelectedMonth = null; diff --git a/BeWoPlanerMobil/Models/SchedulerSessionModel.cs b/BeWoPlanerMobil/Models/SchedulerSessionModel.cs index 8ccea54fa..c2661514d 100644 --- a/BeWoPlanerMobil/Models/SchedulerSessionModel.cs +++ b/BeWoPlanerMobil/Models/SchedulerSessionModel.cs @@ -15,7 +15,7 @@ using DevExpress.XtraReports.UI; namespace BeWoPlanerMobil.Models { [Serializable] - public class SchedulerSessionModel : ISessionModel + public class SchedulerSessionModel : BaseSessionModel { public DateTime SelectedDate { get; set; } public long? SelectedAppointmentOid { get; internal set; } @@ -36,8 +36,10 @@ namespace BeWoPlanerMobil.Models public DateTime? IntervalEndDate { get; internal set; } public int? IntervalDuration { get; internal set; } - public void ResetValues() + public override void ResetValues() { + base.ResetValues(); + SelectedDate = DateTime.Today; SelectedAppointmentOid = null; SelectedResourceOids = new List(); diff --git a/BeWoPlanerMobil/Util/DcToMokMapper.cs b/BeWoPlanerMobil/Util/DcToMokMapper.cs index cf92be3d9..6e3462b26 100644 --- a/BeWoPlanerMobil/Util/DcToMokMapper.cs +++ b/BeWoPlanerMobil/Util/DcToMokMapper.cs @@ -46,6 +46,8 @@ namespace BeWoPlanerMobil.Util var s = new MokServiceRecord { Oid = dc.ServiceRecordOid.Value, + ServiceRecordType = dc.ServiceRecordType, + DistanceInMeter = dc.DistanceInMeter, Start = dc.Start, End = dc.End, EmployeeName = dc.Employee.FirstNameLastName, @@ -106,7 +108,7 @@ namespace BeWoPlanerMobil.Util } #if DEBUG - if (goal.RatingTypeOid.HasValue) + if (model != null && goal.RatingTypeOid.HasValue) { var goalRating = model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value)); @@ -123,7 +125,7 @@ namespace BeWoPlanerMobil.Util } } - if (model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid)) + if (model != null && model.ServiceRecordOids2GoalHeader.ContainsKey(s.Oid.Value)) { var ziele = dc.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptIndividualGoalCategoryType || g.Type == ValueListEntryType.SupportConceptGoalCategoryType).ToList(); diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml index 5443bce64..00c32d392 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBargeldkassen.cshtml @@ -465,7 +465,7 @@
- +
@{ var count = 0; diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml index 2322815ec..909fde3bb 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionenFormPartial.cshtml @@ -142,7 +142,7 @@ { if(selectedBargeldtransaktion.Zahlungsdatum.HasValue) { - transaktionsdatum = selectedBargeldtransaktion.Zahlungsdatum.Value.ToString("dd.MM.yyyy"); + transaktionsdatum = selectedBargeldtransaktion.Zahlungsdatum.Value.ToString("yyyy-MM-dd"); } transaktionsbelegnummer = selectedBargeldtransaktion.Belegnummer; diff --git a/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionshistorienPartial.cshtml b/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionshistorienPartial.cshtml index 7742ed220..dab739866 100644 --- a/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionshistorienPartial.cshtml +++ b/BeWoPlanerMobil/Views/Customer/CustomerBargeldtransaktionshistorienPartial.cshtml @@ -25,7 +25,7 @@ Geändert von diff --git a/BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml b/BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml index 561eb90f5..b5d7f9fdb 100644 --- a/BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml +++ b/BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml @@ -2,7 +2,7 @@ @model BeWoPlanerMobil.Models.MainModel @{ - if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout) + if (TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout) {
- @foreach(var textModule in Model.TextModules) + @foreach (var textModule in Model.TextModules) { @BuildTextModuleTree(textModule) } diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 34ceca949..7397a7e81 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -378,16 +378,17 @@  

- + Version 3.27 +
- @historyEntry.BargeldtransaktionUdpUser + @historyEntry.InsUser