neu

SDL/kassenbuch/frmBelegNeu.vb

@@ -140,7 +140,7 @@ Public Class frmBelegNeu
         cboFiliale.fillWithSQL("SELECT Filialen.FilialenNr, Filialen.Grenzstelle FROM Filialen WHERE (((Filialen.FilialenNr)>=4800) AND ((Filialen.Fil_Status)='A')) ORDER BY Filialen.FilialenNr;", True, "FMZOLL")
 
         cboSteuerschlüssel.changeItem(3520)
-       cboKassen.fillWithSQL("SELECT [rksv_id], [rksv_bez] FROM [tblRKSV_Kassen] WHERE [rksv_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", False, "FMZOLL")
+        cboKassen.fillWithSQL("SELECT [rksv_id], [rksv_bez] FROM [tblRKSV_Kassen] WHERE ([rksv_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR rksv_id IN('" & PERSONAL.cRKSV_KasseID & "')) ", False, "FMZOLL")
         If cboKassen.Items.Count > 0 Then cboKassen.SelectedIndex = 0 'default
         If PERSONAL.cRKSV_KasseID > 0 Then
             cboKassen.changeItem(CStr(PERSONAL.cRKSV_KasseID))
@@ -160,6 +160,11 @@ Public Class frmBelegNeu
             End Select
         End If
 
+        KASSE.LOAD(cboKassen._value)
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> KASSE.rksv_firma Then
+            kdkunde._UseFIRMA = KASSE.rksv_firma
+        End If
 
         cboFrachtf_Sgut.Items.Clear()
         cboFrachtf_Sgut.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("S - Sammelgut", "S"))
@@ -324,7 +329,11 @@ Public Class frmBelegNeu
         If PERSONAL.Niederlassung = "SBG" Then where = "Preislisten_visibleSBG = 1"
         If PERSONAL.Niederlassung = "WAI" Then where = "Preislisten_visibleWAI = 1"
         If PERSONAL.Niederlassung = "NKD" Then where = "Preislisten_visibleNKD = 1"
-        If PERSONAL.Niederlassung = "IME" Then where = "Preislisten_visibleIMEX = 1"
+        If PERSONAL.Niederlassung = "IME" Then
+            where = "Preislisten_visibleIMEX = 1"
+            If PERSONAL.cRKSV_KasseID = 1 Then where = "Preislisten_visibleSUB = 1"
+        End If
+
         If PERSONAL.Mandant = "FO" Then where = "Preislisten_visibleFRONTOFFICE = 1"