mdmAntrag, KI, etc.

SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb

@@ -47,7 +47,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.lblUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblUID.AutoSize = True
         Me.lblUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.lblUID.Location = New System.Drawing.Point(669, 10)
+        Me.lblUID.Location = New System.Drawing.Point(1129, 10)
         Me.lblUID.Name = "lblUID"
         Me.lblUID.Size = New System.Drawing.Size(40, 13)
         Me.lblUID.TabIndex = 1
@@ -58,7 +58,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtUID.Location = New System.Drawing.Point(672, 26)
+        Me.txtUID.Location = New System.Drawing.Point(1132, 26)
         Me.txtUID.Name = "txtUID"
         Me.txtUID.Size = New System.Drawing.Size(134, 23)
         Me.txtUID.TabIndex = 3
@@ -71,7 +71,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.txtFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.txtFirma.Location = New System.Drawing.Point(73, 27)
         Me.txtFirma.Name = "txtFirma"
-        Me.txtFirma.Size = New System.Drawing.Size(173, 23)
+        Me.txtFirma.Size = New System.Drawing.Size(633, 23)
         Me.txtFirma.TabIndex = 1
         Me.txtFirma.Visible = False
         '
@@ -112,7 +112,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.btnUebernehmen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnUebernehmen.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.btnUebernehmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnUebernehmen.Location = New System.Drawing.Point(784, 359)
+        Me.btnUebernehmen.Location = New System.Drawing.Point(1244, 359)
         Me.btnUebernehmen.Name = "btnUebernehmen"
         Me.btnUebernehmen.Size = New System.Drawing.Size(136, 41)
         Me.btnUebernehmen.TabIndex = 9
@@ -123,7 +123,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtStrasse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtStrasse.Location = New System.Drawing.Point(252, 27)
+        Me.txtStrasse.Location = New System.Drawing.Point(712, 27)
         Me.txtStrasse.Name = "txtStrasse"
         Me.txtStrasse.Size = New System.Drawing.Size(163, 23)
         Me.txtStrasse.TabIndex = 101
@@ -134,7 +134,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label1.Location = New System.Drawing.Point(249, 11)
+        Me.Label1.Location = New System.Drawing.Point(709, 11)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(42, 13)
         Me.Label1.TabIndex = 100
@@ -145,7 +145,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtPLZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtPLZ.Location = New System.Drawing.Point(582, 26)
+        Me.txtPLZ.Location = New System.Drawing.Point(1042, 26)
         Me.txtPLZ.Name = "txtPLZ"
         Me.txtPLZ.Size = New System.Drawing.Size(84, 23)
         Me.txtPLZ.TabIndex = 103
@@ -156,7 +156,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label2.Location = New System.Drawing.Point(579, 10)
+        Me.Label2.Location = New System.Drawing.Point(1039, 10)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(27, 13)
         Me.Label2.TabIndex = 102
@@ -167,7 +167,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtOrt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtOrt.Location = New System.Drawing.Point(421, 26)
+        Me.txtOrt.Location = New System.Drawing.Point(881, 26)
         Me.txtOrt.Name = "txtOrt"
         Me.txtOrt.Size = New System.Drawing.Size(155, 23)
         Me.txtOrt.TabIndex = 105
@@ -178,7 +178,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label3.Location = New System.Drawing.Point(418, 10)
+        Me.Label3.Location = New System.Drawing.Point(878, 10)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(21, 13)
         Me.Label3.TabIndex = 104
@@ -196,12 +196,12 @@ Partial Class usrcntlVAT_ATEZ
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.dgvVAT.BackgroundColor = System.Drawing.Color.White
         Me.dgvVAT.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvVAT.Location = New System.Drawing.Point(12, 63)
+        Me.dgvVAT.Location = New System.Drawing.Point(12, 56)
         Me.dgvVAT.Name = "dgvVAT"
         Me.dgvVAT.ReadOnly = True
         Me.dgvVAT.RowHeadersVisible = False
         Me.dgvVAT.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvVAT.Size = New System.Drawing.Size(908, 290)
