From bf2411b5a36ffbb63787507a20e35c1c79878749 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@ownsoft.de>
Date: Thu, 7 Dec 2023 14:54:26 +0100
Subject: [PATCH] =?UTF-8?q?PSM=20Einzelunterschrift=20hinzugef=C3=BCgt.=20?=
 =?UTF-8?q?Die=20hatte=20gefehlt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ServicesOverviewRO hat jetzt eine Bitmap-Einzelunterschrift. Damit kann man die Bitmap einfach an die PictureBox binden.

Pfad in MoK web.config angepasst für CustomerDlls, damit da die angepassten Berichte angezeigt werden.
---
 .../Controllers/ReportViewerController.cs     |  10 +-
 BeWoPlanerMobil/Views/Main/Main.cshtml        |   4 +-
 BeWoPlanerMobil/Web.config                    |   6 +-
 Host/Host.csproj.user                         |   2 +-
 Report/ReportObjects/ServicesOverviewRO.cs    |  17 +-
 .../QuittierungsbelegMitDatum.Designer.cs     | 238 +++++++++---------
 .../PSM/QuittierungsbelegMitDatum.Designer.cs |   3 +-
 ReportImp/PSM/QuittierungsbelegMitDatum.cs    |   1 +
 Service/Plugins/PluginLoader.cs               |  16 +-
 9 files changed, 162 insertions(+), 135 deletions(-)

diff --git a/BeWoPlanerMobil/Controllers/ReportViewerController.cs b/BeWoPlanerMobil/Controllers/ReportViewerController.cs
index fe6c0bc4f..02afc4606 100644
--- a/BeWoPlanerMobil/Controllers/ReportViewerController.cs
+++ b/BeWoPlanerMobil/Controllers/ReportViewerController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web.Mvc;
 using BeWo.Report;
@@ -285,12 +286,13 @@ namespace BeWoPlanerMobil.Controllers
 
         private static AbstractReportCreator GetReportCreator()
         {
-            var creator = PluginLoader.FindClass<DefaultReportCreator>();
-            
+            AbstractReportCreator creator = PluginLoader.FindClass<DefaultReportCreator>() ?? new DefaultReportCreator();
+
+            var mobileBaseDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\Host\");
 #if DEBUG
-            creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, @"demo\temp");
+            creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(mobileBaseDirectory, @"demo\temp");
 #else
-			creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(AppDomain.CurrentDomain.BaseDirectory, PluginLoader.Tenant + @"\temp");
+			creator.TempPath = BS.Shared.Core.Utils.CreateSavePath(mobileBaseDirectory, PluginLoader.Tenant + @"\temp");
 #endif
             return creator;
         }
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index da042e572..06a8c6b08 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -599,7 +599,7 @@
                         var test = $.parseJSON(data);
                     });
                 } catch (error) {
-
+                    showErrorPopup(error);
                 }
             }
         </text>
