Merge branch 'master' into feature_rene_18_ai
# 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:
@@ -79,7 +79,7 @@ namespace Host
|
||||
catch (Exception ex)
|
||||
{
|
||||
var ex_text = ex.Message + "\n" + ex.StackTrace;
|
||||
SendErrorResponse(ex_text);
|
||||
SendErrorResponse("Exception: " + ex_text);
|
||||
}
|
||||
|
||||
Response.End();
|
||||
@@ -199,7 +199,7 @@ namespace Host
|
||||
response.BezDatenannahmestelle = resolved.BezDatenannahmestelle;
|
||||
response.Hausanschrift = resolved.Hausanschrift;
|
||||
response.Postfachanschrift = resolved.Postfachanschrift;
|
||||
response.Grosskundenanschrift = response.Grosskundenanschrift;
|
||||
response.Grosskundenanschrift = resolved.Grosskundenanschrift;
|
||||
}
|
||||
|
||||
SendResponse(response);
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
<PublishDatabases>false</PublishDatabases>
|
||||
<FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
|
||||
Reference in New Issue
Block a user