+        Me.dgvVAT.Size = New System.Drawing.Size(1368, 297)
         Me.dgvVAT.TabIndex = 7
         '
         'cboLand
@@ -223,11 +223,11 @@ Partial Class usrcntlVAT_ATEZ
         Me.lblPagecount.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblPagecount.AutoSize = True
         Me.lblPagecount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.lblPagecount.Location = New System.Drawing.Point(827, 37)
+        Me.lblPagecount.Location = New System.Drawing.Point(1268, 10)
         Me.lblPagecount.Name = "lblPagecount"
-        Me.lblPagecount.Size = New System.Drawing.Size(43, 13)
+        Me.lblPagecount.Size = New System.Drawing.Size(77, 13)
         Me.lblPagecount.TabIndex = 106
-        Me.lblPagecount.Text = "Seiten: "
+        Me.lblPagecount.Text = "Gesamtseiten: "
         '
         'usrcntlVAT_ATEZ
         '
@@ -252,7 +252,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Controls.Add(Me.txtUID)
         Me.Controls.Add(Me.lblUID)
         Me.Name = "usrcntlVAT_ATEZ"
-        Me.Size = New System.Drawing.Size(938, 403)
+        Me.Size = New System.Drawing.Size(1398, 403)
         CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()

SDL/Creditsafe/usrcntlVAT_ATEZ.vb

@@ -1,4 +1,5 @@
 Imports System.Web.UI.WebControls.Expressions
+Imports VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS
 
 Public Class usrcntlVAT_ATEZ
     Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
@@ -60,28 +61,6 @@ Public Class usrcntlVAT_ATEZ
     End Sub
 
 
-
-
-    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))
-        dataTable.Columns.Add("total_pages", GetType(Integer))
-        dataTable.Columns.Add("doc_index", GetType(Integer))
-        dataTable.Columns.Add("page_count", GetType(Integer))
-
-    End Sub
-
     Sub initDGV(dt As DataTable)
 
         dgvVAT.DataSource = dt
@@ -89,14 +68,16 @@ Public Class usrcntlVAT_ATEZ
 
         If dgvVAT.Columns.Count > 0 Then
 
+            Dim pageCpunterCheck = 0
+
             lblPagecount.Text &= dgvVAT.Rows(0).Cells("total_pages").Value
 
             With dgvVAT
                 .RowHeadersWidth = 10
                 .Columns("count").HeaderText = "#"
                 .Columns("count").Width = 25
-                .Columns("currency").HeaderText = "Währung"
+                .Columns("total_VAT_currency").HeaderText = "Währung"
-                .Columns("currency").Width = 50
+                .Columns("total_VAT_currency").Width = 50
                 .Columns("invoice_id").HeaderText = "Rechnungs-Nr"
                 .Columns("seller_VAT_id").HeaderText = "UID-Nr"
                 .Columns("seller_VAT_id").Width = 100
@@ -115,17 +96,27 @@ Public Class usrcntlVAT_ATEZ
                 .Columns("status").HeaderText = "Status"
                 .Columns("invoice_date").Width = 100
                 .Columns("invoice_date").HeaderText = "Rechnungsdatum"
-                .Columns("document_count").HeaderText = "Dok.#"
+                .Columns("doc_index").HeaderText = "Dok.#"
-                .Columns("document_count").Width = 50
+                .Columns("doc_index").Width = 50
                 .Columns("page_count").HeaderText = "Seiten"
                 .Columns("page_count").Width = 50
 
                 .Columns("total_pages").Visible = False
-                .Columns("doc_index").Visible = False
+                .Columns("seller_address_full").Visible = False
+                '.Columns("doc_index").Visible = False
 
             End With
 
             For Each row As DataGridViewRow In dgvVAT.Rows
+
+
+
+                If IsNumeric(row.Cells("page_count").Value) AndAlso row.Cells("page_count").Value <> 0 Then
+                    pageCpunterCheck += row.Cells("page_count").Value
+                End If
+
+
+
                 If Not IsDBNull(row.Cells("status").Value) Then
                     Dim akiv As String = (row.Cells("status").Value.ToString).ToLower
                     If akiv = "success" Then
