Neue Felder Kostenstelle und Buchungskonto im Hilfeplan

BeWo/View/Detail/SupportConceptView.xaml

@@ -449,7 +449,8 @@
 																	<RowDefinition Height="Auto" />
 																	<RowDefinition Height="Auto" />
 																	<RowDefinition Height="Auto" />
-                                  <RowDefinition Height="Auto" />
+                                                                    <RowDefinition Height="Auto" />
+                                                                    <RowDefinition Height="Auto" />
 																</Grid.RowDefinitions>
                                 <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1"
                                                                         Text="{markup:Translate Bezeichnung}" Visibility="{Binding Path=ShowHilfeplanBezeichnung, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"/>
@@ -490,7 +491,7 @@
                                                                         Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Grid.Row="7" Margin="3"
                                                                         Height="23"
                                                                         Grid.Column="1" />
-																<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8" 
+                                                                <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="8" 
                                                                            Text="{markup:Translate Kostenträger Kontakt}" />
 																<uc:PopUpEdit NewButtonVisibility="Visible"
                                                                         NewClick="popupedit_costBearerContactPersonSearch_NewClick"
@@ -502,8 +503,17 @@
                                                                         PopUpClick="popupedit_costBearerContactPersonSearch_PopUpClick"
                                                                         Text="{Binding Path=CostBearerContactPerson.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
                                                                               Cursor="Arrow" PreviewMouseDoubleClick="Popupedit_costBearerContactPersonSearch_OnPreviewMouseDoubleClick"/>
-																
+                                                                <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="9" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
-															</Grid>
+                                                                        Text="{markup:Translate KontoHilfeplan}"/>
+                                                                <TextBox Grid.Column="1" Grid.Row="9" Margin="3" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
+                                                                        Height="23"
+                                                                        Text="{val:ValidationBinding Path=KontoHilfeplan, UpdateSourceTrigger=PropertyChanged}"/>
+                                                                <TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="10" Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
+                                                                        Text="{markup:Translate KostenstelleHilfeplan}" />
+                                                                <TextBox Grid.Column="1" Grid.Row="10" Margin="3"  Visibility="{Binding Path=ShowDatevFields, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type view:SupportConceptView}}, Converter={StaticResource BoolVisibilityConverter}}"
+                                                                        Height="23" Text="{val:ValidationBinding Path=KostenstelleHilfeplan, UpdateSourceTrigger=PropertyChanged}"/>
+
+                                                            </Grid>
 														</GroupBox>
 														<GroupBox Grid.Column="1" Margin="5"
                                                                 Style="{DynamicResource ObjectEditGroupBox}">

BeWo/View/Detail/SupportConceptView.xaml.cs

@@ -198,6 +198,8 @@ namespace BeWo.View.Detail
 
         public bool ShowHilfeplanBezeichnung => BeWoApp.AppSettings.ShowHilfeplanBezeichnung;
 
+        public bool ShowDatevFields => BeWoApp.AppSettings.ShowDatevFields;
+
         public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
 
         public override string Title => Translator.Translate("Hilfepläne");

BeWo/View/Navigation/SupportConceptNavigationView.xaml.cs

@@ -518,6 +518,8 @@ namespace BeWo.View.Navigation
 						CostBearerContactPerson = kt.CostBearerContactPerson, 
 						CustomerReferenceNumber = kt.CustomerReferenceNumber, 
 						Notice                  = kt.Notice, 
+                        KontoHilfeplan          = kt.KontoHilfeplan,
+                        KostenstelleHilfeplan   = kt.KostenstelleHilfeplan,
 						Status                  = CostBearer2SupportConceptStatus.Created,
 						SupportConcept          = kt.SupportConcept
 					};

BeWo/ViewModel/SupportConceptCostBearerRelVM.cs

@@ -37,6 +37,10 @@ namespace BeWo.ViewModel
 
         public static string PropertyName_AuswahlBezeichnung = "AuswahlBezeichnung";
 
+        public static string PropertyName_KontoHilfeplan = "KontoHilfeplan";
+
+        public static string PropertyName_KostenstelleHilfeplan = "KostenstelleHilfeplan";
+
         public static string PropertyName_HourlyRate = "HourlyRate";
 
         public static string PropertyName_MonthlyPayment = "MonthlyPayment";
