diff --git a/BeWo/View/Detail/EmployeeView.xaml b/BeWo/View/Detail/EmployeeView.xaml
index 6b6e4e884..f538dfeed 100644
--- a/BeWo/View/Detail/EmployeeView.xaml
+++ b/BeWo/View/Detail/EmployeeView.xaml
@@ -336,6 +336,8 @@
+
+
@@ -396,39 +398,53 @@
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
- Staatsangehörigkeit
+ Anzahl Kinder
+
+
+
-
+
+
+
+
_Qualifications;
private Sex? _Sex;
private string _Street;
+ private string _TaxClass;
private string _TaxNumber;
private string _Text1;
private string _Text2;
@@ -425,6 +429,23 @@ namespace BeWo.ViewModel
// }
//}
+ public string ChildCount
+ {
+ get { return _ChildCount; }
+
+ set
+ {
+ if (AreDifferent(_ChildCount, value))
+ {
+ _ChildCount = value;
+
+ StoreDirtyInformation(AreDifferent(DataContract.ChildCount, value), PropertyName_ChildCount);
+
+ FirePropertyChanged(PropertyName_ChildCount);
+ }
+ }
+ }
+
public CustomerEmployeeRelationListVM CustomerRelations
{
get { return _CustomerRelations; }
@@ -980,6 +1001,23 @@ namespace BeWo.ViewModel
}
}
+ public string TaxClass
+ {
+ get { return _TaxClass; }
+
+ set
+ {
+ if (AreDifferent(_TaxClass, value))
+ {
+ _TaxClass = value;
+
+ StoreDirtyInformation(AreDifferent(DataContract.TaxClass, value), PropertyName_TaxClass);
+
+ FirePropertyChanged(PropertyName_TaxClass);
+ }
+ }
+ }
+
public string TaxNumber
{
get { return _TaxNumber; }
@@ -1288,6 +1326,8 @@ namespace BeWo.ViewModel
_Profession = pDataContract.Profession;
_Street = pDataContract.Street;
_TaxNumber = pDataContract.TaxNumber;
+ _TaxClass = pDataContract.TaxClass;
+ _ChildCount = pDataContract.ChildCount;
_Town = pDataContract.Town;
_BankName = pDataContract.BankName;
_AccountNumber = pDataContract.AccountNumber;
@@ -1402,6 +1442,8 @@ namespace BeWo.ViewModel
pDataContract.Profession = _Profession;
pDataContract.Street = _Street;
pDataContract.TaxNumber = _TaxNumber;
+ pDataContract.TaxClass = _TaxClass;
+ pDataContract.ChildCount = _ChildCount;
pDataContract.Town = _Town;
pDataContract.BankName = _BankName;
pDataContract.AccountNumber = _AccountNumber;
diff --git a/Data/Entities/Contract.cs b/Data/Entities/Contract.cs
index 399d27e24..de52032a7 100644
--- a/Data/Entities/Contract.cs
+++ b/Data/Entities/Contract.cs
@@ -17,6 +17,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_EntryDate = "EntryDate";
public static string PropertyName_ContractEndDate = "ContractEndDate";
public static string PropertyName_HourlyRate = "HourlyRate";
+ public static string PropertyName_GrossSalary = "GrossSalary";
public static string PropertyName_WeeklyFLS = "WeeklyFLS";
public static string PropertyName_MonthlyFLS = "MonthlyFLS";
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
+ private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -170,6 +172,16 @@ namespace BeWo.Data.Entities
}
}
+ public virtual decimal? GrossSalary
+ {
+ get { return _GrossSalary; }
+ set
+ {
+ if (base.AreDifferent(_GrossSalary, value))
+ _GrossSalary = value;
+ }
+
+ }
public virtual long EmployeeOid
{
get { return _EmployeeOid; }
diff --git a/Data/Entities/ContractHistory.cs b/Data/Entities/ContractHistory.cs
index dd37b46ab..dd75fad3f 100644
--- a/Data/Entities/ContractHistory.cs
+++ b/Data/Entities/ContractHistory.cs
@@ -15,6 +15,7 @@ namespace BeWo.Data.Entities
public static string PropertyName_ContractHistoryEntryDate = "ContractHistoryEntryDate";
public static string PropertyName_ContractHistoryContractEndDate = "ContractHistoryContractEndDate";
public static string PropertyName_ContractHistoryHourlyRate = "ContractHistoryHourlyRate";
+ public static string PropertyName_ContractHistoryGrossSalary = "ContractHistoryGrossSalary";
public static string PropertyName_ContractHistoryWeeklyFLS = "ContractHistoryWeeklyFLS";
public static string PropertyName_ContractHistoryMonthlyFLS = "ContractHistoryMonthlyFLS";
public static string PropertyName_ContractHistoryWeeklyTotalHours = "ContractHistoryWeeklyTotalHours";
@@ -31,6 +32,7 @@ namespace BeWo.Data.Entities
private decimal? _WeeklyFLS;
private decimal? _MonthlyFLS;
private decimal? _HourlyRate;
+ private decimal? _GrossSalary;
private DateTime? _EntryDate;
private DateTime? _ContractEndDate;
private int _CancellationPeriod;
@@ -173,6 +175,16 @@ namespace BeWo.Data.Entities
}
}
+ public virtual decimal? ContractHistoryGrossSalary
+ {
+ get { return _GrossSalary; }
+ set
+ {
+ if (base.AreDifferent(_GrossSalary, value))
+ _GrossSalary = value;
+ }
+ }
+
public virtual long ContractHistoryEmployeeOid
{
get { return _EmployeeOid; }
diff --git a/Data/Entities/Employee.cs b/Data/Entities/Employee.cs
index f465d4862..a2ac6c8b1 100644
--- a/Data/Entities/Employee.cs
+++ b/Data/Entities/Employee.cs
@@ -11,6 +11,8 @@ namespace BeWo.Data.Entities
{
public static string PropertyName_AbsenceTimes = "AbsenceTimes";
+ public static string PropertyName_ChildCount = "ChildCount";
+
public static string PropertyName_Employee2CustomerList = "Employee2CustomerList";
public static string PropertyName_HealthInsurance = "HealthInsurance";
@@ -31,6 +33,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_ServiceRecordList = "ServiceRecordList";
+ public static string PropertyName_TaxClass = "TaxClass";
+
public static string PropertyName_TaxNumber = "TaxNumber";
public static string PropertyName_ValueList = "ValueList";
@@ -61,7 +65,9 @@ namespace BeWo.Data.Entities
private IList _Contracts;
- private IList _Arbeitszeiten;
+ private string _ChildCount;
+
+ private IList _Arbeitszeiten;
private IList _Employee2CustomerList;
@@ -87,6 +93,8 @@ namespace BeWo.Data.Entities
private IList _ServiceRecordList;
+ private string _TaxClass;
+
private string _TaxNumber;
private string _Text1;
@@ -175,6 +183,19 @@ namespace BeWo.Data.Entities
}
}
+ public virtual string ChildCount
+ {
+ get { return _ChildCount; }
+
+ set
+ {
+ if (AreDifferent(_ChildCount, value))
+ {
+ _ChildCount = value;
+ }
+ }
+ }
+
public virtual IList Employee2CustomerList
{
get { return _Employee2CustomerList ?? (_Employee2CustomerList = new List()); }
@@ -307,6 +328,19 @@ namespace BeWo.Data.Entities
}
}
+ public virtual string TaxClass
+ {
+ get { return _TaxClass; }
+
+ set
+ {
+ if (AreDifferent(_TaxClass, value))
+ {
+ _TaxClass = value;
+ }
+ }
+ }
+
public virtual string TaxNumber
{
get { return _TaxNumber; }
diff --git a/Data/Entities/EmployeeHistory.cs b/Data/Entities/EmployeeHistory.cs
index 7e2b7338b..bc9ccfd80 100644
--- a/Data/Entities/EmployeeHistory.cs
+++ b/Data/Entities/EmployeeHistory.cs
@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
private TableID _Employee_Tid;
private string _Employee_PersonnelNumber;
private string _Employee_TaxNumber;
+ private string _Employee_TaxClass;
+ private string _Employee_ChildCount;
private string _Employee_HealthInsurance;
private string _Employee_InsuranceNumber;
private decimal _Employee_HourlyRate;
@@ -158,6 +160,36 @@ namespace BeWo.Data.Entities
}
}
+ public virtual string Employee_TaxClass
+ {
+ get
+ {
+ return _Employee_TaxClass;
+ }
+ set
+ {
+ if (AreDifferent(_Employee_TaxClass, value))
+ {
+ _Employee_TaxClass = value;
+ }
+ }
+ }
+
+ public virtual string Employee_ChildCount
+ {
+ get
+ {
+ return _Employee_ChildCount;
+ }
+ set
+ {
+ if (AreDifferent(_Employee_ChildCount, value))
+ {
+ _Employee_ChildCount = value;
+ }
+ }
+ }
+
public virtual string Employee_HealthInsurance
{
get
diff --git a/Data/Mappings/Contract.hbm.xml b/Data/Mappings/Contract.hbm.xml
index d0b25cb67..fd6f2805b 100644
--- a/Data/Mappings/Contract.hbm.xml
+++ b/Data/Mappings/Contract.hbm.xml
@@ -15,6 +15,7 @@
+
diff --git a/Data/Mappings/ContractHistory.hbm.xml b/Data/Mappings/ContractHistory.hbm.xml
index c075a23df..2dadfaa87 100644
--- a/Data/Mappings/ContractHistory.hbm.xml
+++ b/Data/Mappings/ContractHistory.hbm.xml
@@ -17,6 +17,7 @@
+
diff --git a/Data/Mappings/Employee.hbm.xml b/Data/Mappings/Employee.hbm.xml
index ba3db3087..3edf89ad3 100644
--- a/Data/Mappings/Employee.hbm.xml
+++ b/Data/Mappings/Employee.hbm.xml
@@ -9,6 +9,8 @@
+
+
diff --git a/Data/Mappings/EmployeeHistory.hbm.xml b/Data/Mappings/EmployeeHistory.hbm.xml
index 018e884f2..6bc986033 100644
--- a/Data/Mappings/EmployeeHistory.hbm.xml
+++ b/Data/Mappings/EmployeeHistory.hbm.xml
@@ -22,6 +22,8 @@
+
+
diff --git a/Model/Changes_2025_07_31 Steuerklasse Kinder Bruttogehalt.txt b/Model/Changes_2025_07_31 Steuerklasse Kinder Bruttogehalt.txt
new file mode 100644
index 000000000..de660869a
--- /dev/null
+++ b/Model/Changes_2025_07_31 Steuerklasse Kinder Bruttogehalt.txt
@@ -0,0 +1,13 @@
+ALTER TABLE `Employee`
+ADD COLUMN `TaxClass` varchar(256) NULL DEFAULT NULL AFTER `TaxNumber`,
+ADD COLUMN `ChildCount` varchar(256) NULL DEFAULT NULL AFTER `TaxClass`;
+
+ALTER TABLE `EmployeeHistory`
+ADD COLUMN `Employee_TaxClass` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxNumber`,
+ADD COLUMN `Employee_ChildCount` varchar(256) NULL DEFAULT NULL AFTER `Employee_TaxClass`;
+
+ALTER TABLE `Contract`
+ADD COLUMN `GrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `CancellationPeriod`;
+
+ALTER TABLE `ContractHistory`
+ADD COLUMN `ContractHistoryGrossSalary` decimal(18,10) NULL DEFAULT NULL AFTER `ContractHistoryCancellationPeriod`;
diff --git a/Service/DCEntityMapper/ContractDC_Contract.cs b/Service/DCEntityMapper/ContractDC_Contract.cs
index 29d6031f8..5630c72cc 100644
--- a/Service/DCEntityMapper/ContractDC_Contract.cs
+++ b/Service/DCEntityMapper/ContractDC_Contract.cs
@@ -15,6 +15,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.ContractEndDate = pEntity.ContractEndDate;
pDataContract.EntryDate = pEntity.EntryDate;
pDataContract.HourlyRate = pEntity.HourlyRate;
+ pDataContract.GrossSalary = pEntity.GrossSalary;
pDataContract.LeaveDays = pEntity.LeaveDays;
pDataContract.ProbationPeriod = pEntity.ProbationPeriod;
pDataContract.ProbationPeriod2 = pEntity.ProbationPeriod2;
@@ -54,6 +55,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.ContractEndDate = pDataContract.ContractEndDate;
pEntity.EntryDate = pDataContract.EntryDate;
pEntity.HourlyRate = pDataContract.HourlyRate;
+ pEntity.GrossSalary = pDataContract.GrossSalary;
pEntity.LeaveDays = pDataContract.LeaveDays;
pEntity.ProbationPeriod = pDataContract.ProbationPeriod;
pEntity.ProbationPeriod2 = pDataContract.ProbationPeriod2;
diff --git a/Service/DCEntityMapper/EmployeeDC_Employee.cs b/Service/DCEntityMapper/EmployeeDC_Employee.cs
index d3aeb2fc1..05505c3a7 100644
--- a/Service/DCEntityMapper/EmployeeDC_Employee.cs
+++ b/Service/DCEntityMapper/EmployeeDC_Employee.cs
@@ -36,6 +36,8 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.InsuranceNumber = pEntity.InsuranceNumber;
pDataContract.PersonnelNumber = pEntity.PersonnelNumber;
pDataContract.TaxNumber = pEntity.TaxNumber;
+ pDataContract.TaxClass= pEntity.TaxClass;
+ pDataContract.ChildCount = pEntity.ChildCount;
pDataContract.EmployeeVersion = pEntity.Version;
pDataContract.IsQualified = pEntity.IsQualified;
pDataContract.EmployeeColor = pEntity.EmployeeColor;
@@ -153,6 +155,8 @@ namespace BeWo.Service.DCEntityMapper
pEntity.InsuranceNumber = pDataContract.InsuranceNumber;
pEntity.PersonnelNumber = pDataContract.PersonnelNumber;
pEntity.TaxNumber = pDataContract.TaxNumber;
+ pEntity.TaxClass = pDataContract.TaxClass;
+ pEntity.ChildCount = pDataContract.ChildCount;
pEntity.IsQualified = pDataContract.IsQualified;
pEntity.EmployeeColor = pDataContract.EmployeeColor;
pEntity.Text1 = pDataContract.Text1;
diff --git a/Service/ServiceUtils/History/HistoryCreator.cs b/Service/ServiceUtils/History/HistoryCreator.cs
index 291983914..f674482a5 100644
--- a/Service/ServiceUtils/History/HistoryCreator.cs
+++ b/Service/ServiceUtils/History/HistoryCreator.cs
@@ -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);
diff --git a/Shared/DataContracts/ContractDC.cs b/Shared/DataContracts/ContractDC.cs
index b89422459..f5ac1ed86 100644
--- a/Shared/DataContracts/ContractDC.cs
+++ b/Shared/DataContracts/ContractDC.cs
@@ -33,6 +33,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public decimal? HourlyRate { get; set; }
+ [DataMember]
+ public decimal? GrossSalary { get; set; }
+
[DataMember]
public DateTime? EntryDate { get; set; }
diff --git a/Shared/DataContracts/EmployeeDC.cs b/Shared/DataContracts/EmployeeDC.cs
index a9433c0eb..17dfba38f 100644
--- a/Shared/DataContracts/EmployeeDC.cs
+++ b/Shared/DataContracts/EmployeeDC.cs
@@ -78,6 +78,12 @@ namespace BS.Shared.DataContracts
[DataMember]
public List RelatedCustomers { get; set; }
+ [DataMember]
+ public string ChildCount { get; set; }
+
+ [DataMember]
+ public string TaxClass { get; set; }
+
[DataMember]
public string TaxNumber { get; set; }