@@ -159,6 +150,15 @@ Public Class usrcntlVAT_ATEZ
 
             Next
 
+            If dgvVAT.Rows(0).Cells("total_pages").Value <> pageCpunterCheck Then
+                lblLand.Text = "ACHTUNG, es wurden nur " & pageCpunterCheck & " von möglichen " & dgvVAT.Rows(0).Cells("total_pages").Value & " per KI ausgelesen, das kann uU zu fehlern beim Aufsplitten der Seiten führen!"
+                lblLand.ForeColor = Color.Red
+                lblLand.Visible = True
+            Else
+                lblLand.Visible = False
+
+            End If
+
         End If
 
 
@@ -171,13 +171,14 @@ Public Class usrcntlVAT_ATEZ
 
         For Each row As DataGridViewRow In dgvVAT.SelectedRows
             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("total_VAT_currency").Value), "", row.Cells("total_VAT_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),
                                IIf(IsDBNull(row.Cells("seller_address_country").Value), "", row.Cells("seller_address_country").Value),
                                IIf(IsDBNull(row.Cells("seller_address_postcode").Value), "", row.Cells("seller_address_postcode").Value),
                                IIf(IsDBNull(row.Cells("seller_address_street").Value), "", row.Cells("seller_address_street").Value),
+                               IIf(IsDBNull(row.Cells("seller_address_full").Value), "", row.Cells("seller_address_full").Value),
                                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)),
@@ -217,6 +218,7 @@ Public Class usrcntlVAT_ATEZ
         Public Property seller_address_country As String
         Public Property seller_address_postcode As String
         Public Property seller_address_street As String
+        Public Property seller_address_full As String
         Public Property seller_name As String
         Public Property invoice_date As Date
         Public Property total_VAT_amount As String
@@ -228,7 +230,7 @@ Public Class usrcntlVAT_ATEZ
 
 
 
-        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, _total_pages As Integer, _doc_index As Integer, _page_count As Integer)
+        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_address_full As String, _seller_name As String, _total_VAT_amount As String, _invoice_date As DateTime, _status As String, _document_count As Integer, _total_pages As Integer, _doc_index As Integer, _page_count As Integer)
             count = _count
             currency = _currency
             invoice_id = _invoice_id
@@ -237,6 +239,7 @@ Public Class usrcntlVAT_ATEZ
             seller_address_country = _seller_address_country
             seller_address_postcode = _seller_address_postcode
             seller_address_street = _seller_address_street
+            seller_address_full = _seller_address_full
             seller_name = _seller_name
             total_VAT_amount = _total_VAT_amount
             invoice_date = _invoice_date
@@ -251,7 +254,7 @@ Public Class usrcntlVAT_ATEZ
     End Class
 
     Private Sub dgvCreditsafe_SelectionChanged(sender As Object, e As EventArgs) Handles dgvVAT.SelectionChanged
-        If dgvVAT.SelectedRows.Count <> 1 Then
+        If dgvVAT.SelectedRows.Count = 0 Then
             btnUebernehmen.Enabled = False
         Else
             btnUebernehmen.Enabled = True

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -1360,27 +1360,10 @@ Public Class frmMDM_USTVAntrag
             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 = atez_api.createVATDatatable(documentType)
-
-                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))
-                dt.Columns.Add("doc_index", GetType(Integer))
-                dt.Columns.Add("page_count", GetType(Integer))
-                dt.Columns.Add("total_pages", GetType(Integer))
-            End If
 
             Dim failreDesc As String
             Dim authResp = atez_api.authenticate("VAT", "client1", "password", documentType)
@@ -1389,11 +1372,12 @@ Public Class frmMDM_USTVAntrag
                 MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
                 Return False
             Else
-                'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
 
+                'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
 
                 If atez_api.setJsonVAT(documentType, daid) Then
 
+                    Dim pageCounter = 0
                     resp = atez_api.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt, documentType)
 
 