@@ -67,6 +71,10 @@ namespace BeWo.ViewModel
 
         private string _AuswahlBezeichnung;
 
+        private string _KontoHilfeplan;
+
+        private string _KostenstelleHilfeplan;
+
         private decimal? _MonthlyPayment;
 
         private string _Notice;
@@ -421,6 +429,41 @@ namespace BeWo.ViewModel
             }
         }
 
+        public string KontoHilfeplan
+        {
+            get
+            {
+                return this._KontoHilfeplan;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._KontoHilfeplan, value))
+                {
+                    this._KontoHilfeplan = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KontoHilfeplan, value), PropertyName_KontoHilfeplan);
+                    this.FirePropertyChanged(PropertyName_KontoHilfeplan);
+                }
+            }
+        }
+
+        public string KostenstelleHilfeplan
+        {
+            get
+            {
+                return this._KostenstelleHilfeplan;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._KostenstelleHilfeplan, value))
+                {
+                    this._KostenstelleHilfeplan = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.KostenstelleHilfeplan, value), PropertyName_KostenstelleHilfeplan);
+                    this.FirePropertyChanged(PropertyName_KostenstelleHilfeplan);
+                }
+            }
+        }
 
 
         public override bool IsDirty
@@ -666,7 +709,8 @@ namespace BeWo.ViewModel
                 this.CostBearer = pDataContract.CostBearer;
                 this._CustomerReferenceNumber = pDataContract.CustomerReferenceNumber;
                 this._AuswahlBezeichnung = pDataContract.AuswahlBezeichnung;
-
+                this.KontoHilfeplan = pDataContract.KontoHilfeplan;
+                this.KostenstelleHilfeplan = pDataContract.KostenstelleHilfeplan;
                 // _HourlyRate = pDataContract.HourlyRate;
                 this._Notice = pDataContract.Notice;
                 this._RequestedEndDate = pDataContract.RequestedEndDate;
@@ -692,6 +736,8 @@ namespace BeWo.ViewModel
 
             // DataContract.HourlyRate = _HourlyRate;
             pDataContract.Notice = this._Notice;
+            pDataContract.KontoHilfeplan = this.KontoHilfeplan;
+            pDataContract.KostenstelleHilfeplan = this.KostenstelleHilfeplan;
 
             // DataContract.RateFactor = _RateFactor;
             pDataContract.RequestedStartDate = this._RequestedStartDate;

Data/Entities/CostBearer2SupportConcept.cs

@@ -62,6 +62,10 @@ namespace BeWo.Data.Entities
 
         private string _AuswahlBezeichnung;
 
+        private string _KontoHilfeplan;
+
+        private string _KostenstelleHilfeplan;
+
         private decimal? _MonthlyPayment;
 
         private DateTime? _RequestedEndDate;
@@ -247,6 +251,38 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual string KontoHilfeplan
+        {
+            get
+            {
+                return this._KontoHilfeplan;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._KontoHilfeplan, value))
+                {
+                    this._KontoHilfeplan = value;
+                }
+            }
+        }
+
+        public virtual string KostenstelleHilfeplan
+        {
+            get
+            {
+                return this._KostenstelleHilfeplan;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._KostenstelleHilfeplan, value))
+                {
+                    this._KostenstelleHilfeplan = value;
+                }
+            }
+        }
+
         public virtual decimal? MonthlyPayment
         {
             get

Data/Entities/CostBearer2SupportConceptHistory.cs

@@ -17,6 +17,8 @@ namespace BeWo.Data.Entities
         private long? _CostBearer2SupportConcept_CostBearerContactPersonOid;
         private string _CostBearer2SupportConcept_CustomerReferenceNumber;
         private string _CostBearer2SupportConcept_AuswahlBezeichnung;
+        private string _CostBearer2SupportConcept_KontoHilfeplan;
+        private string _CostBearer2SupportConcept_KostenstelleHilfeplan;
         private decimal? _CostBearer2SupportConcept_MonthlyPayment;
         private DateTime? _CostBearer2SupportConcept_RequestedEndDate;
         private DateTime? _CostBearer2SupportConcept_RequestedStartDate;
@@ -110,8 +112,28 @@ namespace BeWo.Data.Entities
                 if (AreDifferent(_CostBearer2SupportConcept_AuswahlBezeichnung, value))
                     _CostBearer2SupportConcept_AuswahlBezeichnung = value;
             }
