diff --git a/BeWo/ViewModel/InvoiceBaseVM.cs b/BeWo/ViewModel/InvoiceBaseVM.cs index 2736480b9..e82a4aa2b 100644 --- a/BeWo/ViewModel/InvoiceBaseVM.cs +++ b/BeWo/ViewModel/InvoiceBaseVM.cs @@ -920,6 +920,7 @@ namespace BeWo.ViewModel public StoredFileVM XRechnungStoredFileVM { get; set; } public long? Oid => DataContract.InvoiceBaseOid; + public string InvoiceId => DataContract.InvoiceId; public string SenderStreet => DataContract.SenderStreet; public string SenderTown => DataContract.SenderTown; public string SenderPostCode => DataContract.SenderPostCode; diff --git a/Dakota/Dakota.csproj b/Dakota/Dakota.csproj index 597cc70c0..1a023788c 100644 --- a/Dakota/Dakota.csproj +++ b/Dakota/Dakota.csproj @@ -171,10 +171,6 @@ - - {b0d73e3d-4ae7-4024-93a6-db1f46d7ccee} - Data - {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} Shared diff --git a/Dakota/DakotaExtensions.cs b/Dakota/DakotaExtensions.cs index 77670578b..039145b02 100644 --- a/Dakota/DakotaExtensions.cs +++ b/Dakota/DakotaExtensions.cs @@ -1,5 +1,5 @@ -using BeWo.Data.Entities; -using BS.Shared.DataContracts; +using BS.Shared.DataContracts; +using BS.Shared.Interface; using System; using System.Collections.Generic; using System.Linq; @@ -32,7 +32,7 @@ namespace Dakota return false; } - public static bool IsSozioTherapie(this InvoiceBase invoiceBase) + public static bool IsSozioTherapie(this IInvoiceBase invoiceBase) { try { diff --git a/Dakota/DakotaUtils.cs b/Dakota/DakotaUtils.cs index ae7cd19a0..229e1e857 100644 --- a/Dakota/DakotaUtils.cs +++ b/Dakota/DakotaUtils.cs @@ -1,5 +1,4 @@ -using BeWo.Data.Entities; -using BS.Shared.Core; +using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Exceptions; diff --git a/Dakota/Logic/DakotaInfoCreator.cs b/Dakota/Logic/DakotaInfoCreator.cs index d53e881da..b93b9ace3 100644 --- a/Dakota/Logic/DakotaInfoCreator.cs +++ b/Dakota/Logic/DakotaInfoCreator.cs @@ -1,5 +1,4 @@ -using BeWo.Data.Entities; -using BS.Shared; +using BS.Shared; using BS.Shared.DataContracts; using Dakota.Models.Infos; using Dakota.Models.Schlüssels; diff --git a/Dakota/Logic/DakotaManager.cs b/Dakota/Logic/DakotaManager.cs index 945ba52d7..98a842f93 100644 --- a/Dakota/Logic/DakotaManager.cs +++ b/Dakota/Logic/DakotaManager.cs @@ -1,5 +1,5 @@ -using BeWo.Data.Models; -using BS.Shared.DataContracts; +using BS.Shared.DataContracts; +using BS.Shared.Models; using Dakota.Models.Infos; using System; using System.Collections.Generic; diff --git a/Dakota/Models/DakotaFile.cs b/Dakota/Models/DakotaFile.cs index f338002f2..99be8e478 100644 --- a/Dakota/Models/DakotaFile.cs +++ b/Dakota/Models/DakotaFile.cs @@ -1,5 +1,4 @@ -using BeWo.Data.Entities; -using BS.Shared.DataContracts; +using BS.Shared.DataContracts; using Dakota.Models; using Dakota.Models.Auftragsdatei; using Dakota.Models.Blocke; diff --git a/Dakota/Models/Infos/InfoParameterInvoiceItem.cs b/Dakota/Models/Infos/InfoParameterInvoiceItem.cs index 9b96aa75d..61ed616fd 100644 --- a/Dakota/Models/Infos/InfoParameterInvoiceItem.cs +++ b/Dakota/Models/Infos/InfoParameterInvoiceItem.cs @@ -1,6 +1,6 @@ -using BeWo.Data.Models; -using BS.Shared.DataContracts; +using BS.Shared.DataContracts; using BS.Shared.Exceptions; +using BS.Shared.Models; using Dakota.Models.Schlüssels; using System; using System.Collections.Generic; diff --git a/Data/Data.csproj b/Data/Data.csproj index c66407bb8..5d3b39fad 100644 --- a/Data/Data.csproj +++ b/Data/Data.csproj @@ -435,7 +435,6 @@ - diff --git a/Report/ReportObjects/GkvAbrechnungRO.cs b/Report/ReportObjects/GkvAbrechnungRO.cs index 00deac181..59d293e1c 100644 --- a/Report/ReportObjects/GkvAbrechnungRO.cs +++ b/Report/ReportObjects/GkvAbrechnungRO.cs @@ -1,11 +1,11 @@ using BeWo.Data.Entities; -using BeWo.Data.Models; using BeWo.Service.Plugins; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Extensions; +using BS.Shared.Models; using DevExpress.XtraPrinting.Drawing; using System; using System.Collections.Generic; diff --git a/Service/Plugins/AccountingService.cs b/Service/Plugins/AccountingService.cs index b8c8d1f7e..724c3d28a 100644 --- a/Service/Plugins/AccountingService.cs +++ b/Service/Plugins/AccountingService.cs @@ -4,7 +4,6 @@ using System.Linq; using System.ServiceModel; using BeWo.Data.Access; using BeWo.Data.Entities; -using BeWo.Data.Models; using BeWo.Data.Security; using BeWo.Service.Configuration; using BeWo.Service.Core; @@ -15,6 +14,7 @@ using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; +using BS.Shared.Models; namespace BeWo.Service.Plugins { diff --git a/Service/ServiceContracts/IAccountingService.cs b/Service/ServiceContracts/IAccountingService.cs index 73902a928..4bdc84838 100644 --- a/Service/ServiceContracts/IAccountingService.cs +++ b/Service/ServiceContracts/IAccountingService.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.ServiceModel; -using BeWo.Data.Models.XRechnung; using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs index 46018d1f8..149d3be3d 100644 --- a/Service/ServiceImplementations/AccountingServiceImp.cs +++ b/Service/ServiceImplementations/AccountingServiceImp.cs @@ -28,7 +28,6 @@ using BS.Shared.Extensions; using BS.Shared.Exceptions; using BS.Shared.AppSender; using BeWo.Data.Security; -using BeWo.Data.Models.XRechnung; using BS.Shared.DataContracts.Invoicing.XRechnung; using System.IO; using BeWo.Service.ServiceUtils; diff --git a/Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs index e19eec014..15081c6b5 100644 --- a/Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs +++ b/Service/ServiceImplementations/Enhanced/AccountingEnhancedServiceImp.cs @@ -1,7 +1,6 @@ using BeWo.Data; using BeWo.Data.Access; using BeWo.Data.Entities; -using BeWo.Data.Models.XRechnung; using BeWo.Data.Security; using BeWo.Service.Core; using BeWo.Service.DCEntityMapper; diff --git a/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs index 37722c448..3c859ee6b 100644 --- a/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs +++ b/Service/ServiceImplementations/Enhanced/OperationsEnhancedServiceImp.cs @@ -1,7 +1,6 @@ using BeWo.Data; using BeWo.Data.Access; using BeWo.Data.Entities; -using BeWo.Data.Models.XRechnung; using BeWo.Data.Security; using BeWo.Service.Core; using BeWo.Service.DCEntityMapper; diff --git a/Service/ServiceImplementations/GkvAccountingServiceImp.cs b/Service/ServiceImplementations/GkvAccountingServiceImp.cs index a0b18be3a..ee582a6b0 100644 --- a/Service/ServiceImplementations/GkvAccountingServiceImp.cs +++ b/Service/ServiceImplementations/GkvAccountingServiceImp.cs @@ -329,11 +329,10 @@ namespace BeWo.Service.ServiceImplementations Message = app8res.Message, Success = app8res.Success, Hausanschrift = app8res.Hausanschrift ?? new AddressDC(), - Postfachanschrift=app8res.Postfachanschrift ?? new AddressDC(), - Grosskundenanschrift =app8res.Grosskundenanschrift ?? new AddressDC() + Postfachanschrift = app8res.Postfachanschrift ?? new AddressDC(), + Grosskundenanschrift = app8res.Grosskundenanschrift ?? new AddressDC() }; - // Schaue, ob IK Krankenkassen bereits bei einer anderen Organisation hinterlegt ist if (res.Gefunden) { diff --git a/Shared/Interface/IInvoiceBase.cs b/Shared/Interface/IInvoiceBase.cs index 52577d5d3..905442066 100644 --- a/Shared/Interface/IInvoiceBase.cs +++ b/Shared/Interface/IInvoiceBase.cs @@ -9,6 +9,8 @@ namespace BS.Shared.Interface public interface IInvoiceBase { long? Oid { get; } + string InvoiceTitle { get; } + string InvoiceId { get; } string SenderStreet { get; } string SenderTown { get; } string SenderPostCode { get; } diff --git a/Data/Models/AddressInformation.cs b/Shared/Models/AddressInformation.cs similarity index 95% rename from Data/Models/AddressInformation.cs rename to Shared/Models/AddressInformation.cs index 071b88ca4..1422e7111 100644 --- a/Data/Models/AddressInformation.cs +++ b/Shared/Models/AddressInformation.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BeWo.Data.Models +namespace BS.Shared.Models { public class AddressInformation { diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index eea6d0941..0e7be8270 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -416,6 +416,7 @@ +