Dakota -> Data Verweis entfernt

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;

Dakota/Dakota.csproj

@@ -171,10 +171,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\Data.csproj">
-      <Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
-      <Name>Data</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">
       <Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>
       <Name>Shared</Name>

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
             {

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;

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;

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;

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;

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;

Data/Data.csproj

@@ -435,7 +435,6 @@
     <Compile Include="ICF\ICFDAO.cs" />
     <Compile Include="LoggedInUserOperationContextExt.cs" />
     <EmbeddedResource Include="Mappings\Bargeldtransaktionshistory.hbm.xml" />
-    <Compile Include="Models\AddressInformation.cs" />
     <Compile Include="Models\XRechnung\XRBuyerBankAccount.cs" />
     <Compile Include="Models\XRechnung\XRechnung.cs" />
     <Compile Include="Models\XRechnung\XRSellerBankAccount.cs" />

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;

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
 {

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;

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;

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;

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;

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)
 				{

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; }

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
 	{

Shared/Shared.csproj

@@ -416,6 +416,7 @@
     <Compile Include="Interface\IOrganisation.cs" />
     <Compile Include="Interface\IInvoiceItem.cs" />
     <Compile Include="Interface\IStoredFile.cs" />
+    <Compile Include="Models\AddressInformation.cs" />
     <Compile Include="Packet.cs" />
     <Compile Include="ReportRequests\AbstractReportRequest.cs" />
     <Compile Include="ReportRequests\GkvAbrechnungReportRequest.cs" />