ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_rene_18_ai

Browse Source 
# Conflicts:
#	BeWo/BeWo.csproj
#	BeWo/BeWoApp.xaml.cs
#	BeWo/View/Detail/EmployeeView.xaml
#	Report/app.config
#	ReportService/app.config
#	Service/ServiceImplementations/EmployeeServiceImp.cs
#	Service/app.config
#	Shared/BeWoEntityEnums.cs
#	Shared/Core/EnumTranslations.cs
This commit is contained in:
Rene Evertz
2025-09-18 14:26:33 +02:00
parent 81c04fbc0a 17ac34a242
commit 68866e8f28
978 changed files with 103693 additions and 57198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Service/ServiceUtils/History/HistoryCreator.cs
View File

@@ -45,8 +45,10 @@ namespace BeWo.ServiceUtils.History
Employee_Schutzstufe = newEmployee.Schutzstufe,
//Employee_Sequence,
Employee_SystemEntryID = originalEmployee.SystemEntryID,
Employee_TaxNumber = newEmployee.TaxNumber,
Employee_Text1 = newEmployee.Text1,
Employee_TaxNumber = newEmployee.TaxNumber,
Employee_TaxClass = newEmployee.TaxClass,
Employee_ChildCount = newEmployee.ChildCount,
Employee_Text1 = newEmployee.Text1,
Employee_Text2 = newEmployee.Text2,
Employee_Text3 = newEmployee.Text3,
Employee_Text4 = newEmployee.Text4,
@@ -141,8 +143,9 @@ namespace BeWo.ServiceUtils.History
ContractHistoryQualifikationsBedarfValueListEntryOid = contract.QualifikationsBedarfValueListEntry?.ValueListEntryOid,
ContractHistoryWeeklyDays = contract.WeeklyDays,
ContractHistoryWeeklyFLS = contract.WeeklyFLS,
ContractHistoryWeeklyTotalHours = contract.WeeklyTotalHours,
Notice = contract.Notice,
ContractHistoryWeeklyTotalHours = contract.WeeklyTotalHours,
ContractHistoryGrossSalary = contract.GrossSalary,
Notice = contract.Notice,
ChangeType = statementType
};
DAOFactory.GenericDAO.Insert(historyEntry);
@@ -267,6 +270,7 @@ namespace BeWo.ServiceUtils.History
Person_Abbreviation = newPerson.Abbreviation,
Person_AufenthaltsStatus = newPerson.AufenthaltsStatus?.TypeDescription ?? "",
Person_DateOfBirth = newPerson.DateOfBirth,
Person_PlaceOfBirth = newPerson.PlaceOfBirth,
Person_FamilyStatus = newPerson.FamilyStatus,
Person_FirstName = newPerson.FirstName,
Person_Function = newPerson.Function?.TypeDescription ?? "",
@@ -410,7 +414,9 @@ namespace BeWo.ServiceUtils.History
//CostBearer2SupportConcept_AccountingTransactions = originalC2S.AccountingTransactions,
CostBearer2SupportConcept_ApprovedEndDate = originalC2S.ApprovedEndDate,
CostBearer2SupportConcept_ApprovedStartDate = originalC2S.ApprovedStartDate,
CostBearer2SupportConcept_AuswahlBezeichnung = originalC2S.AuswahlBezeichnung,
CostBearer2SupportConcept_AuswahlBezeichnung = originalC2S.AuswahlBezeichnung,
CostBearer2SupportConcept_KontoHilfeplan = originalC2S.KontoHilfeplan,
CostBearer2SupportConcept_KostenstelleHilfeplan = originalC2S.KostenstelleHilfeplan,
CostBearer2SupportConcept_CostBearerContactPersonOid = originalC2S.CostBearerContactPerson?.Oid,
CostBearer2SupportConcept_CostBearerOid = originalC2S.CostBearer?.Oid,
CostBearer2SupportConcept_CustomerReferenceNumber = originalC2S.CustomerReferenceNumber,