20250622

Client/Diverses/SplashScreen.Designer.cs

@@ -40,10 +40,9 @@
             this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage")));
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
             this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage")));
-            this.pictureBox1.Location = new System.Drawing.Point(139, 31);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox1.Location = new System.Drawing.Point(104, 25);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(348, 318);
+            this.pictureBox1.Size = new System.Drawing.Size(261, 258);
             this.pictureBox1.TabIndex = 0;
             this.pictureBox1.TabStop = false;
             // 
@@ -51,10 +50,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(219, 374);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(164, 304);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(151, 31);
+            this.label1.Size = new System.Drawing.Size(122, 26);
             this.label1.TabIndex = 1;
             this.label1.Text = "Version 1.6";
             // 
@@ -62,25 +60,23 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(207, 406);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(150, 330);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(176, 31);
+            this.label2.Size = new System.Drawing.Size(142, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "17. Juni 2025";
+            this.label2.Text = "20. Juni 2025";
             this.label2.Click += new System.EventHandler(this.label2_Click);
             // 
             // SplashScreen
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(625, 487);
+            this.ClientSize = new System.Drawing.Size(469, 396);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.pictureBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "SplashScreen";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "SplashScreen";

Client/UIControls/Serienbrief.cs

@@ -252,7 +252,7 @@ namespace OnDoc.UIControls
                 partnerLöschenToolStripMenuItem.Visible = false;
                 vorschauToolStripMenuItem.Visible = false;
                 sfDataGridEmpfaenger.AllowEditing = false;
-                erneutGenerierenToolStripMenuItem.Visible = true;
+                erneutGenerierenToolStripMenuItem.Visible = false;
                 docPreview1.clear_viewer();
                 docPreview1.Visible = true;
             }
@@ -1318,6 +1318,7 @@ namespace OnDoc.UIControls
 
         private void partnerLöschenToolStripMenuItem_Click(object sender, EventArgs e)
         {
+           
             sfDataGridEmpfaenger.AllowDeleting = true;
             sfDataGridEmpfaenger.DeleteSelectedRecords();
             sfDataGridEmpfaenger.AllowDeleting = false;
@@ -2394,7 +2395,7 @@ namespace OnDoc.UIControls
                         OnBaseDocUpload.attribute p = new OnBaseDocUpload.attribute(rw["fieldname"].ToString(), rw["fieldvalue"].ToString());
                         onbasedoc.attributes.Add(p);
                     }
-                    db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].ToString(), false, true);
+                    db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString() + " and inteintragnr=" + dr["IntEintragNr"].ToString()+ " and dokumentid='"+dr["dokumentid"].ToString()+"'", false, true);
                     onbasedoc.dokumentDatei = db.dsdaten.Tables[0].Rows[0][0].ToString();
                     string URL = "";
                     string response = "";
@@ -2480,7 +2481,9 @@ namespace OnDoc.UIControls
                     dr["status"] = "0"; //changes the Product_name
                 }
             }
-
+            DB db = new DB(AppParams.connectionstring);
+            db.Exec_SQL("Delete from edex_sb_serienbrief_dokument where serienbriefnr=" + sb.serienbriefnr.ToString());
+            db = null;
             refresh_empfaenger(sb.dsempfaenger.Tables[0]);
             ribbonButtonToApproval.Enabled = false;
         }
@@ -2951,6 +2954,17 @@ namespace OnDoc.UIControls
 
         private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e)
         {
+            int hasbl = 0;
+            foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
+            {
+                if (dr["blkunde"].ToString() == "1") { hasbl = 1; }
+            }
+            if (hasbl > 0)
+            {
+                MessageBox.Show("Der Serienbrief enthält Banklagernd-Kunden. Ein Versand über die Versandstrasse ist nicht möglich.", "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                return;
+            }
+
             List<Versandpaket>versandpakete = new List<Versandpaket>();
             Versandpaket vp = new Versandpaket();
             vp.Dokument = new List<Versanddokument>();

Client/Versandstrasse/Versandstrasse.cs

@@ -144,11 +144,13 @@ namespace OnDoc.Versandstrasse
                 if (!serienbrief)
                 {
                     lblpostausgang.Visible = true;
+                    lblserienbrief.Visible = false;
                     this.lblpostausgang.Left = this.Width - lblpostausgang.Width;
                 }
                 else
                 {
-                    lblserienbrief.Visible = true;
+                    lblserienbrief.Visible = false;
+                    lblpostausgang.Visible = false;
                     this.lblserienbrief.Left = this.Width - lblserienbrief.Width;
                 }
             }