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

Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

Browse Source
This commit is contained in:
d.breimaier
2026-04-20 16:48:54 +02:00
parent 6950e7e507 866b4ef83a
commit 3ab69cadd3
5 changed files with 398 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Aviso/ATEZ/frmATEZ_EZA.vb
View File

@@ -345,13 +345,18 @@ Public Class frmATEZ_EZA
End Sub
Private Function getTelefon() As String
Dim defaultDW = "200"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "ATILLA" : Return "0043 7711 28450"
Case "AMBAR" : Return "0049 8651 9962492"
Case "UNISPED" : defaultDW = "800"
Case "IMEX" : defaultDW = "602"
Case "VERAG" : defaultDW = "200"
End Select
Return "0049 8503 7973999 " & If(String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl), "200", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl)
Dim dw = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
Return "0049 8503 7973999 " &
If(String.IsNullOrEmpty(dw) OrElse dw.Length >= 5, defaultDW, dw)
End Function
Private Function getDefaultMail_FIRMA() As String
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA

8
Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb
View File

@@ -277,6 +277,9 @@ Public Class frmAvisoWeiterleiten
'addBtn(flpFirma, "A", "FISK", "VERAG Fiskal")
addBtn(flpFirma, "A", "VRR", "VERRECHNUNG")
addBtn(flpFirma, "N", "KLIPP", "VERAG KLIPPHAUSEN")
Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='VERAG' order by team_id", "ADMIN")
If dt IsNot Nothing Then
For Each t In dt.Rows
@@ -302,7 +305,10 @@ Public Class frmAvisoWeiterleiten
Next
End If
ElseIf sender Is btnFrontoffice Then
addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True)
addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE SUBEN", True)
'addBtn(flpFirma, "F", "FRONTOFFICE_KLIPP", "FRONT-OFFICE KLIPPHAUSEN", True) -> Wenn Firma gegründet
ElseIf sender Is btnATILLA Then
addBtn(flpFirma, "F", "ATILLA", "ATILLA", True)
Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='ATILLA' order by team_id", "ADMIN")

734
Aviso/frmHauptfenster.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

3
Aviso/frmHauptfenster.resx
View File

@@ -257,6 +257,9 @@
sDvNfNUAAAAASUVORK5CYII=
</value>
</data>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>560, 17</value>
</metadata>
<metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>659, 17</value>
</metadata>

10
Aviso/frmHauptfenster.vb
View File

@@ -5447,4 +5447,14 @@ ELSE_ATILLA:
Dim f As New frmReferenzenSicherheiten(writepermissions)
f.ShowDialog(Me)
End Sub
Private Sub KLIPPHAUSENToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KLIPPHAUSENToolStripMenuItem.Click
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "KLIPP"
VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = "KLIPP" 'Nochmal, sonst wird es durch MA geändert
showMeNew()
Else
MsgBox("Keine Berechtigung!")
End If
End Sub
End Class