-        } 
+        }
-        
+
+        public string CostBearer2SupportConcept_KontoHilfeplan
+        {
+            get { return _CostBearer2SupportConcept_KontoHilfeplan; }
+            set
+            {
+                if (AreDifferent(_CostBearer2SupportConcept_KontoHilfeplan, value))
+                    _CostBearer2SupportConcept_KontoHilfeplan = value;
+            }
+        }
+
+        public string CostBearer2SupportConcept_KostenstelleHilfeplan
+        {
+            get { return _CostBearer2SupportConcept_KostenstelleHilfeplan; }
+            set
+            {
+                if (AreDifferent(_CostBearer2SupportConcept_KostenstelleHilfeplan, value))
+                    _CostBearer2SupportConcept_KostenstelleHilfeplan = value;
+            }
+        }
+
         public decimal? CostBearer2SupportConcept_MonthlyPayment
         {
             get { return _CostBearer2SupportConcept_MonthlyPayment; }

Data/Mappings/CostBearer2SupportConcept.hbm.xml

@@ -17,6 +17,8 @@
     <property column="ApprovedEndDate" type="DateTime" name="ApprovedEndDate" />
     <property column="CustomerRefenrenceNumber" type="String" name="CustomerReferenceNumber" length="512" />
     <property column="AuswahlBezeichnung" type="String" name="AuswahlBezeichnung" length="512" />
+	<property column="KontoHilfeplan" type="String" name="KontoHilfeplan" length="512" />
+	<property column="KostenstelleHilfeplan" type="String" name="KostenstelleHilfeplan" length="512" />
     <property column="Notice" type="String" name="Notice" length="1024" />
     <property column="InsTs" type="DateTime" name="InsTs" />
     <property column="InsUser" type="String" name="InsUser" length="256" />

Data/Mappings/Costbearer2SupportConceptHistory.hbm.xml

@@ -25,6 +25,8 @@
         <property name="CostBearer2SupportConcept_MonthlyPayment"               type="System.Decimal"/>
         <property name="CostBearer2SupportConcept_CostBearerContactPersonOid"   type="System.Decimal"/>
         <property name="CostBearer2SupportConcept_AuswahlBezeichnung"           type="String"/>
+		<property name="CostBearer2SupportConcept_KontoHilfeplan"               type="String"/>
+		<property name="CostBearer2SupportConcept_KostenstelleHilfeplan"        type="String"/>
 
     </class>
 </hibernate-mapping>

Model/Changes_2025-08-05_Datevfelder HP.txt

@@ -0,0 +1,7 @@
+ALTER TABLE `costbearer2supportconcept`
+ADD COLUMN `KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Auswahlbezeichnung`,
+ADD COLUMN `KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `KontoHilfeplan`;
+
+ALTER TABLE `costbearer2supportconcepthistory`
+ADD COLUMN `Costbearer2supportconcept_KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_Auswahlbezeichnung`,
+ADD COLUMN `Costbearer2supportconcept_KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_KontoHilfeplan`;

Model/Changes_alle_fuer_neue_db.txt

@@ -1601,3 +1601,27 @@ ADD COLUMN `SozSchwierigkeitenValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER
 ADD COLUMN `SozBeziehungenValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `SozSchwierigkeitenValueListEntryOid`,
 ADD COLUMN `ErstaufnahmeValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `SozBeziehungenValueListEntryOid`,
 ADD COLUMN `RegionValueListEntryOid` BIGINT NULL DEFAULT NULL AFTER `ErstaufnahmeValueListEntryOid`;
+
+
+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`;
+
+
+ALTER TABLE `costbearer2supportconcept`
+ADD COLUMN `KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Auswahlbezeichnung`,
+ADD COLUMN `KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `KontoHilfeplan`;
+
+ALTER TABLE `costbearer2supportconcepthistory`
+ADD COLUMN `Costbearer2supportconcept_KontoHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_Auswahlbezeichnung`,
+ADD COLUMN `Costbearer2supportconcept_KostenstelleHilfeplan` varchar(512) NULL DEFAULT NULL AFTER `Costbearer2supportconcept_KontoHilfeplan`;

Service/DCEntityMapper/SupportConceptCostBearerRelDC_CostBearer2SupportConcept.cs

@@ -28,6 +28,8 @@ namespace BeWo.Service.DCEntityMapper
 			pDataContract.ApprovedEndDate = pEntity.ApprovedEndDate;
 			pDataContract.CustomerReferenceNumber = pEntity.CustomerReferenceNumber;
             pDataContract.AuswahlBezeichnung = pEntity.AuswahlBezeichnung;
+			pDataContract.KontoHilfeplan = pEntity.KontoHilfeplan;
+			pDataContract.KostenstelleHilfeplan = pEntity.KostenstelleHilfeplan;
 
 			pDataContract.MonthlyPayment = pEntity.MonthlyPayment;
 			//pDataContract.ApprovedFLS = pEntity.ApprovedFLS;
@@ -65,6 +67,8 @@ namespace BeWo.Service.DCEntityMapper
 			pEntity.ApprovedEndDate = pDataContract.ApprovedEndDate;
 			pEntity.CustomerReferenceNumber = pDataContract.CustomerReferenceNumber;
             pEntity.AuswahlBezeichnung = pDataContract.AuswahlBezeichnung;
+			pEntity.KontoHilfeplan = pDataContract.KontoHilfeplan;
+			pEntity.KostenstelleHilfeplan = pDataContract.KostenstelleHilfeplan;
 			if (pDataContract.ApprovedStartDate.HasValue)
 			{
 				pEntity.Status = CostBearer2SupportConceptStatus.Approved;

Service/Plugins/SupportConceptAnalysisCreator.cs

@@ -848,6 +848,8 @@ namespace BeWo.Service.Plugins
             dc.ApprovedEndDate = pEntity.ApprovedEndDate;
             dc.CustomerReferenceNumber = pEntity.CustomerReferenceNumber;
             dc.AuswahlBezeichnung = pEntity.AuswahlBezeichnung;
+            dc.KontoHilfeplan = pEntity.KontoHilfeplan;
+            dc.KostenstelleHilfeplan = pEntity.KostenstelleHilfeplan;
 
             dc.MonthlyPayment = pEntity.MonthlyPayment;
             dc.ApprovalPeriodList = MapperFactory.SupportConceptApprovalPeriodDC_SupportConceptApprovalPeriod.MapToNewDCs(pEntity.ApprovalPeriodList);

Service/Plugins/TranslationDictionary.cs

@@ -100,6 +100,8 @@ namespace BeWo.Service.Plugins
 
             AddOrReplaceTranslation(dict, "BewilligungBemerkung", "Bemerkung");
             AddOrReplaceTranslation(dict, "HilfeplanNotiz", "Notiz");
+            AddOrReplaceTranslation(dict, "KontoHilfeplan", "Buchungskonto");
+            AddOrReplaceTranslation(dict, "KostenstelleHilfeplan", "Kostenstelle");
 
             AddOrReplaceTranslation(dict, "Quittierungsbelegunterschriften löschen", "Unterschriften löschen");
             AddOrReplaceTranslation(dict, "Unterschriften der Mitarbeiter für den Quittierungsbeleg leisten (monatlich)", "Unterschriften für den Quittierungsbeleg leisten (monatlich)");

Service/ServiceUtils/History/HistoryCreator.cs

@@ -413,7 +413,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,

Shared/DataContracts/SupportConceptCostBearerRelDC.cs

@@ -44,6 +44,12 @@ namespace BS.Shared.DataContracts
         [DataMember]
         public string AuswahlBezeichnung { get; set; }
 
+        [DataMember]
+        public string KontoHilfeplan { get; set; }
+
+        [DataMember]
+        public string KostenstelleHilfeplan { get; set; }
+
         [DataMember]
         public decimal? MonthlyPayment { get; set; }
 
@@ -64,7 +70,6 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public CompactSupportConceptDC SupportConcept { get; set; }
-        
 
         public TimeSpan? GetApprovedDuration()
         {