@@ -611,7 +611,7 @@
     {
         <text>
             <div class="row">
-                <div class="col-md">
+                <div class="col w-100 m-3">
                     <button class="btn btn-bewo-dev" type="button" onclick="provokeJsonError()">JSON-Fehler provozieren</button>
                 </div>
             </div>
diff --git a/BeWoPlanerMobil/Web.config b/BeWoPlanerMobil/Web.config
index 27d54b352..9d1992036 100644
--- a/BeWoPlanerMobil/Web.config
+++ b/BeWoPlanerMobil/Web.config
@@ -147,10 +147,8 @@
         <add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
         <add key="ContractStateUrl" value="https://support.bewoplaner.de/api/getcontractstate.php?CustomerID=[TENANT]" />
         <!--<add key="PluginPathtest" value="D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\bin" />-->
-        <!-- Lyndon -->
-        <!--<add key="PluginPath" value="C:\Users\lyndo\BeWo\Host\bin" />-->
-        <add key="PluginPath" value="..\Host\bin" />
-        <!-- /Lyndon -->
+        <add key="PluginBasePath" value="..\CustomerDlls" />
+        <add key="PluginPath" value="..\CustomerDlls" />
         <add key="FileRootDirectory" value="\BWP-Files" />
     </appSettings>
     <!--
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 769cd8b25..a0002e9f5 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs
index f74c2c0bd..8df9819ed 100644
--- a/Report/ReportObjects/ServicesOverviewRO.cs
+++ b/Report/ReportObjects/ServicesOverviewRO.cs
@@ -590,6 +590,8 @@ namespace BeWo.Report.ReportObjects
             // if (lServiceRecords == null)
             IList<ServiceRecord> lServiceRecords = DAOFactory.SearchDAO.FindCustomerServiceRecords(customer.Oid.Value, span, null, null, searchServiceRecordsByEndDate);
 
+            var serviceRecordSignatures = DAOFactory.GenericDAO.LoadByIDs<Signature>(lServiceRecords.Where(sr => sr.SignatureOid.HasValue).Select(sr => sr.SignatureOid.Value));
+
             var lResult = new ServicesOverviewRO();
 
             if (checkQbStatus)
@@ -870,7 +872,18 @@ namespace BeWo.Report.ReportObjects
 	                
 					sd.ServiceRecordOid = iSr.Oid.Value;
                     sd.SignatureOid = iSr.SignatureOid;
-					sd.GefahreneKilometer = iSr.DistanceInMeter.HasValue ? (Convert.ToDouble(iSr.DistanceInMeter)).ToString("0.##") : string.Empty;
+
+                    if(iSr.SignatureOid.HasValue)
+                    {
+                        var signature = serviceRecordSignatures.FirstOrDefault(s => s.Oid.HasValue && s.Oid.Value.Equals(iSr.SignatureOid));
+
+                        if(signature != null)
+                        {
+                            sd.SignatureImage = ImageUtils.ConvertBase64StringToBitmap(signature.DataBild);
+                        }
+                    }
+
+                    sd.GefahreneKilometer = iSr.DistanceInMeter.HasValue ? (Convert.ToDouble(iSr.DistanceInMeter)).ToString("0.##") : string.Empty;
 
                     decimal roundedDur = iSr.RoundedDuration;
                     decimal prozent = iSr.ServiceDescription.ServiceCategory.ProzentAbrechnung;
@@ -1664,6 +1677,8 @@ namespace BeWo.Report.ReportObjects
 
             public string EmployeeFirstName { get; set; }
             public string EmployeeLastName { get; set; }
+
+            public Bitmap SignatureImage { get; set; }
         }
 
         public class ServiceDoubleDetail
diff --git a/ReportImp/AmbulantBetreutesWohnenAstridPulm/QuittierungsbelegMitDatum.Designer.cs b/ReportImp/AmbulantBetreutesWohnenAstridPulm/QuittierungsbelegMitDatum.Designer.cs
index a566de124..87ec87f8d 100644
--- a/ReportImp/AmbulantBetreutesWohnenAstridPulm/QuittierungsbelegMitDatum.Designer.cs
+++ b/ReportImp/AmbulantBetreutesWohnenAstridPulm/QuittierungsbelegMitDatum.Designer.cs
@@ -1,34 +1,34 @@
-using BeWo.Report.ReportObjects;
-namespace AmbulantBetreutesWohnenAstridPulm
-{
-    partial class Quittierungsbeleg2
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
+using BeWo.Report.ReportObjects;
+namespace AmbulantBetreutesWohnenAstridPulm
+{
+    partial class Quittierungsbeleg2
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Quittierungsbeleg2));
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
@@ -1368,92 +1368,92 @@ namespace AmbulantBetreutesWohnenAstridPulm
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
-        }
-
-        #endregion
-
-        private DevExpress.XtraReports.UI.DetailBand Detail;
-        private System.Windows.Forms.BindingSource bindingSource1;
-        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
-        private DevExpress.XtraReports.UI.DetailBand Detail1;
-        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
-        private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
-        private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
-        private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
-        private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
-        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
-        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
-        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
-        private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
-        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
-        private DevExpress.XtraReports.UI.XRTable xrTable3;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
-        private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
-        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
-        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
-        private DevExpress.XtraReports.UI.XRLabel lblHatAbwesenheiten;
-        private DevExpress.XtraReports.UI.XRLabel lblHatGruppen;
-        private DevExpress.XtraReports.UI.XRTable xrTableAbwesenheiten;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
-        private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
-        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
-        private DevExpress.XtraReports.UI.XRPictureBox picSignature;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel18;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
-        private DevExpress.XtraReports.UI.XRLabel xrLabel16;
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleCostBearer;
+        private DevExpress.XtraReports.UI.FormattingRule formattingRuleEmployeeName;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel3;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel7;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel8;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel6;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel5;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel4;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel15;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+        private DevExpress.XtraReports.UI.XRRichText xrRichText2;
+        private DevExpress.XtraReports.UI.XRLabel lblHatAbwesenheiten;
+        private DevExpress.XtraReports.UI.XRLabel lblHatGruppen;
+        private DevExpress.XtraReports.UI.XRTable xrTableAbwesenheiten;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
+        private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRPictureBox picSignature;
+        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel18;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel16;
         private DevExpress.XtraReports.UI.XRLabel xrLabel14;
         private DevExpress.XtraReports.UI.XRLabel xrLabel20;
         private DevExpress.XtraReports.UI.XRLabel xrLabel21;
