Änderungen AMBAR

This commit is contained in:
2025-04-04 08:17:02 +02:00
parent 3c0da09315
commit e386fa6655
39 changed files with 1937 additions and 1490 deletions

View File

@@ -49,7 +49,8 @@ Public Class frmMainV2
End Sub
Private Sub frmMainV2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
lblVersion.Text = "Version: " & My.Resources.Version
lblVersion.Text = "Version: " & Application.ProductVersion
cUserSettings.load()
ShowChat()
btnAuftraege.PerformClick()

View File

@@ -80,17 +80,34 @@ where "
cboAuftragsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TRANSPORT", "TRANSPORT"))
cboAuftragsart.changeItem("ALLE")
cboFiliale.Items.Clear()
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUBEN", "4807"))
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEUHAUS", "4819"))
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
Case "NEU" : cboFiliale.changeItem("4819") : Niederlassung = "4819"
Case Else : cboFiliale.changeItem("4807") : Niederlassung = "4807"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "AMBAR"
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "5701"))
cboFiliale.changeItem("5701") : Niederlassung = "5701"
Case Else
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUBEN", "4807"))
cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEUHAUS", "4819"))
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
Case "NEU" : cboFiliale.changeItem("4819") : Niederlassung = "4819"
Case Else : cboFiliale.changeItem("4807") : Niederlassung = "4807"
End Select
End Select
'cboFiliale.Items.Clear()
'cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
'cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUBEN", "4807"))
'cboFiliale.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEUHAUS", "4819"))
'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
' Case "NEU" : cboFiliale.changeItem("4819") : Niederlassung = "4819"
' Case Else : cboFiliale.changeItem("4807") : Niederlassung = "4807"
'End Select
DateBIS.Value = Now()
DateVON.Value = Now.AddYears(-1).AddDays(1)

View File

@@ -223,6 +223,9 @@ Public Class usrcntlFirmen
If cboLand.SelectedItem IsNot "" And cboLand.SelectedItem IsNot "-" And cboLand.SelectedItem IsNot Nothing Then
where &= " AND kd_land = '" & cboLand.SelectedItem & "'"
End If
where &= " AND kd_AVISOfirma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'"
'Else
' If cboRolle._value IsNot "-1" And cboRolle._value IsNot "" Then
' where &= " WHERE kd_rolle = '" & cboRolle._value & "'"

View File

@@ -22,7 +22,7 @@ Public Class usrcntlFrachtkosten
End Sub
Public Sub showDGVFrachtkosten()
Dim where As String = ""
Dim where As String = " AND frtkst_AVISOfirma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' "
Dim search As String = ""
Dim start As Long = (DateTime.Now - New DateTime(1970, 1, 1)).TotalMilliseconds