20250216

API_NetFramework/log.txt

@@ -5378,3 +5378,71 @@ Mit folgendem Link kann OnDoc direkt gestartet werden<br>
 2025-02-12 19:00:51.0045|DEBUG|OnDoc|
 2025-02-12 19:00:51.0085|DEBUG|OnDoc|
 2025-02-12 19:00:51.0256|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:11:39.0560|DEBUG|OnDoc|Mailversand: 2
+2025-02-13 14:11:39.1150|DEBUG|OnDoc|
+2025-02-13 14:11:39.1150|DEBUG|OnDoc|
+2025-02-13 14:11:39.1366|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:11:54.4014|DEBUG|OnDoc|Mailversand: 1
+2025-02-13 14:11:54.4284|DEBUG|OnDoc|
+2025-02-13 14:11:54.4284|DEBUG|OnDoc|
+2025-02-13 14:11:54.4468|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:11:58.6188|DEBUG|OnDoc|
+2025-02-13 14:11:58.6539|DEBUG|OnDoc|
+2025-02-13 14:11:58.6799|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-02-13 14:11:58.6799|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-02-13 14:11:58.7420|DEBUG|OnDoc|
+2025-02-13 14:11:58.7420|DEBUG|OnDoc|
+2025-02-13 14:11:58.7670|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-02-13 14:11:58.7670|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-02-13 14:14:30.8667|DEBUG|OnDoc|Mailversand: 2
+2025-02-13 14:14:30.9197|DEBUG|OnDoc|
+2025-02-13 14:14:30.9197|DEBUG|OnDoc|
+2025-02-13 14:14:30.9387|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:14:43.5857|DEBUG|OnDoc|Mailversand: 1
+2025-02-13 14:14:43.6208|DEBUG|OnDoc|
+2025-02-13 14:14:43.6208|DEBUG|OnDoc|
+2025-02-13 14:14:43.6408|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:14:46.4050|DEBUG|OnDoc|
+2025-02-13 14:14:46.4140|DEBUG|OnDoc|
+2025-02-13 14:14:46.4410|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-02-13 14:14:46.4440|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-02-13 14:14:46.4930|DEBUG|OnDoc|
+2025-02-13 14:14:46.4930|DEBUG|OnDoc|
+2025-02-13 14:14:46.5195|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-02-13 14:14:46.5195|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-02-13 14:23:56.1016|DEBUG|OnDoc|Mailversand: 2
+2025-02-13 14:23:56.1667|DEBUG|OnDoc|
+2025-02-13 14:23:56.1667|DEBUG|OnDoc|
+2025-02-13 14:23:56.1857|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:24:07.5289|DEBUG|OnDoc|Mailversand: 1
+2025-02-13 14:24:07.5569|DEBUG|OnDoc|
+2025-02-13 14:24:07.5569|DEBUG|OnDoc|
+2025-02-13 14:24:07.5762|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:24:11.5903|DEBUG|OnDoc|
+2025-02-13 14:24:11.6263|DEBUG|OnDoc|
+2025-02-13 14:24:11.6583|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-02-13 14:24:11.6603|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-02-13 14:24:11.7083|DEBUG|OnDoc|
+2025-02-13 14:24:11.7083|DEBUG|OnDoc|
+2025-02-13 14:24:11.7349|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-02-13 14:24:11.7349|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-02-13 14:37:57.2339|DEBUG|OnDoc|Mailversand: 2
+2025-02-13 14:37:57.2815|DEBUG|OnDoc|
+2025-02-13 14:37:57.2815|DEBUG|OnDoc|
+2025-02-13 14:37:57.3005|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:38:07.7028|DEBUG|OnDoc|Mailversand: 1
+2025-02-13 14:38:07.7308|DEBUG|OnDoc|
+2025-02-13 14:38:07.7308|DEBUG|OnDoc|
+2025-02-13 14:38:07.7489|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 
+2025-02-13 14:38:11.7683|DEBUG|OnDoc|
+2025-02-13 14:38:11.7793|DEBUG|OnDoc|
+2025-02-13 14:38:11.8043|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal
+2025-02-13 14:38:11.8043|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal
+2025-02-13 14:38:11.8558|DEBUG|OnDoc|
+2025-02-13 14:38:11.8558|DEBUG|OnDoc|
+2025-02-13 14:38:11.8809|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-02-13 14:38:11.8809|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-02-13 19:03:57.0301|DEBUG|OnDoc|Mailversand: 2
+2025-02-13 19:03:57.0781|DEBUG|OnDoc|
+2025-02-13 19:03:57.0781|DEBUG|OnDoc|
+2025-02-13 19:03:57.0961|DEBUG|OnDoc|Mail Versand NOK: Spalte 1 wurde nicht gefunden. 

