diff --git a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb
index 2a75c844..fb13a13d 100644
--- a/SDL/Creditsafe/usrcntlVAT_ATEZ.vb
+++ b/SDL/Creditsafe/usrcntlVAT_ATEZ.vb
@@ -1,4 +1,6 @@
-Public Class usrcntlVAT_ATEZ
+Imports System.Web.UI.WebControls.Expressions
+
+Public Class usrcntlVAT_ATEZ
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim user, pw As String
Dim land As String
@@ -61,17 +63,19 @@
Sub initDataTable()
-
+ dataTable.Columns.Add("count", GetType(Integer))
dataTable.Columns.Add("currency", GetType(String))
dataTable.Columns.Add("invoice_id", GetType(String))
dataTable.Columns.Add("seller_VAT_id", GetType(String))
dataTable.Columns.Add("seller_address_city", GetType(String))
dataTable.Columns.Add("seller_address_country", GetType(String))
dataTable.Columns.Add("seller_address_postcode", GetType(String))
+ dataTable.Columns.Add("total_vat_amount", GetType(Double))
dataTable.Columns.Add("seller_address_street", GetType(String))
dataTable.Columns.Add("seller_name", GetType(String))
dataTable.Columns.Add("status", GetType(String))
dataTable.Columns.Add("invoice_date", GetType(DateTime))
+ dataTable.Columns.Add("document_count", GetType(Integer))
End Sub
@@ -83,37 +87,64 @@
If dgvVAT.Columns.Count > 0 Then
With dgvVAT
.RowHeadersWidth = 10
+ .Columns("count").HeaderText = "#"
+ .Columns("count").Width = 25
.Columns("currency").HeaderText = "Währung"
+ .Columns("currency").Width = 50
.Columns("invoice_id").HeaderText = "Rechnungs-Nr"
- .Columns("seller_VAT_id").HeaderText = "Name"
- .Columns("seller_VAT_id").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+ .Columns("seller_VAT_id").HeaderText = "UID-Nr"
+ .Columns("seller_VAT_id").Width = 100
.Columns("seller_address_city").Width = 100
- .Columns("seller_address_city").HeaderText = "Nr"
+ .Columns("seller_address_city").HeaderText = "Stadt"
.Columns("seller_address_country").Visible = False
.Columns("seller_address_country").HeaderText = "Land"
- .Columns("seller_address_postcode").Width = 100
+ .Columns("total_vat_amount").HeaderText = "MWST"
+ .Columns("seller_address_postcode").Width = 75
.Columns("seller_address_postcode").HeaderText = "PLZ"
- .Columns("seller_address_street").Width = 100
+ .Columns("seller_address_street").Width = 125
.Columns("seller_address_street").HeaderText = "Strasse"
- .Columns("seller_name").Width = 100
- .Columns("seller_name").HeaderText = "Verkäufer"
- .Columns("status").Width = 100
+ .Columns("seller_name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+ .Columns("seller_name").HeaderText = "Leistender"
+ .Columns("status").Width = 75
.Columns("status").HeaderText = "Status"
.Columns("invoice_date").Width = 100
.Columns("invoice_date").HeaderText = "Rechnungsdatum"
+ .Columns("document_count").HeaderText = "Seite"
+ .Columns("document_count").Width = 50
End With
For Each row As DataGridViewRow In dgvVAT.Rows
If Not IsDBNull(row.Cells("status").Value) Then
Dim akiv As String = (row.Cells("status").Value.ToString).ToLower
- If akiv = "active" Then
- row.DefaultCellStyle.BackColor = Color.LightGreen
+ If akiv = "success" Then
+
+ If Not IsDBNull(row.Cells("total_vat_amount").Value) Then
+
+ If IsNumeric(row.Cells("total_vat_amount").Value) AndAlso row.Cells("total_vat_amount").Value <> 0 Then
+ row.DefaultCellStyle.BackColor = Color.LightGreen
+ Else
+ row.DefaultCellStyle.BackColor = Color.IndianRed
+ End If
+
+ Else
+
+ row.DefaultCellStyle.BackColor = Color.LightYellow
+ End If
+
+
+
+
ElseIf akiv = "nonactive" Then
row.DefaultCellStyle.BackColor = Color.IndianRed
Else
row.DefaultCellStyle.BackColor = Color.LightYellow
End If
End If
+
+
+
+
+
Next
End If
@@ -127,7 +158,8 @@
' If Me.Parent.GetType() Is GetType(Form) Then o = Me.FindForm
For Each row As DataGridViewRow In dgvVAT.SelectedRows
- va = New VAT(IIf(IsDBNull(row.Cells("currency").Value), "", row.Cells("currency").Value),
+ va = New VAT(IIf(IsDBNull(row.Cells("count").Value), "", row.Cells("count").Value),
+ IIf(IsDBNull(row.Cells("currency").Value), "", row.Cells("currency").Value),
IIf(IsDBNull(row.Cells("invoice_id").Value), "", row.Cells("invoice_id").Value),
IIf(IsDBNull(row.Cells("seller_VAT_id").Value), "", row.Cells("seller_VAT_id").Value),
IIf(IsDBNull(row.Cells("seller_address_city").Value), "", row.Cells("seller_address_city").Value),
@@ -137,7 +169,8 @@
IIf(IsDBNull(row.Cells("seller_name").Value), "", row.Cells("seller_name").Value),
IIf(IsDBNull(row.Cells("total_VAT_amount").Value), "", row.Cells("total_VAT_amount").Value),
IIf(IsDBNull(row.Cells("invoice_date").Value) Or Not IsDate(row.Cells("invoice_date").Value), Nothing, CDate(row.Cells("invoice_date").Value)),
- IIf(IsDBNull(row.Cells("status").Value), "", row.Cells("status").Value))
+ IIf(IsDBNull(row.Cells("status").Value), "", row.Cells("status").Value),
+ IIf(IsDBNull(row.Cells("document_count").Value), "", row.Cells("document_count").Value))
Next
If va.status.ToLower <> "success" Then
@@ -161,6 +194,7 @@
Public Class VAT
+ Public Property count As Integer
Public Property currency As String
Public Property invoice_id As String
Public Property seller_VAT_id As String
@@ -172,9 +206,11 @@
Public Property invoice_date As Date
Public Property total_VAT_amount As String
Public Property status As String
+ Public Property document_count As Integer
- Public Sub New(_currency As String, _invoice_id As String, _seller_VAT_id As String, _seller_address_city As String, _seller_address_country As String, _seller_address_postcode As String, _seller_address_street As String, _seller_name As String, _total_VAT_amount As String, _invoice_date As DateTime, _status As String)
+ Public Sub New(_count As Integer, _currency As String, _invoice_id As String, _seller_VAT_id As String, _seller_address_city As String, _seller_address_country As String, _seller_address_postcode As String, _seller_address_street As String, _seller_name As String, _total_VAT_amount As String, _invoice_date As DateTime, _status As String, _document_count As Integer)
+ count = _count
currency = _currency
invoice_id = _invoice_id
seller_VAT_id = _seller_VAT_id
@@ -186,6 +222,7 @@
total_VAT_amount = _total_VAT_amount
invoice_date = _invoice_date
status = _status
+ document_count = _document_count
End Sub
diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb
index 1705ed91..01d9124b 100644
--- a/SDL/Fakturierung/cAutomailversand.vb
+++ b/SDL/Fakturierung/cAutomailversand.vb
@@ -1,5 +1,4 @@
-
-Imports Microsoft.Office.Interop
+Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
Public Class cAutomailversand
@@ -146,7 +145,7 @@ Public Class cAutomailversand
End If
End If
-
+
Next
Catch ex As System.Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
@@ -158,9 +157,13 @@ Public Class cAutomailversand
Dim txtRgNr As String = IIf(RechnungsNr < 0, -1, RechnungsNr)
Dim Mailtext As String
- If row.Item("Steuer") = 0 Then
- Mailtext &= (New SQL).getValueTxtBySql("SELECT Text FROM Rechnungstexte WHERE Firma_ID=0 AND EMailRechnung=1 AND Rechnungstexte.DrucksteuerungsKz='R' AND LandKZ='" & row.Item("RechnungsLandKz") & "'", "FMZOLL")
- End If
+
+ 'NICHT MEHR BENÖTIGT!
+
+ 'If row.Item("Steuer") = 0 Then
+ ' Mailtext &= vbNewLine & vbNewLine
+ ' Mailtext &= (New SQL).getValueTxtBySql("SELECT Text FROM Rechnungstexte WHERE Firma_ID=0 AND EMailRechnung=1 AND Rechnungstexte.DrucksteuerungsKz='R' AND LandKZ='" & row.Item("RechnungsLandKz") & "'", "FMZOLL")
+ 'End If
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim listOfTextconserven As cTextkonserve_LIST = New cTextkonserve_LIST(4, "", Firma_ID)
@@ -182,7 +185,9 @@ Public Class cAutomailversand
Subject = r.txt_betreff
Subject = Subject.Replace("%BelegNr%", txtRgNr)
TextHTML &= r.txt_text
- If Mailtext <> "" Then TextHTML &= Mailtext & vbNewLine
+ If Mailtext <> "" Then TextHTML &= Mailtext
+ TextHTML &= vbNewLine & vbNewLine
+
End If
End If
@@ -328,7 +333,13 @@ Public Class cAutomailversand
Dim attachList As New List(Of String)
For Each ATT As cFakt_MailATTach In ATTACHMENTS
- attachList.Add(ATT.Pfad)
+
+ If ATT.Pfad.ToString.ToLower.EndsWith("maut_at.pdf") Or ATT.Pfad.ToString.ToLower.EndsWith("maut_uta.pdf") Or ATT.Pfad.ToString.ToLower.EndsWith("maut_mse.pdf") Then
+ 'diese Anh. nicht mitanfügen!
+ Else
+ attachList.Add(ATT.Pfad)
+ End If
+
Next
diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
index 97eab890..c54a3404 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
@@ -28,6 +28,7 @@ Partial Class frmMDM_USTVAntrag
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag))
Me.pnlBottom = New System.Windows.Forms.Panel()
Me.Button5 = New System.Windows.Forms.Button()
+ Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label27 = New System.Windows.Forms.Label()
Me.picExcel = New System.Windows.Forms.PictureBox()
Me.Button4 = New System.Windows.Forms.Button()
@@ -41,24 +42,39 @@ Partial Class frmMDM_USTVAntrag
Me.lblGesamtUSteuer = New System.Windows.Forms.Label()
Me.lblDiffernezbetrag = New System.Windows.Forms.Label()
Me.lblGesamtErstattung = New System.Windows.Forms.Label()
+ Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+ Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblKdNr = New System.Windows.Forms.Label()
Me.Panel9 = New System.Windows.Forms.Panel()
+ Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblLand = New System.Windows.Forms.Label()
Me.Panel8 = New System.Windows.Forms.Panel()
Me.Label15 = New System.Windows.Forms.Label()
+ Me.txtVZam = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.btnAbfertigungsNrVergeben = New System.Windows.Forms.Button()
Me.Label14 = New System.Windows.Forms.Label()
+ Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lblMWSTAntrag = New System.Windows.Forms.Label()
Me.Label13 = New System.Windows.Forms.Label()
+ Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label11 = New System.Windows.Forms.Label()
+ Me.txtStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label9 = New System.Windows.Forms.Label()
+ Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtAbfNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label8 = New System.Windows.Forms.Label()
+ Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
+ Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.cbxWahrung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblWahrung = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
+ Me.txt3470 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.lblZeitraum = New System.Windows.Forms.Label()
+ Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Panel6 = New System.Windows.Forms.Panel()
Me.lblGesamtUSteuerFW = New System.Windows.Forms.Label()
Me.Label12 = New System.Windows.Forms.Label()
@@ -81,45 +97,33 @@ Partial Class frmMDM_USTVAntrag
Me.btnStorno = New System.Windows.Forms.Button()
Me.lblAntragAbgeschlossen = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
+ Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblFirma = New System.Windows.Forms.Label()
Me.lblWarnung = New System.Windows.Forms.Label()
Me.pnlBody = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.Panel4 = New System.Windows.Forms.Panel()
+ Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
+ Me.btnPDFauslesen = New System.Windows.Forms.Button()
Me.btnEintragloeschen = New System.Windows.Forms.Button()
Me.btnNeuerEintrag = New System.Windows.Forms.Button()
Me.TabPage2 = New System.Windows.Forms.TabPage()
Me.Panel3 = New System.Windows.Forms.Panel()
+ Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.pnlErstattungsdetails = New System.Windows.Forms.Panel()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Button2 = New System.Windows.Forms.Button()
Me.Button3 = New System.Windows.Forms.Button()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
- Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
- Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
- Me.txtVZam = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtAbfNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
- Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.cbxWahrung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
- Me.txt3470 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox()
- Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.cnS_KIUPLOAD = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
- Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
- Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
Me.pnlBottom.SuspendLayout()
CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -132,15 +136,15 @@ Partial Class frmMDM_USTVAntrag
Me.pnlBody.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
+ CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlAntragsPosDetails.SuspendLayout()
Me.Panel2.SuspendLayout()
Me.Panel4.SuspendLayout()
Me.TabPage2.SuspendLayout()
Me.Panel3.SuspendLayout()
+ CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlErstattungsdetails.SuspendLayout()
Me.Panel1.SuspendLayout()
- CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'pnlBottom
@@ -177,6 +181,31 @@ Partial Class frmMDM_USTVAntrag
Me.Button5.UseVisualStyleBackColor = True
Me.Button5.Visible = False
'
+ 'txtSumme
+ '
+ Me.txtSumme._DateTimeOnly = False
+ Me.txtSumme._numbersOnly = False
+ Me.txtSumme._numbersOnlyKommastellen = ""
+ Me.txtSumme._numbersOnlyTrennzeichen = False
+ Me.txtSumme._Prozent = False
+ Me.txtSumme._ShortDateNew = False
+ Me.txtSumme._ShortDateOnly = False
+ Me.txtSumme._TimeOnly = False
+ Me.txtSumme._TimeOnly_Seconds = False
+ Me.txtSumme._value = ""
+ Me.txtSumme._Waehrung = True
+ Me.txtSumme._WaehrungZeichen = True
+ Me.txtSumme.ForeColor = System.Drawing.Color.Black
+ Me.txtSumme.Location = New System.Drawing.Point(1158, 67)
+ Me.txtSumme.MaxLineLength = -1
+ Me.txtSumme.MaxLines_Warning = ""
+ Me.txtSumme.MaxLines_Warning_Label = Nothing
+ Me.txtSumme.Name = "txtSumme"
+ Me.txtSumme.ReadOnly = True
+ Me.txtSumme.Size = New System.Drawing.Size(88, 20)
+ Me.txtSumme.TabIndex = 49
+ Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+ '
'Label27
'
Me.Label27.AutoSize = True
@@ -350,6 +379,48 @@ Partial Class frmMDM_USTVAntrag
Me.lblGesamtErstattung.Text = "000.000,00"
Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight
'
+ 'KdSearchBox1
+ '
+ Me.KdSearchBox1._AlleFirmenCLUSTER = False
+ Me.KdSearchBox1._AllowSetValue = False
+ Me.KdSearchBox1._autoSizeGross = False
+ Me.KdSearchBox1._display_Name1 = False
+ Me.KdSearchBox1._displayAVISO_Email = False
+ Me.KdSearchBox1._displayFullName = False
+ Me.KdSearchBox1._displayWoelflKd = False
+ Me.KdSearchBox1._hideIfListEmpty = True
+ Me.KdSearchBox1._loadKdData = False
+ Me.KdSearchBox1._searchName1 = True
+ Me.KdSearchBox1._UseFIRMA = ""
+ Me.KdSearchBox1._ValueKdAndName = True
+ Me.KdSearchBox1.dgvpos = "LEFT"
+ Me.KdSearchBox1.KdName = Nothing
+ Me.KdSearchBox1.KdNr = "-1"
+ Me.KdSearchBox1.kdNrField = Nothing
+ Me.KdSearchBox1.KdNrNullInt = Nothing
+ Me.KdSearchBox1.Location = New System.Drawing.Point(298, 10)
+ Me.KdSearchBox1.Name = "KdSearchBox1"
+ Me.KdSearchBox1.nurAktive = True
+ Me.KdSearchBox1.searchActive = True
+ Me.KdSearchBox1.Size = New System.Drawing.Size(171, 20)
+ Me.KdSearchBox1.TabIndex = 22
+ Me.KdSearchBox1.TIMER_SEARCH = True
+ Me.KdSearchBox1.usrcntl = Nothing
+ '
+ 'cboAntragArt
+ '
+ Me.cboAntragArt._allowedValuesFreiText = Nothing
+ Me.cboAntragArt._allowFreiText = False
+ Me.cboAntragArt._value = ""
+ Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+ Me.cboAntragArt.FormattingEnabled = True
+ Me.cboAntragArt.Location = New System.Drawing.Point(83, 10)
+ Me.cboAntragArt.Name = "cboAntragArt"
+ Me.cboAntragArt.Size = New System.Drawing.Size(191, 28)
+ Me.cboAntragArt.TabIndex = 21
+ Me.cboAntragArt.Text = "USTV-Antrag"
+ '
'lblKdNr
'
Me.lblKdNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -374,6 +445,21 @@ Partial Class frmMDM_USTVAntrag
Me.Panel9.Size = New System.Drawing.Size(65, 90)
Me.Panel9.TabIndex = 20
'
+ 'cbxLand
+ '
+ Me.cbxLand._allowedValuesFreiText = Nothing
+ Me.cbxLand._allowFreiText = False
+ Me.cbxLand._value = ""
+ Me.cbxLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+ Me.cbxLand.FormattingEnabled = True
+ Me.cbxLand.Location = New System.Drawing.Point(0, 0)
+ Me.cbxLand.Name = "cbxLand"
+ Me.cbxLand.Size = New System.Drawing.Size(65, 28)
+ Me.cbxLand.TabIndex = 23
+ Me.cbxLand.Text = "USTV-Antrag"
+ Me.cbxLand.Visible = False
+ '
'lblLand
'
Me.lblLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
@@ -437,6 +523,31 @@ Partial Class frmMDM_USTVAntrag
Me.Label15.TabIndex = 51
Me.Label15.Text = "VZ am:"
'
+ 'txtVZam
+ '
+ Me.txtVZam._DateTimeOnly = False
+ Me.txtVZam._numbersOnly = False
+ Me.txtVZam._numbersOnlyKommastellen = ""
+ Me.txtVZam._numbersOnlyTrennzeichen = False
+ Me.txtVZam._Prozent = False
+ Me.txtVZam._ShortDateNew = False
+ Me.txtVZam._ShortDateOnly = True
+ Me.txtVZam._TimeOnly = False
+ Me.txtVZam._TimeOnly_Seconds = False
+ Me.txtVZam._value = ""
+ Me.txtVZam._Waehrung = False
+ Me.txtVZam._WaehrungZeichen = False
+ Me.txtVZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtVZam.ForeColor = System.Drawing.Color.Black
+ Me.txtVZam.Location = New System.Drawing.Point(865, 60)
+ Me.txtVZam.MaxLength = 10
+ Me.txtVZam.MaxLineLength = -1
+ Me.txtVZam.MaxLines_Warning = ""
+ Me.txtVZam.MaxLines_Warning_Label = Nothing
+ Me.txtVZam.Name = "txtVZam"
+ Me.txtVZam.Size = New System.Drawing.Size(100, 23)
+ Me.txtVZam.TabIndex = 52
+ '
'btnAbfertigungsNrVergeben
'
Me.btnAbfertigungsNrVergeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -463,6 +574,31 @@ Partial Class frmMDM_USTVAntrag
Me.Label14.TabIndex = 27
Me.Label14.Text = "eingereicht am"
'
+ 'txtEingereichtAm
+ '
+ Me.txtEingereichtAm._DateTimeOnly = False
+ Me.txtEingereichtAm._numbersOnly = False
+ Me.txtEingereichtAm._numbersOnlyKommastellen = ""
+ Me.txtEingereichtAm._numbersOnlyTrennzeichen = False
+ Me.txtEingereichtAm._Prozent = False
+ Me.txtEingereichtAm._ShortDateNew = False
+ Me.txtEingereichtAm._ShortDateOnly = True
+ Me.txtEingereichtAm._TimeOnly = False
+ Me.txtEingereichtAm._TimeOnly_Seconds = False
+ Me.txtEingereichtAm._value = ""
+ Me.txtEingereichtAm._Waehrung = False
+ Me.txtEingereichtAm._WaehrungZeichen = False
+ Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black
+ Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60)
+ Me.txtEingereichtAm.MaxLength = 10
+ Me.txtEingereichtAm.MaxLineLength = -1
+ Me.txtEingereichtAm.MaxLines_Warning = ""
+ Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing
+ Me.txtEingereichtAm.Name = "txtEingereichtAm"
+ Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23)
+ Me.txtEingereichtAm.TabIndex = 26
+ '
'lblMWSTAntrag
'
Me.lblMWSTAntrag.AutoSize = True
@@ -488,6 +624,31 @@ Partial Class frmMDM_USTVAntrag
Me.Label13.TabIndex = 24
Me.Label13.Text = "gültig bis"
'
+ 'txtGueltig
+ '
+ Me.txtGueltig._DateTimeOnly = False
+ Me.txtGueltig._numbersOnly = False
+ Me.txtGueltig._numbersOnlyKommastellen = ""
+ Me.txtGueltig._numbersOnlyTrennzeichen = False
+ Me.txtGueltig._Prozent = False
+ Me.txtGueltig._ShortDateNew = False
+ Me.txtGueltig._ShortDateOnly = True
+ Me.txtGueltig._TimeOnly = False
+ Me.txtGueltig._TimeOnly_Seconds = False
+ Me.txtGueltig._value = ""
+ Me.txtGueltig._Waehrung = False
+ Me.txtGueltig._WaehrungZeichen = False
+ Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtGueltig.ForeColor = System.Drawing.Color.Black
+ Me.txtGueltig.Location = New System.Drawing.Point(101, 61)
+ Me.txtGueltig.MaxLength = 10
+ Me.txtGueltig.MaxLineLength = -1
+ Me.txtGueltig.MaxLines_Warning = ""
+ Me.txtGueltig.MaxLines_Warning_Label = Nothing
+ Me.txtGueltig.Name = "txtGueltig"
+ Me.txtGueltig.Size = New System.Drawing.Size(100, 23)
+ Me.txtGueltig.TabIndex = 23
+ '
'Label11
'
Me.Label11.AutoSize = True
@@ -501,6 +662,31 @@ Partial Class frmMDM_USTVAntrag
Me.Label11.TabIndex = 21
Me.Label11.Text = "Steuer-Nr:"
'
+ 'txtStNr
+ '
+ Me.txtStNr._DateTimeOnly = False
+ Me.txtStNr._numbersOnly = False
+ Me.txtStNr._numbersOnlyKommastellen = ""
+ Me.txtStNr._numbersOnlyTrennzeichen = False
+ Me.txtStNr._Prozent = False
+ Me.txtStNr._ShortDateNew = False
+ Me.txtStNr._ShortDateOnly = False
+ Me.txtStNr._TimeOnly = False
+ Me.txtStNr._TimeOnly_Seconds = False
+ Me.txtStNr._value = ""
+ Me.txtStNr._Waehrung = False
+ Me.txtStNr._WaehrungZeichen = False
+ Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtStNr.ForeColor = System.Drawing.Color.Black
+ Me.txtStNr.Location = New System.Drawing.Point(101, 36)
+ Me.txtStNr.MaxLength = 20
+ Me.txtStNr.MaxLineLength = -1
+ Me.txtStNr.MaxLines_Warning = ""
+ Me.txtStNr.MaxLines_Warning_Label = Nothing
+ Me.txtStNr.Name = "txtStNr"
+ Me.txtStNr.Size = New System.Drawing.Size(136, 23)
+ Me.txtStNr.TabIndex = 22
+ '
'Label9
'
Me.Label9.AutoSize = True
@@ -514,6 +700,56 @@ Partial Class frmMDM_USTVAntrag
Me.Label9.TabIndex = 19
Me.Label9.Text = "VZ:"
'
+ 'txtVZ
+ '
+ Me.txtVZ._DateTimeOnly = False
+ Me.txtVZ._numbersOnly = True
+ Me.txtVZ._numbersOnlyKommastellen = ""
+ Me.txtVZ._numbersOnlyTrennzeichen = True
+ Me.txtVZ._Prozent = False
+ Me.txtVZ._ShortDateNew = False
+ Me.txtVZ._ShortDateOnly = False
+ Me.txtVZ._TimeOnly = False
+ Me.txtVZ._TimeOnly_Seconds = False
+ Me.txtVZ._value = ""
+ Me.txtVZ._Waehrung = True
+ Me.txtVZ._WaehrungZeichen = True
+ Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtVZ.ForeColor = System.Drawing.Color.Black
+ Me.txtVZ.Location = New System.Drawing.Point(865, 31)
+ Me.txtVZ.MaxLength = 10
+ Me.txtVZ.MaxLineLength = -1
+ Me.txtVZ.MaxLines_Warning = ""
+ Me.txtVZ.MaxLines_Warning_Label = Nothing
+ Me.txtVZ.Name = "txtVZ"
+ Me.txtVZ.Size = New System.Drawing.Size(100, 23)
+ Me.txtVZ.TabIndex = 20
+ '
+ 'txtAbfNr
+ '
+ Me.txtAbfNr._DateTimeOnly = False
+ Me.txtAbfNr._numbersOnly = True
+ Me.txtAbfNr._numbersOnlyKommastellen = ""
+ Me.txtAbfNr._numbersOnlyTrennzeichen = False
+ Me.txtAbfNr._Prozent = False
+ Me.txtAbfNr._ShortDateNew = False
+ Me.txtAbfNr._ShortDateOnly = False
+ Me.txtAbfNr._TimeOnly = False
+ Me.txtAbfNr._TimeOnly_Seconds = False
+ Me.txtAbfNr._value = ""
+ Me.txtAbfNr._Waehrung = False
+ Me.txtAbfNr._WaehrungZeichen = False
+ Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtAbfNr.ForeColor = System.Drawing.Color.Red
+ Me.txtAbfNr.Location = New System.Drawing.Point(654, 33)
+ Me.txtAbfNr.MaxLength = 10
+ Me.txtAbfNr.MaxLineLength = -1
+ Me.txtAbfNr.MaxLines_Warning = ""
+ Me.txtAbfNr.MaxLines_Warning_Label = Nothing
+ Me.txtAbfNr.Name = "txtAbfNr"
+ Me.txtAbfNr.Size = New System.Drawing.Size(117, 23)
+ Me.txtAbfNr.TabIndex = 18
+ '
'Label8
'
Me.Label8.AutoSize = True
@@ -527,6 +763,19 @@ Partial Class frmMDM_USTVAntrag
Me.Label8.TabIndex = 17
Me.Label8.Text = "Abfertigungs-Nr:"
'
+ 'cbxFiliale
+ '
+ Me.cbxFiliale._allowedValuesFreiText = Nothing
+ Me.cbxFiliale._allowFreiText = False
+ Me.cbxFiliale._value = ""
+ Me.cbxFiliale.DropDownWidth = 150
+ Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cbxFiliale.FormattingEnabled = True
+ Me.cbxFiliale.Location = New System.Drawing.Point(413, 32)
+ Me.cbxFiliale.Name = "cbxFiliale"
+ Me.cbxFiliale.Size = New System.Drawing.Size(105, 24)
+ Me.cbxFiliale.TabIndex = 16
+ '
'Label4
'
Me.Label4.AutoSize = True
@@ -553,6 +802,43 @@ Partial Class frmMDM_USTVAntrag
Me.Label2.TabIndex = 13
Me.Label2.Text = "Bezugs/Pos-Nr.:"
'
+ 'txtBezugsNr
+ '
+ Me.txtBezugsNr._DateTimeOnly = False
+ Me.txtBezugsNr._numbersOnly = True
+ Me.txtBezugsNr._numbersOnlyKommastellen = ""
+ Me.txtBezugsNr._numbersOnlyTrennzeichen = False
+ Me.txtBezugsNr._Prozent = False
+ Me.txtBezugsNr._ShortDateNew = False
+ Me.txtBezugsNr._ShortDateOnly = False
+ Me.txtBezugsNr._TimeOnly = False
+ Me.txtBezugsNr._TimeOnly_Seconds = False
+ Me.txtBezugsNr._value = ""
+ Me.txtBezugsNr._Waehrung = False
+ Me.txtBezugsNr._WaehrungZeichen = False
+ Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtBezugsNr.ForeColor = System.Drawing.Color.Red
+ Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4)
+ Me.txtBezugsNr.MaxLength = 10
+ Me.txtBezugsNr.MaxLineLength = -1
+ Me.txtBezugsNr.MaxLines_Warning = ""
+ Me.txtBezugsNr.MaxLines_Warning_Label = Nothing
+ Me.txtBezugsNr.Name = "txtBezugsNr"
+ Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23)
+ Me.txtBezugsNr.TabIndex = 14
+ '
+ 'cbxWahrung
+ '
+ Me.cbxWahrung._allowedValuesFreiText = Nothing
+ Me.cbxWahrung._allowFreiText = False
+ Me.cbxWahrung._value = ""
+ Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cbxWahrung.FormattingEnabled = True
+ Me.cbxWahrung.Location = New System.Drawing.Point(431, 4)
+ Me.cbxWahrung.Name = "cbxWahrung"
+ Me.cbxWahrung.Size = New System.Drawing.Size(87, 24)
+ Me.cbxWahrung.TabIndex = 12
+ '
'lblWahrung
'
Me.lblWahrung.AutoSize = True
@@ -579,6 +865,31 @@ Partial Class frmMDM_USTVAntrag
Me.Label1.TabIndex = 10
Me.Label1.Text = "3470:"
'
+ 'txt3470
+ '
+ Me.txt3470._DateTimeOnly = False
+ Me.txt3470._numbersOnly = True
+ Me.txt3470._numbersOnlyKommastellen = ""
+ Me.txt3470._numbersOnlyTrennzeichen = True
+ Me.txt3470._Prozent = False
+ Me.txt3470._ShortDateNew = False
+ Me.txt3470._ShortDateOnly = False
+ Me.txt3470._TimeOnly = False
+ Me.txt3470._TimeOnly_Seconds = False
+ Me.txt3470._value = ""
+ Me.txt3470._Waehrung = True
+ Me.txt3470._WaehrungZeichen = True
+ Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txt3470.ForeColor = System.Drawing.Color.Black
+ Me.txt3470.Location = New System.Drawing.Point(865, 2)
+ Me.txt3470.MaxLength = 10
+ Me.txt3470.MaxLineLength = -1
+ Me.txt3470.MaxLines_Warning = ""
+ Me.txt3470.MaxLines_Warning_Label = Nothing
+ Me.txt3470.Name = "txt3470"
+ Me.txt3470.Size = New System.Drawing.Size(100, 23)
+ Me.txt3470.TabIndex = 10
+ '
'Label3
'
Me.Label3.AutoSize = True
@@ -605,6 +916,56 @@ Partial Class frmMDM_USTVAntrag
Me.lblZeitraum.TabIndex = 7
Me.lblZeitraum.Text = "-"
'
+ 'txtVon
+ '
+ Me.txtVon._DateTimeOnly = False
+ Me.txtVon._numbersOnly = False
+ Me.txtVon._numbersOnlyKommastellen = ""
+ Me.txtVon._numbersOnlyTrennzeichen = False
+ Me.txtVon._Prozent = False
+ Me.txtVon._ShortDateNew = True
+ Me.txtVon._ShortDateOnly = False
+ Me.txtVon._TimeOnly = False
+ Me.txtVon._TimeOnly_Seconds = False
+ Me.txtVon._value = ""
+ Me.txtVon._Waehrung = False
+ Me.txtVon._WaehrungZeichen = False
+ Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtVon.ForeColor = System.Drawing.Color.Black
+ Me.txtVon.Location = New System.Drawing.Point(101, 9)
+ Me.txtVon.MaxLength = 10
+ Me.txtVon.MaxLineLength = -1
+ Me.txtVon.MaxLines_Warning = ""
+ Me.txtVon.MaxLines_Warning_Label = Nothing
+ Me.txtVon.Name = "txtVon"
+ Me.txtVon.Size = New System.Drawing.Size(100, 23)
+ Me.txtVon.TabIndex = 6
+ '
+ 'txtBis
+ '
+ Me.txtBis._DateTimeOnly = False
+ Me.txtBis._numbersOnly = False
+ Me.txtBis._numbersOnlyKommastellen = ""
+ Me.txtBis._numbersOnlyTrennzeichen = False
+ Me.txtBis._Prozent = False
+ Me.txtBis._ShortDateNew = True
+ Me.txtBis._ShortDateOnly = False
+ Me.txtBis._TimeOnly = False
+ Me.txtBis._TimeOnly_Seconds = False
+ Me.txtBis._value = ""
+ Me.txtBis._Waehrung = False
+ Me.txtBis._WaehrungZeichen = False
+ Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ Me.txtBis.ForeColor = System.Drawing.Color.Black
+ Me.txtBis.Location = New System.Drawing.Point(227, 9)
+ Me.txtBis.MaxLength = 10
+ Me.txtBis.MaxLineLength = -1
+ Me.txtBis.MaxLines_Warning = ""
+ Me.txtBis.MaxLines_Warning_Label = Nothing
+ Me.txtBis.Name = "txtBis"
+ Me.txtBis.Size = New System.Drawing.Size(100, 23)
+ Me.txtBis.TabIndex = 8
+ '
'Panel6
'
Me.Panel6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -900,6 +1261,19 @@ Partial Class frmMDM_USTVAntrag
Me.Label5.TabIndex = 0
Me.Label5.Text = "Status:"
'
+ 'cboStatus
+ '
+ Me.cboStatus._allowedValuesFreiText = Nothing
+ Me.cboStatus._allowFreiText = False
+ Me.cboStatus._value = ""
+ Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+ Me.cboStatus.FormattingEnabled = True
+ Me.cboStatus.Location = New System.Drawing.Point(76, 16)
+ Me.cboStatus.Name = "cboStatus"
+ Me.cboStatus.Size = New System.Drawing.Size(394, 28)
+ Me.cboStatus.TabIndex = 1
+ '
'lblFirma
'
Me.lblFirma.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -963,6 +1337,27 @@ Partial Class frmMDM_USTVAntrag
Me.TabPage1.Text = "Antragspositionen"
Me.TabPage1.UseVisualStyleBackColor = True
'
+ 'dgvUSTVPositionen
+ '
+ Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500
+ Me.dgvUSTVPositionen.AllowUserToAddRows = False
+ Me.dgvUSTVPositionen.AllowUserToDeleteRows = False
+ DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+ Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White
+ Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3)
+ Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen"
+ Me.dgvUSTVPositionen.ReadOnly = True
+ Me.dgvUSTVPositionen.RowHeadersVisible = False
+ Me.dgvUSTVPositionen.RowHeadersWidth = 62
+ Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+ Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169)
+ Me.dgvUSTVPositionen.TabIndex = 0
+ '
'pnlAntragsPosDetails
'
Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2)
@@ -988,6 +1383,9 @@ Partial Class frmMDM_USTVAntrag
'
Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.Panel4.Controls.Add(Me.cbxKIUploaddelete)
+ Me.Panel4.Controls.Add(Me.scanUSTVA)
+ Me.Panel4.Controls.Add(Me.btnPDFauslesen)
Me.Panel4.Controls.Add(Me.btnEintragloeschen)
Me.Panel4.Controls.Add(Me.btnNeuerEintrag)
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left
@@ -996,6 +1394,39 @@ Partial Class frmMDM_USTVAntrag
Me.Panel4.Size = New System.Drawing.Size(154, 261)
Me.Panel4.TabIndex = 0
'
+ 'scanUSTVA
+ '
+ Me.scanUSTVA._ARCHIV = True
+ Me.scanUSTVA._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanUSTVA._DATENSERVER_ORDNER = "MDM"
+ Me.scanUSTVA._DATENSERVER_UOrdner1 = Nothing
+ Me.scanUSTVA._DATENSERVER_UOrdner2 = Nothing
+ Me.scanUSTVA._DATENSERVER_UOrdner3 = Nothing
+ Me.scanUSTVA._MULTI_FILES = False
+ Me.scanUSTVA._TEXT_PDF = "USTVA"
+ Me.scanUSTVA.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanUSTVA.BackColor = System.Drawing.Color.White
+ Me.scanUSTVA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanUSTVA.Cursor = System.Windows.Forms.Cursors.Default
+ Me.scanUSTVA.Location = New System.Drawing.Point(6, 140)
+ Me.scanUSTVA.Name = "scanUSTVA"
+ Me.scanUSTVA.Size = New System.Drawing.Size(135, 40)
+ Me.scanUSTVA.TabIndex = 3
+ '
+ 'btnPDFauslesen
+ '
+ Me.btnPDFauslesen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnPDFauslesen.ForeColor = System.Drawing.Color.Black
+ Me.btnPDFauslesen.Image = Global.SDL.My.Resources.Resources.pdf_s
+ Me.btnPDFauslesen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnPDFauslesen.Location = New System.Drawing.Point(4, 186)
+ Me.btnPDFauslesen.Name = "btnPDFauslesen"
+ Me.btnPDFauslesen.Size = New System.Drawing.Size(135, 39)
+ Me.btnPDFauslesen.TabIndex = 2
+ Me.btnPDFauslesen.Text = "PDF auslesen"
+ Me.btnPDFauslesen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnPDFauslesen.UseVisualStyleBackColor = True
+ '
'btnEintragloeschen
'
Me.btnEintragloeschen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1047,6 +1478,27 @@ Partial Class frmMDM_USTVAntrag
Me.Panel3.Size = New System.Drawing.Size(1438, 438)
Me.Panel3.TabIndex = 3
'
+ 'dgvErstattungspositionen
+ '
+ Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500
+ Me.dgvErstattungspositionen.AllowUserToAddRows = False
+ Me.dgvErstattungspositionen.AllowUserToDeleteRows = False
+ DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+ Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White
+ Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3)
+ Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen"
+ Me.dgvErstattungspositionen.ReadOnly = True
+ Me.dgvErstattungspositionen.RowHeadersVisible = False
+ Me.dgvErstattungspositionen.RowHeadersWidth = 62
+ Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+ Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172)
+ Me.dgvErstattungspositionen.TabIndex = 1
+ '
'pnlErstattungsdetails
'
Me.pnlErstattungsdetails.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1109,371 +1561,10 @@ Partial Class frmMDM_USTVAntrag
Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
'
- 'KdSearchBox1
+ 'cnS_KIUPLOAD
'
- Me.KdSearchBox1._AlleFirmenCLUSTER = False
- Me.KdSearchBox1._AllowSetValue = False
- Me.KdSearchBox1._autoSizeGross = False
- Me.KdSearchBox1._display_Name1 = False
- Me.KdSearchBox1._displayAVISO_Email = False
- Me.KdSearchBox1._displayFullName = False
- Me.KdSearchBox1._displayWoelflKd = False
- Me.KdSearchBox1._hideIfListEmpty = True
- Me.KdSearchBox1._loadKdData = False
- Me.KdSearchBox1._searchName1 = True
- Me.KdSearchBox1._UseFIRMA = ""
- Me.KdSearchBox1._ValueKdAndName = True
- Me.KdSearchBox1.dgvpos = "LEFT"
- Me.KdSearchBox1.KdName = Nothing
- Me.KdSearchBox1.KdNr = "-1"
- Me.KdSearchBox1.kdNrField = Nothing
- Me.KdSearchBox1.KdNrNullInt = Nothing
- Me.KdSearchBox1.Location = New System.Drawing.Point(298, 10)
- Me.KdSearchBox1.Name = "KdSearchBox1"
- Me.KdSearchBox1.nurAktive = True
- Me.KdSearchBox1.searchActive = True
- Me.KdSearchBox1.Size = New System.Drawing.Size(171, 20)
- Me.KdSearchBox1.TabIndex = 22
- Me.KdSearchBox1.TIMER_SEARCH = True
- Me.KdSearchBox1.usrcntl = Nothing
- '
- 'cboAntragArt
- '
- Me.cboAntragArt._allowedValuesFreiText = Nothing
- Me.cboAntragArt._allowFreiText = False
- Me.cboAntragArt._value = ""
- Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
- Me.cboAntragArt.FormattingEnabled = True
- Me.cboAntragArt.Location = New System.Drawing.Point(83, 10)
- Me.cboAntragArt.Name = "cboAntragArt"
- Me.cboAntragArt.Size = New System.Drawing.Size(191, 28)
- Me.cboAntragArt.TabIndex = 21
- Me.cboAntragArt.Text = "USTV-Antrag"
- '
- 'cbxLand
- '
- Me.cbxLand._allowedValuesFreiText = Nothing
- Me.cbxLand._allowFreiText = False
- Me.cbxLand._value = ""
- Me.cbxLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
- Me.cbxLand.FormattingEnabled = True
- Me.cbxLand.Location = New System.Drawing.Point(0, 0)
- Me.cbxLand.Name = "cbxLand"
- Me.cbxLand.Size = New System.Drawing.Size(65, 28)
- Me.cbxLand.TabIndex = 23
- Me.cbxLand.Text = "USTV-Antrag"
- Me.cbxLand.Visible = False
- '
- 'txtVZam
- '
- Me.txtVZam._DateTimeOnly = False
- Me.txtVZam._numbersOnly = False
- Me.txtVZam._numbersOnlyKommastellen = ""
- Me.txtVZam._numbersOnlyTrennzeichen = False
- Me.txtVZam._Prozent = False
- Me.txtVZam._ShortDateNew = False
- Me.txtVZam._ShortDateOnly = True
- Me.txtVZam._TimeOnly = False
- Me.txtVZam._TimeOnly_Seconds = False
- Me.txtVZam._value = ""
- Me.txtVZam._Waehrung = False
- Me.txtVZam._WaehrungZeichen = False
- Me.txtVZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtVZam.ForeColor = System.Drawing.Color.Black
- Me.txtVZam.Location = New System.Drawing.Point(865, 60)
- Me.txtVZam.MaxLength = 10
- Me.txtVZam.MaxLineLength = -1
- Me.txtVZam.MaxLines_Warning = ""
- Me.txtVZam.MaxLines_Warning_Label = Nothing
- Me.txtVZam.Name = "txtVZam"
- Me.txtVZam.Size = New System.Drawing.Size(100, 23)
- Me.txtVZam.TabIndex = 52
- '
- 'txtEingereichtAm
- '
- Me.txtEingereichtAm._DateTimeOnly = False
- Me.txtEingereichtAm._numbersOnly = False
- Me.txtEingereichtAm._numbersOnlyKommastellen = ""
- Me.txtEingereichtAm._numbersOnlyTrennzeichen = False
- Me.txtEingereichtAm._Prozent = False
- Me.txtEingereichtAm._ShortDateNew = False
- Me.txtEingereichtAm._ShortDateOnly = True
- Me.txtEingereichtAm._TimeOnly = False
- Me.txtEingereichtAm._TimeOnly_Seconds = False
- Me.txtEingereichtAm._value = ""
- Me.txtEingereichtAm._Waehrung = False
- Me.txtEingereichtAm._WaehrungZeichen = False
- Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black
- Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60)
- Me.txtEingereichtAm.MaxLength = 10
- Me.txtEingereichtAm.MaxLineLength = -1
- Me.txtEingereichtAm.MaxLines_Warning = ""
- Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing
- Me.txtEingereichtAm.Name = "txtEingereichtAm"
- Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23)
- Me.txtEingereichtAm.TabIndex = 26
- '
- 'txtGueltig
- '
- Me.txtGueltig._DateTimeOnly = False
- Me.txtGueltig._numbersOnly = False
- Me.txtGueltig._numbersOnlyKommastellen = ""
- Me.txtGueltig._numbersOnlyTrennzeichen = False
- Me.txtGueltig._Prozent = False
- Me.txtGueltig._ShortDateNew = False
- Me.txtGueltig._ShortDateOnly = True
- Me.txtGueltig._TimeOnly = False
- Me.txtGueltig._TimeOnly_Seconds = False
- Me.txtGueltig._value = ""
- Me.txtGueltig._Waehrung = False
- Me.txtGueltig._WaehrungZeichen = False
- Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtGueltig.ForeColor = System.Drawing.Color.Black
- Me.txtGueltig.Location = New System.Drawing.Point(101, 61)
- Me.txtGueltig.MaxLength = 10
- Me.txtGueltig.MaxLineLength = -1
- Me.txtGueltig.MaxLines_Warning = ""
- Me.txtGueltig.MaxLines_Warning_Label = Nothing
- Me.txtGueltig.Name = "txtGueltig"
- Me.txtGueltig.Size = New System.Drawing.Size(100, 23)
- Me.txtGueltig.TabIndex = 23
- '
- 'txtStNr
- '
- Me.txtStNr._DateTimeOnly = False
- Me.txtStNr._numbersOnly = False
- Me.txtStNr._numbersOnlyKommastellen = ""
- Me.txtStNr._numbersOnlyTrennzeichen = False
- Me.txtStNr._Prozent = False
- Me.txtStNr._ShortDateNew = False
- Me.txtStNr._ShortDateOnly = False
- Me.txtStNr._TimeOnly = False
- Me.txtStNr._TimeOnly_Seconds = False
- Me.txtStNr._value = ""
- Me.txtStNr._Waehrung = False
- Me.txtStNr._WaehrungZeichen = False
- Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtStNr.ForeColor = System.Drawing.Color.Black
- Me.txtStNr.Location = New System.Drawing.Point(101, 36)
- Me.txtStNr.MaxLength = 20
- Me.txtStNr.MaxLineLength = -1
- Me.txtStNr.MaxLines_Warning = ""
- Me.txtStNr.MaxLines_Warning_Label = Nothing
- Me.txtStNr.Name = "txtStNr"
- Me.txtStNr.Size = New System.Drawing.Size(136, 23)
- Me.txtStNr.TabIndex = 22
- '
- 'txtVZ
- '
- Me.txtVZ._DateTimeOnly = False
- Me.txtVZ._numbersOnly = True
- Me.txtVZ._numbersOnlyKommastellen = ""
- Me.txtVZ._numbersOnlyTrennzeichen = True
- Me.txtVZ._Prozent = False
- Me.txtVZ._ShortDateNew = False
- Me.txtVZ._ShortDateOnly = False
- Me.txtVZ._TimeOnly = False
- Me.txtVZ._TimeOnly_Seconds = False
- Me.txtVZ._value = ""
- Me.txtVZ._Waehrung = True
- Me.txtVZ._WaehrungZeichen = True
- Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtVZ.ForeColor = System.Drawing.Color.Black
- Me.txtVZ.Location = New System.Drawing.Point(865, 31)
- Me.txtVZ.MaxLength = 10
- Me.txtVZ.MaxLineLength = -1
- Me.txtVZ.MaxLines_Warning = ""
- Me.txtVZ.MaxLines_Warning_Label = Nothing
- Me.txtVZ.Name = "txtVZ"
- Me.txtVZ.Size = New System.Drawing.Size(100, 23)
- Me.txtVZ.TabIndex = 20
- '
- 'txtAbfNr
- '
- Me.txtAbfNr._DateTimeOnly = False
- Me.txtAbfNr._numbersOnly = True
- Me.txtAbfNr._numbersOnlyKommastellen = ""
- Me.txtAbfNr._numbersOnlyTrennzeichen = False
- Me.txtAbfNr._Prozent = False
- Me.txtAbfNr._ShortDateNew = False
- Me.txtAbfNr._ShortDateOnly = False
- Me.txtAbfNr._TimeOnly = False
- Me.txtAbfNr._TimeOnly_Seconds = False
- Me.txtAbfNr._value = ""
- Me.txtAbfNr._Waehrung = False
- Me.txtAbfNr._WaehrungZeichen = False
- Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtAbfNr.ForeColor = System.Drawing.Color.Red
- Me.txtAbfNr.Location = New System.Drawing.Point(654, 33)
- Me.txtAbfNr.MaxLength = 10
- Me.txtAbfNr.MaxLineLength = -1
- Me.txtAbfNr.MaxLines_Warning = ""
- Me.txtAbfNr.MaxLines_Warning_Label = Nothing
- Me.txtAbfNr.Name = "txtAbfNr"
- Me.txtAbfNr.Size = New System.Drawing.Size(117, 23)
- Me.txtAbfNr.TabIndex = 18
- '
- 'cbxFiliale
- '
- Me.cbxFiliale._allowedValuesFreiText = Nothing
- Me.cbxFiliale._allowFreiText = False
- Me.cbxFiliale._value = ""
- Me.cbxFiliale.DropDownWidth = 150
- Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.cbxFiliale.FormattingEnabled = True
- Me.cbxFiliale.Location = New System.Drawing.Point(413, 32)
- Me.cbxFiliale.Name = "cbxFiliale"
- Me.cbxFiliale.Size = New System.Drawing.Size(105, 24)
- Me.cbxFiliale.TabIndex = 16
- '
- 'txtBezugsNr
- '
- Me.txtBezugsNr._DateTimeOnly = False
- Me.txtBezugsNr._numbersOnly = True
- Me.txtBezugsNr._numbersOnlyKommastellen = ""
- Me.txtBezugsNr._numbersOnlyTrennzeichen = False
- Me.txtBezugsNr._Prozent = False
- Me.txtBezugsNr._ShortDateNew = False
- Me.txtBezugsNr._ShortDateOnly = False
- Me.txtBezugsNr._TimeOnly = False
- Me.txtBezugsNr._TimeOnly_Seconds = False
- Me.txtBezugsNr._value = ""
- Me.txtBezugsNr._Waehrung = False
- Me.txtBezugsNr._WaehrungZeichen = False
- Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtBezugsNr.ForeColor = System.Drawing.Color.Red
- Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4)
- Me.txtBezugsNr.MaxLength = 10
- Me.txtBezugsNr.MaxLineLength = -1
- Me.txtBezugsNr.MaxLines_Warning = ""
- Me.txtBezugsNr.MaxLines_Warning_Label = Nothing
- Me.txtBezugsNr.Name = "txtBezugsNr"
- Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23)
- Me.txtBezugsNr.TabIndex = 14
- '
- 'cbxWahrung
- '
- Me.cbxWahrung._allowedValuesFreiText = Nothing
- Me.cbxWahrung._allowFreiText = False
- Me.cbxWahrung._value = ""
- Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.cbxWahrung.FormattingEnabled = True
- Me.cbxWahrung.Location = New System.Drawing.Point(431, 4)
- Me.cbxWahrung.Name = "cbxWahrung"
- Me.cbxWahrung.Size = New System.Drawing.Size(87, 24)
- Me.cbxWahrung.TabIndex = 12
- '
- 'txt3470
- '
- Me.txt3470._DateTimeOnly = False
- Me.txt3470._numbersOnly = True
- Me.txt3470._numbersOnlyKommastellen = ""
- Me.txt3470._numbersOnlyTrennzeichen = True
- Me.txt3470._Prozent = False
- Me.txt3470._ShortDateNew = False
- Me.txt3470._ShortDateOnly = False
- Me.txt3470._TimeOnly = False
- Me.txt3470._TimeOnly_Seconds = False
- Me.txt3470._value = ""
- Me.txt3470._Waehrung = True
- Me.txt3470._WaehrungZeichen = True
- Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txt3470.ForeColor = System.Drawing.Color.Black
- Me.txt3470.Location = New System.Drawing.Point(865, 2)
- Me.txt3470.MaxLength = 10
- Me.txt3470.MaxLineLength = -1
- Me.txt3470.MaxLines_Warning = ""
- Me.txt3470.MaxLines_Warning_Label = Nothing
- Me.txt3470.Name = "txt3470"
- Me.txt3470.Size = New System.Drawing.Size(100, 23)
- Me.txt3470.TabIndex = 10
- '
- 'txtVon
- '
- Me.txtVon._DateTimeOnly = False
- Me.txtVon._numbersOnly = False
- Me.txtVon._numbersOnlyKommastellen = ""
- Me.txtVon._numbersOnlyTrennzeichen = False
- Me.txtVon._Prozent = False
- Me.txtVon._ShortDateNew = True
- Me.txtVon._ShortDateOnly = False
- Me.txtVon._TimeOnly = False
- Me.txtVon._TimeOnly_Seconds = False
- Me.txtVon._value = ""
- Me.txtVon._Waehrung = False
- Me.txtVon._WaehrungZeichen = False
- Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtVon.ForeColor = System.Drawing.Color.Black
- Me.txtVon.Location = New System.Drawing.Point(101, 9)
- Me.txtVon.MaxLength = 10
- Me.txtVon.MaxLineLength = -1
- Me.txtVon.MaxLines_Warning = ""
- Me.txtVon.MaxLines_Warning_Label = Nothing
- Me.txtVon.Name = "txtVon"
- Me.txtVon.Size = New System.Drawing.Size(100, 23)
- Me.txtVon.TabIndex = 6
- '
- 'txtBis
- '
- Me.txtBis._DateTimeOnly = False
- Me.txtBis._numbersOnly = False
- Me.txtBis._numbersOnlyKommastellen = ""
- Me.txtBis._numbersOnlyTrennzeichen = False
- Me.txtBis._Prozent = False
- Me.txtBis._ShortDateNew = True
- Me.txtBis._ShortDateOnly = False
- Me.txtBis._TimeOnly = False
- Me.txtBis._TimeOnly_Seconds = False
- Me.txtBis._value = ""
- Me.txtBis._Waehrung = False
- Me.txtBis._WaehrungZeichen = False
- Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
- Me.txtBis.ForeColor = System.Drawing.Color.Black
- Me.txtBis.Location = New System.Drawing.Point(227, 9)
- Me.txtBis.MaxLength = 10
- Me.txtBis.MaxLineLength = -1
- Me.txtBis.MaxLines_Warning = ""
- Me.txtBis.MaxLines_Warning_Label = Nothing
- Me.txtBis.Name = "txtBis"
- Me.txtBis.Size = New System.Drawing.Size(100, 23)
- Me.txtBis.TabIndex = 8
- '
- 'cboStatus
- '
- Me.cboStatus._allowedValuesFreiText = Nothing
- Me.cboStatus._allowFreiText = False
- Me.cboStatus._value = ""
- Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
- Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
- Me.cboStatus.FormattingEnabled = True
- Me.cboStatus.Location = New System.Drawing.Point(76, 16)
- Me.cboStatus.Name = "cboStatus"
- Me.cboStatus.Size = New System.Drawing.Size(394, 28)
- Me.cboStatus.TabIndex = 1
- '
- 'dgvUSTVPositionen
- '
- Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500
- Me.dgvUSTVPositionen.AllowUserToAddRows = False
- Me.dgvUSTVPositionen.AllowUserToDeleteRows = False
- DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
- Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White
- Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3)
- Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen"
- Me.dgvUSTVPositionen.ReadOnly = True
- Me.dgvUSTVPositionen.RowHeadersVisible = False
- Me.dgvUSTVPositionen.RowHeadersWidth = 62
- Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169)
- Me.dgvUSTVPositionen.TabIndex = 0
+ Me.cnS_KIUPLOAD.Name = "ContextMenuStrip1"
+ Me.cnS_KIUPLOAD.Size = New System.Drawing.Size(61, 4)
'
'UstCntlUSTV_AntragPosition1
'
@@ -1483,27 +1574,6 @@ Partial Class frmMDM_USTVAntrag
Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261)
Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
'
- 'dgvErstattungspositionen
- '
- Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500
- Me.dgvErstattungspositionen.AllowUserToAddRows = False
- Me.dgvErstattungspositionen.AllowUserToDeleteRows = False
- DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
- Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White
- Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3)
- Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen"
- Me.dgvErstattungspositionen.ReadOnly = True
- Me.dgvErstattungspositionen.RowHeadersVisible = False
- Me.dgvErstattungspositionen.RowHeadersWidth = 62
- Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172)
- Me.dgvErstattungspositionen.TabIndex = 1
- '
'UstCntlUSTV_AntragErstattungen1
'
Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
@@ -1512,30 +1582,18 @@ Partial Class frmMDM_USTVAntrag
Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259)
Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
'
- 'txtSumme
+ 'cbxKIUploaddelete
'
- Me.txtSumme._DateTimeOnly = False
- Me.txtSumme._numbersOnly = False
- Me.txtSumme._numbersOnlyKommastellen = ""
- Me.txtSumme._numbersOnlyTrennzeichen = False
- Me.txtSumme._Prozent = False
- Me.txtSumme._ShortDateNew = False
- Me.txtSumme._ShortDateOnly = False
- Me.txtSumme._TimeOnly = False
- Me.txtSumme._TimeOnly_Seconds = False
- Me.txtSumme._value = ""
- Me.txtSumme._Waehrung = True
- Me.txtSumme._WaehrungZeichen = True
- Me.txtSumme.ForeColor = System.Drawing.Color.Black
- Me.txtSumme.Location = New System.Drawing.Point(1158, 67)
- Me.txtSumme.MaxLineLength = -1
- Me.txtSumme.MaxLines_Warning = ""
- Me.txtSumme.MaxLines_Warning_Label = Nothing
- Me.txtSumme.Name = "txtSumme"
- Me.txtSumme.ReadOnly = True
- Me.txtSumme.Size = New System.Drawing.Size(88, 20)
- Me.txtSumme.TabIndex = 49
- Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+ Me.cbxKIUploaddelete.AutoSize = True
+ Me.cbxKIUploaddelete.Checked = True
+ Me.cbxKIUploaddelete.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbxKIUploaddelete.ForeColor = System.Drawing.Color.Black
+ Me.cbxKIUploaddelete.Location = New System.Drawing.Point(6, 231)
+ Me.cbxKIUploaddelete.Name = "cbxKIUploaddelete"
+ Me.cbxKIUploaddelete.Size = New System.Drawing.Size(149, 17)
+ Me.cbxKIUploaddelete.TabIndex = 51
+ Me.cbxKIUploaddelete.Text = "PDF nach KI-Upl. löschen"
+ Me.cbxKIUploaddelete.UseVisualStyleBackColor = True
'
'frmMDM_USTVAntrag
'
@@ -1568,15 +1626,16 @@ Partial Class frmMDM_USTVAntrag
Me.pnlBody.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False)
+ CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlAntragsPosDetails.ResumeLayout(False)
Me.Panel2.ResumeLayout(False)
Me.Panel4.ResumeLayout(False)
+ Me.Panel4.PerformLayout()
Me.TabPage2.ResumeLayout(False)
Me.Panel3.ResumeLayout(False)
+ CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlErstattungsdetails.ResumeLayout(False)
Me.Panel1.ResumeLayout(False)
- CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -1675,4 +1734,8 @@ Partial Class frmMDM_USTVAntrag
Friend WithEvents Label15 As Label
Friend WithEvents txtVZam As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Button5 As Button
+ Friend WithEvents btnPDFauslesen As Button
+ Friend WithEvents scanUSTVA As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
+ Friend WithEvents cnS_KIUPLOAD As ContextMenuStrip
+ Friend WithEvents cbxKIUploaddelete As CheckBox
End Class
diff --git a/SDL/USTV/frmMDM_USTVAntrag.resx b/SDL/USTV/frmMDM_USTVAntrag.resx
index 1b6ea673..3b80769c 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.resx
+++ b/SDL/USTV/frmMDM_USTVAntrag.resx
@@ -123,6 +123,9 @@
174, 17
+
+ 330, 17
+
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 550bc040..2c94eae4 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1,9 +1,7 @@
Imports System.IO
Imports System.Reflection
Imports System.Windows.Documents
-Imports com
Imports itextsharp.text.pdf
-Imports itextsharp.text.pdf.parser
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
@@ -578,8 +576,7 @@ Public Class frmMDM_USTVAntrag
setinfofields()
If VERAG_PROG_ALLGEMEIN.cAllgemein.AUTO_ABF_NR Then btnAbfertigungsNrVergeben.Visible = True
-
-
+ initScanUSTVA()
End Sub
@@ -697,7 +694,7 @@ Public Class frmMDM_USTVAntrag
Return False
End Function
- Shared Function loadUSTVFrom_PLOSE(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien, MWSTSummenAusBeleg) As Boolean
+ Shared Function loadUSTVFrom_PLOSE(UStVAn_ID As Integer, Antrag_LandKz As String, ArchivierteEintracheNochmalsEinarbetien As Boolean, MWSTSummenAusBeleg As Boolean) As Boolean
Try
Dim bytSchnittstellenNr = IIf(MWSTSummenAusBeleg, 11, 6)
Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
@@ -850,7 +847,7 @@ Public Class frmMDM_USTVAntrag
End Function
- Shared Function loadUSTVFrom_VERAG(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
+ Shared Function loadUSTVFrom_VERAG(UStVAn_ID As Integer, Antrag_LandKz As String, ArchivierteEintracheNochmalsEinarbetien As Boolean) As Boolean
Try
If Antrag_LandKz <> "AT" Then
@@ -966,7 +963,7 @@ Public Class frmMDM_USTVAntrag
End Function
- Shared Function loadUSTVFrom_RMC(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
+ Shared Function loadUSTVFrom_RMC(UStVAn_ID As Integer, Antrag_LandKz As String, ArchivierteEintracheNochmalsEinarbetien As Boolean) As Boolean
Try
Dim bytSchnittstellenNr = 7
@@ -1047,7 +1044,7 @@ Public Class frmMDM_USTVAntrag
End Try
End Function
- Shared Function loadUSTVFrom_MSE(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
+ Shared Function loadUSTVFrom_MSE(UStVAn_ID As Integer, Antrag_LandKz As String, ArchivierteEintracheNochmalsEinarbetien As Boolean) As Boolean
Try
Dim bytSchnittstellenNr = 9 'damit von alter Schnittstelle und neue Schnittstelle keine Daten doppelt importiert werden
Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
@@ -1124,7 +1121,7 @@ Public Class frmMDM_USTVAntrag
End Try
End Function
- Shared Function loadUSTVFrom_UTA(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
+ Shared Function loadUSTVFrom_UTA(UStVAn_ID As Integer, Antrag_LandKz As String, ArchivierteEintracheNochmalsEinarbetien As Boolean) As Boolean
Try
Dim bytSchnittstellenNr = 10 'damit von alter Schnittstelle und neue Schnittstelle keine Daten doppelt importiert werden
Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
@@ -1179,7 +1176,6 @@ Public Class frmMDM_USTVAntrag
If (UST_org <> 0 AndAlso UST_org <> UST_EUR) Then
-
umrechKurs = Math.Floor((UST_org / UST_EUR * 100 + 0.5)) / 100
End If
@@ -1207,7 +1203,7 @@ Public Class frmMDM_USTVAntrag
End Try
End Function
- Shared Function loadUSTVFrom_IDS(UStVAn_ID, Antrag_LandKz, ArchivierteEintracheNochmalsEinarbetien) As Boolean
+ Shared Function loadUSTVFrom_IDS(UStVAn_ID As Integer, Antrag_LandKz As String, ArchivierteEintracheNochmalsEinarbetien As Boolean) As Boolean
Try
'Dim bytSchnittstellenNr = 8 'damit von alter Schnittstelle und neue Schnittstelle keine Daten doppelt importiert werden
Dim bytSchnittstellenNr = 12
@@ -1322,6 +1318,216 @@ Public Class frmMDM_USTVAntrag
End Function
+ Shared Function loadUSTVFrom_ATEZ_KI(UStVAn_ID As Integer, Antrag_LandKz As String, atez_api As cATEZ_NCTS_IN, daid As Integer, pageCount As Integer, documentType As String, deleteOrigPDF As Boolean) As Boolean
+ Try
+
+ Dim bytSchnittstellenNr = -1
+
+ Dim USTV_ANTRAG As New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID)
+
+
+ Dim dt As New DataTable
+
+ If dt IsNot Nothing And Not dt.Columns.Contains("currency") Then
+
+ dt.Columns.Add("count", GetType(Integer))
+ dt.Columns.Add("currency", GetType(String))
+ dt.Columns.Add("seller_VAT_id", GetType(String))
+ dt.Columns.Add("seller_address_city", GetType(String))
+ dt.Columns.Add("seller_address_country", GetType(String))
+ dt.Columns.Add("seller_address_postcode", GetType(String))
+ dt.Columns.Add("seller_address_street", GetType(String))
+ dt.Columns.Add("seller_name", GetType(String))
+ dt.Columns.Add("total_VAT_amount", GetType(Double))
+ dt.Columns.Add("invoice_id", GetType(String))
+ dt.Columns.Add("invoice_date", GetType(String))
+ dt.Columns.Add("status", GetType(String))
+ dt.Columns.Add("document_count", GetType(Integer))
+ End If
+
+ Dim failreDesc As String
+ Dim authResp = atez_api.authenticate("VAT", "client1", "password")
+ Dim resp
+ If authResp <> "200" Then
+ MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
+ Return False
+ Else
+ 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
+
+
+ If atez_api.setJsonVAT(documentType, daid) Then
+
+ resp = atez_api.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt)
+
+
+ If dt.Rows.Count > 0 Then
+
+
+ Dim f As New frmVAT_ATEZ()
+ f.usrcntlVAT_ATEZ1.initDGV(dt)
+ If f.ShowDialog = DialogResult.OK Then
+
+
+ Dim DS_ORIG_alreadyDeleted = Not deleteOrigPDF 'ist wirklich so richtig!
+ Dim DS_ORIG As New cDATENSERVER(daid)
+ Dim fi_orig As New FileInfo(DS_ORIG.GET_TOP1_PATH())
+
+ For Each r As DataGridViewRow In f.usrcntlVAT_ATEZ1.dgvVAT.SelectedRows
+
+ Dim sql As New SQL
+ 'Dim kdnr = r.Cells("Kundennummer").Value
+
+ Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen
+
+
+ Dim reDat As Date = IIf(Not IsDBNull(r.Cells("invoice_date").Value) AndAlso IsDate(r.Cells("invoice_date").Value), r.Cells("invoice_date").Value, Nothing)
+
+ USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID]
+ USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr
+ USTV_POS.UStVPo_ReDat = reDat.ToShortDateString
+ USTV_POS.UStVPo_ReNr = r.Cells("invoice_id").Value.ToString
+ USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
+
+ USTV_POS.UStVPo_Leistungsbezeichnung = "Maut/Diesel"
+ USTV_POS.UStVPo_Schnittstelle = True
+
+
+
+
+
+ If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
+
+
+
+ If pageCount = r.Cells("document_count").Value Then
+ USTV_POS.UStVPo_daId_loeschbar = True
+
+ Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("yyyyMMdd"), fi_orig.Name, USTV_ANTRAG.UStVAn_KuNr, False)
+ If Not DS_NEW.uploadDataToDATENSERVER(fi_orig.FullName) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
+ If DS_NEW.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
+ USTV_POS.UStVPo_daId = DS_NEW.da_id
+
+ 'gesamtePDF wird gespeichert, alte DS kann gelscht werden:
+ If DS_ORIG.DELETE_COMPLETE() Then DS_ORIG_alreadyDeleted = True
+
+ Else
+ USTV_POS.UStVPo_daId_loeschbar = True
+
+ 'todo: Logik Aufsplittung des PDF in Teilpdfs
+ Dim pagestart = 0
+ For Each pages As DataRow In dt.Rows
+ pagestart += CInt(pages.Item("document_count"))
+ If pages.Item("count") = r.Cells("count").Value Then Exit For
+ Next
+
+
+
+ Dim TMP_Path_Old = fi_orig.FullName
+ Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fi_orig.Name, fi_orig.Extension,, True, "USTVA_POS")
+
+ VERAG_PROG_ALLGEMEIN.cAllgemein.ExtractPdfPages(TMP_Path_Old, TMP_Path_New, pagestart, r.Cells("document_count").Value)
+
+
+ Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("yyyyMMdd"), fi_orig.Name, USTV_ANTRAG.UStVAn_KuNr, False)
+ If Not DS_NEW.uploadDataToDATENSERVER(TMP_Path_New) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
+ If DS_NEW.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
+
+ USTV_POS.UStVPo_daId = DS_NEW.da_id
+
+
+ End If
+
+
+
+
+
+
+ Dim leistenderName As String = r.Cells("seller_name").Value
+ Dim leistenderUID As String = r.Cells("seller_VAT_id").Value
+ Dim leistender As New cUStVLeistender(leistenderUID, True)
+
+ If leistender.UStV_LeistenderId < 1 Then
+ leistender = New cUStVLeistender(leistenderName & " " & Antrag_LandKz, Antrag_LandKz)
+ End If
+ If leistender.UStV_LeistenderId < 1 Then
+ leistender = New cUStVLeistender(leistenderName)
+ End If
+
+ USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
+ USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+ USTV_POS.UStVPo_Zeitstempel = Now()
+
+ '1. Antragswährung = Belegswährung (EUR zu FREMD und FREMD zu EUR)
+ If r.Cells("currency").Value = USTV_ANTRAG.UStVAn_Währungscode Then
+ Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode)
+ If USTV_ANTRAG.UStVAn_Währungscode = "EUR" Then
+ USTV_POS.UStVPo_USteuerbetragEUR = r.Cells("total_VAT_amount").Value
+ If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then
+ USTV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
+ USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ Else
+ USTV_POS.UStVPo_USteuerbetrag = r.Cells("total_VAT_amount").Value
+ USTV_POS.UStVPo_Umrechnungskurs = 1
+ End If
+
+ Else
+
+ USTV_POS.UStVPo_USteuerbetrag = r.Cells("total_VAT_amount").Value
+ USTV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(r.Cells("total_VAT_amount").Value, r.Cells("currency").Value, CDate(USTV_POS.UStVPo_ReDat)), 2)
+ USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ End If
+ Else
+ '2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR)
+ If USTV_ANTRAG.UStVAn_Währungscode = "EUR" Then
+ Dim kurs As New cEZB_Waehrungskurse(r.Cells("currency").Value)
+ If r.Cells("currency").Value <> "EUR" Then
+ USTV_POS.UStVPo_USteuerbetrag = r.Cells("total_VAT_amount").Value
+ USTV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, r.Cells("currency").Value, CDate(USTV_POS.UStVPo_ReDat)), 2)
+ USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+ ElseIf r.Cells("currency").Value = "EUR" Then
+ USTV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
+ USTV_POS.UStVPo_USteuerbetragEUR = USTV_POS.UStVPo_USteuerbetrag
+ USTV_POS.UStVPo_Umrechnungskurs = 1
+ End If
+ Else
+ '2.1 Antragswährung <> Belegswährung (FREMD zu FREMD)
+
+ USTV_POS.UStVPo_USteuerbetrag = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(r.Cells("total_VAT_amount").Value, r.Cells("currency").Value, USTV_ANTRAG.UStVAn_Währungscode)
+ Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode)
+ USTV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(r.Cells("total_VAT_amount").Value, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
+ USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+
+ End If
+
+ End If
+
+ USTV_POS.INSERT()
+
+ End If
+
+
+ Next
+
+ If Not DS_ORIG_alreadyDeleted Then
+ DS_ORIG.DELETE_COMPLETE()
+
+ End If
+
+
+ End If
+ Else
+ MsgBox(resp)
+ End If
+ End If
+ End If
+ Return True
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ Return False
+ End Try
+ End Function
+
+
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
If UStVAn_ID > 0 Then
@@ -1701,17 +1907,18 @@ Public Class frmMDM_USTVAntrag
End If
+ Dim Leistungsbezeichnung = ""
+ If UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value = 3 Then Leistungsbezeichnung = UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_Leistungsbezeichnung
- If setArchiv(UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_Leistungsbezeichnung) Then
- If UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) Then
- reorderUSTVAPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID)
- End If
- init()
+ If setArchiv(UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr, Leistungsbezeichnung) Then
+ If UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) Then
+ reorderUSTVAPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID)
End If
-
+ init()
End If
+ End If
- UstCntlUSTV_AntragPosition1.Enabled = False
+ UstCntlUSTV_AntragPosition1.Enabled = False
End If
End Sub
@@ -2627,31 +2834,32 @@ Public Class frmMDM_USTVAntrag
End If
+ Dim Leistungsbezeichnung = ""
+ If r.Cells("UStVPo_SchnittstellenNr").Value = 3 Then Leistungsbezeichnung = r.Cells("UStVPo_Leistungsbezeichnung").Value
- If setArchiv(r.Cells("UStVPo_SchnittstellenNr").Value, r.Cells("UStVPo_ReDat").Value, r.Cells("UStVPo_ReNr").Value, r.Cells("UStVPo_Leistungsbezeichnung").Value) Then
- Dim sqlstr = " DELETE FROM tblUStVPositionen WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & r.Cells("UStVPo_ID").Value
- If Not SQL.doSQL(sqlstr, "FMZOLL") Then
- Exit Sub
- End If
-
+ If setArchiv(r.Cells("UStVPo_SchnittstellenNr").Value, r.Cells("UStVPo_ReDat").Value, r.Cells("UStVPo_ReNr").Value, Leistungsbezeichnung) Then
+ Dim sqlstr = " DELETE FROM tblUStVPositionen WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & r.Cells("UStVPo_ID").Value
+ If Not SQL.doSQL(sqlstr, "FMZOLL") Then
+ Exit Sub
End If
End If
- Next
- reorderUSTVAPositions(Me.UStVAn_ID)
- init()
- UstCntlUSTV_AntragPosition1.Enabled = False
- End If
- End If
- e.Handled = True
+ End If
+
+ Next
+ reorderUSTVAPositions(Me.UStVAn_ID)
+ init()
+ UstCntlUSTV_AntragPosition1.Enabled = False
+ End If
+ End If
+ e.Handled = True
End If
End Sub
Private Sub txtAbfNr_TextChanged(sender As Object, e As EventArgs) Handles txtAbfNr.TextChanged
-
If IsNumeric(txtAbfNr.Text) AndAlso CInt(txtAbfNr.Text) > 10000 AndAlso USTV_ANTRAG.AbfertigungsNr <> txtAbfNr.Text AndAlso (Not btnAbfertigungsNrVergeben.Visible) Then
Dim spedBuch As New cSpeditionsbuch(USTV_ANTRAG.FilialenNr, txtAbfNr.Text, 0)
If spedBuch.hasEntry Then
@@ -2735,6 +2943,92 @@ Public Class frmMDM_USTVAntrag
End If
+ End Sub
+
+ Private Sub scanUSTVA_FileAdded(id As String, path As String, name As String) Handles scanUSTVA.FileAdded
+ btnPDFauslesen.Enabled = scanUSTVA.getDS.da_id > 0
+ cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
+
+ End Sub
+
+ Private Sub scanUSTVA_FileDeleted() Handles scanUSTVA.FileDeleted
+ btnPDFauslesen.Enabled = False
+ cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
+
+ End Sub
+
+ Private Sub mnuItemKIUPLOAD_Clicked(sender As Object, e As EventArgs)
+
+ cnS_KIUPLOAD.Hide()
+ Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+ If item IsNot Nothing Then
+
+ Dim daid As Integer = scanUSTVA.getDS().da_id
+
+ If daid > 0 Then
+
+ Dim DS As New cDATENSERVER(daid)
+
+ If DS.GET_TOP1_PATH <> "" Then
+
+ Dim pdfR As New PdfReader(DS.GET_TOP1_PATH)
+
+
+ If atez_api IsNot Nothing Then
+
+
+
+ If vbYes = MsgBox("Möchten Sie die Rechnungsdaten der " & item.Text & " per ATEZ-API auslesen lassen?", vbYesNoCancel) Then
+
+ 'document_type = vat_invoice or receipt
+ loadUSTVFrom_ATEZ_KI(UStVAn_ID, Antrag_LandKz, atez_api, scanUSTVA.getDS().da_id, pdfR.NumberOfPages, item.Name, cbxKIUploaddelete.Checked)
+
+ initScanUSTVA()
+
+ End If
+
+ Else
+ If cbxKIUploaddelete.Checked Then
+ DS.DELETE_COMPLETE()
+ initScanUSTVA()
+
+ End If
+
+ End If
+ init()
+ End If
+
+ End If
+
+ End If
+
+
+
+
+ End Sub
+
+ Private Sub btnPDFauslesen_Click(sender As Object, e As EventArgs) Handles btnPDFauslesen.Click
+
+ 'document_type = vat_invoice or receipt
+
+ If Not cnS_KIUPLOAD.Items.ContainsKey("vat_invoice") Then
+ Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "vat_invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ cnS_KIUPLOAD.Items.Add(vat)
+ AddHandler vat.Click, AddressOf mnuItemKIUPLOAD_Clicked
+ End If
+
+
+ If Not cnS_KIUPLOAD.Items.ContainsKey("receipt") Then
+ Dim receipt = New ToolStripMenuItem() With {.Text = "Quittung(en)", .Name = "receipt", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ cnS_KIUPLOAD.Items.Add(receipt)
+ AddHandler receipt.Click, AddressOf mnuItemKIUPLOAD_Clicked
+
+ End If
+
+ cnS_KIUPLOAD.Show(Cursor.Position)
+
+
End Sub
Private Sub calcSumme()
@@ -2756,4 +3050,15 @@ Public Class frmMDM_USTVAntrag
+ Private Sub initScanUSTVA()
+
+ scanUSTVA.INIT(USTV_ANTRAG.UStVAn_KuNr, "MDM", "USTVA_KI_" & USTV_ANTRAG.UStVAn_ID)
+ btnPDFauslesen.Enabled = scanUSTVA.getDS().da_id > 0
+ cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
+
+
+ End Sub
+
+
+
End Class
\ No newline at end of file
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
index 7a4cc9b4..592b2352 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
@@ -24,9 +24,12 @@ Partial Class ustCntlUSTV_AntragPosition
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.tabDok = New System.Windows.Forms.TabPage()
+ Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.tbcntr = New System.Windows.Forms.TabControl()
Me.tabVollmachten = New System.Windows.Forms.TabPage()
+ Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.tabFABest = New System.Windows.Forms.TabPage()
+ Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.Label8 = New System.Windows.Forms.Label()
Me.Label7 = New System.Windows.Forms.Label()
Me.Panel2 = New System.Windows.Forms.Panel()
@@ -46,31 +49,21 @@ Partial Class ustCntlUSTV_AntragPosition
Me.lblAenderungsdatum = New System.Windows.Forms.Label()
Me.lblSachbearbeiter = New System.Windows.Forms.Label()
Me.pnl = New System.Windows.Forms.Panel()
+ Me.btnDel = New System.Windows.Forms.Button()
+ Me.cbxAntragsfilter = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
Me.lblWarning = New System.Windows.Forms.Label()
Me.btnLeistenderSave = New System.Windows.Forms.Button()
+ Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.pnlAdresse = New System.Windows.Forms.Panel()
+ Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label14 = New System.Windows.Forms.Label()
Me.Label17 = New System.Windows.Forms.Label()
Me.Label15 = New System.Windows.Forms.Label()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.Panel1 = New System.Windows.Forms.Panel()
- Me.btnAPIUbload = New System.Windows.Forms.Button()
- Me.Panel3 = New System.Windows.Forms.Panel()
- Me.Panel4 = New System.Windows.Forms.Panel()
- Me.TabControl1 = New System.Windows.Forms.TabControl()
- Me.TabPage1 = New System.Windows.Forms.TabPage()
- Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
- Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
- Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
- Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
- Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
- Me.cbxAntragsfilter = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components)
- Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox()
- Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cboSchnittstellennr = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtRgNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -81,6 +74,15 @@ Partial Class ustCntlUSTV_AntragPosition
Me.txtUSTBetragEUR = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.btnAPIUbload = New System.Windows.Forms.Button()
+ Me.Panel3 = New System.Windows.Forms.Panel()
+ Me.Panel4 = New System.Windows.Forms.Panel()
+ Me.TabControl1 = New System.Windows.Forms.TabControl()
+ Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+ Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
+ Me.cnS_KIUPLOAD = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.tabDok.SuspendLayout()
Me.tbcntr.SuspendLayout()
Me.tabVollmachten.SuspendLayout()
@@ -106,6 +108,27 @@ Partial Class ustCntlUSTV_AntragPosition
Me.tabDok.Text = "Rechnungen"
Me.tabDok.UseVisualStyleBackColor = True
'
+ 'scanSonstiges
+ '
+ Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanSonstiges._DATENSERVER_ORDNER = "MDM"
+ Me.scanSonstiges._DATENSERVER_UOrdner1 = ""
+ Me.scanSonstiges._DATENSERVER_UOrdner2 = ""
+ Me.scanSonstiges._DATENSERVER_UOrdner3 = ""
+ Me.scanSonstiges._OPEN_ORIGINAL = False
+ Me.scanSonstiges._TYPE = "PDF"
+ Me.scanSonstiges.AllowDrop = True
+ Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanSonstiges.BackColor = System.Drawing.Color.White
+ Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.scanSonstiges.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.scanSonstiges.Location = New System.Drawing.Point(3, 3)
+ Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
+ Me.scanSonstiges.Name = "scanSonstiges"
+ Me.scanSonstiges.Size = New System.Drawing.Size(250, 191)
+ Me.scanSonstiges.TabIndex = 0
+ '
'tbcntr
'
Me.tbcntr.Controls.Add(Me.tabDok)
@@ -129,6 +152,27 @@ Partial Class ustCntlUSTV_AntragPosition
Me.tabVollmachten.Text = "Vollmachten"
Me.tabVollmachten.UseVisualStyleBackColor = True
'
+ 'scanUSTVVollmachten
+ '
+ Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM"
+ Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = ""
+ Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = ""
+ Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
+ Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
+ Me.scanUSTVVollmachten._TYPE = "PDF"
+ Me.scanUSTVVollmachten.AllowDrop = True
+ Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
+ Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3)
+ Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0)
+ Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten"
+ Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 191)
+ Me.scanUSTVVollmachten.TabIndex = 1
+ '
'tabFABest
'
Me.tabFABest.Controls.Add(Me.scanUSTVFABest)
@@ -139,6 +183,27 @@ Partial Class ustCntlUSTV_AntragPosition
Me.tabFABest.Text = "FA_Bestätigung"
Me.tabFABest.UseVisualStyleBackColor = True
'
+ 'scanUSTVFABest
+ '
+ Me.scanUSTVFABest._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanUSTVFABest._DATENSERVER_ORDNER = "MDM"
+ Me.scanUSTVFABest._DATENSERVER_UOrdner1 = ""
+ Me.scanUSTVFABest._DATENSERVER_UOrdner2 = ""
+ Me.scanUSTVFABest._DATENSERVER_UOrdner3 = ""
+ Me.scanUSTVFABest._OPEN_ORIGINAL = False
+ Me.scanUSTVFABest._TYPE = "PDF"
+ Me.scanUSTVFABest.AllowDrop = True
+ Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanUSTVFABest.BackColor = System.Drawing.Color.White
+ Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanUSTVFABest.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.scanUSTVFABest.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.scanUSTVFABest.Location = New System.Drawing.Point(0, 0)
+ Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0)
+ Me.scanUSTVFABest.Name = "scanUSTVFABest"
+ Me.scanUSTVFABest.Size = New System.Drawing.Size(256, 197)
+ Me.scanUSTVFABest.TabIndex = 1
+ '
'Label8
'
Me.Label8.AutoSize = True
@@ -329,6 +394,7 @@ Partial Class ustCntlUSTV_AntragPosition
'pnl
'
Me.pnl.BackColor = System.Drawing.Color.White
+ Me.pnl.Controls.Add(Me.btnDel)
Me.pnl.Controls.Add(Me.cbxAntragsfilter)
Me.pnl.Controls.Add(Me.lblWarning)
Me.pnl.Controls.Add(Me.btnLeistenderSave)
@@ -363,6 +429,33 @@ Partial Class ustCntlUSTV_AntragPosition
Me.pnl.Size = New System.Drawing.Size(1300, 239)
Me.pnl.TabIndex = 1
'
+ 'btnDel
+ '
+ Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
+ Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnDel.Location = New System.Drawing.Point(834, 162)
+ Me.btnDel.Name = "btnDel"
+ Me.btnDel.Size = New System.Drawing.Size(36, 24)
+ Me.btnDel.TabIndex = 25
+ Me.btnDel.TextAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btnDel.UseVisualStyleBackColor = True
+ Me.btnDel.Visible = False
+ '
+ 'cbxAntragsfilter
+ '
+ Me.cbxAntragsfilter._date = Nothing
+ Me.cbxAntragsfilter._showdate = False
+ Me.cbxAntragsfilter._value = ""
+ Me.cbxAntragsfilter.AutoSize = True
+ Me.cbxAntragsfilter.Location = New System.Drawing.Point(779, 29)
+ Me.cbxAntragsfilter.Name = "cbxAntragsfilter"
+ Me.cbxAntragsfilter.Size = New System.Drawing.Size(134, 17)
+ Me.cbxAntragsfilter.TabIndex = 24
+ Me.cbxAntragsfilter.Text = "*nach Antr.-Land filtern"
+ Me.cbxAntragsfilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+ Me.cbxAntragsfilter.UseVisualStyleBackColor = True
+ '
'lblWarning
'
Me.lblWarning.AutoSize = True
@@ -386,245 +479,6 @@ Partial Class ustCntlUSTV_AntragPosition
Me.btnLeistenderSave.UseVisualStyleBackColor = True
Me.btnLeistenderSave.Visible = False
'
- 'pnlAdresse
- '
- Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
- Me.pnlAdresse.Controls.Add(Me.txtStrasse)
- Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
- Me.pnlAdresse.Controls.Add(Me.Label14)
- Me.pnlAdresse.Controls.Add(Me.Label17)
- Me.pnlAdresse.Controls.Add(Me.Label15)
- Me.pnlAdresse.Controls.Add(Me.txtLand)
- Me.pnlAdresse.Controls.Add(Me.txtPLZ)
- Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
- Me.pnlAdresse.Controls.Add(Me.Label16)
- Me.pnlAdresse.Controls.Add(Me.txtOrt)
- Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
- Me.pnlAdresse.Name = "pnlAdresse"
- Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
- Me.pnlAdresse.TabIndex = 14
- '
- 'Label14
- '
- Me.Label14.AutoSize = True
- Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label14.Location = New System.Drawing.Point(4, 5)
- Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(64, 15)
- Me.Label14.TabIndex = 23
- Me.Label14.Text = "Strasse/Nr"
- '
- 'Label17
- '
- Me.Label17.AutoSize = True
- Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label17.Location = New System.Drawing.Point(129, 63)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(45, 15)
- Me.Label17.TabIndex = 31
- Me.Label17.Text = "UID-Nr"
- '
- 'Label15
- '
- Me.Label15.AutoSize = True
- Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label15.Location = New System.Drawing.Point(8, 32)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(48, 15)
- Me.Label15.TabIndex = 25
- Me.Label15.Text = "PLZ/Ort"
- '
- 'Label16
- '
- Me.Label16.AutoSize = True
- Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label16.Location = New System.Drawing.Point(8, 58)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(35, 15)
- Me.Label16.TabIndex = 27
- Me.Label16.Text = "Land"
- '
- 'Panel1
- '
- Me.Panel1.Controls.Add(Me.btnAPIUbload)
- Me.Panel1.Controls.Add(Me.btnBildAuf)
- Me.Panel1.Controls.Add(Me.Button1)
- Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right
- Me.Panel1.Location = New System.Drawing.Point(937, 30)
- Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(99, 239)
- Me.Panel1.TabIndex = 2
- '
- 'btnAPIUbload
- '
- Me.btnAPIUbload.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.btnAPIUbload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnAPIUbload.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.btnAPIUbload.Location = New System.Drawing.Point(16, 186)
- Me.btnAPIUbload.Name = "btnAPIUbload"
- Me.btnAPIUbload.Size = New System.Drawing.Size(71, 24)
- Me.btnAPIUbload.TabIndex = 25
- Me.btnAPIUbload.Text = "API-Upload"
- Me.btnAPIUbload.UseVisualStyleBackColor = True
- '
- 'Panel3
- '
- Me.Panel3.Controls.Add(Me.tbcntr)
- Me.Panel3.Controls.Add(Me.Panel4)
- Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right
- Me.Panel3.Location = New System.Drawing.Point(1036, 30)
- Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(264, 239)
- Me.Panel3.TabIndex = 25
- '
- 'Panel4
- '
- Me.Panel4.Controls.Add(Me.TabControl1)
- Me.Panel4.Controls.Add(Me.scanLieferschein)
- Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
- Me.Panel4.Location = New System.Drawing.Point(0, 0)
- Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(264, 16)
- Me.Panel4.TabIndex = 26
- '
- 'TabControl1
- '
- Me.TabControl1.Controls.Add(Me.TabPage1)
- Me.TabControl1.Location = New System.Drawing.Point(39, 49)
- Me.TabControl1.Name = "TabControl1"
- Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(278, 239)
- Me.TabControl1.TabIndex = 3
- '
- 'TabPage1
- '
- Me.TabPage1.Controls.Add(Me.UsrcntlPDFScanList1)
- Me.TabPage1.Location = New System.Drawing.Point(4, 22)
- Me.TabPage1.Name = "TabPage1"
- Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage1.Size = New System.Drawing.Size(270, 213)
- Me.TabPage1.TabIndex = 1
- Me.TabPage1.Text = "Dokumente"
- Me.TabPage1.UseVisualStyleBackColor = True
- '
- 'scanSonstiges
- '
- Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.scanSonstiges._DATENSERVER_ORDNER = "MDM"
- Me.scanSonstiges._DATENSERVER_UOrdner1 = ""
- Me.scanSonstiges._DATENSERVER_UOrdner2 = ""
- Me.scanSonstiges._DATENSERVER_UOrdner3 = ""
- Me.scanSonstiges._OPEN_ORIGINAL = False
- Me.scanSonstiges._TYPE = "PDF"
- Me.scanSonstiges.AllowDrop = True
- Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.scanSonstiges.BackColor = System.Drawing.Color.White
- Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand
- Me.scanSonstiges.Dock = System.Windows.Forms.DockStyle.Fill
- Me.scanSonstiges.Location = New System.Drawing.Point(3, 3)
- Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
- Me.scanSonstiges.Name = "scanSonstiges"
- Me.scanSonstiges.Size = New System.Drawing.Size(250, 191)
- Me.scanSonstiges.TabIndex = 0
- '
- 'scanUSTVVollmachten
- '
- Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM"
- Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = ""
- Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = ""
- Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = ""
- Me.scanUSTVVollmachten._OPEN_ORIGINAL = False
- Me.scanUSTVVollmachten._TYPE = "PDF"
- Me.scanUSTVVollmachten.AllowDrop = True
- Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White
- Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand
- Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
- Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3)
- Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0)
- Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten"
- Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 191)
- Me.scanUSTVVollmachten.TabIndex = 1
- '
- 'scanUSTVFABest
- '
- Me.scanUSTVFABest._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.scanUSTVFABest._DATENSERVER_ORDNER = "MDM"
- Me.scanUSTVFABest._DATENSERVER_UOrdner1 = ""
- Me.scanUSTVFABest._DATENSERVER_UOrdner2 = ""
- Me.scanUSTVFABest._DATENSERVER_UOrdner3 = ""
- Me.scanUSTVFABest._OPEN_ORIGINAL = False
- Me.scanUSTVFABest._TYPE = "PDF"
- Me.scanUSTVFABest.AllowDrop = True
- Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.scanUSTVFABest.BackColor = System.Drawing.Color.White
- Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.scanUSTVFABest.Cursor = System.Windows.Forms.Cursors.Hand
- Me.scanUSTVFABest.Dock = System.Windows.Forms.DockStyle.Fill
- Me.scanUSTVFABest.Location = New System.Drawing.Point(0, 0)
- Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0)
- Me.scanUSTVFABest.Name = "scanUSTVFABest"
- Me.scanUSTVFABest.Size = New System.Drawing.Size(256, 197)
- Me.scanUSTVFABest.TabIndex = 1
- '
- 'UsrcntlPDFScanList1
- '
- Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = "MDM"
- Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = ""
- Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = ""
- Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
- Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
- Me.UsrcntlPDFScanList1._TYPE = "PDF"
- Me.UsrcntlPDFScanList1.AllowDrop = True
- Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
- Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Hand
- Me.UsrcntlPDFScanList1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(3, 3)
- Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
- Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
- Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
- Me.UsrcntlPDFScanList1.TabIndex = 0
- '
- 'scanLieferschein
- '
- Me.scanLieferschein._ARCHIV = True
- Me.scanLieferschein._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.scanLieferschein._DATENSERVER_ORDNER = "MDM"
- Me.scanLieferschein._DATENSERVER_UOrdner1 = Nothing
- Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing
- Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing
- Me.scanLieferschein._MULTI_FILES = True
- Me.scanLieferschein._TEXT_PDF = "XX Vollmacht"
- Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.scanLieferschein.BackColor = System.Drawing.Color.White
- Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default
- Me.scanLieferschein.Location = New System.Drawing.Point(146, 3)
- Me.scanLieferschein.Name = "scanLieferschein"
- Me.scanLieferschein.Size = New System.Drawing.Size(111, 34)
- Me.scanLieferschein.TabIndex = 2
- Me.scanLieferschein.Visible = False
- '
- 'cbxAntragsfilter
- '
- Me.cbxAntragsfilter._date = Nothing
- Me.cbxAntragsfilter._showdate = False
- Me.cbxAntragsfilter._value = ""
- Me.cbxAntragsfilter.AutoSize = True
- Me.cbxAntragsfilter.Location = New System.Drawing.Point(779, 29)
- Me.cbxAntragsfilter.Name = "cbxAntragsfilter"
- Me.cbxAntragsfilter.Size = New System.Drawing.Size(134, 17)
- Me.cbxAntragsfilter.TabIndex = 24
- Me.cbxAntragsfilter.Text = "*nach Antr.-Land filtern"
- Me.cbxAntragsfilter.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
- Me.cbxAntragsfilter.UseVisualStyleBackColor = True
- '
'sbLeistender
'
Me.sbLeistender._allowFreitext = True
@@ -650,6 +504,24 @@ Partial Class ustCntlUSTV_AntragPosition
Me.sbLeistender.TabIndex = 9
Me.sbLeistender.usrcntl = Nothing
'
+ 'pnlAdresse
+ '
+ Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
+ Me.pnlAdresse.Controls.Add(Me.txtStrasse)
+ Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
+ Me.pnlAdresse.Controls.Add(Me.Label14)
+ Me.pnlAdresse.Controls.Add(Me.Label17)
+ Me.pnlAdresse.Controls.Add(Me.Label15)
+ Me.pnlAdresse.Controls.Add(Me.txtLand)
+ Me.pnlAdresse.Controls.Add(Me.txtPLZ)
+ Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
+ Me.pnlAdresse.Controls.Add(Me.Label16)
+ Me.pnlAdresse.Controls.Add(Me.txtOrt)
+ Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
+ Me.pnlAdresse.Name = "pnlAdresse"
+ Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
+ Me.pnlAdresse.TabIndex = 14
+ '
'txtStrasse
'
Me.txtStrasse._DateTimeOnly = False
@@ -698,6 +570,36 @@ Partial Class ustCntlUSTV_AntragPosition
Me.txtUIDNr.Size = New System.Drawing.Size(106, 20)
Me.txtUIDNr.TabIndex = 15
'
+ 'Label14
+ '
+ Me.Label14.AutoSize = True
+ Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label14.Location = New System.Drawing.Point(4, 5)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(64, 15)
+ Me.Label14.TabIndex = 23
+ Me.Label14.Text = "Strasse/Nr"
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label17.Location = New System.Drawing.Point(129, 63)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(45, 15)
+ Me.Label17.TabIndex = 31
+ Me.Label17.Text = "UID-Nr"
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = True
+ Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label15.Location = New System.Drawing.Point(8, 32)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(48, 15)
+ Me.Label15.TabIndex = 25
+ Me.Label15.Text = "PLZ/Ort"
+ '
'txtLand
'
Me.txtLand._DateTimeOnly = False
@@ -770,6 +672,16 @@ Partial Class ustCntlUSTV_AntragPosition
Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20)
Me.txtStrassenNr.TabIndex = 11
'
+ 'Label16
+ '
+ Me.Label16.AutoSize = True
+ Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label16.Location = New System.Drawing.Point(8, 58)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(35, 15)
+ Me.Label16.TabIndex = 27
+ Me.Label16.Text = "Land"
+ '
'txtOrt
'
Me.txtOrt._DateTimeOnly = False
@@ -979,6 +891,115 @@ Partial Class ustCntlUSTV_AntragPosition
Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20)
Me.txtUSTBetrag.TabIndex = 17
'
+ 'Panel1
+ '
+ Me.Panel1.Controls.Add(Me.btnAPIUbload)
+ Me.Panel1.Controls.Add(Me.btnBildAuf)
+ Me.Panel1.Controls.Add(Me.Button1)
+ Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right
+ Me.Panel1.Location = New System.Drawing.Point(937, 30)
+ Me.Panel1.Name = "Panel1"
+ Me.Panel1.Size = New System.Drawing.Size(99, 239)
+ Me.Panel1.TabIndex = 2
+ '
+ 'btnAPIUbload
+ '
+ Me.btnAPIUbload.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnAPIUbload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnAPIUbload.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnAPIUbload.Location = New System.Drawing.Point(16, 186)
+ Me.btnAPIUbload.Name = "btnAPIUbload"
+ Me.btnAPIUbload.Size = New System.Drawing.Size(71, 24)
+ Me.btnAPIUbload.TabIndex = 25
+ Me.btnAPIUbload.Text = "API-Upload"
+ Me.btnAPIUbload.UseVisualStyleBackColor = True
+ '
+ 'Panel3
+ '
+ Me.Panel3.Controls.Add(Me.tbcntr)
+ Me.Panel3.Controls.Add(Me.Panel4)
+ Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right
+ Me.Panel3.Location = New System.Drawing.Point(1036, 30)
+ Me.Panel3.Name = "Panel3"
+ Me.Panel3.Size = New System.Drawing.Size(264, 239)
+ Me.Panel3.TabIndex = 25
+ '
+ 'Panel4
+ '
+ Me.Panel4.Controls.Add(Me.TabControl1)
+ Me.Panel4.Controls.Add(Me.scanLieferschein)
+ Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top
+ Me.Panel4.Location = New System.Drawing.Point(0, 0)
+ Me.Panel4.Name = "Panel4"
+ Me.Panel4.Size = New System.Drawing.Size(264, 16)
+ Me.Panel4.TabIndex = 26
+ '
+ 'TabControl1
+ '
+ Me.TabControl1.Controls.Add(Me.TabPage1)
+ Me.TabControl1.Location = New System.Drawing.Point(39, 49)
+ Me.TabControl1.Name = "TabControl1"
+ Me.TabControl1.SelectedIndex = 0
+ Me.TabControl1.Size = New System.Drawing.Size(278, 239)
+ Me.TabControl1.TabIndex = 3
+ '
+ 'TabPage1
+ '
+ Me.TabPage1.Controls.Add(Me.UsrcntlPDFScanList1)
+ Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage1.Name = "TabPage1"
+ Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage1.Size = New System.Drawing.Size(270, 213)
+ Me.TabPage1.TabIndex = 1
+ Me.TabPage1.Text = "Dokumente"
+ Me.TabPage1.UseVisualStyleBackColor = True
+ '
+ 'UsrcntlPDFScanList1
+ '
+ Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = "MDM"
+ Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = ""
+ Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = ""
+ Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = ""
+ Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False
+ Me.UsrcntlPDFScanList1._TYPE = "PDF"
+ Me.UsrcntlPDFScanList1.AllowDrop = True
+ Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
+ Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.UsrcntlPDFScanList1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(3, 3)
+ Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
+ Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
+ Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
+ Me.UsrcntlPDFScanList1.TabIndex = 0
+ '
+ 'scanLieferschein
+ '
+ Me.scanLieferschein._ARCHIV = True
+ Me.scanLieferschein._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanLieferschein._DATENSERVER_ORDNER = "MDM"
+ Me.scanLieferschein._DATENSERVER_UOrdner1 = Nothing
+ Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing
+ Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing
+ Me.scanLieferschein._MULTI_FILES = True
+ Me.scanLieferschein._TEXT_PDF = "XX Vollmacht"
+ Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanLieferschein.BackColor = System.Drawing.Color.White
+ Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default
+ Me.scanLieferschein.Location = New System.Drawing.Point(146, 3)
+ Me.scanLieferschein.Name = "scanLieferschein"
+ Me.scanLieferschein.Size = New System.Drawing.Size(111, 34)
+ Me.scanLieferschein.TabIndex = 2
+ Me.scanLieferschein.Visible = False
+ '
+ 'cnS_KIUPLOAD
+ '
+ Me.cnS_KIUPLOAD.Name = "ContextMenuStrip1"
+ Me.cnS_KIUPLOAD.Size = New System.Drawing.Size(61, 4)
+ '
'ustCntlUSTV_AntragPosition
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1065,4 +1086,6 @@ Partial Class ustCntlUSTV_AntragPosition
Friend WithEvents lblWarning As Label
Friend WithEvents cbxAntragsfilter As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue
Friend WithEvents btnAPIUbload As Button
+ Friend WithEvents btnDel As Button
+ Friend WithEvents cnS_KIUPLOAD As ContextMenuStrip
End Class
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.resx b/SDL/USTV/ustCntlUSTV_AntragPosition.resx
index 1af7de15..40bf4eff 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.resx
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
index 33d9368f..df49d222 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -1,4 +1,5 @@
+Imports itextsharp.text.pdf
Imports VERAG_PROG_ALLGEMEIN
Public Class ustCntlUSTV_AntragPosition
@@ -265,6 +266,7 @@ Public Class ustCntlUSTV_AntragPosition
txtOrt.Text = ""
txtLand.Text = ""
txtUIDNr.Text = ""
+ btnDel.Visible = False
Else
pnlAdresse.Enabled = True 'enablePanel 'immer änderbar!
@@ -274,7 +276,12 @@ Public Class ustCntlUSTV_AntragPosition
txtOrt.Text = If(UStV_Leist.UstV_Leistender_Stadt, "")
txtLand.Text = If(UStV_Leist.UstV_Leistender_Land, "")
txtUIDNr.Text = If(UStV_Leist.UstV_Leistender_UstNr, "")
- If UStV_Leist.hasEntry Then adressLoadedByLeistender = True
+ If UStV_Leist.hasEntry Then
+ adressLoadedByLeistender = True
+ btnDel.Visible = True
+ Else
+ btnDel.Visible = False
+ End If
End If
@@ -340,6 +347,7 @@ Public Class ustCntlUSTV_AntragPosition
End If
Else
+
Dim adresseChanged As Boolean = False
If UStV_Leist.UstV_Leistender_Strasse <> If(txtStrasse.Text, "") Then adresseChanged = True
@@ -409,6 +417,7 @@ Public Class ustCntlUSTV_AntragPosition
cboSchnittstellennr.Items.Add(New MyListItem("MSE neu", 9))
cboSchnittstellennr.Items.Add(New MyListItem("UTA neu", 10))
cboSchnittstellennr.Items.Add(New MyListItem("PLOSE neu", 11))
+ cboSchnittstellennr.Items.Add(New MyListItem("IDS neu", 12))
End If
End Sub
@@ -431,7 +440,7 @@ Public Class ustCntlUSTV_AntragPosition
End Sub
- Private Sub txtUSTBetrag_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtUSTBetrag.PreviewKeyDown, txtUSTBetragEUR.PreviewKeyDown, txtRgDatum.PreviewKeyDown, txtRgNr.PreviewKeyDown, txtUmrechnungskurs.PreviewKeyDown, sbLeistender.PreviewKeyDown
+ Private Sub txtUSTBetrag_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtUSTBetrag.PreviewKeyDown, txtUSTBetragEUR.PreviewKeyDown, txtRgDatum.PreviewKeyDown, txtRgNr.PreviewKeyDown, txtUmrechnungskurs.PreviewKeyDown, sbLeistender.PreviewKeyDown, txtLeistungsbezeichnung.PreviewKeyDown
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub
If gridAktiv And Me.FindForm IsNot Nothing Then
@@ -540,13 +549,20 @@ Public Class ustCntlUSTV_AntragPosition
'If IsDate(txtRgDatum.Text) Then txtChanged = True
End If
+ ElseIf sender Is txtLeistungsbezeichnung Then
+
+ txtChanged = True
+
+
ElseIf sender Is sbLeistender Then
If sbLeistender.Text <> "" Then
If sbLeistender.Text IsNot Nothing AndAlso sbLeistender.Text <> "" Then
If IsNumeric(sbLeistender.Text) Then
+ If UStV_Leist.UStV_LeistenderId <> sbLeistender.Text OrElse UStV_POS.UStVPo_LeistenderId <> sbLeistender.Text Then txtChanged = True
UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(CInt(sbLeistender.Text))
Else
+ If UStV_Leist.UStV_Leistender <> sbLeistender.Text OrElse UStV_POS.UStVPo_Leistender <> sbLeistender.Text Then txtChanged = True
UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender.Text)
End If
@@ -596,128 +612,142 @@ Public Class ustCntlUSTV_AntragPosition
End If
End Sub
- Private Sub btnAPIUbload_Click(sender As Object, e As EventArgs) Handles btnAPIUbload.Click
- If API IsNot Nothing Then
- If vbYes = MsgBox("Möchten Sie die Rechnungsdaten per ATEZ-API auslesen lassen?", vbYesNoCancel) Then
+ Private Sub mnuItemKIUPLOAD_Clicked(sender As Object, e As EventArgs)
+
+ cnS_KIUPLOAD.Hide()
+ Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+ If UStV_POS.UStVPo_daId < 1 Then Exit Sub
+
+ If item IsNot Nothing Then
- Dim dt As New DataTable
+ If API IsNot Nothing Then
+ If vbYes = MsgBox("Möchten Sie die Rechnungsdaten per ATEZ-API auslesen lassen?", vbYesNoCancel) Then
- If dt IsNot Nothing And Not dt.Columns.Contains("currency") Then
+ Dim dt As New DataTable
- dt.Columns.Add("currency", GetType(String))
- dt.Columns.Add("seller_VAT_id", GetType(String))
- dt.Columns.Add("seller_address_city", GetType(String))
- dt.Columns.Add("seller_address_country", GetType(String))
- dt.Columns.Add("seller_address_postcode", GetType(String))
- dt.Columns.Add("seller_address_street", GetType(String))
- dt.Columns.Add("seller_name", GetType(String))
- dt.Columns.Add("total_VAT_amount", GetType(Double))
- dt.Columns.Add("invoice_id", GetType(String))
- dt.Columns.Add("invoice_date", GetType(String))
- dt.Columns.Add("status", GetType(String))
- End If
+ If dt IsNot Nothing And Not dt.Columns.Contains("currency") Then
- Dim failreDesc As String
- Dim authResp = API.authenticate("VAT", "client1", "password")
- Dim resp
- If authResp <> "200" Then
- MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
- Exit Sub
- Else
- 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
+ dt.Columns.Add("count", GetType(Integer))
+ dt.Columns.Add("currency", GetType(String))
+ dt.Columns.Add("seller_VAT_id", GetType(String))
+ dt.Columns.Add("seller_address_city", GetType(String))
+ dt.Columns.Add("seller_address_country", GetType(String))
+ dt.Columns.Add("seller_address_postcode", GetType(String))
+ dt.Columns.Add("seller_address_street", GetType(String))
+ dt.Columns.Add("seller_name", GetType(String))
+ dt.Columns.Add("total_VAT_amount", GetType(Double))
+ dt.Columns.Add("invoice_id", GetType(String))
+ dt.Columns.Add("invoice_date", GetType(String))
+ dt.Columns.Add("status", GetType(String))
+ dt.Columns.Add("document_count", GetType(Integer))
+ End If
- 'document_type = vat_invoice or receipt
- If API.setJsonVAT("vat_invoice", UStV_POS.UStVPo_daId) Then
+ Dim failreDesc As String
+ Dim authResp = API.authenticate("VAT", "client1", "password")
+ Dim resp
+ If authResp <> "200" Then
+ MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
+ Exit Sub
+ Else
+ 'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
- resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt)
+ 'document_type = vat_invoice or receipt
+ If API.setJsonVAT(item.Name, UStV_POS.UStVPo_daId) Then
+
+ resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt)
- If dt.Rows.Count > 0 Then
+ If dt.Rows.Count > 0 Then
- Dim f As New frmVAT_ATEZ()
- f.usrcntlVAT_ATEZ1.initDGV(dt)
- If f.ShowDialog = DialogResult.OK Then
- txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date
- txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id
- txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street
- txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city
- txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country
- txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode
- sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name
- If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 AndAlso f.usrcntlVAT_ATEZ1.va.currency <> "" Then
- Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID)
+ Dim f As New frmVAT_ATEZ()
+ f.usrcntlVAT_ATEZ1.initDGV(dt)
+ If f.ShowDialog = DialogResult.OK Then
+ txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date
+ txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id
+ txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street
+ txtOrt.Text = f.usrcntlVAT_ATEZ1.va.seller_address_city
+ txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country
+ txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode
+ sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name
+ If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 AndAlso f.usrcntlVAT_ATEZ1.va.currency <> "" Then
+ Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID)
- '1. Antragswährung = Belegswährung (EUR zu FREMD und FREMD zu EUR)
- If f.usrcntlVAT_ATEZ1.va.currency = antr.UStVAn_Währungscode Then
- Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
- If antr.UStVAn_Währungscode = "EUR" Then
- txtUSTBetragEUR.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
- If antr.UStVAn_Währungscode <> "EUR" Then
- txtUSTBetrag.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
- txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
- Else
- txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
- txtUmrechnungskurs.Text = 1
- End If
-
- Else
-
- txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
- txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
- txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
-
- End If
-
- Else
- '2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR)
- If antr.UStVAn_Währungscode = "EUR" Then
- Dim kurs As New cEZB_Waehrungskurse(f.usrcntlVAT_ATEZ1.va.currency)
- If f.usrcntlVAT_ATEZ1.va.currency <> "EUR" Then
- txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
- txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
- txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
- ElseIf f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then
- txtUSTBetrag.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
- txtUSTBetragEUR.Text = txtUSTBetrag.Text
- txtUmrechnungskurs.Text = 1
-
- End If
-
- Else
- '2.1 Antragswährung <> Belegswährung (FREMD zu FREMD)
-
- txtUSTBetrag.Text = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, antr.UStVAn_Währungscode)
+ '1. Antragswährung = Belegswährung (EUR zu FREMD und FREMD zu EUR)
+ If f.usrcntlVAT_ATEZ1.va.currency = antr.UStVAn_Währungscode Then
Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
- txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
- txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
+ If antr.UStVAn_Währungscode = "EUR" Then
+ txtUSTBetragEUR.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ If antr.UStVAn_Währungscode <> "EUR" Then
+ txtUSTBetrag.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
+ txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
+ Else
+ txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ txtUmrechnungskurs.Text = 1
+ End If
- End If
+ Else
+
+ txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
+ txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
+
+ End If
+
+ Else
+ '2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR)
+ If antr.UStVAn_Währungscode = "EUR" Then
+ Dim kurs As New cEZB_Waehrungskurse(f.usrcntlVAT_ATEZ1.va.currency)
+ If f.usrcntlVAT_ATEZ1.va.currency <> "EUR" Then
+ txtUSTBetrag.Text = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+ txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
+ txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
+ ElseIf f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then
+ txtUSTBetrag.Text = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
+ txtUSTBetragEUR.Text = txtUSTBetrag.Text
+ txtUmrechnungskurs.Text = 1
+
+ End If
+
+ Else
+ '2.1 Antragswährung <> Belegswährung (FREMD zu FREMD)
+
+ txtUSTBetrag.Text = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, antr.UStVAn_Währungscode)
+ Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
+ txtUSTBetragEUR.Text = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
+ txtUmrechnungskurs.Text = Math.Floor((CDbl(txtUSTBetrag.Text) / CDbl(txtUSTBetragEUR.Text) * 100 + 0.5)) / 100
+
+ End If
End If
End If
- End If
+ End If
- Else
+ Else
- MsgBox(resp)
+ MsgBox(resp)
+
+
+ End If
End If
+ 'Else
+ ' MsgBox("Service is not running!")
+ 'End If
End If
-
- 'Else
- ' MsgBox("Service is not running!")
-
- 'End If
End If
End If
+
+
+
End If
@@ -725,7 +755,29 @@ Public Class ustCntlUSTV_AntragPosition
End Sub
- Private Sub txtStrasse_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtStrasse.PreviewKeyDown, txtPLZ.PreviewKeyDown, txtOrt.PreviewKeyDown, txtLand.PreviewKeyDown, txtStrassenNr.PreviewKeyDown
+ Private Sub btnAPIUbload_Click(sender As Object, e As EventArgs) Handles btnAPIUbload.Click
+
+
+ If Not cnS_KIUPLOAD.Items.ContainsKey("vat_invoice") Then
+ Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "vat_invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ cnS_KIUPLOAD.Items.Add(vat)
+ AddHandler vat.Click, AddressOf mnuItemKIUPLOAD_Clicked
+ End If
+
+
+ If Not cnS_KIUPLOAD.Items.ContainsKey("receipt") Then
+ Dim receipt = New ToolStripMenuItem() With {.Text = "Quittung(en)", .Name = "receipt", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ cnS_KIUPLOAD.Items.Add(receipt)
+ AddHandler receipt.Click, AddressOf mnuItemKIUPLOAD_Clicked
+
+ End If
+
+ cnS_KIUPLOAD.Show(Cursor.Position)
+
+
+ End Sub
+
+ Private Sub txtStrasse_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtStrasse.PreviewKeyDown, txtPLZ.PreviewKeyDown, txtOrt.PreviewKeyDown, txtLand.PreviewKeyDown, txtStrassenNr.PreviewKeyDown, txtUIDNr.PreviewKeyDown
If gridAktiv And Me.FindForm IsNot Nothing Then
@@ -749,5 +801,35 @@ Public Class ustCntlUSTV_AntragPosition
+ End Sub
+
+ Private Sub btnDel_Click(sender As Object, e As EventArgs) Handles btnDel.Click
+
+ Dim leistNew = sbLeistender.Text
+ UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(leistNew)
+
+ If UStV_Leist.hasEntry Then
+
+ If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVALeistender_deaktiveren", Me.FindForm) Then
+ MsgBox("Nicht berechtigt!")
+ Exit Sub
+ End If
+
+ If Not vbYes = MsgBox("Soll der Leistende " & UStV_Leist.UStV_Leistender & " gelöscht werden?", vbYesNo) Then Exit Sub
+
+ UStV_Leist.UstV_aktiv = False
+ UStV_Leist.SAVE()
+ sbLeistender.Text = ""
+ sbLeistender._value = ""
+ UStV_POS.UStVPo_LeistenderId = -1
+ UStV_POS.UStVPo_Leistender = ""
+ values_changed()
+ btnDel.Visible = False
+
+
+ End If
+
+
+
End Sub
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb
index 5d003551..53732134 100644
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb
@@ -23,11 +23,15 @@ Public Class usrcntlPDFScan
Public Event FileAdded(id As String, path As String, name As String)
+ Public Event FileDeleted()
Private Sub usrcntlPDFScan_Layout(sender As Object, e As LayoutEventArgs) Handles Me.Layout
Me.txt.Text = _TEXT_PDF
End Sub
+ Public Function getDS() As cDATENSERVER
+ Return DS
+ End Function
Public Sub INIT(KdNr)
Me.KdNr = KdNr
@@ -360,6 +364,7 @@ Public Class usrcntlPDFScan
'DatenserverIDCollection.DELETE(DatenserverIDCollection.LIST(0).coll_daId)
''' DatenserverIDCollection.Clear()
initPdf()
+ RaiseEvent FileDeleted()
End If
End Sub
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb
index 8bc96dfb..35f933e6 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb
@@ -12,14 +12,23 @@ Public Class cUStVLeistender
Property UstV_Leistender_UstNr As Object = Nothing
Property UstV_Leistender_Adresse As Boolean
Property UStV_LeistenderId As Integer
+ Property UstV_aktiv As Boolean
Public hasEntry = False
Dim SQL As New SQL
- Sub New(UStV_Leistender As String)
- Me.UStV_Leistender = UStV_Leistender
- LOAD()
+ Sub New(UStV_Leistender As String, Optional searchbyUID As Boolean = False)
+ If Not searchbyUID Then
+ Me.UStV_Leistender = UStV_Leistender
+ LOAD()
+
+ Else
+ Me.UstV_Leistender_UstNr = UStV_Leistender
+ LOADBYUID()
+
+ End If
+
End Sub
Sub New(Id As Integer)
@@ -44,6 +53,7 @@ Public Class cUStVLeistender
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_UstNr", UstV_Leistender_UstNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Adresse", UstV_Leistender_Adresse))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_LeistenderId", UStV_LeistenderId,, True))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_aktiv", UstV_aktiv))
Return list
End Function
@@ -147,6 +157,35 @@ Public Class cUStVLeistender
End Try
End Sub
+ Public Sub LOADByUID()
+ Try
+ hasEntry = False
+ Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+ Using cmd As New SqlCommand("SELECT * FROM tblUStVLeistender WHERE UstV_Leistender_UstNr=@UstV_Leistender_UstNr ", conn)
+ cmd.Parameters.AddWithValue("@UstV_Leistender_UstNr", UstV_Leistender_UstNr)
+
+ Dim dr = cmd.ExecuteReader()
+ If dr.Read Then
+ For Each li In getParameterList()
+ Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+ If dr.Item(li.Text) Is DBNull.Value Then
+ propInfo.SetValue(Me, Nothing)
+ Else
+ propInfo.SetValue(Me, dr.Item(li.Text))
+ End If
+
+ Next
+ hasEntry = True
+ End If
+ dr.Close()
+ End Using
+ End Using
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+ End Sub
+
Public Sub LOADByLand(Land As String)
Try
hasEntry = False
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
index b3282860..eff94a60 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
@@ -988,7 +988,7 @@ Public Class cMDMFunctionsAllgemein
For page As Integer = 1 To pdfReader.NumberOfPages
Dim canvas As PdfContentByte = stamper.GetOverContent(page)
Dim bf As BaseFont = BaseFont.CreateFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.EMBEDDED)
- canvas.SetFontAndSize(bf, 12)
+ canvas.SetFontAndSize(bf, 16)
canvas.BeginText()
'The origin (0,0) is at the bottom-left corner of the page and represent coordinates in points!!!!!
@@ -1097,7 +1097,7 @@ Public Class cMDMFunctionsAllgemein
header2 = "VAT NO.: " & USTV_ANTRAG.UStVAn_Steuernummer & " " & "Name/Company: " & AD.Name_1 & " " & AD.Name_2 & " " & "VAT in " & Antrag_LandKz & ": " & SteuerNR
End If
- Return cProgramFunctions.genExcelFromDT_NEW_(dtNew, {"K4:K" & (dtNew.Rows.Count + 1)},, header1, header2, IIf(USTV_ANTRAG.UStVAn_Währungscode = "EUR", "€", ""), True, "J", True,, openFile)
+ Return cProgramFunctions.genExcelFromDT_NEW_(dtNew, {"K1:K" & (dtNew.Rows.Count + 1)},, header1, header2, IIf(USTV_ANTRAG.UStVAn_Währungscode = "EUR", "€", ""), True, "J", True,, openFile)
End If
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
index f114d8f1..38b67e0f 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
@@ -854,39 +854,115 @@ Public Class cATEZ_NCTS_IN
success = jsonResult.LoadSb(sbResponseBody)
jsonResult.Emit()
+ '--------------------------------
+
+
+
+ Dim num As Integer = jsonResult.Size
+ Dim data
+ Dim sizeArray = jsonResult.SizeOfArray("data")
+
If dt IsNot Nothing Then
+ If sizeArray > 0 Then
+
+ num = sizeArray
+
+ data = jsonResult.ArrayOf("data")
+ If (jsonResult.LastMethodSuccess = False) Then
+ Return "data not found."
+ End If
+
+
+ Else
+ data = New Chilkat.JsonObject
+ data = jsonResult
+ num = 1 'nur ein Object
+
+ If (data.LastMethodSuccess = False) Then
+ Debug.WriteLine("data member not found.")
+ End If
+
- Dim data As New Chilkat.JsonObject
- data = jsonResult
- If (data.LastMethodSuccess = False) Then
- Debug.WriteLine("data member not found.")
End If
+ 'Dim i As Integer'
+ 'For i = 0 To num - 1
- Dim num As Integer = 1
- If num = -1 Then
- Return "FEHLER Array Data ist leer"
- End If
+ ' Dim name As String = jsonResult.NameAt(i)
+ ' Dim value As String = jsonResult.StringAt(i)
+
+ ' Debug.WriteLine(name & ": " & value)
+
+ ' Dim iValue As Integer = jsonResult.IntAt(i)
+ ' Debug.WriteLine(name & " as integer: " & iValue)
+
+ 'Next
+
+
+
+
+ '--------------------------------
+
+
+
+ 'num = jsonResult.SizeOfArray("data")
+
+ 'If num = -1 Then
+ ' If dt IsNot Nothing Then
+
+ ' Dim data
+
+
+ ' 'TODO: Check if array, else jsonObject
+
+ ' If True Then
+
+ ' data = New Chilkat.JsonObject
+ ' data = jsonResult
+ ' If (data.LastMethodSuccess = False) Then
+ ' Debug.WriteLine("data member not found.")
+ ' End If
+
+ ' If num = -1 Then
+ ' Return "FEHLER Array Data ist leer"
+ ' End If
+
+ ' Else
+
+
+
+
+ ' data = jsonResult.ArrayOf("data")
+ ' If (jsonResult.LastMethodSuccess = False) Then
+ ' Return "data not found."
+ ' End If
+
+
+ 'End If
+
+ '--------------------------------
Dim j As Integer = 0
-
While j < num
- Dim invoice As Chilkat.JsonObject = data.ObjectAt(j)
+ Dim invoice As Chilkat.JsonObject = jsonResult.ObjectAt(j)
Dim R As DataRow = dt.NewRow
+ R("count") = j + 1
R("currency") = checkNullStr(invoice.StringOf("currency"))
Dim totalAmonut As String = invoice.StringOf("total_VAT_amount").Replace(".", ",")
R("total_VAT_amount") = CDbl(checkNulDbl(totalAmonut))
R("invoice_id") = checkNullStr(invoice.StringOf("invoice_id"))
R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date"))
R("seller_VAT_id") = checkNullStr(invoice.StringOf("seller_VAT_id"))
+ R("seller_name") = checkNullStr(invoice.StringOf("seller_name"))
R("seller_address_city") = checkNullStr(invoice.StringOf("seller_address_city"))
R("seller_address_country") = checkNullStr(invoice.StringOf("seller_address_country"))
R("seller_address_postcode") = checkNullStr(invoice.StringOf("seller_address_postcode"))
R("seller_address_street") = checkNullStr(invoice.StringOf("seller_address_street"))
R("status") = checkNullStr(jsonResult.StringOf("status"))
+ R("document_count") = checkNulInt(jsonResult.IntOf("document_count"))
dt.Rows.Add(R)
@@ -900,9 +976,9 @@ Public Class cATEZ_NCTS_IN
Return jsonResult.StringOf("atezId")
- End If
+ End If
- End If
+ End If
Catch ex As WebException
@@ -926,6 +1002,17 @@ Public Class cATEZ_NCTS_IN
Return 0
End If
End Function
+ Public Shared Function checkNulInt(ByVal o As Object) As Double
+ If o IsNot Nothing And o IsNot DBNull.Value Then
+ If IsNumeric(o) Then
+ Return CInt(o)
+ Else
+ Return 0
+ End If
+ Else
+ Return 0
+ End If
+ End Function
Shared Function setJsonNCTS(ncts As cATEZ_NCTS_DATA)
diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
index 818c4733..2fd13364 100644
--- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb
@@ -2,6 +2,7 @@
Imports GrapeCity.ActiveReports.Document
Imports System.ComponentModel
Imports System.Data.SqlClient
+Imports System.IO
Public Class cAllgemein
Public Shared FIRMA As String
@@ -597,6 +598,40 @@ Public Class cAllgemein
End If
Return ""
End Function
+
+ Public Shared Function ExtractPdfPages(ByVal SourceFile As String, ByVal TargetFile As String, pageStart As Integer, pagesEnd As Integer) As Boolean 'ITEXTSHARP
+ Try
+ Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing
+ If SourceFile.Contains(" ") Then SourceFile = SourceFile
+ Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile)
+ If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf"
+ Dim srcDoc As New iTextSharp.text.Document() 'Reader.GetPageSizeWithRotation(0))
+ Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New FileStream(TargetFile, System.IO.FileMode.Create))
+ PdfCopyProvider.SetFullCompression()
+ srcDoc.Open()
+ For p As Integer = pageStart To pagesEnd
+ If p > Reader.NumberOfPages Then
+ MsgBox("Seitenanzahl überschritten!")
+ srcDoc.Close() : Reader.Close()
+ Return False
+ End If
+ impPage = PdfCopyProvider.GetImportedPage(Reader, p)
+ ' ----- 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, Reader.GetPageRotation(p)))
+ ' ----- PDF Seite in das neue Dokument einfügen
+ PdfCopyProvider.AddPage(impPage)
+
+ Next
+ ' ----- neues PDF Dokument und den Reader schließen
+ srcDoc.Close()
+ Reader.Close()
+ Return True
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+ Return False
+ End Function
+
End Class
Public Class cNCTS_GUARANTEES
@@ -635,4 +670,6 @@ Public Class cNCTS_GUARANTEES
End Function
+
+
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/frmScan.Designer.vb b/VERAG_PROG_ALLGEMEIN/frmScan.Designer.vb
index 81a51c39..c0e7d2ee 100644
--- a/VERAG_PROG_ALLGEMEIN/frmScan.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/frmScan.Designer.vb
@@ -22,7 +22,6 @@ Partial Class frmScan
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
_
Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmScan))
Me.dsViewer = New Dynamsoft.Forms.DSViewer()
Me.btn = New System.Windows.Forms.Button()
@@ -57,7 +56,8 @@ Partial Class frmScan
Me.tbxCurrentImageIndex = New System.Windows.Forms.Label()
Me.tbxTotalImageNum = New System.Windows.Forms.Label()
Me.pnl = New System.Windows.Forms.Panel()
- Me.UsrcntlPDFScan1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
+ Me.cbxAltFormat = New System.Windows.Forms.CheckBox()
+ Me.cboFormat = New System.Windows.Forms.ComboBox()
Me.grpFarbe.SuspendLayout()
Me.grpTyp.SuspendLayout()
Me.pnl.SuspendLayout()
@@ -89,7 +89,7 @@ Partial Class frmScan
Me.btnScan.Enabled = False
Me.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnScan.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.btnScan.Location = New System.Drawing.Point(477, 132)
+ Me.btnScan.Location = New System.Drawing.Point(476, 157)
Me.btnScan.Name = "btnScan"
Me.btnScan.Size = New System.Drawing.Size(254, 59)
Me.btnScan.TabIndex = 2
@@ -139,7 +139,7 @@ Partial Class frmScan
'
Me.lblDateiname.AutoSize = True
Me.lblDateiname.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblDateiname.Location = New System.Drawing.Point(473, 566)
+ Me.lblDateiname.Location = New System.Drawing.Point(473, 546)
Me.lblDateiname.Name = "lblDateiname"
Me.lblDateiname.Size = New System.Drawing.Size(61, 13)
Me.lblDateiname.TabIndex = 7
@@ -205,9 +205,9 @@ Partial Class frmScan
'cboSource
'
Me.cboSource.FormattingEnabled = True
- Me.cboSource.Location = New System.Drawing.Point(477, 105)
+ Me.cboSource.Location = New System.Drawing.Point(480, 105)
Me.cboSource.Name = "cboSource"
- Me.cboSource.Size = New System.Drawing.Size(254, 21)
+ Me.cboSource.Size = New System.Drawing.Size(251, 21)
Me.cboSource.TabIndex = 9
'
'rdbtnRGB
@@ -267,7 +267,7 @@ Partial Class frmScan
Me.grpTyp.Controls.Add(Me.rdbtnBMP)
Me.grpTyp.Controls.Add(Me.rdbtnPNG)
Me.grpTyp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.grpTyp.Location = New System.Drawing.Point(477, 493)
+ Me.grpTyp.Location = New System.Drawing.Point(477, 473)
Me.grpTyp.Name = "grpTyp"
Me.grpTyp.Size = New System.Drawing.Size(254, 64)
Me.grpTyp.TabIndex = 11
@@ -279,15 +279,17 @@ Partial Class frmScan
Me.tbxSaveFileName._DateTimeOnly = False
Me.tbxSaveFileName._numbersOnly = False
Me.tbxSaveFileName._numbersOnlyKommastellen = ""
+ Me.tbxSaveFileName._numbersOnlyTrennzeichen = True
Me.tbxSaveFileName._Prozent = False
Me.tbxSaveFileName._ShortDateNew = False
Me.tbxSaveFileName._ShortDateOnly = False
Me.tbxSaveFileName._TimeOnly = False
+ Me.tbxSaveFileName._TimeOnly_Seconds = False
Me.tbxSaveFileName._value = Nothing
Me.tbxSaveFileName._Waehrung = False
Me.tbxSaveFileName._WaehrungZeichen = True
Me.tbxSaveFileName.ForeColor = System.Drawing.Color.Black
- Me.tbxSaveFileName.Location = New System.Drawing.Point(536, 563)
+ Me.tbxSaveFileName.Location = New System.Drawing.Point(536, 543)
Me.tbxSaveFileName.MaxLineLength = -1
Me.tbxSaveFileName.MaxLines_Warning = ""
Me.tbxSaveFileName.MaxLines_Warning_Label = Nothing
@@ -432,7 +434,8 @@ Partial Class frmScan
'
'pnl
'
- Me.pnl.Controls.Add(Me.UsrcntlPDFScan1)
+ Me.pnl.Controls.Add(Me.cbxAltFormat)
+ Me.pnl.Controls.Add(Me.cboFormat)
Me.pnl.Controls.Add(Me.Label2)
Me.pnl.Controls.Add(Me.dsViewer)
Me.pnl.Controls.Add(Me.Button3)
@@ -461,25 +464,25 @@ Partial Class frmScan
Me.pnl.Size = New System.Drawing.Size(741, 683)
Me.pnl.TabIndex = 21
'
- 'UsrcntlPDFScan1
+ 'cbxAltFormat
'
- Me.UsrcntlPDFScan1._ARCHIV = False
- Me.UsrcntlPDFScan1._DATENSERVER_KATEGORIE = "DOKUMENTE"
- Me.UsrcntlPDFScan1._DATENSERVER_ORDNER = ""
- Me.UsrcntlPDFScan1._DATENSERVER_UOrdner1 = ""
- Me.UsrcntlPDFScan1._DATENSERVER_UOrdner2 = ""
- Me.UsrcntlPDFScan1._DATENSERVER_UOrdner3 = ""
- Me.UsrcntlPDFScan1._MULTI_FILES = False
- Me.UsrcntlPDFScan1._TEXT_PDF = Nothing
- Me.UsrcntlPDFScan1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
- Me.UsrcntlPDFScan1.BackColor = System.Drawing.Color.White
- Me.UsrcntlPDFScan1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.UsrcntlPDFScan1.Cursor = System.Windows.Forms.Cursors.Hand
- Me.UsrcntlPDFScan1.Location = New System.Drawing.Point(344, 349)
- Me.UsrcntlPDFScan1.Name = "UsrcntlPDFScan1"
- Me.UsrcntlPDFScan1.Size = New System.Drawing.Size(8, 8)
- Me.UsrcntlPDFScan1.TabIndex = 21
- Me.UsrcntlPDFScan1.Visible = False
+ Me.cbxAltFormat.AutoSize = True
+ Me.cbxAltFormat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cbxAltFormat.Location = New System.Drawing.Point(477, 569)
+ Me.cbxAltFormat.Name = "cbxAltFormat"
+ Me.cbxAltFormat.Size = New System.Drawing.Size(88, 17)
+ Me.cbxAltFormat.TabIndex = 9
+ Me.cbxAltFormat.Text = "speichern als"
+ Me.cbxAltFormat.UseVisualStyleBackColor = True
+ '
+ 'cboFormat
+ '
+ Me.cboFormat.Enabled = False
+ Me.cboFormat.FormattingEnabled = True
+ Me.cboFormat.Location = New System.Drawing.Point(594, 565)
+ Me.cboFormat.Name = "cboFormat"
+ Me.cboFormat.Size = New System.Drawing.Size(133, 21)
+ Me.cboFormat.TabIndex = 22
'
'frmScan
'
@@ -534,5 +537,6 @@ Partial Class frmScan
Friend WithEvents tbxCurrentImageIndex As System.Windows.Forms.Label
Friend WithEvents tbxTotalImageNum As System.Windows.Forms.Label
Friend WithEvents pnl As System.Windows.Forms.Panel
- Friend WithEvents UsrcntlPDFScan1 As usrcntlPDFScan
+ Friend WithEvents cboFormat As Windows.Forms.ComboBox
+ Friend WithEvents cbxAltFormat As Windows.Forms.CheckBox
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/frmScan.vb b/VERAG_PROG_ALLGEMEIN/frmScan.vb
index 96cfca62..6d1e0634 100644
--- a/VERAG_PROG_ALLGEMEIN/frmScan.vb
+++ b/VERAG_PROG_ALLGEMEIN/frmScan.vb
@@ -18,6 +18,10 @@ Imports Dynamsoft.Core.Annotation
Imports Dynamsoft.TWAIN.Interface
Imports Dynamsoft.Core.Enums
Imports System.IO
+Imports Dynamsoft.TWAIN.Enums
+Imports Dynamsoft.DotTwain
+Imports ClosedXML.Excel
+Imports Dynamsoft.PDF.Enums
'Aktuell3
@@ -61,6 +65,23 @@ Public Class frmScan
End Sub
+ Public Enum TwainSupportedSizes As UShort
+ TWSS_NONE = 0
+ TWSS_A4 = 1
+ TWSS_JISB5 = 2
+ TWSS_USLETTER = 3
+ TWSS_USLEGAL = 4
+ TWSS_A5 = 5
+ TWSS_ISOB4 = 6
+ TWSS_ISOB6 = 7
+ TWSS_USLEDGER = 9
+ TWSS_USEXECUTIVE = 10
+ TWSS_A3 = 11
+ TWSS_B4 = 12
+ TWSS_B6 = 13
+ TWSS_BUSINESSCARD = 14
+ End Enum
+
Public Sub OnPostAllTransfers() Implements IAcquireCallback.OnPostAllTransfers
Me.Invoke(New CrossThreadOperationControl(AddressOf CallMe))
@@ -132,11 +153,11 @@ Public Class frmScan
dsViewer.Bind(m_ImageCore)
End Sub
- _
+
Private Shared Function GetSystemDirectory( lpBuffer As StringBuilder, uSize As UInteger) As UInteger
End Function
- _
+
Private Shared Function GetWindowsDirectory( lpBuffer As StringBuilder, uSize As UInteger) As UInteger
End Function
@@ -245,6 +266,11 @@ Public Class frmScan
Private Sub picboxScan_Click(sender As Object, e As EventArgs) Handles btnScan.Click
'startScanTimeout()
startScan()
+
+ cboFormat.SelectedIndex = cboFormat.FindStringExact("A4")
+ If cboFormat.SelectedIndex > 0 Then cbxAltFormat.Checked = True
+
+
End Sub
Sub startScan()
@@ -267,6 +293,10 @@ Public Class frmScan
m_TwainManager.SelectSourceByIndex(sSourceIndex)
+
+
+ 'm_TwainManager.SetImageLayout(New Dynamsoft.Common.Margin(0.0, 0.0, width, height))
+
''vor Opensource
'Dim tmpFile = Path.GetTempFileName & ".pdf"
'tmpFile = "D:\Andreas\Dokumente\temptest<>.pdf"
@@ -314,6 +344,10 @@ Public Class frmScan
End If
m_TwainManager.Resolution = Integer.Parse(cboResolution.Text)
+ 'Dim selectedPaper = CType(cboFormat.SelectedItem, KeyValuePair(Of String, Tuple(Of Double, Double)))
+ 'Dim width = selectedPaper.Value.Item1
+ 'Dim height = selectedPaper.Value.Item2
+
'm_TwainManager.sca()
@@ -400,6 +434,30 @@ Public Class frmScan
' hasWebcamSource = true;
hasTwainSource = True
Next
+
+
+
+ cboFormat.Items.Clear()
+
+ 'Dim formats As New List(Of KeyValuePair(Of String, EnumPageSize)) From {
+ ' New KeyValuePair(Of String, EnumPageSize)(" ", EnumPageSize.ImageSize),
+ ' New KeyValuePair(Of String, EnumPageSize)("A4", EnumPageSize.A4),
+ ' New KeyValuePair(Of String, EnumPageSize)("Legal", EnumPageSize.Legal),
+ ' New KeyValuePair(Of String, EnumPageSize)("Letter", EnumPageSize.Letter)
+ ' }
+
+ 'cboFormat.DataSource = formats
+
+
+ Dim items = [Enum].GetValues(GetType(EnumPageSize)).Cast(Of EnumPageSize)().Select(Function(e) New KeyValuePair(Of String, EnumPageSize)(e.ToString(), e)).ToList()
+
+ With cboFormat
+ .DataSource = items
+ .DisplayMember = "Key"
+ .ValueMember = "Value"
+ End With
+
+
If hasTwainSource Then
cboSource.Enabled = True
' chkShowUI.Enabled = True
@@ -438,6 +496,12 @@ Public Class frmScan
Try
Select Case ART
Case "DirectScan"
+
+ If cboFormat.SelectedIndex >= 0 Then
+ Dim selectedPaper As EnumPageSize = CType(cboFormat.SelectedValue, EnumPageSize)
+ If cbxAltFormat.Checked Then m_PDFCreator.PageSize = selectedPaper
+ End If
+
Dim PDF_bytes As Byte() = m_PDFCreator.SaveAsBytes(TryCast(Me, ISave))
Me.fileName = addExtension(tbxSaveFileName.Text) ' DS.LAST_ID
Me.ReturnValue = PDF_bytes ' DS.LAST_ID
@@ -531,7 +595,10 @@ Public Class frmScan
SaveFileDialog.DefaultExt = "pdf"
If SaveFileDialog.ShowDialog() = DialogResult.OK Then
' Multi page PDF
-
+ If cboFormat.SelectedIndex >= 0 Then
+ Dim selectedPaper As EnumPageSize = CType(cboFormat.SelectedValue, EnumPageSize)
+ If cbxAltFormat.Checked Then m_PDFCreator.PageSize = selectedPaper
+ End If
m_PDFCreator.Save(TryCast(Me, ISave), SaveFileDialog.FileName)
End If
End If
@@ -575,12 +642,12 @@ Public Class frmScan
Dim iHeight As Integer = (tempAnnotation.EndPoint.X - tempAnnotation.StartPoint.X)
Select Case tempAnnotation.AnnotationType
'case AnnotationType.enumLine:
- Case AnnotationType.enumEllipse, AnnotationType.enumRectangle, AnnotationType.enumText
+ Case Dynamsoft.Core.Enums.AnnotationType.enumEllipse, Dynamsoft.Core.Enums.AnnotationType.enumRectangle, Dynamsoft.Core.Enums.AnnotationType.enumText
tempAnnotation.StartPoint = New Point(x, y)
'tempAnnotation.Size = new Size(iWidth, iHeight);
tempAnnotation.EndPoint = New Point((tempAnnotation.StartPoint.X + iWidth), (tempAnnotation.StartPoint.Y + iHeight))
Exit Select
- Case AnnotationType.enumLine
+ Case Dynamsoft.Core.Enums.AnnotationType.enumLine
Dim startPoint As Point = tempAnnotation.StartPoint
x = startPoint.Y
y = iImageWidth - startPoint.X
@@ -608,11 +675,11 @@ Public Class frmScan
Dim iHeight As Integer = tempAnnotation.Size.Width
Select Case tempAnnotation.AnnotationType
'case AnnotationType.enumLine:
- Case AnnotationType.enumEllipse, AnnotationType.enumRectangle, AnnotationType.enumText
+ Case Dynamsoft.Core.Enums.AnnotationType.enumEllipse, Dynamsoft.Core.Enums.AnnotationType.enumRectangle, Dynamsoft.Core.Enums.AnnotationType.enumText
tempAnnotation.StartPoint = New Point(x, y)
tempAnnotation.EndPoint = New Point((tempAnnotation.StartPoint.X + iWidth), (tempAnnotation.StartPoint.Y + iHeight))
Exit Select
- Case AnnotationType.enumLine
+ Case Dynamsoft.Core.Enums.AnnotationType.enumLine
Dim startPoint As Point = tempAnnotation.StartPoint
x = iImageHeight - startPoint.Y
y = startPoint.X
@@ -708,6 +775,10 @@ Public Class frmScan
Case "QuickScan"
Do
startScan()
+ If cboFormat.SelectedIndex >= 0 Then
+ Dim selectedPaper As EnumPageSize = CType(cboFormat.SelectedValue, EnumPageSize)
+ If cbxAltFormat.Checked Then m_PDFCreator.PageSize = selectedPaper
+ End If
Dim PDF_bytes As Byte() = m_PDFCreator.SaveAsBytes(TryCast(Me, ISave))
Me.fileName = addExtension(tbxSaveFileName.Text) ' DS.LAST_ID
Me.ReturnValue = PDF_bytes ' DS.LAST_ID
@@ -754,6 +825,10 @@ Public Class frmScan
Return True
'Throw New NotImplementedException()
End Function
+
+ Private Sub cbxAltFormat_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAltFormat.CheckedChanged
+ cboFormat.Enabled = cbxAltFormat.Checked
+ End Sub
End Class