diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
index 71a770f..25a7ad7 100644
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -498,7 +498,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnResetFilter.ForeColor = System.Drawing.Color.Black
Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh
- Me.btnResetFilter.Location = New System.Drawing.Point(249, 24)
+ Me.btnResetFilter.Location = New System.Drawing.Point(283, 21)
Me.btnResetFilter.Name = "btnResetFilter"
Me.btnResetFilter.Size = New System.Drawing.Size(62, 33)
Me.btnResetFilter.TabIndex = 3
diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb
index 74f5d10..4a90f66 100644
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -54,7 +54,7 @@ Public Class frmGesamtsicherheitenMenuNEU
btnMonat.Text = MONAT.ToString("MMMM")
btnJahr.Text = JAHR.Year
- If GesSichRef.brgakto_gs_ATR = True Then
+ If GesSichRef.brgakto_gs_ATR Then
Dim anzahlOffenerGSUeber85Tage As Integer = checkOpenATBs()
If anzahlOffenerGSUeber85Tage > 0 Then
btnOpenOver85Days.Visible = True
@@ -67,36 +67,95 @@ Public Class frmGesamtsicherheitenMenuNEU
Public Function LoadDGV()
Dim sqladdon As String = ""
- If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'"
- If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'"
+ Dim sqlSicherheitssaldo As String = ""
+ If chkOffen.Checked Then sqlSicherheitssaldo &= " HAVING
+ ( COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) +
+ COALESCE(MAX(PositionenSaldo.gsp_SicherheitsSaldo), 0)
+ ) <> 0 "
+ If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = " & cbxStandort._value.ToString
If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'"
- Dim sqlstring As String =
- " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId,
- max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(
- (Select SUM( Case
- when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
- when gs_art = 'Close' then gs_sicherheitsbetrag
- End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
- )
- +
- (Select SUM( Case
- when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
- when gsp_art = 'Close' then gsp_sicherheitsbetrag
- End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
- ) , 'C', 'de-DE') as gs_SicherheitsSaldo
+ 'Dim sqlstring As String =
+ ' " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId,
+ ' max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT(
+ ' (Select SUM( Case
+ 'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+ 'when gs_art = 'Close' then gs_sicherheitsbetrag
+ ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
+ ' )
+ ' +
+ ' (Select SUM( Case
+ 'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
+ 'when gsp_art = 'Close' then gsp_sicherheitsbetrag
+ ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
+ ' ) , 'C', 'de-DE') as gs_SicherheitsSaldo
- From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where
- gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
- gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR
- gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR
- gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR
- gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR
- gs_warenort like '%" & txtSuchbegriff.Text & "%'
- ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2
- Where gs_standort = '" & Standort & "' " & sqladdon & "
- AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "'
- AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr"
+ ' From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where
+ ' gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
+ ' gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR
+ ' gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR
+ ' gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR
+ ' gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR
+ ' gs_warenort like '%" & txtSuchbegriff.Text & "%'
+ ' ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2
+ ' Where gs_standort = '" & Standort & "' " & sqladdon & "
+ ' AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "'
+ ' AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr"
+
+
+
+ Dim sqlstring As String = "WITH SicherheitsSaldo AS (
+ SELECT
+ gs_gsnr,
+ SUM(CASE
+ WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag
+ WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag
+ END) AS gs_SicherheitsSaldo
+ FROM tblGesamtsicherheit
+ GROUP BY gs_gsnr
+ ),
+ PositionenSaldo AS (
+ SELECT
+ gsp_gsnr,
+ SUM(CASE
+ WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag
+ WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag
+ END) AS gsp_SicherheitsSaldo
+ FROM tblGesamtsicherheitsPositionen
+ GROUP BY gsp_gsnr
+ )
+ SELECT
+ gs.gs_gsnr,
+ MIN(gs.gs_standort) AS gs_standort,
+ MIN(gs.gs_warenort) AS gs_warenort,
+ MIN(gs.gs_filialenNr) AS gs_filialenNr,
+ MIN(gs.gs_abfertigungsNr) AS gs_abfertigungsNr,
+ MIN(gs.gs_avisoId) AS gs_avisoId,
+ MAX(gs.gs_LKWKZ) AS gs_LKWKZ,
+ MIN(gs.gs_datum) AS gs_datum,
+ (
+ COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) +
+ COALESCE(MAX(PositionenSaldo.gsp_SicherheitsSaldo), 0)
+ ) AS gs_SicherheitsSaldo
+ FROM
+ tblGesamtsicherheit gs
+ LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr
+ LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr
+ WHERE
+ gs.gs_standort = '" & Standort & "' " & sqladdon & "
+ AND gs.gs_datum BETWEEN '" & Date.Parse(txtDatVon.Text) & "' AND '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'
+ AND (
+ gs.gs_freitext LIKE '%" & txtSuchbegriff.Text & "%' OR
+ gs.gs_abfertigungsNr LIKE '%" & txtSuchbegriff.Text & "%' OR
+ gs.gs_avisoId LIKE '%" & txtSuchbegriff.Text & "%' OR
+ gs.gs_ATBNr LIKE '%" & txtSuchbegriff.Text & "%' OR
+ gs.gs_LKWKZ LIKE '%" & txtSuchbegriff.Text & "%' OR
+ gs.gs_warenort LIKE '%" & txtSuchbegriff.Text & "%'
+ )
+ GROUP BY
+ gs.gs_gsnr " & sqlSicherheitssaldo &
+ "ORDER BY
+ gs.gs_gsnr;"
dgvListe.SET_SQL(sqlstring, "AVISO")
dgvListe.LOAD()
@@ -115,6 +174,7 @@ Public Class frmGesamtsicherheitenMenuNEU
.Columns("gs_datum").HeaderText = "Datum"
.Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("gs_SicherheitsSaldo").HeaderText = "offener S-Betrag"
+ .Columns("gs_SicherheitsSaldo").DefaultCellStyle.Format = "c2"
.Columns("gs_Warenort").Width = 96
.Columns("gs_Warenort").HeaderText = "Warenort"
.Columns("gs_avisoId").Width = 96
@@ -123,8 +183,6 @@ Public Class frmGesamtsicherheitenMenuNEU
End With
-
-
If dgvListe.Rows.Count = 0 Then Exit Function
dataTable = New DataTable()
@@ -361,21 +419,63 @@ Public Class frmGesamtsicherheitenMenuNEU
Dim anzahlOffenerGSUeber85Tage As Integer
- Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum,
- (Select SUM( Case
- when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
- when gs_art = 'Close' then gs_sicherheitsbetrag
- End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
- )
- +
- (Select SUM( Case
- when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
- when gsp_art = 'Close' then gsp_sicherheitsbetrag
- End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
- ) as Sicherheitssaldo
+ ' Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum,
+ ' (Select SUM( Case
+ 'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
+ 'when gs_art = 'Close' then gs_sicherheitsbetrag
+ ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr
+ ' )
+ ' +
+ ' (Select SUM( Case
+ 'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
+ 'when gsp_art = 'Close' then gsp_sicherheitsbetrag
+ ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr
+ ' ) as Sicherheitssaldo
+
+ ' From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2
+ ' Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0 AND gs_datum < '" & Date.Now().AddDays(-85) & "'"
+
+
+
+ Dim sqlstring As String = "WITH SicherheitsSaldo AS (
+ SELECT
+ gs_gsnr,
+ SUM(CASE
+ WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag
+ WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag
+ END) AS gs_SicherheitsSaldo
+ FROM tblGesamtsicherheit
+ GROUP BY gs_gsnr
+ ),
+ PositionenSaldo AS (
+ SELECT
+ gsp_gsnr,
+ SUM(CASE
+ WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag
+ WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag
+ END) AS gsp_SicherheitsSaldo
+ FROM tblGesamtsicherheitsPositionen
+ GROUP BY gsp_gsnr
+ )
+ SELECT
+ COUNT(*) AS anzahlOffeneATBs
+ FROM (
+ SELECT
+ gs.gs_gsnr,
+ MIN(gs.gs_standort) AS gs_standort,
+ MIN(gs.gs_datum) AS gs_datum,
+ COALESCE(SUM(SicherheitsSaldo.gs_SicherheitsSaldo), 0) +
+ COALESCE(SUM(PositionenSaldo.gsp_SicherheitsSaldo), 0) AS Sicherheitssaldo
+ FROM tblGesamtsicherheit gs
+ LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr
+ LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr
+ WHERE gs.gs_standort = '" & Standort & "'
+ AND gs.gs_datum < '" & Date.Now().AddDays(-85) & "'
+ GROUP BY gs.gs_gsnr
+ ) AS meh2
+ WHERE meh2.Sicherheitssaldo <> 0;"
+
- From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2
- Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0 AND gs_datum < '" & Date.Now().AddDays(-85) & "'"
Dim dtNew As DataTable = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)
@@ -412,13 +512,10 @@ Public Class frmGesamtsicherheitenMenuNEU
Next
Dim frm As New frmGesamtsicherheitenNEU
-
Dim datumVon As Date = CDate(txtDatVon.Text)
-
datumVon = datumVon.AddDays(-1)
If sender.ToString = "Detailliste" Then
-
frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text)
ElseIf sender.ToString = "Referenzliste-Zollamt" Then
frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort)
diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb
index 0a4bbfb..43eff63 100644
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -75,7 +75,7 @@ Public Class frmGesamtsicherheitenNEU
panOverlay.Visible = True
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
- cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
+ cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND [wo_firma] = " & firmaId & " AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
If datum = Nothing Then datum = Date.Now
nextGessicherheitID = -1
@@ -120,15 +120,15 @@ Public Class frmGesamtsicherheitenNEU
txtGestellInfo.Text = ""
Dim sqladd1 As String = ""
- If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust"
+ If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", (([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100) as gs_ust"
If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]"
Dim sqlSearchSting As String = ""
If withFilterParam = True Then
- If txtSuche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
+ If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0"
End If
- Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
+ Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
dgvGesamtsicherheit.LOAD()
@@ -159,6 +159,7 @@ Public Class frmGesamtsicherheitenNEU
.Columns("gs_atr").Width = 35
.Columns("gs_ust").Width = 70
.Columns("gs_ust").HeaderText = "Ust"
+ .Columns("gs_ust").DefaultCellStyle.Format = "c2"
Case Else
@@ -226,13 +227,6 @@ Public Class frmGesamtsicherheitenNEU
Next
- 'Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',
- ' [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext
- ' from [tblGesamtsicherheit]
- ' inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
- ' where [gs_gsnr] IN (" & gsnr & ")
- ' order by gs_gsId"
-
Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt'
From [tblGesamtsicherheit]
@@ -731,6 +725,7 @@ Public Class frmGesamtsicherheitenNEU
.gsp_ust = ""
.gsp_avisoId = Me.avisoID
.gsp_gsNr = OPEN.gs_gsNr
+ .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
End With
@@ -797,6 +792,7 @@ Public Class frmGesamtsicherheitenNEU
.gsp_ust = currentSicherheit.gs_ust
.gsp_ATCNr = txtPositionenCRN.Text
.gsp_avisoId = Me.avisoID
+ .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
End With
SicherheitsPos.SAVE()
@@ -996,6 +992,8 @@ Public Class frmGesamtsicherheitenNEU
End With
If checkSicherheitsbetrag() = False Then Exit Sub
+ currentSicherheit.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+ currentSicherheit.gs_zuletztgeandert = Now()
currentSicherheit.SAVE()
txtAnzahlPos.Enabled = True
btnUpdateSicherheit.Visible = False
@@ -1008,7 +1006,10 @@ Public Class frmGesamtsicherheitenNEU
Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click
- If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then Exit Sub
+ If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then
+
+ Exit Sub
+ End If
With currentSPos
@@ -1022,11 +1023,17 @@ Public Class frmGesamtsicherheitenNEU
currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
Else
currentSPos.gsp_datum = Nothing
+ If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then
+ MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!")
+ Exit Sub
+ End If
End If
End With
If checkSicherheitsbetrag() = False Then Exit Sub
+ currentSPos.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+ currentSPos.gsp_zuletztgeandert = Now()
currentSPos.SAVE()
btnAddPos.Visible = True
btnUpdatePos.Visible = False
@@ -1129,6 +1136,8 @@ Public Class frmGesamtsicherheitenNEU
sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer
sicherheiten.gs_LKWKZ = gessich.LKWKZ
sicherheiten.gs_warenort = gessich.warenortID
+ sicherheiten.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
End Sub
@@ -1892,6 +1901,7 @@ Public Class frmGesamtsicherheitenNEU
.gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID
.gsp_isPosRundungsdiff = True
.gsp_avisoId = Me.avisoID
+ .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
End With
SicherheitsPos.SAVE()
diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb
index bb7526a..3647d5e 100644
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -24,15 +24,15 @@ Partial Class frmHauptfenster
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
- Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -291,7 +291,6 @@ Partial Class frmHauptfenster
Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
- Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
Me.pnl = New System.Windows.Forms.Panel()
Me.Button10 = New System.Windows.Forms.Button()
Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -399,6 +398,8 @@ Partial Class frmHauptfenster
Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
Me.conMenuAviso.SuspendLayout()
Me.MenuStrip1.SuspendLayout()
Me.pnlDetailsRechts.SuspendLayout()
@@ -892,26 +893,26 @@ Partial Class frmHauptfenster
'GenerelleGestellungenDurchsuchenToolStripMenuItem
'
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem"
- Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen"
Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False
'
'KundenVonFremdenSpeditionenToolStripMenuItem
'
Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem"
- Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen"
'
'KundenverwaltungToolStripMenuItem
'
Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem"
- Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung"
'
'MDMParkplatzkartenToolStripMenuItem
'
Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem"
- Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten"
'
'SMSSendenToolStripMenuItem
@@ -919,7 +920,7 @@ Partial Class frmHauptfenster
Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem})
Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2
Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem"
- Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.SMSSendenToolStripMenuItem.Text = "SMS"
'
'NeueSMSSendenToolStripMenuItem
@@ -937,51 +938,51 @@ Partial Class frmHauptfenster
'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem
'
Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem"
- Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen"
'
'MRNBarcodedruckToolStripMenuItem
'
Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem"
- Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck"
'
'ToolStripSeparator12
'
Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
- Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6)
+ Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6)
'
'tool_BRGXLS
'
Me.tool_BRGXLS.Name = "tool_BRGXLS"
- Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30)
+ Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22)
Me.tool_BRGXLS.Text = "Bürgschaften Excel"
'
'ToolStripMenuItem4
'
Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
- Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30)
+ Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel"
Me.ToolStripMenuItem4.Visible = False
'
'ToolStripMenuItem5
'
Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
- Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30)
+ Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel"
Me.ToolStripMenuItem5.Visible = False
'
'BürgschaftenExcelToolStripMenuItem
'
Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem"
- Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel"
Me.BürgschaftenExcelToolStripMenuItem.Visible = False
'
'ToolStripMenuItem6
'
Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6"
- Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30)
+ Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel"
Me.ToolStripMenuItem6.Visible = False
'
@@ -989,69 +990,69 @@ Partial Class frmHauptfenster
'
Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem})
Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
- Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
Me.GesamtsicherheitenToolStripMenuItem.Visible = False
'
'ATVeragAGToolStripMenuItem
'
Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem"
- Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG"
'
'ATImexCSToolStripMenuItem
'
Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem"
- Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH"
'
'ATVeragCSToolStripMenuItem
'
Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem"
- Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS"
'
'DEVeragGmbHToolStripMenuItem
'
Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem"
- Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH"
'
'ATUnispedGmbHToolStripMenuItem
'
Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem"
- Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH"
'
'DEAmbarToolStripMenuItem
'
Me.DEAmbarToolStripMenuItem.Name = "DEAmbarToolStripMenuItem"
- Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+ Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(178, 22)
Me.DEAmbarToolStripMenuItem.Text = "DE | Ambar GmbH"
Me.DEAmbarToolStripMenuItem.Visible = False
'
'ToolStripMenuItem10
'
Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
- Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30)
+ Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem10.Text = "TICKET Parkplatz"
'
'TICKETWaidhausToolStripMenuItem
'
Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem"
- Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz"
'
'ToolStripSeparator10
'
Me.ToolStripSeparator10.Name = "ToolStripSeparator10"
- Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6)
+ Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6)
'
'DAKOSYToolStripMenuItem
'
Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem})
Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem"
- Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.DAKOSYToolStripMenuItem.Text = "DAKOSY"
'
'StammreferenzenVerwaltenToolStripMenuItem
@@ -1063,69 +1064,69 @@ Partial Class frmHauptfenster
'ToolStripSeparator23
'
Me.ToolStripSeparator23.Name = "ToolStripSeparator23"
- Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6)
+ Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6)
'
'toolOriginalATR
'
Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr
Me.toolOriginalATR.Name = "toolOriginalATR"
- Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30)
+ Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22)
Me.toolOriginalATR.Text = "Original-ATR"
'
'SDLAbholaufträgeToolStripMenuItem
'
Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem"
- Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge"
'
'ToolStripMenuItem13
'
Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13"
- Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30)
+ Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22)
Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)"
'
'VorauskassenToolStripMenuItem
'
Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung
Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem"
- Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
'
'ToolStripSeparator11
'
Me.ToolStripSeparator11.Name = "ToolStripSeparator11"
- Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6)
+ Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6)
'
'EssensbestellungenToolStripMenuItem
'
Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem"
- Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
Me.EssensbestellungenToolStripMenuItem.Visible = False
'
'AdministrationEssensbestellungenToolStripMenuItem
'
Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
- Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
'
'ToolStripSeparator24
'
Me.ToolStripSeparator24.Name = "ToolStripSeparator24"
- Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6)
+ Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6)
'
'WarenorteToolStripMenuItem
'
Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
- Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.WarenorteToolStripMenuItem.Text = "Warenorte"
'
'DatevBuchungsexportToolStripMenuItem
'
Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem})
Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem"
- Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport"
Me.DatevBuchungsexportToolStripMenuItem.Visible = False
'
@@ -1144,13 +1145,13 @@ Partial Class frmHauptfenster
'APIToolStripMenuItem
'
Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem"
- Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.APIToolStripMenuItem.Text = "API"
'
'FIBUSachkontenToolStripMenuItem
'
Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem"
- Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+ Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten"
'
'StatistikToolStripMenuItem
@@ -1774,6 +1775,7 @@ Partial Class frmHauptfenster
'Top
'
Me.Top.BackColor = System.Drawing.Color.White
+ Me.Top.Controls.Add(Me.Button1)
Me.Top.Controls.Add(Me.lblUsrname)
Me.Top.Controls.Add(Me.lblFimaAviso)
Me.Top.Controls.Add(Me.Button11)
@@ -1825,7 +1827,7 @@ Partial Class frmHauptfenster
'
'Button11
'
- Me.Button11.Location = New System.Drawing.Point(687, 26)
+ Me.Button11.Location = New System.Drawing.Point(1081, 15)
Me.Button11.Name = "Button11"
Me.Button11.Size = New System.Drawing.Size(75, 23)
Me.Button11.TabIndex = 14
@@ -2494,15 +2496,6 @@ Partial Class frmHauptfenster
Me.SplitContainer3.SplitterDistance = 158
Me.SplitContainer3.TabIndex = 3
'
- 'UsrCntlBenachrichtigungen1
- '
- Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
- Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
- Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300)
- Me.UsrCntlBenachrichtigungen1.TabIndex = 0
- '
'pnl
'
Me.pnl.Controls.Add(Me.Button10)
@@ -2535,38 +2528,38 @@ Partial Class frmHauptfenster
Me.gridMyAviso.AllowUserToDeleteRows = False
Me.gridMyAviso.AllowUserToOrderColumns = True
Me.gridMyAviso.AllowUserToResizeRows = False
- DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure
- Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+ DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
+ Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White
- DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
- DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11
+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3
Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridMyAviso.Location = New System.Drawing.Point(0, 21)
Me.gridMyAviso.Name = "gridMyAviso"
Me.gridMyAviso.ReadOnly = True
- DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13
+ DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.gridMyAviso.RowHeadersVisible = False
Me.gridMyAviso.RowHeadersWidth = 62
Me.gridMyAviso.Size = New System.Drawing.Size(488, 279)
@@ -2979,47 +2972,47 @@ Partial Class frmHauptfenster
Me.gridAviso.AllowUserToAddRows = False
Me.gridAviso.AllowUserToDeleteRows = False
Me.gridAviso.AllowUserToResizeRows = False
- DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure
- DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
+ DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray
Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable
- DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue
- DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15
+ DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue
+ DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.gridAviso.ColumnHeadersHeight = 25
Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
- DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16
+ DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7
Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridAviso.Location = New System.Drawing.Point(0, 248)
Me.gridAviso.MultiSelect = False
Me.gridAviso.Name = "gridAviso"
Me.gridAviso.ReadOnly = True
- DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17
+ DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
Me.gridAviso.RowHeadersVisible = False
Me.gridAviso.RowHeadersWidth = 62
Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
- DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18
+ DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9
Me.gridAviso.RowTemplate.ReadOnly = True
Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -3793,6 +3786,25 @@ Partial Class frmHauptfenster
Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
Me.UsrCntlTestsystem1.TabIndex = 8
'
+ 'Button1
+ '
+ Me.Button1.Location = New System.Drawing.Point(1028, 7)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(75, 23)
+ Me.Button1.TabIndex = 87
+ Me.Button1.Text = "Button1"
+ Me.Button1.UseVisualStyleBackColor = True
+ Me.Button1.Visible = False
+ '
+ 'UsrCntlBenachrichtigungen1
+ '
+ Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+ Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+ Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300)
+ Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+ '
'frmHauptfenster
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4232,4 +4244,5 @@ Partial Class frmHauptfenster
Friend WithEvents FTPToolStripMenuItem As ToolStripMenuItem
Friend WithEvents SpireLizenzPrüfenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents DEAmbarToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents Button1 As Button
End Class
diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx
index 9801068..b95b36c 100644
--- a/Aviso/frmHauptfenster.resx
+++ b/Aviso/frmHauptfenster.resx
@@ -243,9 +243,6 @@
pOTzPwAAAABJRU5ErkJggg==
-
- 560, 17
-
659, 17
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index 84c1b38..4abeb5d 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -368,6 +368,7 @@ Public Class frmHauptfenster
AdministrationToolStripMenuItem.Visible = True
lblMitarbeiter.Text += " (Admin)"
Button3.Visible = True
+ Button1.Visible = True
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then
@@ -4318,11 +4319,153 @@ Public Class frmHauptfenster
Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click
+ Exit Sub
+
setProfileImage()
cHMRC.VATTEST(InputBox("Token"))
End Sub
+ Sub saveLukowaPDFsFromTherefore()
+ ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ ' Dim dt As DataTable = SQL.loadDgvBySql("", "EZOLL")
+ Dim slist As New List(Of String)
+ slist.Add("530324001596")
+ slist.Add("530324001604")
+ slist.Add("530324001658")
+ slist.Add("530324001685")
+ slist.Add("530324001707")
+ slist.Add("530324001721")
+ slist.Add("530324001756")
+ slist.Add("530324001720")
+ slist.Add("530324001755")
+ slist.Add("530324001863")
+ slist.Add("530324001853")
+ slist.Add("530324001941")
+ slist.Add("530324001695")
+ slist.Add("530324002015")
+ slist.Add("530324002021")
+ slist.Add("530324002034")
+ slist.Add("530324002042")
+ slist.Add("530324002083")
+ slist.Add("530324002089")
+ slist.Add("530324002090")
+ slist.Add("530324002094")
+ slist.Add("530324002097")
+ slist.Add("530324002107")
+ slist.Add("530324002108")
+ slist.Add("530324002117")
+ slist.Add("530324002115")
+ slist.Add("530324002114")
+ slist.Add("530324002116")
+ slist.Add("530324002189")
+ slist.Add("530324002217")
+ slist.Add("530324002230")
+ slist.Add("530324002274")
+ slist.Add("530324002276")
+ slist.Add("530324002288")
+ slist.Add("530324002290")
+ slist.Add("530324002291")
+ slist.Add("530324002349")
+ slist.Add("530324002386")
+ slist.Add("530324002387")
+ slist.Add("530324002390")
+ slist.Add("530324002380")
+ slist.Add("530324002383")
+ slist.Add("530324002412")
+ slist.Add("530324002451")
+ slist.Add("530324002450")
+ slist.Add("530324002453")
+ slist.Add("530324002459")
+ slist.Add("530324002460")
+ slist.Add("530324002474")
+ slist.Add("530324002498")
+ slist.Add("530324002499")
+ slist.Add("530324002487")
+ slist.Add("530324002507")
+ slist.Add("530324002554")
+ slist.Add("530324002560")
+ slist.Add("530324002544")
+ slist.Add("530324002548")
+ slist.Add("530324002551")
+ slist.Add("530324002581")
+ slist.Add("530324002616")
+ slist.Add("530324002619")
+ slist.Add("530324002610")
+ slist.Add("530324002634")
+ slist.Add("530324002636")
+ slist.Add("530324002675")
+ slist.Add("530324002681")
+ slist.Add("530324002682")
+ slist.Add("530324002688")
+ slist.Add("530324002689")
+ slist.Add("530324002665")
+ slist.Add("530324002659")
+ slist.Add("530324002723")
+ slist.Add("530324002796")
+ slist.Add("530324002798")
+ slist.Add("530324002783")
+ slist.Add("530324002890")
+ slist.Add("530324002905")
+ slist.Add("530324002913")
+ slist.Add("530324002918")
+ slist.Add("530324002926")
+ slist.Add("530324002956")
+ slist.Add("530324002959")
+ slist.Add("530324002961")
+ slist.Add("530324002962")
+ slist.Add("530324002972")
+ slist.Add("530324002963")
+ slist.Add("530324003079")
+ slist.Add("530324003111")
+ slist.Add("530324003140")
+ slist.Add("530324003142")
+ slist.Add("530324003161")
+ slist.Add("530324003164")
+ slist.Add("530324003230")
+ slist.Add("530324003294")
+ slist.Add("530324003295")
+ slist.Add("530324003312")
+ slist.Add("530324003380")
+ slist.Add("530324003430")
+ slist.Add("530324003395")
+ slist.Add("530324003514")
+ slist.Add("530324003454")
+ slist.Add("530324003499")
+ slist.Add("530324003501")
+ slist.Add("530324003504")
+ slist.Add("530324003500")
+ slist.Add("530324003606")
+ slist.Add("530324003616")
+ slist.Add("530324003674")
+ slist.Add("530324003682")
+ slist.Add("530324003780")
+ slist.Add("530324003653")
+ slist.Add("530324003985")
+ slist.Add("530324004016")
+ slist.Add("530324004157")
+ slist.Add("530324004254")
+ slist.Add("530324004367")
+ slist.Add("530324004386")
+ slist.Add("530324004387")
+ slist.Add("530324004747")
+ slist.Add("530324004756")
+ slist.Add("530324004757")
+ slist.Add("530324004836")
+ slist.Add("530324004918")
+ slist.Add("530324004916")
+ slist.Add("530324005000")
+ slist.Add("530324005049")
+ slist.Add("530324005132")
+
+
+
+ For Each s In slist
+ VERAG_PROG_ALLGEMEIN.cTherefore.getFileFromFolderCat("C:\Users\DEVELOPER1\Desktop\LUKOWA\", s, "", "Import ab Jänner 2024", "Import ab Jänner 2024")
+ Next
+
+
+ End Sub
Private Sub GVMSUKIMportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSUKIMportToolStripMenuItem.Click
Process.Start("https://www.tax.service.gov.uk/goods-movement-system/dashboard")
End Sub
@@ -4739,7 +4882,10 @@ Public Class frmHauptfenster
End Sub
+ Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
+ saveLukowaPDFsFromTherefore()
+ End Sub
End Class
Public Class AvisoStatusFunctions
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 20d1e8f..768cea8 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -5399,13 +5399,15 @@ Public Class frmSendungsdetailsNEU
VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, SENDUNG.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge
Dim invoicePrinted As Boolean = False
- If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.Contains("RECHNUNG")) Then invoicePrinted = True
+ If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.ToUpper.Contains("RECHNUNG")) Then invoicePrinted = True
For Each l In ANH_LIST_SND
Select Case l.anh_Art.ToString.ToUpper
Case "RECHNUNG", "HANDELSRECHNUNG"
VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)})
- Case "EFATURA", "EUR1"
+ Case "EFATURA"
If Not invoicePrinted Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)})
+ Case "EUR1"
+ VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)})
End Select
Next
@@ -7099,6 +7101,7 @@ Public Class frmSendungsdetailsNEU
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ isFailureShown = True
End Try
End Sub