Client/Client.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>ondoc:%3ffunktion=openclient&amp;partnernr=1000208</StartArguments>
+    <StartArguments>ondoc::%3ffunktion=openclient</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>

Client/Diverses/NativVorlagen.cs

@@ -19,6 +19,7 @@ using Syncfusion.Compression.Zip;
 using static System.Net.Mime.MediaTypeNames;
 using System.Diagnostics;
 using Microsoft.Office.Interop.Word;
+using Syncfusion.Windows.Forms.HTMLUI;
 
 namespace OnDoc.Diverses
 {
@@ -56,33 +57,66 @@ namespace OnDoc.Diverses
                 e.DrawDefault = true;
             }
         }
-        private void NativVorlagen_Load(object sender, EventArgs e)
+        public void PopulateTree(string dir, TreeNode node)
         {
-
+            DirectoryInfo directory = new DirectoryInfo(dir);
-            string line = "";
+            foreach (DirectoryInfo d in directory.GetDirectories())
-            int i = 1;
-            StreamReader sr = new StreamReader(AppParams.pathNativVorlagen+@"\klassifizierung.txt");
-            line = sr.ReadLine();
-            while (line != null)
             {
-                RadioButton rb = new RadioButton();
+                TreeNode t = new TreeNode(d.Name);
-                rb.Name = "rb"+i.ToString();
+                t.ImageIndex = 3;
-                rb.Text = line;
+                PopulateTree(d.FullName, t);
-                rb.Left = label1.Left;
+                node.Nodes.Add(t);
-                rb.Top  = label1.Top + (i*25);
-                rb.Width = 180;
-                i++;
-                this.Controls.Add(rb);
-                line = sr.ReadLine();   
             }
-            sr.Close();
+            foreach (FileInfo f in directory.GetFiles())
-            TotalKlassifizierung = i - 1;
-            try
             {
-                RadioButton rb = this.Controls.Find("rb1", true).FirstOrDefault() as RadioButton;
+                TreeNode t = new TreeNode(f.Name);
-                rb.Checked = true;
+                string ext = System.IO.Path.GetExtension(f.Name);
+                ext = ext.Substring(0, 3).ToUpper();
+                t.ImageIndex = 4;
+                t.SelectedImageIndex = 4;
+                if (ext == ".DO") { t.ImageIndex = 0; t.SelectedImageIndex = 0; };
+                if (ext == ".XL") { t.ImageIndex = 1; t.SelectedImageIndex = 1; };
+                if (ext == ".PP") { t.ImageIndex = 2; t.SelectedImageIndex = 2; };
+                if (ext == ".PD") { t.ImageIndex = 5; t.SelectedImageIndex = 5; };
+                t.Tag = f.FullName;
+                node.Nodes.Add(t);
             }
-            catch { }
+        }
+
+        private void NativVorlagen_Load(object sender, EventArgs e)
+        {
+            TreeNode root = new TreeNode();
+            root.Text = "Vorlagen";
+            root.ImageIndex = 3;
+            root.SelectedImageIndex = 3;
+            treeView.Nodes.Add(root);
+            PopulateTree(AppParams.pathNativVorlagen, root);
+            treeView.Nodes[0].Expand();
+            return;
+            string line = "";
+            int i = 1;
+            //StreamReader sr = new StreamReader(AppParams.pathNativVorlagen+@"\klassifizierung.txt");
+            //line = sr.ReadLine();
+            //while (line != null)
+            //{
+            //    RadioButton rb = new RadioButton();
+            //    rb.Name = "rb"+i.ToString();
+            //    rb.Text = line;
+            //    rb.Left = label1.Left;
+            //    rb.Top  = label1.Top + (i*25);
+            //    rb.Width = 180;
+            //    i++;
+            //    this.Controls.Add(rb);
+            //    line = sr.ReadLine();   
+            //}
+            //sr.Close();
+            //TotalKlassifizierung = i - 1;
+            //try
+            //{
+            //    RadioButton rb = this.Controls.Find("rb1", true).FirstOrDefault() as RadioButton;
+            //    rb.Checked = true;
+            //}
+            //catch { }
 
             string ext = "";
             DirectoryInfo directoryInfo = new DirectoryInfo(AppParams.pathNativVorlagen);
@@ -90,7 +124,7 @@ namespace OnDoc.Diverses
             {
                 try
                 {
-                    TreeNode root = new TreeNode();
+                    TreeNode root1 = new TreeNode();
                     root.Text = "Vorlagen";
                     root.ImageIndex = 3;
                     root.SelectedImageIndex = 3;
@@ -274,7 +308,8 @@ namespace OnDoc.Diverses
                 switch (ext)
                 {
                     case ".DO":
-                        System.Diagnostics.Process.Start("winword.exe", " /t" + tempfilename);
+                        System.Diagnostics.Process.Start("winword.exe", "/t" + tempfilename);
+                        //MessageBox.Show(tempfilename);
                         break;
                     case ".XL":
                         System.Diagnostics.Process.Start("excel.exe", " /t " + tempfilename);

Client/Diverses/NativVorlagen.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
-        DQAAAk1TRnQBSQFMAgEBBgEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBBgEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -154,7 +154,7 @@
         AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
         AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
         AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAf8B8QjyBPEB/wMA
-        Af8B7gn0AUwiAAHzAfQHAAH/AdYB/wEAAfQB1gH/AgAB9AoAAUwiAAHxAvQF8gHzAfID/wEAAfQB8gIA
+        Af8BvAn0AUwiAAHzAfQHAAH/AdYB/wEAAfQB1gH/AgAB9AoAAUwiAAHxAvQF8gHzAfID/wEAAfQB8gIA
         AfQCAAEaAQABGgEHAfMBGwIAAUwiAAHxAfQB/wX0Af8B8gEAAfQB8QIAAfICAAH0AgABGgHzARoBAAIH
         AgABTCIAAfEC9AXzAfQB8gH0AfMBCQLzAfICAAH0AgAB/wHzAf8B8wEAAfMCAAFMIgAB8QH0AfMG8QHd
         AfEB9AHxAvQB/wIAAfQCAAHxAf8GAAFMIgAB8QH0Cf8BAAEJBQAB9AIAAkwDAAF1ARoBAAFMIgAB8QH0

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(177, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "12. Februar 2025";
+            this.label2.Text = "14. Februar 2025";
             // 
             // SplashScreen
             // 

Client/DocMgmt/Dokumenterstellung.cs

@@ -22,10 +22,11 @@ using OnDoc.Helper;
 using DOCGEN;
 using System.Globalization;
 using System.Threading;
+using Syncfusion.Windows.Forms;
 
 namespace OnDoc.DocMgmt
 {
-    public partial class Dokumenterstellung : SfForm, IMessageListener1
+    public partial class Dokumenterstellung : SfForm,  IMessageListener1
     {
         public int partnernr { get; set; } = 0;
         public int profilnr { get; set; } = 0;

Client/DocMgmt/SerienbriefBearbeitung.Designer.cs

@@ -120,6 +120,7 @@
             this.sfdatagridstandard.AccessibleName = "Table";
             this.sfdatagridstandard.AllowEditing = false;
             this.sfdatagridstandard.AllowFiltering = true;
+            this.sfdatagridstandard.AllowResizingColumns = true;
             this.sfdatagridstandard.ContextMenuStrip = this.contextMenuStandard;
             this.sfdatagridstandard.Location = new System.Drawing.Point(3, 39);
             this.sfdatagridstandard.Name = "sfdatagridstandard";
@@ -200,6 +201,8 @@
             // 
             this.sfdatagridUsed.AccessibleName = "Table";
             this.sfdatagridUsed.AllowEditing = false;
+            this.sfdatagridUsed.AllowFiltering = true;
+            this.sfdatagridUsed.AllowResizingColumns = true;
             this.sfdatagridUsed.ContextMenuStrip = this.contextMenuUsed;
             this.sfdatagridUsed.Location = new System.Drawing.Point(3, 542);
             this.sfdatagridUsed.Name = "sfdatagridUsed";
@@ -326,6 +329,8 @@
             this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
             this.Text = "Serienbrief-Bearbeitung";
             this.Load += new System.EventHandler(this.SerienbriefBearbeitung_Load);
+            this.ResizeEnd += new System.EventHandler(this.SerienbriefBearbeitung_ResizeEnd);
+            this.Resize += new System.EventHandler(this.SerienbriefBearbeitung_Resize);
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.sfdatagridstandard)).EndInit();

Client/DocMgmt/SerienbriefBearbeitung.cs

@@ -487,5 +487,26 @@ namespace OnDoc.DocMgmt
             this.Width = groupBox2.Width + 10;
             return;
         }
+
+        private void SerienbriefBearbeitung_ResizeEnd(object sender, EventArgs e)
+        {
+            
+        }
+
+        private void SerienbriefBearbeitung_Resize(object sender, EventArgs e)
+        {
+            if (this.docPreview1.Visible == false)
+            {
+                this.groupBox2.Dock = DockStyle.Fill;
+                this.sfdatagridDokspezifisch.Width = groupBox2.Width - 10;
+                this.sfdatagridstandard.Width = groupBox2.Width - 10;
+                this.sfdatagridUsed.Width = groupBox2.Width - 10;
+            }
+            else
+            {
+                this.groupBox2.Dock = DockStyle.Left;
+              
+            }
+        }
     }
 }

Client/Klassen/EDKFile.cs

@@ -90,7 +90,9 @@ namespace OnDoc.Klassen
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message);
+                Logging.Logging.Debug("Fehlerhafte EDK-Datei: " + filename, "OnDoc-EDK", "");
+                System.IO.File.Delete(filename);
+                return;
             }
 
             // read header elements