@@ -1466,5 +1466,5 @@ namespace AmbulantBetreutesWohnenAstridPulm
         private DevExpress.XtraReports.UI.XRLabel xrLabel23;
         private DevExpress.XtraReports.UI.XRLabel xrLabel19;
         private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
-    }
-}
+    }
+}
diff --git a/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs b/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs
index 2f6fec22b..6fc2e69f6 100644
--- a/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs
+++ b/ReportImp/PSM/QuittierungsbelegMitDatum.Designer.cs
@@ -303,7 +303,8 @@ namespace PSM
             // 
             this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
+            new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature"),
+            new DevExpress.XtraReports.UI.XRBinding("Image", null, "Services.SignatureImage")});
             this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.picSignature.Name = "picSignature";
             this.picSignature.SizeF = new System.Drawing.SizeF(160.0001F, 20.00001F);
diff --git a/ReportImp/PSM/QuittierungsbelegMitDatum.cs b/ReportImp/PSM/QuittierungsbelegMitDatum.cs
index 2aa111ddd..f5df9907f 100644
--- a/ReportImp/PSM/QuittierungsbelegMitDatum.cs
+++ b/ReportImp/PSM/QuittierungsbelegMitDatum.cs
@@ -116,6 +116,7 @@ namespace PSM
 
         private void picSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
         {
+            return;
             XRPictureBox xrBox = sender as XRPictureBox;
             //var test = this.GetCurrent
             string base64String = xrBox.Tag as string;
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index eae8d6a7b..ecf32fb7b 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -147,7 +147,7 @@ namespace BeWo.Service.Plugins
                 //t = "9975231461"; // Selwo
                 //t = "8181286349"; // BeWo am Rhein
                 //t = "4595275645"; // Eigenständig
-                t = "7912635399"; // Prof. Dr. Eggers Stiftung
+                //t = "7912635399"; // Prof. Dr. Eggers Stiftung
                 //t = "3549726254"; // Socia
                 //t = "1992495802"; // Monvita
                 //t = "7381352241"; // Ressource e.V.
@@ -373,6 +373,7 @@ namespace BeWo.Service.Plugins
                 //t = "4431610343"; // B-B-C-Terwort GmbH
                 //t = "2235342307"; // Suchtkrankenhilfe Ostfriesland
                 //t = "1733934665"; // Auf eigenen Füßen stehen (Birgit Apel de Santos & Stefan Haefs)
+                t = "9814444882"; // PSM gGmbH (Paritätische Sozialdienste in Meerbusch)
                 return t;
 #else
                 if (MultitenancyOperationContextExt.Current != null)
@@ -394,7 +395,16 @@ namespace BeWo.Service.Plugins
             {
                 if (pluginPath.StartsWith(".."))
                 {
-                    pluginPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, pluginPath);
+                    var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
+
+                    const string mobileClientDirectory = "BeWoPlanerMobil\\";
+
+                    if(baseDirectory.EndsWith(mobileClientDirectory))
+                    {
+                        //pluginPath = pluginPath.Substring(3);
+                    }
+
+                    pluginPath = Path.Combine(baseDirectory, pluginPath);
                 }
             }
             else
@@ -406,7 +416,7 @@ namespace BeWo.Service.Plugins
 #endif
             }
 
-           
+            var directoryExists = File.Exists(Path.Combine(pluginPath, dllName));
 
             return Path.Combine(pluginPath, dllName);
         }