fix,
This commit is contained in:
@@ -5350,19 +5350,22 @@ Public Class cFakturierung
|
|||||||
Dim BelegartenKz = If(Gesamt_RG_Betrag < 0, "AG", "AR")
|
Dim BelegartenKz = If(Gesamt_RG_Betrag < 0, "AG", "AR")
|
||||||
|
|
||||||
Select Case Row("RechnungSprache")
|
Select Case Row("RechnungSprache")
|
||||||
Case "EN"
|
|
||||||
Select Case BelegartenKz
|
'Mehrsprachigkeit bei Sammelrechnung vorerst deaktivieren!!!!
|
||||||
Case "AR"
|
|
||||||
rpt.lblUeberschriftRG_GS.Text = IIf(Not isMDMRechnungsdruck, "Attatchment to INVOICE", "INVOICE")
|
'Case "EN"
|
||||||
rpt.lblSummeUeberschrift.Text = "Invoice Amount:"
|
' Select Case BelegartenKz
|
||||||
rpt.lblRgNrUeberschrift.Text = "Invoice No.:"
|
' Case "AR"
|
||||||
rpt.lblRgDatumUeberschrift.Text = "Invoice Date:"
|
' rpt.lblUeberschriftRG_GS.Text = IIf(Not isMDMRechnungsdruck, "Attatchment to INVOICE", "INVOICE")
|
||||||
Case "AG"
|
' rpt.lblSummeUeberschrift.Text = "Invoice Amount:"
|
||||||
rpt.lblUeberschriftRG_GS.Text = IIf(Not isMDMRechnungsdruck, "Attatchment to CREDIT NOTE", "CREDIT NOTE")
|
' rpt.lblRgNrUeberschrift.Text = "Invoice No.:"
|
||||||
rpt.lblSummeUeberschrift.Text = "Credit Amount:"
|
' rpt.lblRgDatumUeberschrift.Text = "Invoice Date:"
|
||||||
rpt.lblRgNrUeberschrift.Text = "Credit Note No.:"
|
' Case "AG"
|
||||||
rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:"
|
' rpt.lblUeberschriftRG_GS.Text = IIf(Not isMDMRechnungsdruck, "Attatchment to CREDIT NOTE", "CREDIT NOTE")
|
||||||
End Select
|
' rpt.lblSummeUeberschrift.Text = "Credit Amount:"
|
||||||
|
' rpt.lblRgNrUeberschrift.Text = "Credit Note No.:"
|
||||||
|
' rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:"
|
||||||
|
' End Select
|
||||||
Case Else
|
Case Else
|
||||||
Select Case BelegartenKz
|
Select Case BelegartenKz
|
||||||
Case "AR"
|
Case "AR"
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
Imports System.IO
|
Imports System.IO
|
||||||
Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util
|
|
||||||
Imports Microsoft.Office.Interop
|
Imports Microsoft.Office.Interop
|
||||||
|
|
||||||
Public Class frmAbrechnungsMaske
|
Public Class frmAbrechnungsMaske
|
||||||
@@ -80,8 +79,8 @@ Public Class frmAbrechnungsMaske
|
|||||||
cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL")
|
cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL")
|
||||||
cboFirma.changeItem("1")
|
cboFirma.changeItem("1")
|
||||||
cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True)
|
cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True)
|
||||||
cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK"))
|
'cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK"))
|
||||||
cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DANIEL", "DANIEL"))
|
'cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DANIEL", "DANIEL"))
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
@@ -330,10 +329,15 @@ Public Class frmAbrechnungsMaske
|
|||||||
|
|
||||||
If sender Is cboER_SR Then
|
If sender Is cboER_SR Then
|
||||||
|
|
||||||
lblKunde.Visible = cboER_SR._value = "MSR"
|
lblKunde.Visible = True 'cboER_SR._value = "MSR"
|
||||||
KdSearchBox1.Visible = cboER_SR._value = "MSR"
|
KdSearchBox1.Visible = True 'cboER_SR._value = "MSR"
|
||||||
|
|
||||||
If KdSearchBox1.KdNr_value > 0 AndAlso cboER_SR._value <> "MSR" Then
|
'If KdSearchBox1.KdNr_value > 0 AndAlso cboER_SR._value <> "MSR" Then 'KdSearchBox1.KdNr_value > 0 AndAlso cboER_SR._value <> "MSR"
|
||||||
|
' KdSearchBox1.KdNr_value = -1
|
||||||
|
|
||||||
|
'End If
|
||||||
|
|
||||||
|
If KdSearchBox1.KdNr_value > 0 Then
|
||||||
KdSearchBox1.KdNr_value = -1
|
KdSearchBox1.KdNr_value = -1
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|||||||
@@ -103,15 +103,21 @@
|
|||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
Dim dtTemp As DataTable
|
|
||||||
dtTemp = SQL.loadDgvBySql_Param("select [id] as clmnID,[belegNr] as clmnReNr,[buchungstext] as clmnAbfNr,[zinssatz] clmnVZ,[belegZahlungsziel],[ueberschreitungInTagen] clmnTage,[zinsbetrag] clmnZinsen,[belegDatum] as clmnReDatum,[zahlungsBetrag] as clmnReBetrag,[zahlungDatum] as clmnZE, [faelligkeitsDatum] as clmnFaellig from tblMDM_Zinsberechnung where RK_ID =" & RECHNUNG.RK_ID & " and RIGHT('00000' + CAST(id AS VARCHAR(5)), 5) +'-'+ buchungstext like '" & LeistungsText.Trim() & "%'", "FMZOLL")
|
|
||||||
|
|
||||||
For Each rg As DataRow In dtTemp.Rows
|
If RECHNUNG.BelegartenKz <> "AG" Then
|
||||||
dt.Rows.Add(rg.Item("clmnID"), rg.Item("clmnReNr"), rg.Item("clmnReDatum"), rg.Item("clmnAbfNr"), rg.Item("clmnReBetrag"), rg.Item("clmnZE"), rg.Item("clmnTage"), rg.Item("clmnZinsen"), rg.Item("clmnVZ"), rg.Item("clmnFaellig"))
|
|
||||||
Next
|
Dim dtTemp As DataTable
|
||||||
|
dtTemp = SQL.loadDgvBySql_Param("select [id] as clmnID,[belegNr] as clmnReNr,[buchungstext] as clmnAbfNr,[zinssatz] clmnVZ,[belegZahlungsziel],[ueberschreitungInTagen] clmnTage,[zinsbetrag] clmnZinsen,[belegDatum] as clmnReDatum,[zahlungsBetrag] as clmnReBetrag,[zahlungDatum] as clmnZE, [faelligkeitsDatum] as clmnFaellig from tblMDM_Zinsberechnung where RK_ID =" & RECHNUNG.RK_ID & " and RIGHT('00000' + CAST(id AS VARCHAR(5)), 5) +'-'+ buchungstext like '" & LeistungsText.Trim() & "%'", "FMZOLL")
|
||||||
|
|
||||||
|
For Each rg As DataRow In dtTemp.Rows
|
||||||
|
dt.Rows.Add(rg.Item("clmnID"), rg.Item("clmnReNr"), rg.Item("clmnReDatum"), rg.Item("clmnAbfNr"), rg.Item("clmnReBetrag"), rg.Item("clmnZE"), rg.Item("clmnTage"), rg.Item("clmnZinsen"), rg.Item("clmnVZ"), rg.Item("clmnFaellig"))
|
||||||
|
Next
|
||||||
|
Else
|
||||||
|
dt.Rows.Add("0", "", RECHNUNG.Abfertigungsdatum.ToShortDateString, "", "", LeistungsText.ToString, "", Betrag.ToString, "", "")
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.5.1.0")>
|
<Assembly: AssemblyVersion("1.5.1.1")>
|
||||||
<Assembly: AssemblyFileVersion("1.5.1.0")>
|
<Assembly: AssemblyFileVersion("1.5.1.1")>
|
||||||
|
|||||||
@@ -1280,7 +1280,7 @@ Public Class frmMDMDatenverarbetiung
|
|||||||
|
|
||||||
Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
|
Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
|
||||||
Dim verarbOK = IIf(test, False, True)
|
Dim verarbOK = IIf(test, False, True)
|
||||||
Dim RECHNUNG As cRechnungsausgang = Nothing
|
Dim RECHNUNG As New cRechnungsausgang(4823, 25015595)
|
||||||
|
|
||||||
|
|
||||||
If Not gen_SPEDBUCH_ByKdNr(uta("Customer Nr"), SPEDBUCH, "UTA",,,, datPloseAnhang.Value) Then verarbOK = False
|
If Not gen_SPEDBUCH_ByKdNr(uta("Customer Nr"), SPEDBUCH, "UTA",,,, datPloseAnhang.Value) Then verarbOK = False
|
||||||
@@ -3884,10 +3884,10 @@ Public Class frmMDMDatenverarbetiung
|
|||||||
If dictPloseKunden.TryGetValue(ploseKunde, rowKd) Then
|
If dictPloseKunden.TryGetValue(ploseKunde, rowKd) Then
|
||||||
r.Cells("VERAGKdNr").Value = rowKd("PLOSEKundenNr")
|
r.Cells("VERAGKdNr").Value = rowKd("PLOSEKundenNr")
|
||||||
VERAGKdNr = CInt(rowKd("AdressenNr"))
|
VERAGKdNr = CInt(rowKd("AdressenNr"))
|
||||||
r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream
|
'r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream
|
||||||
Else
|
Else
|
||||||
pruefData_PLOSE = False
|
pruefData_PLOSE = False
|
||||||
r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip
|
'r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'Produkt lookup
|
'Produkt lookup
|
||||||
@@ -3895,20 +3895,20 @@ Public Class frmMDMDatenverarbetiung
|
|||||||
If dictProdukt.TryGetValue(produktCode, rowProdukt) Then
|
If dictProdukt.TryGetValue(produktCode, rowProdukt) Then
|
||||||
VERAGLeistungsNr = CInt(rowProdukt("plp_LeistungsNr"))
|
VERAGLeistungsNr = CInt(rowProdukt("plp_LeistungsNr"))
|
||||||
r.Cells("VERAGLeistungsNr").Value = VERAGLeistungsNr
|
r.Cells("VERAGLeistungsNr").Value = VERAGLeistungsNr
|
||||||
r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream
|
'r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream
|
||||||
Else
|
Else
|
||||||
pruefData_PLOSE = False
|
pruefData_PLOSE = False
|
||||||
r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip
|
'r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'Offerte 80 lookup
|
'Offerte 80 lookup
|
||||||
Dim offered80 As Object = Nothing
|
Dim offered80 As Object = Nothing
|
||||||
If dictOfferte.TryGetValue(VERAGKdNr.ToString(), offered80) Then
|
If dictOfferte.TryGetValue(VERAGKdNr.ToString(), offered80) Then
|
||||||
r.Cells("KundeOffertenNr").Value = offered80
|
r.Cells("KundeOffertenNr").Value = offered80
|
||||||
r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream
|
'r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream
|
||||||
Else
|
Else
|
||||||
pruefData_PLOSE = False
|
pruefData_PLOSE = False
|
||||||
r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip
|
'r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'Leistung lookup
|
'Leistung lookup
|
||||||
@@ -3917,10 +3917,10 @@ Public Class frmMDMDatenverarbetiung
|
|||||||
setLeist.Contains(VERAGLeistungsNr.ToString()) Then
|
setLeist.Contains(VERAGLeistungsNr.ToString()) Then
|
||||||
|
|
||||||
r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr
|
r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr
|
||||||
r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream
|
'r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream
|
||||||
Else
|
Else
|
||||||
pruefData_PLOSE = False
|
pruefData_PLOSE = False
|
||||||
r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip
|
'r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'UI update alle 100 Zeilen statt 5
|
'UI update alle 100 Zeilen statt 5
|
||||||
|
|||||||
15
SDL/seriendruck/usrCntlFakturierung.Designer.vb
generated
15
SDL/seriendruck/usrCntlFakturierung.Designer.vb
generated
@@ -99,6 +99,7 @@ Partial Class usrcntlFakturierung
|
|||||||
Me.btnRePos = New System.Windows.Forms.Button()
|
Me.btnRePos = New System.Windows.Forms.Button()
|
||||||
Me.Validation1 = New SDL.EORI.validation()
|
Me.Validation1 = New SDL.EORI.validation()
|
||||||
Me.btnWikiStatusmails = New System.Windows.Forms.Button()
|
Me.btnWikiStatusmails = New System.Windows.Forms.Button()
|
||||||
|
Me.btnRE_Text = New System.Windows.Forms.Button()
|
||||||
Me.GroupBox1.SuspendLayout()
|
Me.GroupBox1.SuspendLayout()
|
||||||
Me.GBMautberichte.SuspendLayout()
|
Me.GBMautberichte.SuspendLayout()
|
||||||
CType(Me.dgvMautbericht, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.dgvMautbericht, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
@@ -343,6 +344,7 @@ Partial Class usrcntlFakturierung
|
|||||||
'
|
'
|
||||||
'GBSammelrechnung
|
'GBSammelrechnung
|
||||||
'
|
'
|
||||||
|
Me.GBSammelrechnung.Controls.Add(Me.btnRE_Text)
|
||||||
Me.GBSammelrechnung.Controls.Add(Me.btnFixeTaxe)
|
Me.GBSammelrechnung.Controls.Add(Me.btnFixeTaxe)
|
||||||
Me.GBSammelrechnung.Controls.Add(Me.Label11)
|
Me.GBSammelrechnung.Controls.Add(Me.Label11)
|
||||||
Me.GBSammelrechnung.Controls.Add(Me.PictureBox6)
|
Me.GBSammelrechnung.Controls.Add(Me.PictureBox6)
|
||||||
@@ -941,6 +943,18 @@ Partial Class usrcntlFakturierung
|
|||||||
Me.btnWikiStatusmails.TabIndex = 72
|
Me.btnWikiStatusmails.TabIndex = 72
|
||||||
Me.btnWikiStatusmails.UseVisualStyleBackColor = True
|
Me.btnWikiStatusmails.UseVisualStyleBackColor = True
|
||||||
'
|
'
|
||||||
|
'btnRE_Text
|
||||||
|
'
|
||||||
|
Me.btnRE_Text.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||||
|
Me.btnRE_Text.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
|
||||||
|
Me.btnRE_Text.Location = New System.Drawing.Point(744, 223)
|
||||||
|
Me.btnRE_Text.Name = "btnRE_Text"
|
||||||
|
Me.btnRE_Text.Size = New System.Drawing.Size(107, 32)
|
||||||
|
Me.btnRE_Text.TabIndex = 127
|
||||||
|
Me.btnRE_Text.Text = "RE-Text setzen"
|
||||||
|
Me.btnRE_Text.UseVisualStyleBackColor = True
|
||||||
|
Me.btnRE_Text.Visible = False
|
||||||
|
'
|
||||||
'usrcntlFakturierung
|
'usrcntlFakturierung
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
@@ -1050,4 +1064,5 @@ Partial Class usrcntlFakturierung
|
|||||||
Friend WithEvents Label11 As Label
|
Friend WithEvents Label11 As Label
|
||||||
Friend WithEvents PictureBox6 As PictureBox
|
Friend WithEvents PictureBox6 As PictureBox
|
||||||
Friend WithEvents btnFixeTaxe As Button
|
Friend WithEvents btnFixeTaxe As Button
|
||||||
|
Friend WithEvents btnRE_Text As Button
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -86,6 +86,8 @@ Public Class usrcntlFakturierung
|
|||||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then
|
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then
|
||||||
Button2.Visible = True
|
Button2.Visible = True
|
||||||
Button3.Visible = True
|
Button3.Visible = True
|
||||||
|
btnRE_Text.Visible = True
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
@@ -179,8 +181,9 @@ Public Class usrcntlFakturierung
|
|||||||
|
|
||||||
'es sollen alle RE der letzen 3 Monate gesetzt werden (warum, weil das schon immer so war....)
|
'es sollen alle RE der letzen 3 Monate gesetzt werden (warum, weil das schon immer so war....)
|
||||||
'ok = SQL.doSQL("update [Rechnungsausgang] set Sachbearbeiter='" & Sachbearbeiter & "' where Sammelrechnung=6 and Firma_ID=19 and Abfertigungsdatum = '" & dtRechnungsdatum.Value & "'", "FMZOLL")
|
'ok = SQL.doSQL("update [Rechnungsausgang] set Sachbearbeiter='" & Sachbearbeiter & "' where Sammelrechnung=6 and Firma_ID=19 and Abfertigungsdatum = '" & dtRechnungsdatum.Value & "'", "FMZOLL")
|
||||||
|
Dim vergangAbfertigunsdatuminMontaen As Integer = -12
|
||||||
|
|
||||||
ok = SQL.doSQL("update [Rechnungsausgang] set Sachbearbeiter='" & Sachbearbeiter & "' where Firma_ID = 19 And Sammelrechnung = 6 And Abfertigungsdatum > DateAdd(Month, -3, GETDATE())", "FMZOLL")
|
ok = SQL.doSQL("update [Rechnungsausgang] set Sachbearbeiter='" & Sachbearbeiter & "' where Firma_ID = 19 And Sammelrechnung = 6 And Abfertigungsdatum > DateAdd(Month, " & vergangAbfertigunsdatuminMontaen & ", GETDATE())", "FMZOLL")
|
||||||
|
|
||||||
showPic(ok, PictureBox1)
|
showPic(ok, PictureBox1)
|
||||||
|
|
||||||
@@ -192,7 +195,7 @@ Public Class usrcntlFakturierung
|
|||||||
|
|
||||||
If rechnungenMitAbwAbfDat > 0 Then
|
If rechnungenMitAbwAbfDat > 0 Then
|
||||||
Dim res As MsgBoxResult
|
Dim res As MsgBoxResult
|
||||||
res = MsgBox("Es gibt noch " & rechnungenMitAbwAbfDat & " Rechnungen mit abweichenden Abfertigungsdatum (Abfertigungsdatum ist nicht " & rechnungsdatum & ")" & vbNewLine & "Möchten Sie fortfahren (Abfertigungsdatum wird automatisch auf " & rechnungsdatum & " gesetzt) ?", vbYesNoCancel)
|
res = MsgBox("Es gibt noch " & rechnungenMitAbwAbfDat & " Rechnungen mit abweichenden Abfertigungsdatum (Abfertigungsdatum ist nicht " & rechnungsdatum & ")" & vbNewLine & "Möchten Sie fortfahren (Abfertigungsdatum wird automatisch auf " & rechnungsdatum & " gesetzt (nur die letzten " & Math.Abs(vergangAbfertigunsdatuminMontaen) & " Monate ab heute) ?", vbYesNoCancel)
|
||||||
Select Case res
|
Select Case res
|
||||||
Case MsgBoxResult.Yes : SQL.doSQL("update [Rechnungsausgang] set Abfertigungsdatum = '" & rechnungsdatum & "' WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) <> '" & rechnungsdatum & "'", "FMZOLL")
|
Case MsgBoxResult.Yes : SQL.doSQL("update [Rechnungsausgang] set Abfertigungsdatum = '" & rechnungsdatum & "' WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) <> '" & rechnungsdatum & "'", "FMZOLL")
|
||||||
Case MsgBoxResult.No
|
Case MsgBoxResult.No
|
||||||
@@ -681,7 +684,7 @@ Public Class usrcntlFakturierung
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
Private Function setRechnungstext(Sachbearbeiter As String, rechnungsdatum As Date, ByRef sammelRechnungen As DataTable) As Boolean
|
Private Function setRechnungstext(Sachbearbeiter As String, rechnungsdatum As Date, ByRef sammelRechnungen As DataTable, Optional setTextifNull As Boolean = False) As Boolean
|
||||||
|
|
||||||
Dim varText As String = ""
|
Dim varText As String = ""
|
||||||
Dim varNettozahlungsziel As Integer = 0
|
Dim varNettozahlungsziel As Integer = 0
|
||||||
@@ -692,7 +695,7 @@ Public Class usrcntlFakturierung
|
|||||||
|
|
||||||
Dim dtSelectedSammelrechnungen As DataTable = (New SQL).loadDgvBySql("SELECT [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], isnull([Steuersatz %],0) as [Steuersatz %], cast([Lastschrift] as bit) as Lastschrift, [RK_ID], [BelegartenNr],cast([Vorkasse] as bit) as Vorkasse, [Nettozahlungsziel], [OffertenNr], [RechnungsLandKz], [Text]
|
Dim dtSelectedSammelrechnungen As DataTable = (New SQL).loadDgvBySql("SELECT [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], isnull([Steuersatz %],0) as [Steuersatz %], cast([Lastschrift] as bit) as Lastschrift, [RK_ID], [BelegartenNr],cast([Vorkasse] as bit) as Vorkasse, [Nettozahlungsziel], [OffertenNr], [RechnungsLandKz], [Text]
|
||||||
FROM Rechnungsausgang
|
FROM Rechnungsausgang
|
||||||
WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'
|
WHERE " & IIf(setTextifNull, "[Status] = 4 AND Text is null", "[Status] = 0") & " AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'
|
||||||
ORDER BY [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], [Steuersatz %], [Lastschrift], [RK_ID]", "FMZOLL")
|
ORDER BY [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], [Steuersatz %], [Lastschrift], [RK_ID]", "FMZOLL")
|
||||||
Try
|
Try
|
||||||
|
|
||||||
@@ -2217,5 +2220,22 @@ Public Class usrcntlFakturierung
|
|||||||
Process.Start(webAddress)
|
Process.Start(webAddress)
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub btnRE_Text_Click(sender As Object, e As EventArgs) Handles btnRE_Text.Click
|
||||||
|
|
||||||
|
Dim Sachbearbeiter = cboSachbearbeiter._value
|
||||||
|
Dim rechnungsdatum As Date = CDate(dtRechnungsdatum.Text)
|
||||||
|
Dim dtSammelrechnungen As New DataTable
|
||||||
|
|
||||||
|
Dim setText As Boolean = False
|
||||||
|
|
||||||
|
Dim res As MsgBoxResult
|
||||||
|
res = MsgBox("Möchten Sie den Rechnungstext für bereits gedruckte Rechnungen setzen (WENN TEXT = NULL)?" & vbNewLine & "JA -> nur bei Text = NULL und STATUS = 4" & vbNewLine & "NEIN -> Text bei STATUS = 0" & vbNewLine & "ABBRUCH ->NICHTS MACHEN", vbYesNoCancel)
|
||||||
|
Select Case res
|
||||||
|
Case MsgBoxResult.Yes : setText = True
|
||||||
|
Case MsgBoxResult.No : setText = False
|
||||||
|
Case MsgBoxResult.Cancel : Exit Sub
|
||||||
|
End Select
|
||||||
|
|
||||||
|
showPic(setRechnungstext(Sachbearbeiter, rechnungsdatum, dtSammelrechnungen, setText), PictureBox3)
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -173,7 +173,18 @@ 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")
|
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
|
End Function
|
||||||
|
|
||||||
Public Function CalcSaldo(Optional dtDate As DataTable = Nothing) As String
|
Public Function CalcSaldo(Optional dtDate As DataTable = Nothing, Optional Stichtag As Date? = Nothing) As String
|
||||||
|
|
||||||
|
|
||||||
|
Dim StichtagSQLGesamtsicherheit = ""
|
||||||
|
Dim StichtagSQLGesamtsicherheitsPositionen = ""
|
||||||
|
If Stichtag.HasValue Then
|
||||||
|
StichtagSQLGesamtsicherheitsPositionen = " And cast(gsp_datum as Date) <= '" & Stichtag.Value.ToShortDateString & "'"
|
||||||
|
StichtagSQLGesamtsicherheit = " AND cast(gs_datum as Date) <= '" & Stichtag.Value.ToShortDateString & "'"
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Dim SaldoString As String =
|
Dim SaldoString As String =
|
||||||
"select
|
"select
|
||||||
@@ -184,24 +195,35 @@ Public Class cAufschubKonten
|
|||||||
when gs_art = 'Close' then gs_sicherheitsbetrag
|
when gs_art = 'Close' then gs_sicherheitsbetrag
|
||||||
end)
|
end)
|
||||||
|
|
||||||
as SicherheitsSaldoGS from [tblGesamtsicherheit] Where gs_standort = '" & brgakto_gs_standort & "')+
|
as SicherheitsSaldoGS from [tblGesamtsicherheit] Where gs_standort = '" & brgakto_gs_standort & "'" & StichtagSQLGesamtsicherheit & ")+
|
||||||
|
|
||||||
(select SUM(
|
(select SUM(
|
||||||
case
|
case
|
||||||
when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
|
when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
|
||||||
when gsp_art = 'Close' then gsp_sicherheitsbetrag
|
when gsp_art = 'Close' then gsp_sicherheitsbetrag
|
||||||
end)
|
end)
|
||||||
as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & brgakto_gs_standort & "' And ISNULL(gs_ReferenzAenderung,0) = 0 ))"
|
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 & ")"
|
||||||
|
|
||||||
Dim dt As New DataTable
|
Dim dt As New DataTable
|
||||||
Dim mrn As Double = 0
|
Dim mrn As Double = 0
|
||||||
dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
|
dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
|
||||||
If dt.Rows(0).Item(0).ToString.Length > 0 Then
|
If dt.Rows(0).Item(0).ToString.Length > 0 Then
|
||||||
mrn = dt.Rows(0).Item(0)
|
mrn = dt.Rows(0).Item(0)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
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"))
|
||||||
|
Else
|
||||||
|
brgakto_gs_aktSaldo = getReferenzbetrag(Today) 'aktueller Referenzbetrag + Verwahrungsausgänge - Verwahrungseingänge....
|
||||||
|
brgakto_gs_aktSaldo += mrn
|
||||||
|
updateSaldo()
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
brgakto_gs_aktSaldo = getReferenzbetrag(Today) + mrn
|
|
||||||
updateSaldo()
|
|
||||||
|
|
||||||
|
|
||||||
Return brgakto_gs_aktSaldo
|
Return brgakto_gs_aktSaldo
|
||||||
@@ -211,7 +233,7 @@ Public Class cAufschubKonten
|
|||||||
|
|
||||||
Try
|
Try
|
||||||
|
|
||||||
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]='" & brgakto_id & "' and brgarefb_gs_aktiv = 1 And [brgarefb_gueltig_ab] <= '" & 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
|
Catch ex As Exception
|
||||||
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
|
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ Imports System.Data.SqlClient
|
|||||||
Imports System.IO
|
Imports System.IO
|
||||||
Imports System.Net
|
Imports System.Net
|
||||||
Imports System.Reflection
|
Imports System.Reflection
|
||||||
|
Imports DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing
|
||||||
|
|
||||||
Public Class cIDS
|
Public Class cIDS
|
||||||
|
|
||||||
@@ -632,6 +633,10 @@ Public Class cIDS
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Public Shared Function countBackToCustomerNotSet(SQL As SQL) As Integer
|
||||||
|
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblIDSInvoicesNewSplittedByCountry] where InvToCustomer Is null ", "FMZOLL",,, -1)
|
||||||
|
End Function
|
||||||
|
|
||||||
Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, ids_kdNr As Integer, country As String, UStVAn_ID As Integer) As Boolean
|
Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, ids_kdNr As Integer, country As String, UStVAn_ID As Integer) As Boolean
|
||||||
Try
|
Try
|
||||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||||
|
|||||||
@@ -278,6 +278,10 @@ Public Class cRMC
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Public Shared Function countBackToCustomerNotSet(SQL As SQL) As Integer
|
||||||
|
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblRMCImport] where InvToCustomer Is null ", "FMZOLL",,, -1)
|
||||||
|
End Function
|
||||||
|
|
||||||
Public Class Paramter
|
Public Class Paramter
|
||||||
|
|
||||||
Shared apiSettingsloaded As Boolean = False
|
Shared apiSettingsloaded As Boolean = False
|
||||||
|
|||||||
@@ -41,6 +41,10 @@ Public Class cUTA
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Public Shared Function countBackToCustomerNotSet(SQL As SQL) As Integer
|
||||||
|
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblUTAImportNew] where InvToCustomer Is null ", "FMZOLL",,, -1)
|
||||||
|
End Function
|
||||||
|
|
||||||
Public Class UTAHeader
|
Public Class UTAHeader
|
||||||
|
|
||||||
Property Übertragungsnummer As Integer
|
Property Übertragungsnummer As Integer
|
||||||
|
|||||||
@@ -67,6 +67,10 @@ Public Class cMSEAPI
|
|||||||
|
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Public Shared Function countBackToCustomerNotSet(SQL As SQL) As Integer
|
||||||
|
Return SQL.getValueTxtBySql("SELECT count(InvToCustomer) FROM [tblMSEInvoices] where InvToCustomer Is null ", "FMZOLL",,, -1)
|
||||||
|
End Function
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user