Client/Klassen/clstheming.cs

@@ -25,8 +25,8 @@ namespace OnDoc.Klassen
         private static int r;
         private static int b;
         private static int g;
-        public static byte ShadowOpacity = 0;
+        public static byte ShadowOpacity = 100;
-        public static byte InactivShadowOpacity = 0;
+        public static byte InactivShadowOpacity = 100;
 
         public static Color Titelbar()
         {

Client/Program.cs

@@ -75,7 +75,7 @@ namespace OnDoc
                 else
                 {
                  
-                    if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0)
+                    if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0 || args[0].ToString().ToUpper().IndexOf("OPENCLIENT") > 0)
                     {
                         AppParams.init();
                         //MessageBox.Show(AppParams.tempdir);
@@ -89,7 +89,7 @@ namespace OnDoc
                     else
                     { 
                         
-                        MessageBox.Show("Die Übergabeparemeter '" + args[0].ToString()+"' sind ungültig","Aufruffehler",MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        MessageBox.Show("Die Übergabeparameter '" + args[0].ToString()+"' sind ungültig","Aufruffehler",MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
                 

Client/Start.cs

@@ -47,6 +47,8 @@ namespace OnDoc
             this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
             this.Style.ShadowOpacity = Theaming.ShadowOpacity;
             this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
+            
+            this.Style.Border.Width = 0;
 
             InitLogging();
             Logging.Logging.Debug("Start", "OnDoc-Client", "");

Client/UIControls/Approval.cs

@@ -59,6 +59,7 @@ namespace OnDoc.UIControls
                 notes.Columns.Add("Notewriter");
                 this.docPreview1.Show_Doc(nodetag);
                 Database.DB db = new Database.DB(AppParams.connectionstring);
+
                 db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + nodetag + "'", false, true);
                 this.txtdokumentid.Text = db.dsdaten.Tables[0].Rows[0]["Dokumentid"].ToString();
                 this.txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["bezeichnung"].ToString();

Client/UIControls/DokList.Designer.cs

@@ -168,6 +168,7 @@ namespace OnDoc.UICintrols
             this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
             this.docPreview1 = new OnDoc.UIControls.DocPreview();
             this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
             this.ctxMenuDokList.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -190,6 +191,8 @@ namespace OnDoc.UICintrols
             this.dokumentUnterzeichnenToolStripMenuItem,
             this.archivierenToolStripMenuItem,
             this.druckenToolStripMenuItem,
+            this.toolStripMenuItem4,
+            this.dokumentFürPartnerErstellenToolStripMenuItem,
             this.dokumentKopierenToolStripMenuItem,
             this.toolStripMenuItem1,
             this.barcodeDemoToolStripMenuItem,
@@ -200,12 +203,11 @@ namespace OnDoc.UICintrols
             this.wordInterOPEditToolStripMenuItem,
             this.attributeAnzeigenVersteckenToolStripMenuItem,
             this.historyToolStripMenuItem,
-            this.dokumentFürPartnerErstellenToolStripMenuItem,
             this.toolStripMenuItem3,
             this.gruppenÖffnenToolStripMenuItem,
             this.gruppenSchliessenToolStripMenuItem});
             this.ctxMenuDokList.Name = "ctxMenuDokList";
-            this.ctxMenuDokList.Size = new System.Drawing.Size(280, 462);
+            this.ctxMenuDokList.Size = new System.Drawing.Size(280, 468);
             this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
             // 
             // dokumentAnzeigenToolStripMenuItem
@@ -566,6 +568,7 @@ namespace OnDoc.UICintrols
             // 
             // ribbonPanelNeu
             // 
+            this.ribbonPanelNeu.ButtonMoreVisible = false;
             this.ribbonPanelNeu.Items.Add(this.RibbonButtonNewDoc);
             this.ribbonPanelNeu.Items.Add(this.RibbonButtonFavoriten);
             this.ribbonPanelNeu.Name = "ribbonPanelNeu";
@@ -1402,6 +1405,11 @@ namespace OnDoc.UICintrols
             this.dokwerte1.Size = new System.Drawing.Size(0, 694);
             this.dokwerte1.TabIndex = 7;
             // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(276, 6);
+            // 
             // DokList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1566,5 +1574,6 @@ namespace OnDoc.UICintrols
         private System.Windows.Forms.RibbonPanel ribbonPanelNeu;
         private System.Windows.Forms.RibbonPanel ribbonPanel4;
         private System.Windows.Forms.RibbonButton ribbonButtonDokinBearbeitung;
+        private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4;
     }
 }

