diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index 6dd3e681..f432d02c 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index bc3ce954..cc5f230b 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index c5c364e7..03cd5cdd 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index bd9686bb..245794e7 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/bin/vbBarcodes.dll b/API_NetFramework/bin/vbBarcodes.dll index 10b0a86b..2d6a4fbc 100644 Binary files a/API_NetFramework/bin/vbBarcodes.dll and b/API_NetFramework/bin/vbBarcodes.dll differ diff --git a/API_NetFramework/bin/vbBarcodes.pdb b/API_NetFramework/bin/vbBarcodes.pdb index ecc2b08b..50334496 100644 Binary files a/API_NetFramework/bin/vbBarcodes.pdb and b/API_NetFramework/bin/vbBarcodes.pdb differ diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 61baa74b..5fd6e661 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index c5c364e7..03cd5cdd 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index bd9686bb..245794e7 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index a2319454..3d790fc0 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/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 // diff --git a/Client/DocMgmt/frmBewilligung.cs b/Client/DocMgmt/frmBewilligung.cs index f280a47a..1f3879e9 100644 --- a/Client/DocMgmt/frmBewilligung.cs +++ b/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 diff --git a/Client/DocMgmt/frmSerienbrief.cs b/Client/DocMgmt/frmSerienbrief.cs index e22d1c46..b37c2ef9 100644 --- a/Client/DocMgmt/frmSerienbrief.cs +++ b/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); } } } diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs index 78c1dea9..6c88a89f 100644 --- a/Client/UIControls/Serienbrief.cs +++ b/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; diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index 6dd3e681..f432d02c 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index bc3ce954..cc5f230b 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index b3ef8010..1ad1692d 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index 785440bb..218557bd 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index fb42801c..1f711297 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 1f12cb10..4ee99227 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/bin/Debug/vbBarcodes.dll b/Client/bin/Debug/vbBarcodes.dll index 10b0a86b..2d6a4fbc 100644 Binary files a/Client/bin/Debug/vbBarcodes.dll and b/Client/bin/Debug/vbBarcodes.dll differ diff --git a/Client/bin/Debug/vbBarcodes.pdb b/Client/bin/Debug/vbBarcodes.pdb index ecc2b08b..50334496 100644 Binary files a/Client/bin/Debug/vbBarcodes.pdb and b/Client/bin/Debug/vbBarcodes.pdb differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 9ac9bf72..f583304f 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 83b3c43e..7aa82387 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index ceb0058b..5d47de64 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index b3ef8010..1ad1692d 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index 785440bb..218557bd 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 1f12cb10..4ee99227 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index d045d491..ba4e91c2 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/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; diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index 6dd3e681..f432d02c 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index bc3ce954..cc5f230b 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/bin/Debug/vbBarcodes.dll b/DOCGEN/bin/Debug/vbBarcodes.dll index 10b0a86b..2d6a4fbc 100644 Binary files a/DOCGEN/bin/Debug/vbBarcodes.dll and b/DOCGEN/bin/Debug/vbBarcodes.dll differ diff --git a/DOCGEN/bin/Debug/vbBarcodes.pdb b/DOCGEN/bin/Debug/vbBarcodes.pdb index ecc2b08b..50334496 100644 Binary files a/DOCGEN/bin/Debug/vbBarcodes.pdb and b/DOCGEN/bin/Debug/vbBarcodes.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index 6dd3e681..f432d02c 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index bc3ce954..cc5f230b 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 8fbd27b3..80faf51d 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/bin/Debug/vbBarcodes.dll b/OnDocOffice/bin/Debug/vbBarcodes.dll index 10b0a86b..2d6a4fbc 100644 Binary files a/OnDocOffice/bin/Debug/vbBarcodes.dll and b/OnDocOffice/bin/Debug/vbBarcodes.dll differ diff --git a/OnDocOffice/bin/Debug/vbBarcodes.pdb b/OnDocOffice/bin/Debug/vbBarcodes.pdb index ecc2b08b..50334496 100644 Binary files a/OnDocOffice/bin/Debug/vbBarcodes.pdb and b/OnDocOffice/bin/Debug/vbBarcodes.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 8cc00dab..c4a62b97 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs index 4aa37eac..ab14332d 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfo.cs +++ b/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")] diff --git a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache index 6407eeb0..682fe511 100644 --- a/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache +++ b/OnDocWPF/obj/Debug/net8.0-windows/OnDocWPF.AssemblyInfoInputs.cache @@ -1 +1 @@ -81feb0337159ee1b6ddf947cb75b7a297b2cfdbbf925b437eb0c11e651b926d8 +a119047dce806a05c7722776bb4aceb8f4aaa3b6c03d2336ad09e0c5cf0be82e diff --git a/vbBarcodes/Class1.vb b/vbBarcodes/Class1.vb index 3455c60c..372fedcc 100644 --- a/vbBarcodes/Class1.vb +++ b/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 diff --git a/vbBarcodes/bin/Debug/BarcodeLib.dll b/vbBarcodes/bin/Debug/BarcodeLib.dll index 60d53151..2e63cd02 100644 Binary files a/vbBarcodes/bin/Debug/BarcodeLib.dll and b/vbBarcodes/bin/Debug/BarcodeLib.dll differ diff --git a/vbBarcodes/bin/Debug/BarcodeLib.pdb b/vbBarcodes/bin/Debug/BarcodeLib.pdb index 9024f342..9f0f8897 100644 Binary files a/vbBarcodes/bin/Debug/BarcodeLib.pdb and b/vbBarcodes/bin/Debug/BarcodeLib.pdb differ diff --git a/vbBarcodes/bin/Debug/vbBarcodes.dll b/vbBarcodes/bin/Debug/vbBarcodes.dll index 10b0a86b..2d6a4fbc 100644 Binary files a/vbBarcodes/bin/Debug/vbBarcodes.dll and b/vbBarcodes/bin/Debug/vbBarcodes.dll differ diff --git a/vbBarcodes/bin/Debug/vbBarcodes.pdb b/vbBarcodes/bin/Debug/vbBarcodes.pdb index ecc2b08b..50334496 100644 Binary files a/vbBarcodes/bin/Debug/vbBarcodes.pdb and b/vbBarcodes/bin/Debug/vbBarcodes.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.dll b/vbBarcodes/obj/Debug/vbBarcodes.dll index 10b0a86b..2d6a4fbc 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.dll and b/vbBarcodes/obj/Debug/vbBarcodes.dll differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.pdb b/vbBarcodes/obj/Debug/vbBarcodes.pdb index ecc2b08b..50334496 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.pdb and b/vbBarcodes/obj/Debug/vbBarcodes.pdb differ diff --git a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache index 307cd1fd..ed0f8482 100644 Binary files a/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache and b/vbBarcodes/obj/Debug/vbBarcodes.vbproj.AssemblyReference.cache differ