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

FakrAbre

Browse Source
This commit is contained in:
d.breimaier
2024-05-28 10:43:12 +02:00
parent 90e68d6796
commit e8456241ce
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -543,9 +543,9 @@ Public Class usrCntlFaktAbrechnung
FirmaTmp = "VERAGIMEX" FirmaTmp = "VERAGIMEX"
End If End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then 'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
FirmaTmp = "AMBAR" ' FirmaTmp = "AMBAR"
End If 'End If
Select Case FirmaTmp Select Case FirmaTmp
Case "VERAG" Case "VERAG"
@@ -581,16 +581,6 @@ Public Class usrCntlFaktAbrechnung
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty) cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty)
cboFirma.SelectedIndex = 0 cboFirma.SelectedIndex = 0
'------------------------------------------------------TEST-START
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
' cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN(4801,4802) ORDER BY FilialenNr ", True, "FMZOLL", True)
'Else
' cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
'End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER And FirmaTmp <> "VERAGIMEX" Then If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER And FirmaTmp <> "VERAGIMEX" Then
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
cboFiliale._allowedValuesFreiText = {4801, 4802} cboFiliale._allowedValuesFreiText = {4801, 4802}
@@ -604,12 +594,6 @@ Public Class usrCntlFaktAbrechnung
End If End If
'------------------------------------------------------TEST-END
cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
cboRechnungNotiz.fillWithSQL("SELECT [Notiz],[Notiz] as N2 FROM tblRechnungsnotizen", True, "FMZOLL", True) cboRechnungNotiz.fillWithSQL("SELECT [Notiz],[Notiz] as N2 FROM tblRechnungsnotizen", True, "FMZOLL", True)
'cboWaehrung.fillWithSQL(" SELECT Währungscode, isnull(Währungscode + ' - ' ,'') + LandBez + ' (' + cast(LandNr as varchar(8)) + ')' FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY case when Währungscode is null then 1 else 0 end,LandBez ", False, "FMZOLL", True) 'cboWaehrung.fillWithSQL(" SELECT Währungscode, isnull(Währungscode + ' - ' ,'') + LandBez + ' (' + cast(LandNr as varchar(8)) + ')' FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY case when Währungscode is null then 1 else 0 end,LandBez ", False, "FMZOLL", True)
cboWaehrung.fillWithSQL(" SELECT Währungsschlüssel, Währungscode FROM Währungstabelle ORDER BY Währungscode,[Währungsschlüssel] DESC ", False, "FMZOLL", True) cboWaehrung.fillWithSQL(" SELECT Währungsschlüssel, Währungscode FROM Währungstabelle ORDER BY Währungscode,[Währungsschlüssel] DESC ", False, "FMZOLL", True)