Client/UIControls/DokList.resx

@@ -545,4 +545,7 @@
         vAAADrwBlbxySQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
 </root>

Client/UIControls/Dokwerte.Designer.cs

@@ -107,14 +107,14 @@
             this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.notizHistoryToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(185, 48);
             this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
             // 
             // notizHistoryToolStripMenuItem
             // 
             this.notizHistoryToolStripMenuItem.Name = "notizHistoryToolStripMenuItem";
-            this.notizHistoryToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.notizHistoryToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
-            this.notizHistoryToolStripMenuItem.Text = "Notiz-History";
+            this.notizHistoryToolStripMenuItem.Text = "Bewilligungs-History";
             this.notizHistoryToolStripMenuItem.Click += new System.EventHandler(this.notizHistoryToolStripMenuItem_Click);
             // 
             // Dokwerte

Database/db.cs

@@ -420,7 +420,7 @@ namespace Database
             dok.iUnterschriftrechts = Convert.ToInt32(DocData.Unterschrift_Rechts);
             //db.Get_Mitarbeiternr(DocData.Unterschrift_Links);
             //dok.iUnterschriftrechts = db.Get_Mitarbeiternr(DocData.Unterschrift_Rechts);
-            dok.iErsteller = Convert.ToInt32(DocData.Ersteller);
+            
             dok.iVerantwortlich = Convert.ToInt32(DocData.Verantwortlich);
             dok.sBezeichnung = DocData.Bezeichnung;
             dok.daTermin = Convert.ToDateTime(DocData.Termin);
