edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
d.breimaier
2022-11-14 09:47:58 +01:00
parent 1b5479ceec 3e642d5283
commit 03f055dc05
3 changed files with 341 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SDL/Fakturierung/cFakturierung.vb
View File

@@ -696,14 +696,14 @@ Public Class cFakturierung
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
If hasVK(Rechnung) Then If hasVK(Rechnung) Then
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT35 4480 0365 7822 0002" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT35 4480 0365 7822 0002" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
If hasEUSTZOLL(Rechnung) Then If hasEUSTZOLL(Rechnung) Then
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT62 4480 0365 7822 0001" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT62 4480 0365 7822 0001" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT89 4480 0365 7822 0000" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT89 4480 0365 7822 0000" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
End If End If
End If End If
@@ -761,14 +761,14 @@ Public Class cFakturierung
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
If hasVK(RechnungsNr, Buchungsjahr) Then If hasVK(RechnungsNr, Buchungsjahr) Then
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT35 4480 0365 7822 0002" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT35 4480 0365 7822 0002" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
If hasEUSTZOLL(RechnungsNr) Then If hasEUSTZOLL(RechnungsNr) Then
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT62 4480 0365 7822 0001" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT62 4480 0365 7822 0001" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT89 4480 0365 7822 0000" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT89 4480 0365 7822 0000" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
End If End If
End If End If
@@ -817,14 +817,14 @@ Public Class cFakturierung
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
If hasVK(RechnungsNr, Buchungsjahr) Then If hasVK(RechnungsNr, Buchungsjahr) Then
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT35 4480 0365 7822 0002" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT35 4480 0365 7822 0002" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
If hasEUSTZOLL(RechnungsNr) Then If hasEUSTZOLL(RechnungsNr) Then
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT62 4480 0365 7822 0001" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT62 4480 0365 7822 0001" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
Else Else
rpt.txtBank1.Text = "Volksbank Schärding" & vbNewLine & "IBAN:AT89 4480 0365 7822 0000" & vbNewLine & "BIC: VBOEATWWOOE" rpt.txtBank1.Text = "Volksbank Oberösterreich AG" & vbNewLine & "IBAN:AT89 4480 0365 7822 0000" & vbNewLine & "BIC: VBOEATWWOOE"
rpt.txtBank2.Text = "" rpt.txtBank2.Text = ""
End If End If
End If End If

658
SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

5
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
View File

@@ -836,7 +836,7 @@ Public Class frmMessenger
If dgvChats.SelectedRows.Count > 0 Then If dgvChats.SelectedRows.Count > 0 Then
If vbYes = MsgBox("Möchten Sie diesen Chat wirklich deaktivieren?", vbYesNoCancel) Then If vbYes = MsgBox("Möchten Sie diesen Chat wirklich deaktivieren?", vbYesNoCancel) Then
CHAT = New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat(dgvChats.SelectedRows(0).Cells("chat_id").Value, 1) CHAT = New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat(dgvChats.SelectedRows(0).Cells("chat_id").Value, "100")
SplitContainer1.Enabled = True SplitContainer1.Enabled = True
CHAT.chat_aktiv = Not CHAT.chat_aktiv CHAT.chat_aktiv = Not CHAT.chat_aktiv
CHAT.SAVE(False) CHAT.SAVE(False)
@@ -1098,7 +1098,8 @@ Public Class frmMessenger
Dim dateTmp = InputBox("Bitte geben Sie das Datum ein, ab dem der Chat dargestellt werden soll:",, Now.AddMonths(-1).ToShortDateString) Dim dateTmp = InputBox("Bitte geben Sie das Datum ein, ab dem der Chat dargestellt werden soll:",, Now.AddMonths(-1).ToShortDateString)
If IsDate(dateTmp) Then If IsDate(dateTmp) Then
topMessagesDateHistory = CDate(dateTmp) topMessagesDateHistory = CDate(dateTmp)
CHAT = New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat(CHAT.chat_id, 1, topMessagesDateHistory) CHAT = New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_Chat(CHAT.chat_id, "200", topMessagesDateHistory)
SplitContainer1.Enabled = True
RELOAD_CHAT() RELOAD_CHAT()
Else Else
MsgBox("Datum ungültig!") MsgBox("Datum ungültig!")