Update 20250130

Client/Diverses/SplashScreen.Designer.cs

@@ -64,7 +64,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(168, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "27. Januar 2025";
+            this.label2.Text = "30. Januar 2025";
             // 
             // SplashScreen
             // 

Client/DocMgmt/frmBewilligung.cs

@@ -106,7 +106,7 @@ namespace OnDoc.DocMgmt
             //serienbrief1.approvaldata = new DataTable();
 
             serienbrief1.approvaldata = treeViewAdv1.SelectedNode.TagObject as DataRow;
-            serienbrief1.Init();
+            serienbrief1.Init(0);
             //refresh_serienbief();
             
             try

Client/DocMgmt/frmSerienbrief.cs

@@ -57,7 +57,7 @@ namespace OnDoc.DocMgmt
         private void frmSerienbrief_Load(object sender, EventArgs e)
         {
             
-            serienbrief1.Init();
+            serienbrief1.Init(this.profilnr);
         }
     }
 }

Client/UIControls/Serienbrief.cs

@@ -90,8 +90,9 @@ namespace OnDoc.UIControls
 
         }
 
-        public void Init()
+        public void Init(int profilnr)
         {
+            this.profilnr=profilnr;
             if (approval)
             {
                 this.ribbonTabFunktionen.Visible = false;
@@ -483,6 +484,7 @@ namespace OnDoc.UIControls
 
         private void refresh_empfaenger(System.Data.DataTable dt)
         {
+            
             sfDataGridEmpfaenger.DataSource = null;
             sfDataGridEmpfaenger.DataSource = dt;
             update_zahlen();
@@ -526,7 +528,7 @@ namespace OnDoc.UIControls
         {
             Database.DB db = new DB(AppParams.connectionstring);
 
-            db.Get_Tabledata("Select dbo.BinaryToBase64(xmldata) as Data from edex_sb_empfaenger where serienbriefnr=" + serienbriefnr.ToString(), false, true);
+            db.Get_Tabledata("Select dbo.BinaryToBase64(xmldata) as Data from edex_sb_empfaenger where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true);
             Base64Helper bh = new Base64Helper();
             bh.Base64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
             string xml = bh.DecodeBase64();
@@ -562,7 +564,8 @@ namespace OnDoc.UIControls
                     sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
                     update_serienbrief_details(true, sb.dokumenttypnr, 0);
                     init_empfaenger(-1);
-                   //this.cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter;
+                    //this.cbboxzustaendigmitarbeiter.SelectedValue = AppParams.CurrentMitarbeiter;
+                    sb.verantwortlich = AppParams.CurrentMitarbeiter;
                     vorlagenfelder(sb.dokumenttypnr);
                     refresh_empfaenger(sb.dsempfaenger.Tables[0]);
                     update_screen();
@@ -1138,6 +1141,10 @@ namespace OnDoc.UIControls
 
                     sb.dsempfaenger.Tables[0].Rows.Add(dr);
                 this.partnernr = "";
+                if (sb.dsempfaenger.Tables[0].Rows.Count == 2 && sb.dsempfaenger.Tables[0].Rows[0][0].ToString() == "")
+                {
+                    sb.dsempfaenger.Tables[0].Rows.RemoveAt(0);
+                }
                     refresh_empfaenger(sb.dsempfaenger.Tables[0]);
                 }
                 db = null;

DOCGEN/Klassen/SyncFWord.cs

@@ -872,12 +872,12 @@ namespace DOCGEN.Klassen
 
                     if (docData.barcode_horizontal == 0)
                     {
-                        barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, " U", "Futur Book", 8,270);
+                        barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, docData.barcode_zusatz, "Futur Book", 8,270);
 
                     }
                     else
                     {
-                        barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, " U", "Futur Book", 8, 0);
+                        barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, docData.barcode_zusatz, "Futur Book", 8, 0);
 
                     }
 
@@ -926,8 +926,8 @@ namespace DOCGEN.Klassen
                 if (docData.barcode_horizontal == 0)
                 {
                     picture.Rotation = 0;
-                    picture.Height = docData.barcode_width;
-                    picture.Width = docData.barcode_height;
+                   // picture.Height = docData.barcode_width;
+                    //picture.Width = docData.barcode_height;
                     picture.VerticalPosition = docData.barcode_top; ;
                     picture.HorizontalPosition = docData.barcode_left;
 

OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("OnDocWPF")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3f765247ee134f49933fac6b869ebcef1fafe573")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6558c21a9d29616f99f678390863436c5abd8c48")]
 [assembly: System.Reflection.AssemblyProductAttribute("OnDocWPF")]
 [assembly: System.Reflection.AssemblyTitleAttribute("OnDocWPF")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache

@@ -1 +1 @@
-81feb0337159ee1b6ddf947cb75b7a297b2cfdbbf925b437eb0c11e651b926d8
+a119047dce806a05c7722776bb4aceb8f4aaa3b6c03d2336ad09e0c5cf0be82e

vbBarcodes/Class1.vb

@@ -65,15 +65,15 @@ Public Class vbarcodes
     Dim barcodeImage2of5 As System.Drawing.Image
     Private Sub ins_Barcode()
         Dim Barcode2of5 As New BarcodeLib.clsBarI25()
-        barcodeImage2of5 = Barcode2of5.GetBarI25(Color.Black, Color.White, docdata.Dokumentid.Substring(6, 16), "Bar 25i c HR", 36, 350, 50, " U", "Futur Book", 8, 0)
-        barcodeImage2of5.Save(Temppath + "a_" + docdata.Dokumentid + ".png", System.Drawing.Imaging.ImageFormat.Png)
+        'barcodeImage2of5 = Barcode2of5.GetBarI25(Color.Black, Color.White, docdata.Dokumentid.Substring(6, 16), "Bar 25i c HR", 36, 350, 50, " U", "Futur Book", 8, 0)
+        'barcodeImage2of5.Save(Temppath + "a_" + docdata.Dokumentid + ".png", System.Drawing.Imaging.ImageFormat.Png)
         'barcodeImage2of5 = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docdata.Dokumentid.Substring(6, 16), docdata.Dokumentid.Substring(6, 16) + docdata.barcode_zusatz, docdata.barcode_textposition, docdata.Zusatz_Font, Convert.ToInt32(docdata.Zusatz_FontSize), 0)
         'barcodeImage2of5 = ScaleImage(barcodeImage2of5,
         '                              30)
         'barcodeImage2of5.Save(Temppath + "a_" + docdata.Dokumentid + ".png", System.Drawing.Imaging.ImageFormat.Png)
 
 
-        BarcodeFormatn =
+        BarcodeFormatn = docdata.barcode_formatn
         BarcodeBeschriftung = docdata.barcode_text
         Kantenlaenge = docdata.barcode_kantenlaenge
         BarcodeContent = docdata.barcode_content
@@ -82,6 +82,8 @@ Public Class vbarcodes
             datamatrix_generator()
         End If
 
+
+
         Dim xname As String
         Dim i As Integer
         Dim pages As Long