@@ -446,9 +446,14 @@ namespace Database
             // dok.sBezeichnung = doktyp.sBezeichnung;
             dok.iNrpar00 = Convert.ToInt32(DocData.PartnerNr);
             dok.iMutierer = dok.iErsteller;
+            dok.iMutierer = Convert.ToInt32(DocData.Ersteller);
             dok.iMitarbeiternr = dok.iErsteller;
+            dok.iMitarbeiternr =  Convert.ToInt32(DocData.Ersteller);
             dok.daMutiertam = DateTime.Now;
-            if (!editdoc) { dok.daErstelltam = DateTime.Now; }
+            if (!editdoc) { 
+                dok.daErstelltam = DateTime.Now;
+                dok.iErsteller = Convert.ToInt32(DocData.Ersteller);
+            }
             dok.iMutiererteam = Convert.ToInt32(DocData.Team);
             dok.iMutierertieam = Convert.ToInt32(DocData.Team);
             dok.iErstellerteam = Convert.ToInt32(DocData.Team); ;

OnDocOffice/clsoffice.cs

@@ -1662,13 +1662,22 @@ namespace OnDocOffice
 
 
 
+
             object missing = Type.Missing;
             Microsoft.Office.Interop.Word.Range myRange = docWord.Bookmarks[bookmark].Range;
