cRKSV, Abrechnungmaske, Aufschibkonten, Nacherfassung, etc.
This commit is contained in:
@@ -1337,6 +1337,23 @@ Public Class cRKSV
|
||||
' rpt.lblKdNr.Text = IIf(BELEG.KundenNr > 0, BELEG.KundenNr, "")
|
||||
rpt.Label24.Text = "Auszahlungsbetrag"
|
||||
|
||||
|
||||
If PERSONAL.isLeihgeldkasse AndAlso BELEG.Niederlassung = "SUA" Then
|
||||
Dim fontAtilla As New Font("Arial", 14, FontStyle.Bold)
|
||||
|
||||
rpt.lblFahrer.Font = fontAtilla
|
||||
rpt.lblFahrer2.Font = fontAtilla
|
||||
rpt.lblLKWKz.Font = fontAtilla
|
||||
rpt.lblPassnummer.Font = fontAtilla
|
||||
rpt.Label12.Font = fontAtilla
|
||||
rpt.Label15.Font = fontAtilla
|
||||
rpt.Label14.Font = fontAtilla
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
rpt.lblFahrer.Text = BELEG.Fahrer
|
||||
rpt.lblFahrer2.Text = BELEG.Fahrer
|
||||
rpt.lblLKWKz.Text = BELEG.LKW_Kennzeichen
|
||||
@@ -2529,7 +2546,7 @@ Public Class cRKSV
|
||||
End If
|
||||
|
||||
If DefaultMandant = 9 Then
|
||||
MsgBox("ACHTUNG, Daten werden in Mandant " & DefaultMandant & " eingespielt -> " & IIf(DefaultMandant = 9, "TESTMANDANT!", "PRODUKTIVMANDANT!"))
|
||||
MsgBox("ACHTUNG, Daten werden in Mandant " & DefaultMandant & " eingespielt -> " & IIf(DefaultMandant = 9, "TEST-MANDANT!", "PRODUKTIV-MANDANT!"))
|
||||
End If
|
||||
|
||||
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL()
|
||||
@@ -2547,7 +2564,7 @@ Public Class cRKSV
|
||||
End If
|
||||
|
||||
If rel_periode > periode Then
|
||||
jahr -= 1
|
||||
'jahr -= 1 warum nochmals???????
|
||||
End If
|
||||
|
||||
Dim betrag As Decimal = SumBelegPositionen(beleg)
|
||||
@@ -2608,143 +2625,6 @@ Public Class cRKSV
|
||||
Next
|
||||
|
||||
|
||||
'Set @dec_aktuellersaldo = (Select [FIBU2].dbo.fibu_konto.dec_aktuellersaldo FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = @MandantNr And [FIBU2].dbo.fibu_konto.i_konto = @Schleifenkonto)
|
||||
'If @dec_aktuellersaldo Is NULL SET @dec_aktuellersaldo = 0
|
||||
|
||||
'INSERT INTO [FIBU2].dbo.fibu_periodensaldo (
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_firm_refid,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.si_jahr,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_konto,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_perioden,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_eroeff,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_abschluss,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_eroeff,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_abschluss,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_buchungskreis)
|
||||
|
||||
'VALUES (
|
||||
'@MandantNr,
|
||||
'@Jahr,
|
||||
'@Schleifenkonto,
|
||||
'0,
|
||||
'@dec_aktuellersaldo,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'@dec_aktuellersaldo,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'1)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
InsertBelegskopf_new(sql, mandant, jahr, periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), 1, buchungstext, CType(betrag, Double), "EUR", Now(), VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, protokollId, BelegNrUID)
|
||||
|
||||
@@ -2984,13 +2864,146 @@ Public Class cRKSV
|
||||
jahr & "," &
|
||||
konto & "," &
|
||||
"0," &
|
||||
String.Join(",", Enumerable.Repeat("0", 32)) & "," &
|
||||
saldo & "," &
|
||||
String.Join(",", Enumerable.Repeat("0", 26)) & "," &
|
||||
String.Join(",", Enumerable.Repeat("0", 27)) & "," &
|
||||
saldo & "," &
|
||||
String.Join(",", Enumerable.Repeat("0", 27)) & "," &
|
||||
"1);"
|
||||
|
||||
sql.doSQL(sqlStr, "FIBU")
|
||||
|
||||
|
||||
'--------------------------- ZUM VERGLEICH - SQL aus UM ----------------------------------------
|
||||
'Set @dec_aktuellersaldo = (Select [FIBU2].dbo.fibu_konto.dec_aktuellersaldo FROM [FIBU2].dbo.fibu_konto WHERE [FIBU2].dbo.fibu_konto.i_firm_refid = @MandantNr And [FIBU2].dbo.fibu_konto.i_konto = @Schleifenkonto)
|
||||
'If @dec_aktuellersaldo Is NULL SET @dec_aktuellersaldo = 0
|
||||
|
||||
'INSERT INTO [FIBU2].dbo.fibu_periodensaldo (
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_firm_refid,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.si_jahr,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_konto,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_perioden,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_eroeff,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_abschluss,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_soll_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.dec_haben_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_eroeff,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_abschluss,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_1,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_2,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_3,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_4,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_5,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_6,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_7,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_8,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_9,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_10,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_11,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_12,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_soll_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.eur_haben_13,
|
||||
'[FIBU2].dbo.fibu_periodensaldo.i_buchungskreis)
|
||||
|
||||
'VALUES (
|
||||
'@MandantNr,
|
||||
'@Jahr,
|
||||
'@Schleifenkonto,
|
||||
'0,
|
||||
'@dec_aktuellersaldo,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'@dec_aktuellersaldo,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'0,
|
||||
'1)
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Shared Sub createOP_new(mandant As Integer, Betrag As Double, BelegNrText As String, datumKurz As String, BelegNr As String, Buchungstext As String, Buchungsbetrag As Double, Waehrung As String, Personenkonto As Integer, Forderungskonto As Integer, i_op_refid As String, c_op_Typ As Char, Sprache As String, Zahlungsziel As String, Skonto As String, Skontodatum As String, Nettodatum As String, c_ustidnr As String, c_urbelegid As String)
|
||||
|
||||
@@ -8,6 +8,8 @@ Public Class frmAbrechnungsMaske
|
||||
|
||||
Dim loaded = False
|
||||
|
||||
Dim FilialNrRestriction As Integer = -1
|
||||
|
||||
Private Sub frmAbrechnungsMaske_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
'Größe anpassen:
|
||||
|
||||
@@ -50,16 +52,6 @@ Public Class frmAbrechnungsMaske
|
||||
FirmaTmp = "VERAGIMEX"
|
||||
End If
|
||||
|
||||
'If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then
|
||||
' FirmaTmp = "VERAG360"
|
||||
'End If
|
||||
|
||||
|
||||
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
|
||||
'FirmaTmp = "AMBAR"
|
||||
'End If
|
||||
|
||||
cboSachbearbeiter.Items.Clear()
|
||||
|
||||
Select Case FirmaTmp
|
||||
@@ -107,10 +99,11 @@ Public Class frmAbrechnungsMaske
|
||||
cboFirma.changeItem("24")
|
||||
cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='AMBAR' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
|
||||
|
||||
'Case "VERAG360"
|
||||
' cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID=19", False, "FMZOLL")
|
||||
' cboFirma.changeItem("19")
|
||||
' MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where isnull(mit_firmaFMZoll,0)=19 and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
|
||||
Case "ATILLA"
|
||||
cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID=7", False, "FMZOLL")
|
||||
cboFirma.changeItem("7")
|
||||
cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where isnull(mit_firmaFMZoll,0)=7 and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
|
||||
FilialNrRestriction = 4813
|
||||
|
||||
Case "VERAGIMEX"
|
||||
Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','IMEX','ATILLA','VERAGUNISPED','FRONTOFFICE') "
|
||||
@@ -197,7 +190,7 @@ Public Class frmAbrechnungsMaske
|
||||
If cbxGutschriftenAnVerag.Checked AndAlso cboFirma._value <> "" AndAlso cboFirma._value = "24" Then
|
||||
sqlstr &= " SELECT R1.FilialenNr, R1.AbfertigungsNr, cast(R1.FilialenNr as varchar) + ' ' + cast(R1.AbfertigungsNr as varchar) as PosNr, R1.UnterNr, Firma_ID,R1.Sammelrechnung as Art, [RechnungsName 1] as Rechnungsempfänger, (isnull(SteuerpflichtigerGesamtbetrag,0) + isnull(SteuerfreierGesamtbetrag,0)) as Betrag, RK_ID,RechnungsLandKz,RechnungsKundenNr FROM Rechnungsausgang as R1 INNER JOIN Adressen ON AdressenNr=R1.RechnungsKundenNr inner Join Speditionsbuch on Speditionsbuch.FilialenNr = R1.FilialenNr And Speditionsbuch.AbfertigungsNr = R1.AbfertigungsNr and Speditionsbuch.UnterNr = R1.SpeditionsbuchUnterNr "
|
||||
sqlstr &= " WHERE 1=1 AND R1.Firma_ID=24 "
|
||||
sqlstr &= getRGWhere(cboER_SR._value)
|
||||
sqlstr &= getRGWhere(cboER_SR._value, FilialNrRestriction)
|
||||
sqlstr &= " and (SELECT COUNT(*) FROM Rechnungsausgang as R2 where"
|
||||
sqlstr &= " R1.FilialenNr=R2.FilialenNr and R1.AbfertigungsNr=R2.AbfertigungsNr and R1.SpeditionsbuchUnterNr=R2.SpeditionsbuchUnterNr AND (RechnungsKundenNr=3013401 OR RechnungsKundenNr = 3017683) and R2.[BelegartenNr]=71)=0"
|
||||
sqlstr &= " and Speditionsbuch.Abfertigungsart IN (1)"
|
||||
@@ -211,7 +204,7 @@ Public Class frmAbrechnungsMaske
|
||||
sqlstr &= " FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=Rechnungsausgang.RechnungsKundenNr"
|
||||
sqlstr &= " WHERE 1=1 "
|
||||
|
||||
sqlstr &= getRGWhere(cboER_SR._value)
|
||||
sqlstr &= getRGWhere(cboER_SR._value, FilialNrRestriction)
|
||||
' sqlstr &= " AND (SteuerpflichtigerGesamtbetrag<>0 OR SteuerfreierGesamtbetrag<>0)"
|
||||
sqlstr &= " ORDER BY FilialenNr, AbfertigungsNr, UnterNr "
|
||||
End If
|
||||
@@ -273,7 +266,7 @@ Public Class frmAbrechnungsMaske
|
||||
End With
|
||||
End Sub
|
||||
|
||||
Function getRGWhere(filterSR)
|
||||
Function getRGWhere(filterSR As String, Optional filialenNr As Integer = -1)
|
||||
Dim sqlstr = ""
|
||||
Dim srchSB = "" ' "NÖBAUER ANJA" 'VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
srchSB = cboSachbearbeiter._value
|
||||
@@ -288,6 +281,10 @@ Public Class frmAbrechnungsMaske
|
||||
End Select
|
||||
|
||||
|
||||
If filialenNr > 0 Then
|
||||
sqlstr &= " AND Rechnungsausgang.FilialenNr = " & filialenNr
|
||||
End If
|
||||
|
||||
|
||||
If cbx.Checked Then
|
||||
'sqlstr &= " AND Status = 0 "
|
||||
@@ -417,7 +414,7 @@ Public Class frmAbrechnungsMaske
|
||||
'Exit Sub
|
||||
|
||||
Dim PARAM_printZollbeleg = VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("FAKTURIERUNG_PRINT_Zollbeleg")
|
||||
Dim dt = SQL.loadDgvBySql("SELECT RK_ID,Rechnungsdruck as Rechnungsdruck FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=RechnungsKundenNr WHERE Status=0 " & getRGWhere("ER") & orderBy, "FMZOLL")
|
||||
Dim dt = SQL.loadDgvBySql("SELECT RK_ID,Rechnungsdruck as Rechnungsdruck FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=RechnungsKundenNr WHERE Status=0 " & getRGWhere("ER", FilialNrRestriction) & orderBy, "FMZOLL")
|
||||
|
||||
If dt IsNot Nothing Then
|
||||
If vbYes = MsgBox("Es werden " & dt.Rows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
|
||||
@@ -441,7 +438,7 @@ Public Class frmAbrechnungsMaske
|
||||
|
||||
Function print_Anlagen() As Boolean
|
||||
Dim erg = True
|
||||
Dim dt = SQL.loadDgvBySql("SELECT RK_ID FROM Rechnungsausgang WHERE Status=0 " & getRGWhere("SR") & " ORDER BY [BelegartenKz] DESC, FilialenNr, AbfertigungsNr, [RK_ID]", "FMZOLL")
|
||||
Dim dt = SQL.loadDgvBySql("SELECT RK_ID FROM Rechnungsausgang WHERE Status=0 " & getRGWhere("SR", FilialNrRestriction) & " ORDER BY [BelegartenKz] DESC, FilialenNr, AbfertigungsNr, [RK_ID]", "FMZOLL")
|
||||
If dt IsNot Nothing Then
|
||||
If vbYes = MsgBox("Es werden " & dt.Rows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then
|
||||
For Each r In dt.Rows
|
||||
|
||||
@@ -254,6 +254,11 @@ Public Class frmRechnungenSuche
|
||||
Case "IMEX"
|
||||
cboFiliale.changeItem("5501")
|
||||
cboFiliale.Enabled = False
|
||||
Case "ATILLA"
|
||||
cboFiliale.changeItem("4813")
|
||||
cboFiliale.Enabled = False
|
||||
cboFirma.changeItem("7")
|
||||
cboFirma.Enabled = False
|
||||
Case "VERAGIMEX"
|
||||
' cboFiliale.changeItem("5501")
|
||||
End Select
|
||||
|
||||
@@ -525,7 +525,7 @@ Public Class usrCntlFaktAbrechnung
|
||||
GutschriftAnVeragToolStripMenuItem.Visible = False
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN(4801,4802, 4806) ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN(4801,4802, 4813) 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
|
||||
|
||||
@@ -63,6 +63,7 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.lblKbNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
|
||||
Me.txtFrachtfuhrer = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
|
||||
Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label()
|
||||
Me.Label13 = New GrapeCity.ActiveReports.SectionReportModel.Label()
|
||||
Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
|
||||
Me.lblBetragSum = New GrapeCity.ActiveReports.SectionReportModel.Label()
|
||||
Me.lblBetragSteuern = New GrapeCity.ActiveReports.SectionReportModel.Label()
|
||||
@@ -78,7 +79,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line()
|
||||
Me.lblSachbearbeiter2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
|
||||
Me.lblFahrer2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
|
||||
Me.Label13 = New GrapeCity.ActiveReports.SectionReportModel.Label()
|
||||
CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -118,6 +118,7 @@ Partial Public Class rptLeihgeldBeleg
|
||||
CType(Me.lblKbNr, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.txtFrachtfuhrer, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.Label13, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.lblBetragSum, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.lblBetragSteuern, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.lblGesamtbetrag, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -129,7 +130,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
CType(Me.Label9, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.lblSachbearbeiter2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.lblFahrer2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.Label13, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
'
|
||||
'PageHeader
|
||||
@@ -265,7 +265,7 @@ Partial Public Class rptLeihgeldBeleg
|
||||
'ReportHeader1
|
||||
'
|
||||
Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.picVERAG, Me.lblFirma_Details, Me.Label2, Me.Label3, Me.lblRgDatum, Me.lblRgNr, Me.Label25, Me.lblFirma_Name, Me.lblTitel, Me.lblUhrzeit, Me.lblSachbearbeiter, Me.Label26, Me.lblPosNr, Me.Label28, Me.Label11, Me.Label12, Me.lblFahrer, Me.lblFrachtf, Me.Label15, Me.lblLKWKz, Me.Label14, Me.lblPassnummer, Me.Label20, Me.lblUID, Me.Label10, Me.lblKdNr, Me.lblFirma, Me.Line5, Me.QR, Me.lblKbNr, Me.txtFrachtfuhrer, Me.Label7, Me.Label13})
|
||||
Me.ReportHeader1.Height = 4.490026!
|
||||
Me.ReportHeader1.Height = 4.458776!
|
||||
Me.ReportHeader1.Name = "ReportHeader1"
|
||||
'
|
||||
'picVERAG
|
||||
@@ -444,18 +444,19 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label12.Name = "Label12"
|
||||
Me.Label12.Style = "font-size: 10pt; font-weight: normal; text-align: left"
|
||||
Me.Label12.Text = "Fahrer:"
|
||||
Me.Label12.Top = 3.414961!
|
||||
Me.Label12.Top = 3.478741!
|
||||
Me.Label12.Width = 1.28937!
|
||||
'
|
||||
'lblFahrer
|
||||
'
|
||||
Me.lblFahrer.DataField = ""
|
||||
Me.lblFahrer.Height = 0.1968501!
|
||||
Me.lblFahrer.HyperLink = Nothing
|
||||
Me.lblFahrer.Left = 1.49252!
|
||||
Me.lblFahrer.Name = "lblFahrer"
|
||||
Me.lblFahrer.Style = "font-size: 10pt; font-weight: normal; text-align: left"
|
||||
Me.lblFahrer.Style = "color: Black; font-size: 12pt; font-weight: normal; text-align: left"
|
||||
Me.lblFahrer.Text = "-"
|
||||
Me.lblFahrer.Top = 3.414961!
|
||||
Me.lblFahrer.Top = 3.478741!
|
||||
Me.lblFahrer.Width = 3.756299!
|
||||
'
|
||||
'lblFrachtf
|
||||
@@ -477,18 +478,19 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label15.Name = "Label15"
|
||||
Me.Label15.Style = "font-size: 10pt; font-weight: normal; text-align: left"
|
||||
Me.Label15.Text = "LKW-Kennzeichen:"
|
||||
Me.Label15.Top = 3.21811!
|
||||
Me.Label15.Top = 3.28189!
|
||||
Me.Label15.Width = 1.28937!
|
||||
'
|
||||
'lblLKWKz
|
||||
'
|
||||
Me.lblLKWKz.DataField = ""
|
||||
Me.lblLKWKz.Height = 0.1968501!
|
||||
Me.lblLKWKz.HyperLink = Nothing
|
||||
Me.lblLKWKz.Left = 1.49252!
|
||||
Me.lblLKWKz.Name = "lblLKWKz"
|
||||
Me.lblLKWKz.Style = "font-size: 10pt; font-weight: normal; text-align: left"
|
||||
Me.lblLKWKz.Style = "color: Black; font-size: 12pt; font-weight: normal; text-align: left"
|
||||
Me.lblLKWKz.Text = "-"
|
||||
Me.lblLKWKz.Top = 3.21811!
|
||||
Me.lblLKWKz.Top = 3.28189!
|
||||
Me.lblLKWKz.Width = 3.756299!
|
||||
'
|
||||
'Label14
|
||||
@@ -499,18 +501,19 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label14.Name = "Label14"
|
||||
Me.Label14.Style = "font-size: 10pt; font-weight: normal; text-align: left"
|
||||
Me.Label14.Text = "Passnummer:"
|
||||
Me.Label14.Top = 3.611811!
|
||||
Me.Label14.Top = 3.675591!
|
||||
Me.Label14.Width = 1.28937!
|
||||
'
|
||||
'lblPassnummer
|
||||
'
|
||||
Me.lblPassnummer.DataField = ""
|
||||
Me.lblPassnummer.Height = 0.1968501!
|
||||
Me.lblPassnummer.HyperLink = Nothing
|
||||
Me.lblPassnummer.Left = 1.49252!
|
||||
Me.lblPassnummer.Name = "lblPassnummer"
|
||||
Me.lblPassnummer.Style = "font-size: 10pt; font-weight: normal; text-align: left"
|
||||
Me.lblPassnummer.Style = "color: Black; font-size: 12pt; font-weight: normal; text-align: left"
|
||||
Me.lblPassnummer.Text = "-"
|
||||
Me.lblPassnummer.Top = 3.611811!
|
||||
Me.lblPassnummer.Top = 3.675591!
|
||||
Me.lblPassnummer.Width = 3.756299!
|
||||
'
|
||||
'Label20
|
||||
@@ -586,7 +589,7 @@ Partial Public Class rptLeihgeldBeleg
|
||||
'
|
||||
Me.QR.Height = 1.181102!
|
||||
Me.QR.HyperLink = Nothing
|
||||
Me.QR.ImageData = Nothing
|
||||
Me.QR.ImageBase64String = resources.GetString("QR.ImageBase64String")
|
||||
Me.QR.Left = 5.318898!
|
||||
Me.QR.Name = "QR"
|
||||
Me.QR.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom
|
||||
@@ -609,8 +612,9 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.txtFrachtfuhrer.Height = 0.148031!
|
||||
Me.txtFrachtfuhrer.Left = 1.49252!
|
||||
Me.txtFrachtfuhrer.Name = "txtFrachtfuhrer"
|
||||
Me.txtFrachtfuhrer.Style = "font-size: 12pt"
|
||||
Me.txtFrachtfuhrer.Text = Nothing
|
||||
Me.txtFrachtfuhrer.Top = 3.0063!
|
||||
Me.txtFrachtfuhrer.Top = 3.07008!
|
||||
Me.txtFrachtfuhrer.Width = 3.756299!
|
||||
'
|
||||
'Label7
|
||||
@@ -621,9 +625,20 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label7.Name = "Label7"
|
||||
Me.Label7.Style = "font-size: 10pt; font-weight: bold; text-align: left"
|
||||
Me.Label7.Text = "Fr<EFBFBD>chter:"
|
||||
Me.Label7.Top = 3.0063!
|
||||
Me.Label7.Top = 3.07008!
|
||||
Me.Label7.Width = 1.28937!
|
||||
'
|
||||
'Label13
|
||||
'
|
||||
Me.Label13.Height = 0.2!
|
||||
Me.Label13.HyperLink = Nothing
|
||||
Me.Label13.Left = 0.02047244!
|
||||
Me.Label13.Name = "Label13"
|
||||
Me.Label13.Style = "font-size: 12pt; font-weight: bold; text-align: left"
|
||||
Me.Label13.Text = "GILT AUCH ALS RECHNUNG"
|
||||
Me.Label13.Top = 1.197244!
|
||||
Me.Label13.Width = 3.190945!
|
||||
'
|
||||
'ReportFooter1
|
||||
'
|
||||
Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblBetragSum, Me.lblBetragSteuern, Me.lblGesamtbetrag, Me.lblTextSteuern, Me.Label24, Me.lblStorno, Me.Line1, Me.Label1, Me.Label8, Me.Label9, Me.Line2, Me.Line3, Me.lblSachbearbeiter2, Me.lblFahrer2})
|
||||
@@ -720,7 +735,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label1.HyperLink = Nothing
|
||||
Me.Label1.Left = 0!
|
||||
Me.Label1.Name = "Label1"
|
||||
Me.Label1.ShrinkToFit = True
|
||||
Me.Label1.Style = "font-size: 10pt; font-weight: bold; text-align: left; vertical-align: middle; ddo" &
|
||||
"-char-set: 1; ddo-shrink-to-fit: true"
|
||||
Me.Label1.Text = "Wir best<73>tigen, den o.g. Betrag von der Firma VERAG Spedition AG erhalten zu habe" &
|
||||
@@ -734,7 +748,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label8.HyperLink = Nothing
|
||||
Me.Label8.Left = 0!
|
||||
Me.Label8.Name = "Label8"
|
||||
Me.Label8.ShrinkToFit = True
|
||||
Me.Label8.Style = "font-size: 10pt; font-weight: bold; text-align: center; vertical-align: middle; d" &
|
||||
"do-char-set: 1; ddo-shrink-to-fit: true"
|
||||
Me.Label8.Text = "ausbezahlt von:"
|
||||
@@ -747,7 +760,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.Label9.HyperLink = Nothing
|
||||
Me.Label9.Left = 3.518898!
|
||||
Me.Label9.Name = "Label9"
|
||||
Me.Label9.ShrinkToFit = True
|
||||
Me.Label9.Style = "font-size: 10pt; font-weight: bold; text-align: center; vertical-align: middle; d" &
|
||||
"do-char-set: 1; ddo-shrink-to-fit: true"
|
||||
Me.Label9.Text = "Betrag erhalten:"
|
||||
@@ -786,7 +798,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.lblSachbearbeiter2.HyperLink = Nothing
|
||||
Me.lblSachbearbeiter2.Left = 0!
|
||||
Me.lblSachbearbeiter2.Name = "lblSachbearbeiter2"
|
||||
Me.lblSachbearbeiter2.ShrinkToFit = True
|
||||
Me.lblSachbearbeiter2.Style = "font-size: 10pt; font-weight: normal; text-align: center; text-justify: auto; ver" &
|
||||
"tical-align: top; ddo-char-set: 1; ddo-shrink-to-fit: true"
|
||||
Me.lblSachbearbeiter2.Text = "Maximilian Mustermann ( SUB ) ( 1234 )"
|
||||
@@ -799,24 +810,12 @@ Partial Public Class rptLeihgeldBeleg
|
||||
Me.lblFahrer2.HyperLink = Nothing
|
||||
Me.lblFahrer2.Left = 3.522048!
|
||||
Me.lblFahrer2.Name = "lblFahrer2"
|
||||
Me.lblFahrer2.ShrinkToFit = True
|
||||
Me.lblFahrer2.Style = "font-size: 10pt; font-weight: normal; text-align: center; text-justify: auto; ver" &
|
||||
"tical-align: top; ddo-char-set: 1; ddo-shrink-to-fit: true"
|
||||
Me.lblFahrer2.Text = "Maximilian Mustermann ( SUB ) ( 1234 )"
|
||||
Me.lblFahrer2.Top = 3.062599!
|
||||
Me.lblFahrer2.Width = 2.635433!
|
||||
'
|
||||
'Label13
|
||||
'
|
||||
Me.Label13.Height = 0.2!
|
||||
Me.Label13.HyperLink = Nothing
|
||||
Me.Label13.Left = 0.02047244!
|
||||
Me.Label13.Name = "Label13"
|
||||
Me.Label13.Style = "font-size: 12pt; font-weight: bold; text-align: left"
|
||||
Me.Label13.Text = "GILT AUCH ALS RECHNUNG"
|
||||
Me.Label13.Top = 1.197244!
|
||||
Me.Label13.Width = 3.190945!
|
||||
'
|
||||
'rptLeihgeldBeleg
|
||||
'
|
||||
Me.MasterReport = False
|
||||
@@ -877,6 +876,7 @@ Partial Public Class rptLeihgeldBeleg
|
||||
CType(Me.lblKbNr, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.txtFrachtfuhrer, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.Label13, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.lblBetragSum, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.lblBetragSteuern, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.lblGesamtbetrag, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
@@ -888,7 +888,6 @@ Partial Public Class rptLeihgeldBeleg
|
||||
CType(Me.Label9, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.lblSachbearbeiter2, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.lblFahrer2, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me.Label13, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
|
||||
End Sub
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -328,7 +328,13 @@ Public Class frmBelegNeu
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
|
||||
' btnNeueAbfNr.Visible = True
|
||||
|
||||
If PERSONAL.isLeihgeldkasse Then
|
||||
cboFiliale.changeItem(4806)
|
||||
Else
|
||||
cboFiliale.changeItem(4801)
|
||||
End If
|
||||
|
||||
ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
|
||||
' btnNeueAbfNr.Visible = True
|
||||
cboFiliale.changeItem(5501)
|
||||
|
||||
@@ -77,8 +77,8 @@ Public Class frmNacherfassungLeihgeld
|
||||
stammfiliale = "5501"
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN (5501) ORDER BY FilialenNr ", False, "FMZOLL", True)
|
||||
Case "ATILLA"
|
||||
stammfiliale = "4806"
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN (4806) ORDER BY FilialenNr ", False, "FMZOLL", True)
|
||||
stammfiliale = "4813"
|
||||
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN (4813) ORDER BY FilialenNr ", False, "FMZOLL", True)
|
||||
cbxOP_sofort_buchen.Checked = PERSONAL_LG.automFIBUBuchung
|
||||
|
||||
Case Else
|
||||
@@ -313,8 +313,8 @@ Public Class frmNacherfassungLeihgeld
|
||||
Dim KundenKontoArchiv As String = (New VERAG_PROG_ALLGEMEIN.SQL).getValueTxtBySql("SELECT isnull(c_archiv,'A') FROM [FIBU2].dbo.fibu_konto WHERE i_konto = " & BELEG.KundenNr & " AND i_firm_refid = " & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "9", "7"), "FIBU") 'ATILLA MANDANT!'
|
||||
|
||||
Select Case KundenKontoArchiv
|
||||
Case "I" : MsgBox("ACHTUNG, der Debitor mit der Nr: " & BELEG.KundenNr & " ist in der Syska-FIBU inaktiv, bitte andere KundenNr verwenden (799999)!") : Me.Cursor = Cursors.Default : Exit Sub 'inaktiv
|
||||
Case "" : MsgBox("ACHTUNG, der Debitor mit der Nr: " & BELEG.KundenNr & " ist in der Syska-FIBU nicht vorhanden, bitte andere KundenNr verwenden (799999)!") : Me.Cursor = Cursors.Default : Exit Sub 'nicht vorhanden
|
||||
Case "I" : MsgBox("ACHTUNG, der Debitor mit der Nr: " & BELEG.KundenNr & " ist in der Syska-FIBU INAKTIV, bitte andere KundenNr verwenden (799999)!") : Me.Cursor = Cursors.Default : Exit Sub 'inaktiv
|
||||
Case "" : MsgBox("ACHTUNG, der Debitor mit der Nr: " & BELEG.KundenNr & " ist in der Syska-FIBU NICHT vorhanden, bitte andere KundenNr verwenden (799999)!") : Me.Cursor = Cursors.Default : Exit Sub 'nicht vorhanden
|
||||
Case Else 'aktiv -> OK
|
||||
End Select
|
||||
|
||||
@@ -454,16 +454,14 @@ Public Class frmNacherfassungLeihgeld
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" AndAlso spedBuchExisting Then
|
||||
'create Rechnung für ATILLA
|
||||
Dim verarbOK As Boolean = True
|
||||
Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(BELEG.FilialenNr, BELEG.AbfertigungsNr)
|
||||
Dim RK_ID As Integer = -1
|
||||
|
||||
If Not gen_RECHNUNG_BySPEDBUCH(BELEG.KundenNr, SPEDBUCH, RK_ID, cbxOP_sofort_buchen.Checked, summeBRUTTO, summeNETTO) Then verarbOK = False
|
||||
If Not gen_RECHNUNG_BySPEDBUCH(BELEG.KundenNr, SPEDBUCH, RK_ID, cbxOP_sofort_buchen.Checked, summeBRUTTO, summeNETTO, BELEG) Then verarbOK = False
|
||||
If RK_ID > 0 Then
|
||||
Dim RECHNUNG As New cRechnungsausgang(RK_ID)
|
||||
|
||||
'rechnungsNr vergeben, aber nicht gedruckt!
|
||||
If Not cFakturierung.doRechnungsDruck(RECHNUNG, Today(),, 4) Then verarbOK = False
|
||||
If RECHNUNG.[DruckDatumZeit] IsNot Nothing Then
|
||||
RECHNUNG.[DruckDatumZeit] = Nothing
|
||||
@@ -496,7 +494,7 @@ Public Class frmNacherfassungLeihgeld
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer, ByRef trdin As Boolean, ByRef summeBRUTTO As Double, ByRef summeNETTO As Double)
|
||||
Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer, ByRef trdin As Boolean, ByRef summeBRUTTO As Double, ByRef summeNETTO As Double, ByRef BARBELEG As EABeleg)
|
||||
Try
|
||||
|
||||
If KdNr = "" Then Return False
|
||||
@@ -594,7 +592,7 @@ Public Class frmNacherfassungLeihgeld
|
||||
RG.LOAD_OFFERT_POSITIONEN() ' --> OFFERTE MIT ANZAHL >0 und Preis >0
|
||||
|
||||
|
||||
allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO))
|
||||
allPos(RG, OFFERTE, 110, summeBRUTTO, summeNETTO, (summeBRUTTO - summeNETTO), " (" & BARBELEG.LKW_Kennzeichen & " " & BARBELEG.Fahrer & ")")
|
||||
|
||||
Dim dtSt As DataTable = SQL.loadDgvBySql("SELECT TOP 1 isnull([Steuersatz %],0),isnull([Steuerbezeichnung],'') FROM [Steuertabelle] WHERE [Steuerschlüssel]='" & RG.Steuerschlüssel & "'", "FMZOLL")
|
||||
If dtSt IsNot Nothing AndAlso dtSt.Rows.Count > 0 Then
|
||||
@@ -619,7 +617,7 @@ Public Class frmNacherfassungLeihgeld
|
||||
|
||||
End Function
|
||||
|
||||
Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double, Optional UstBetrag As Double = 0)
|
||||
Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double, Optional UstBetrag As Double = 0, Optional leistungsBez As String = "")
|
||||
Try
|
||||
|
||||
For Each o In OFFERTE.POSITIONEN
|
||||
@@ -628,13 +626,11 @@ Public Class frmNacherfassungLeihgeld
|
||||
Dim POS As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen()
|
||||
Dim LEISTUNG As New VERAG_PROG_ALLGEMEIN.cLeistungen(o.LeistungsNr)
|
||||
POS.LeistungsNr = o.LeistungsNr
|
||||
POS.LeistungsBez = o.LeistungsBez
|
||||
POS.LeistungsBez = IIf(leistungsBez <> "", leistungsBez, o.LeistungsBez)
|
||||
|
||||
POS.BerechnungsartNr = o.BerechnungsartNr
|
||||
'POS.Preis = BruttoBetrag
|
||||
POS.Anzahl = 1
|
||||
POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig
|
||||
'Berrechnunggebühr wird immer vom übergebenen Betrag abzüglich UST berechnet (Nettobetrag), außer bei UTA!
|
||||
POS.BGebBgl = NettoBetrag - UstBetrag
|
||||
|
||||
|
||||
@@ -645,7 +641,6 @@ Public Class frmNacherfassungLeihgeld
|
||||
POS.SteuerfreierBetrag = BruttoBetrag
|
||||
POS.Preis = BruttoBetrag
|
||||
End If
|
||||
'POS.NachzahlungsID = nachzahlungsID 'nix gut
|
||||
POS.BGebLeistungsNr = o.BGebLeistungsNr
|
||||
POS.BGebProzent = o.BGebProzent
|
||||
POS.BGebMinBetrag = o.BGebMinBetrag
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
Imports System.Data.SqlClient
|
||||
Imports System.Reflection
|
||||
Imports jdk.nashorn.internal.objects.annotations
|
||||
|
||||
Public Class cAufschubKonten
|
||||
Property brgakto_id As Integer
|
||||
@@ -173,7 +174,7 @@ Public Class cAufschubKonten
|
||||
Return SQL.doSQL("Update [tblBrgAufschubKonten] Set brgakto_gs_aktSaldo = CAST(REPLACE('" & brgakto_gs_aktSaldo & "' ,',','.')AS decimal(18,2)) WHERE brgakto_gs_standort = '" & brgakto_gs_standort & "'", "ADMIN")
|
||||
End Function
|
||||
|
||||
Public Function CalcSaldo(Optional dtDate As DataTable = Nothing, Optional Stichtag As Date? = Nothing) As String
|
||||
Public Function CalcSaldo(Optional dtDate As DataTable = Nothing, Optional Stichtag As Date? = Nothing, Optional showMessage As Boolean = False) As String
|
||||
|
||||
|
||||
Dim StichtagSQLGesamtsicherheit = ""
|
||||
@@ -186,23 +187,31 @@ Public Class cAufschubKonten
|
||||
|
||||
|
||||
|
||||
|
||||
Dim SaldoString As String =
|
||||
"select
|
||||
" SELECT
|
||||
SUM(Betrag) AS GesamtSicherheitsSaldo
|
||||
FROM (
|
||||
SELECT
|
||||
CASE
|
||||
WHEN gs_art = 'OPEN' THEN gs_sicherheitsbetrag * -1
|
||||
WHEN gs_art = 'CLOSE' THEN gs_sicherheitsbetrag
|
||||
END AS Betrag
|
||||
FROM tblGesamtsicherheit
|
||||
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0
|
||||
|
||||
(select SUM(
|
||||
case
|
||||
when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
|
||||
when gs_art = 'Close' then gs_sicherheitsbetrag
|
||||
end)
|
||||
UNION ALL
|
||||
|
||||
as SicherheitsSaldoGS from [tblGesamtsicherheit] Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & ")+
|
||||
|
||||
(select SUM(
|
||||
case
|
||||
when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
|
||||
when gsp_art = 'Close' then gsp_sicherheitsbetrag
|
||||
end)
|
||||
as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " And ISNULL(gs_ReferenzAenderung,0) = 0 )" & StichtagSQLGesamtsicherheitsPositionen & ")"
|
||||
SELECT
|
||||
CASE
|
||||
WHEN gsp_art = 'OPEN' THEN gsp_sicherheitsbetrag * -1
|
||||
WHEN gsp_art = 'CLOSE' THEN gsp_sicherheitsbetrag
|
||||
END
|
||||
FROM tblGesamtsicherheitsPositionen
|
||||
WHERE gsp_gsnr IN (
|
||||
SELECT gs_gsnr
|
||||
FROM tblGesamtsicherheit
|
||||
WHERE gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & " AND ISNULL(gs_ReferenzAenderung,0) = 0 )) x;"
|
||||
|
||||
Dim dt As New DataTable
|
||||
Dim mrn As Double = 0
|
||||
@@ -214,7 +223,7 @@ Public Class cAufschubKonten
|
||||
If Stichtag.HasValue Then
|
||||
brgakto_gs_aktSaldo = getReferenzbetrag(Stichtag.Value) 'aktueller Referenzbetrag + Verwahrungsausgänge - Verwahrungseingänge zum Stichtag!!! -> nicht updaten, nur INFO!!!!
|
||||
brgakto_gs_aktSaldo += mrn
|
||||
MsgBox("Saldo zum Stichtag " & Stichtag.Value & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2"))
|
||||
If showMessage Then MsgBox("Saldo zum Stichtag " & Stichtag.Value & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2"))
|
||||
Else
|
||||
brgakto_gs_aktSaldo = getReferenzbetrag(Today) 'aktueller Referenzbetrag + Verwahrungsausgänge - Verwahrungseingänge....
|
||||
brgakto_gs_aktSaldo += mrn
|
||||
@@ -233,7 +242,7 @@ Public Class cAufschubKonten
|
||||
|
||||
Try
|
||||
|
||||
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]='" & brgakto_id & "' and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
|
||||
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
|
||||
|
||||
Reference in New Issue
Block a user