From 6f0ae4475618bbdbdc90bfa1f87948f8fec9b37e Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 9 Jan 2025 10:56:51 +0100 Subject: [PATCH] beleg --- SDL/USTV/frmMDM_USTVAntrag.vb | 16 ++++---- SDL/kassenbuch/frmBelegNeu.Designer.vb | 52 +++++++++++++------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 87cd2666..8908a2f8 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -5,13 +5,13 @@ Imports System.Windows.Documents Imports com.sun.org.apache.xml.internal.resolver Imports com.sun.tools.internal.ws.wsdl.framework Imports DocumentFormat.OpenXml.Office2010.Drawing.Charts -Imports itextsharp.text.pdf -Imports itextsharp.text.pdf.parser +Imports iTextSharp.text.pdf +Imports iTextSharp.text.pdf.parser Imports java.text.Normalizer Imports jdk.nashorn.internal.objects.annotations 'Imports DocumentFormat.OpenXml.Drawing.Charts Imports Microsoft.Office.Interop -Imports org.BouncyCastle.Pqc.Crypto +Imports Org.BouncyCastle.Pqc.Crypto Imports sun.swing Imports VERAG_PROG_ALLGEMEIN @@ -1519,11 +1519,11 @@ Public Class frmMDM_USTVAntrag Try Dim fi As New System.IO.DirectoryInfo(path_src) - Dim pdfReader As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(path_src) + Dim pdfReader As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(path_src) Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fi.Name, fi.Extension,, True, "IDS-Rechnungen") - Dim srcDoc As New itextsharp.text.Document() - Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New FileStream(TMP_Path_New, System.IO.FileMode.Create)) + Dim srcDoc As New iTextSharp.text.Document() + Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New FileStream(TMP_Path_New, System.IO.FileMode.Create)) PdfCopyProvider.SetFullCompression() srcDoc.Open() PdfReader.unethicalreading = True @@ -1534,7 +1534,7 @@ Public Class frmMDM_USTVAntrag Dim strategy As ITextExtractionStrategy = New SimpleTextExtractionStrategy() Dim currentpagetext As String = PdfTextExtractor.GetTextFromPage(pdfReader, page, strategy) Dim searchtext As String = ReNr - Dim impPage As itextsharp.text.pdf.PdfImportedPage = Nothing + Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing If (currentpagetext.Contains(searchtext)) Then @@ -1547,7 +1547,7 @@ Public Class frmMDM_USTVAntrag impPage = PdfCopyProvider.GetImportedPage(pdfReader, page) ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite - PdfCopyProvider.SetPageSize(New itextsharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, pdfReader.GetPageRotation(page))) + PdfCopyProvider.SetPageSize(New iTextSharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, pdfReader.GetPageRotation(page))) ' ----- PDF Seite in das neue Dokument einfügen If impPage IsNot Nothing Then PdfCopyProvider.AddPage(impPage) Catch ex As Exception diff --git a/SDL/kassenbuch/frmBelegNeu.Designer.vb b/SDL/kassenbuch/frmBelegNeu.Designer.vb index b194cfd7..18936d33 100644 --- a/SDL/kassenbuch/frmBelegNeu.Designer.vb +++ b/SDL/kassenbuch/frmBelegNeu.Designer.vb @@ -307,7 +307,7 @@ Partial Class frmBelegNeu ' Me.lblMandant.BackColor = System.Drawing.Color.Transparent Me.lblMandant.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMandant.Location = New System.Drawing.Point(5, 38) + Me.lblMandant.Location = New System.Drawing.Point(5, 41) Me.lblMandant.Name = "lblMandant" Me.lblMandant.Size = New System.Drawing.Size(43, 18) Me.lblMandant.TabIndex = 5 @@ -317,7 +317,7 @@ Partial Class frmBelegNeu ' Me.lblSachbearbeiter.BackColor = System.Drawing.Color.Transparent Me.lblSachbearbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblSachbearbeiter.Location = New System.Drawing.Point(5, 54) + Me.lblSachbearbeiter.Location = New System.Drawing.Point(5, 57) Me.lblSachbearbeiter.Name = "lblSachbearbeiter" Me.lblSachbearbeiter.Size = New System.Drawing.Size(195, 17) Me.lblSachbearbeiter.TabIndex = 9 @@ -350,7 +350,7 @@ Partial Class frmBelegNeu Me.Label14.AutoSize = True Me.Label14.BackColor = System.Drawing.Color.Transparent Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(5, 70) + Me.Label14.Location = New System.Drawing.Point(5, 73) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(83, 13) Me.Label14.TabIndex = 10 @@ -383,7 +383,7 @@ Partial Class frmBelegNeu Me.lblKassenbuchNr.AutoSize = True Me.lblKassenbuchNr.BackColor = System.Drawing.Color.Transparent Me.lblKassenbuchNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblKassenbuchNr.Location = New System.Drawing.Point(94, 70) + Me.lblKassenbuchNr.Location = New System.Drawing.Point(94, 73) Me.lblKassenbuchNr.Name = "lblKassenbuchNr" Me.lblKassenbuchNr.Size = New System.Drawing.Size(31, 13) Me.lblKassenbuchNr.TabIndex = 11 @@ -393,7 +393,7 @@ Partial Class frmBelegNeu ' Me.lblMandant_niederlassung.BackColor = System.Drawing.Color.Transparent Me.lblMandant_niederlassung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMandant_niederlassung.Location = New System.Drawing.Point(61, 38) + Me.lblMandant_niederlassung.Location = New System.Drawing.Point(61, 41) Me.lblMandant_niederlassung.Name = "lblMandant_niederlassung" Me.lblMandant_niederlassung.Size = New System.Drawing.Size(34, 18) Me.lblMandant_niederlassung.TabIndex = 7 @@ -403,7 +403,7 @@ Partial Class frmBelegNeu ' Me.Label15.BackColor = System.Drawing.Color.Transparent Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label15.Location = New System.Drawing.Point(44, 38) + Me.Label15.Location = New System.Drawing.Point(44, 41) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(11, 18) Me.Label15.TabIndex = 6 @@ -645,13 +645,13 @@ Partial Class frmBelegNeu 'pnlData ' Me.pnlData.BackColor = System.Drawing.Color.FromArgb(CType(CType(244, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(244, Byte), Integer)) + Me.pnlData.Controls.Add(Me.lblErr_Fahrer) + Me.pnlData.Controls.Add(Me.lblErr_Pass) Me.pnlData.Controls.Add(Me.Label28) Me.pnlData.Controls.Add(Me.lblZahlungsmittel) Me.pnlData.Controls.Add(Me.txtzuKassieren) Me.pnlData.Controls.Add(Me.Label22) Me.pnlData.Controls.Add(Me.cbxSplittung) - Me.pnlData.Controls.Add(Me.lblErr_Fahrer) - Me.pnlData.Controls.Add(Me.lblErr_Pass) Me.pnlData.Controls.Add(Me.lblErr_LKW) Me.pnlData.Controls.Add(Me.btnOfferte) Me.pnlData.Controls.Add(Me.Label19) @@ -687,7 +687,7 @@ Partial Class frmBelegNeu Me.pnlData.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlData.Location = New System.Drawing.Point(498, 0) Me.pnlData.Name = "pnlData" - Me.pnlData.Size = New System.Drawing.Size(624, 212) + Me.pnlData.Size = New System.Drawing.Size(624, 208) Me.pnlData.TabIndex = 5 ' 'Label28 @@ -763,7 +763,7 @@ Partial Class frmBelegNeu Me.lblErr_Fahrer.AutoSize = True Me.lblErr_Fahrer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblErr_Fahrer.ForeColor = System.Drawing.Color.Red - Me.lblErr_Fahrer.Location = New System.Drawing.Point(352, 153) + Me.lblErr_Fahrer.Location = New System.Drawing.Point(351, 150) Me.lblErr_Fahrer.Name = "lblErr_Fahrer" Me.lblErr_Fahrer.Size = New System.Drawing.Size(90, 13) Me.lblErr_Fahrer.TabIndex = 43 @@ -775,7 +775,7 @@ Partial Class frmBelegNeu Me.lblErr_Pass.AutoSize = True Me.lblErr_Pass.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblErr_Pass.ForeColor = System.Drawing.Color.Red - Me.lblErr_Pass.Location = New System.Drawing.Point(352, 196) + Me.lblErr_Pass.Location = New System.Drawing.Point(351, 196) Me.lblErr_Pass.Name = "lblErr_Pass" Me.lblErr_Pass.Size = New System.Drawing.Size(90, 13) Me.lblErr_Pass.TabIndex = 42 @@ -1223,18 +1223,18 @@ Partial Class frmBelegNeu Me.pnlOPt.Controls.Add(Me.pnlBetrag) Me.pnlOPt.Controls.Add(Me.Panel1) Me.pnlOPt.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlOPt.Location = New System.Drawing.Point(498, 212) + Me.pnlOPt.Location = New System.Drawing.Point(498, 208) Me.pnlOPt.Name = "pnlOPt" - Me.pnlOPt.Size = New System.Drawing.Size(624, 92) + Me.pnlOPt.Size = New System.Drawing.Size(624, 96) Me.pnlOPt.TabIndex = 6 ' 'LinkLabel1 ' Me.LinkLabel1.AutoSize = True - Me.LinkLabel1.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LinkLabel1.Location = New System.Drawing.Point(476, 0) + Me.LinkLabel1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold) + Me.LinkLabel1.Location = New System.Drawing.Point(472, -2) Me.LinkLabel1.Name = "LinkLabel1" - Me.LinkLabel1.Size = New System.Drawing.Size(126, 9) + Me.LinkLabel1.Size = New System.Drawing.Size(158, 13) Me.LinkLabel1.TabIndex = 16 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "Fragen zum POS-Terminal?" @@ -1245,7 +1245,7 @@ Partial Class frmBelegNeu Me.cboPrinter._allowFreiText = False Me.cboPrinter._value = "" Me.cboPrinter.FormattingEnabled = True - Me.cboPrinter.Location = New System.Drawing.Point(331, 6) + Me.cboPrinter.Location = New System.Drawing.Point(331, 9) Me.cboPrinter.Name = "cboPrinter" Me.cboPrinter.Size = New System.Drawing.Size(141, 21) Me.cboPrinter.TabIndex = 3 @@ -1253,7 +1253,7 @@ Partial Class frmBelegNeu 'cbxBelegOffnen ' Me.cbxBelegOffnen.AutoSize = True - Me.cbxBelegOffnen.Location = New System.Drawing.Point(192, 74) + Me.cbxBelegOffnen.Location = New System.Drawing.Point(192, 77) Me.cbxBelegOffnen.Name = "cbxBelegOffnen" Me.cbxBelegOffnen.Size = New System.Drawing.Size(86, 17) Me.cbxBelegOffnen.TabIndex = 15 @@ -1267,7 +1267,7 @@ Partial Class frmBelegNeu Me.lblStorno.Cursor = System.Windows.Forms.Cursors.Default Me.lblStorno.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStorno.ForeColor = System.Drawing.Color.White - Me.lblStorno.Location = New System.Drawing.Point(196, 53) + Me.lblStorno.Location = New System.Drawing.Point(196, 56) Me.lblStorno.Name = "lblStorno" Me.lblStorno.Size = New System.Drawing.Size(82, 20) Me.lblStorno.TabIndex = 8 @@ -1280,7 +1280,7 @@ Partial Class frmBelegNeu Me.Label17.BackColor = System.Drawing.Color.Yellow Me.Label17.Cursor = System.Windows.Forms.Cursors.Default Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label17.Location = New System.Drawing.Point(216, 33) + Me.Label17.Location = New System.Drawing.Point(216, 36) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(62, 20) Me.Label17.TabIndex = 4 @@ -1291,7 +1291,7 @@ Partial Class frmBelegNeu ' Me.Label18.AutoSize = True Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(5, 9) + Me.Label18.Location = New System.Drawing.Point(5, 12) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(39, 13) Me.Label18.TabIndex = 0 @@ -1304,7 +1304,7 @@ Partial Class frmBelegNeu Me.cboKassen._value = "" Me.cboKassen.Enabled = False Me.cboKassen.FormattingEnabled = True - Me.cboKassen.Location = New System.Drawing.Point(50, 6) + Me.cboKassen.Location = New System.Drawing.Point(50, 9) Me.cboKassen.Name = "cboKassen" Me.cboKassen.Size = New System.Drawing.Size(226, 21) Me.cboKassen.TabIndex = 1 @@ -1313,7 +1313,7 @@ Partial Class frmBelegNeu ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(284, 9) + Me.Label3.Location = New System.Drawing.Point(284, 12) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(48, 13) Me.Label3.TabIndex = 2 @@ -1329,7 +1329,7 @@ Partial Class frmBelegNeu Me.pnlBetrag.Controls.Add(Me.lblBetrag_Steuern) Me.pnlBetrag.Controls.Add(Me.Label25) Me.pnlBetrag.Controls.Add(Me.lblBetrag_Brutto) - Me.pnlBetrag.Location = New System.Drawing.Point(280, 33) + Me.pnlBetrag.Location = New System.Drawing.Point(280, 36) Me.pnlBetrag.Name = "pnlBetrag" Me.pnlBetrag.Size = New System.Drawing.Size(196, 59) Me.pnlBetrag.TabIndex = 12 @@ -1406,7 +1406,7 @@ Partial Class frmBelegNeu Me.Panel1.Controls.Add(Me.btnPOS) Me.Panel1.Controls.Add(Me.btnPrint) Me.Panel1.Controls.Add(Me.Button3) - Me.Panel1.Location = New System.Drawing.Point(475, 9) + Me.Panel1.Location = New System.Drawing.Point(475, 12) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(145, 83) Me.Panel1.TabIndex = 13 @@ -1426,7 +1426,7 @@ Partial Class frmBelegNeu ' Me.Label26.Cursor = System.Windows.Forms.Cursors.Default Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle)) - Me.Label26.Location = New System.Drawing.Point(3, -1) + Me.Label26.Location = New System.Drawing.Point(3, 0) Me.Label26.Name = "Label26" Me.Label26.Size = New System.Drawing.Size(137, 17) Me.Label26.TabIndex = 17