-
+           
+            ///
             Microsoft.Office.Interop.Word.Bookmark bm = docWord.Bookmarks[bookmark];
+            bm.Select();
+            bm.Range.GoTo();
+            Microsoft.Office.Interop.Word.Shape myShape1 = docWord.Shapes.AddPicture(imagepath, false, true, 0, 0, 120, 50, missing);
+            myShape1.Top = myShape1.Top - myShape1.Height;
+            myShape1.WrapFormat.Type = Microsoft.Office.Interop.Word.WdWrapType.wdWrapBehind;
+            return;
+            ///
+
+            // Microsoft.Office.Interop.Word.InlineShape myinlineshape =  myRange.InlineShapes.AddPicture(imagepath, false, false, missing);
 
-           // Microsoft.Office.Interop.Word.InlineShape myinlineshape =  myRange.InlineShapes.AddPicture(imagepath, false, false, missing);
-           
             float vertical = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdVerticalPositionRelativeToPage];
             float horizontal = bm.Range.Information[Microsoft.Office.Interop.Word.WdInformation.wdHorizontalPositionRelativeToPage];
             float marigntop = docWord.PageSetup.TopMargin;
@@ -1691,7 +1700,8 @@ namespace OnDocOffice
             }
             else
             {
-                myShape.Left = horizontal - marginleft;
+                //myShape.Left = horizontal - marginleft;
+                myShape.Left = horizontal;
             }
             myShape.Name = "Unterschrift_" + bookmark;