@@ -1402,6 +1386,7 @@ Public Class frmMDM_USTVAntrag
 
                         Dim f As New frmVAT_ATEZ()
                         f.usrcntlVAT_ATEZ1.initDGV(dt)
+
                         If f.ShowDialog = DialogResult.OK Then
 
 
@@ -1439,7 +1424,7 @@ Public Class frmMDM_USTVAntrag
                                     If pageCount = r.Cells("page_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)
+                                        Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("ddMMyy_HHmmss.ffff"), 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
@@ -1454,7 +1439,7 @@ Public Class frmMDM_USTVAntrag
                                         Dim pagestart = 0
                                         For Each pages As DataRow In dt.Rows
                                             pagestart += CInt(pages.Item("page_count"))
-                                            If pages.Item("count") = r.Cells("count").Value Then Exit For
+                                            If pages.Item("doc_index") = r.Cells("doc_index").Value Then Exit For
                                         Next
 
 
@@ -1465,9 +1450,9 @@ Public Class frmMDM_USTVAntrag
                                         VERAG_PROG_ALLGEMEIN.cAllgemein.ExtractPdfPages(TMP_Path_Old, TMP_Path_New, pagestart, r.Cells("page_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)
+                                        Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("ddMMyy_HHmmss.ffff"), 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 Not DS_NEW.uploadDataToDATENSERVER(TMP_Path_New) Then MsgBox("Fehler beim Speichern: Datenserver!")
-                                        If DS_NEW.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
+                                        If DS_NEW.da_id <= 0 Then MsgBox("Keine DocId!")
 
                                         USTV_POS.UStVPo_daId = DS_NEW.da_id
 
@@ -1495,7 +1480,7 @@ Public Class frmMDM_USTVAntrag
                                     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
+                                    If r.Cells("total_VAT_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
@@ -1510,18 +1495,18 @@ Public Class frmMDM_USTVAntrag
                                         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_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(r.Cells("total_VAT_amount").Value, r.Cells("total_VAT_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)
+                                            Dim kurs As New cEZB_Waehrungskurse(r.Cells("total_VAT_currency").Value)
-                                            If r.Cells("currency").Value <> "EUR" Then
+                                            If r.Cells("total_VAT_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_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, r.Cells("total_VAT_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
+                                            ElseIf r.Cells("total_VAT_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
@@ -1529,7 +1514,7 @@ Public Class frmMDM_USTVAntrag
                                         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)
+                                            USTV_POS.UStVPo_USteuerbetrag = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(r.Cells("total_VAT_amount").Value, r.Cells("total_VAT_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
@@ -3111,8 +3096,8 @@ Public Class frmMDM_USTVAntrag
 
         'document_type = vat_invoice or receipt
 
-        If Not cnS_KIUPLOAD.Items.ContainsKey("vat_invoice") Then
+        If Not cnS_KIUPLOAD.Items.ContainsKey("invoice") Then
-            Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "vat_invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
             cnS_KIUPLOAD.Items.Add(vat)
             AddHandler vat.Click, AddressOf mnuItemKIUPLOAD_Clicked
         End If

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -644,25 +644,7 @@ Public Class ustCntlUSTV_AntragPosition
 
                     Dim dt As New DataTable
 
-                    If dt IsNot Nothing And Not dt.Columns.Contains("currency") Then
+                    dt = API.createVATDatatable(item.Name)
-
-                        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))
-                        dt.Columns.Add("page_count", GetType(Integer))
-                        dt.Columns.Add("doc_index", GetType(Integer))
-                        dt.Columns.Add("total_pages", GetType(Integer))
-                    End If
 
                     Dim failreDesc As String
                     Dim authResp = API.authenticate("VAT", "client1", "password", item.Name)

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb

@@ -4,6 +4,8 @@ Imports System.Reflection
 Imports System.Threading
 Imports System.Windows.Forms
 Imports Chilkat
+Imports com.sun.tools.doclets.internal.toolkit.resources
+Imports com.sun.xml.internal.rngom
 Imports DocumentFormat.OpenXml.Wordprocessing
 Imports javax
 Imports javax.xml.ws.soap.AddressingFeature
@@ -950,28 +952,43 @@ Public Class cATEZ_NCTS_IN
                         '--------------------------------
 
                         Dim j As Integer = 0
+                        dt.Clear()
+
                         While j < num
 
-                            Dim invoice As Chilkat.JsonObject = jsonResult.ObjectAt(j)
 
                             Dim R As DataRow = dt.NewRow
+
+                            Dim invoice As Chilkat.JsonObject = data.ObjectAt(j)
+
                             Dim totalAmonut As String = invoice.StringOf("total_VAT_amount").Replace(".", ",")
 
                             R("count") = j + 1
-                            R("currency") = checkNullStr(invoice.StringOf("currency"))
+                            R("total_VAT_currency") = checkNullStr(invoice.StringOf("currency"))
                             R("total_VAT_amount") = CDbl(checkNulDbl(totalAmonut))
-                            R("invoice_id") = checkNullStr(invoice.StringOf("invoice_id"))
+
-                            R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date"))
+                            If documentType = "receipt" Then
+                                R("invoice_id") = checkNullStr(invoice.StringOf("receipt_id"))
+                                R("invoice_date") = checkNullStr(invoice.StringOf("receipt_date"))
+                            Else
+                                R("invoice_id") = checkNullStr(invoice.StringOf("invoice_id"))
+                                R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date"))
+                            End If
+
                             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("seller_address_full") = checkNullStr(invoice.StringOf("seller_address_full"))
+
+
+
                             R("status") = checkNullStr(jsonResult.StringOf("status"))
                             R("document_count") = checkNulInt(jsonResult.IntOf("document_count"))
-                            R("doc_index") = checkNulInt(jsonResult.IntOf("doc_index"))
+                            R("doc_index") = checkNulInt(invoice.IntOf("doc_index"))
-                            R("page_count") = checkNulInt(jsonResult.IntOf("page_count"))
+                            R("page_count") = checkNulInt(invoice.IntOf("page_count"))
                             R("total_pages") = checkNulInt(jsonResult.IntOf("total_pages"))
 
                             dt.Rows.Add(R)
@@ -979,6 +996,7 @@ Public Class cATEZ_NCTS_IN
                             j = j + 1
                         End While
 
+
                         Return jsonResult.StringOf("status")
 
                     End If
@@ -1091,6 +1109,47 @@ Public Class cATEZ_NCTS_IN
 
     End Function
 
+
+    Shared Function createVATDatatable(documentType As String) As DataTable
+
+
+        Dim dt As New DataTable
+
+        Dim success As Boolean = False
+
+
+        If dt IsNot Nothing And Not dt.Columns.Contains("total_VAT_currency") Then
+
+                dt.Columns.Add("count", GetType(Integer))
+                dt.Columns.Add("total_VAT_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_address_full", GetType(String))
+                dt.Columns.Add("seller_name", GetType(String))
+            dt.Columns.Add("total_VAT_amount", GetType(Double))
+            dt.Columns.Add("status", GetType(String))
+            dt.Columns.Add("document_count", GetType(Integer))
+                dt.Columns.Add("doc_index", GetType(Integer))
+                dt.Columns.Add("page_count", GetType(Integer))
+            dt.Columns.Add("total_pages", GetType(Integer))
+            dt.Columns.Add("invoice_id", GetType(String))
+                dt.Columns.Add("invoice_date", GetType(String))
+
+        End If
+
+
+
+        Return dt
+
+    End Function
+
+
+
+
+
     Public Function setJsonPDF(ncts As cATEZ_NCTS_DATA, dgv As DataGridView)
 
         Dim success As Boolean

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -609,7 +609,7 @@ Public Class cAllgemein
             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
+            For p As Integer = pageStart To (pageStart + pagesEnd) - 1
                 If p > Reader.NumberOfPages Then
                     MsgBox("Seitenanzahl überschritten!")
                     srcDoc.Close() : Reader.Close()