This commit is contained in:
2020-03-12 14:49:31 +01:00
parent f4c1a74870
commit cc28d5a6cf
197 changed files with 37402 additions and 4503 deletions

View File

@@ -266,7 +266,7 @@ Public Class cEPBes
Try
POS.Clear()
Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM EPBesPOS WHERE EPBes_ID=@ID ", conn)
Using cmd As New SqlCommand("SELECT * FROM EPBesPOS WHERE EPBes_ID=@ID order by PositionsNr ", conn)
cmd.Parameters.AddWithValue("@ID", ID)
' cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr)
Dim dr = cmd.ExecuteReader()

View File

@@ -155,6 +155,74 @@ Public Class cGenWord
End Function
Public Function genUebernahmebestaetigungKuvert(dt As DataTable, kdNr As Integer, sachbearbeiter As String, autodruck As Boolean, Optional PrinterName As String = "", Optional AuftragsNr As Integer = 0, Optional ByRef pfadWord As String = "", Optional visible As Boolean = True) As Microsoft.Office.Interop.Word.Document
Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing
Try
pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Uebernahmebestätigung\ÜBERNAHMEBESTÄTIGUNG_Kuvert.dotx"
Dim oWord As New Microsoft.Office.Interop.Word.Application
odoc = openWord(pfadWord, (Not autodruck And visible), oWord)
' Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=210 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'")
Dim KUNDE = kundenSQL.getKundeFMZOLLByKdNr(kdNr)
If KUNDE Is Nothing Then MsgBox("Kunde nicht gefunden!") : Return odoc
' Dim PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr)
Dim oTable As Word.Table
odoc.FormFields("Adresse1").Range.Text = KUNDE.Name_1 & " " & KUNDE.Name_2
odoc.FormFields("Adresse2").Range.Text = KUNDE.Straße
odoc.FormFields("Adresse3").Range.Text = KUNDE.LandKz & " " & KUNDE.PLZ & " " & KUNDE.Ort
' odoc.FormFields("KdNrVERAG").Range.Text = KUNDE.KundenNr
' odoc.FormFields("KdNrMST").Range.Text = PartnerKdNrFromFMZOLL.MSEKundenNr
odoc.FormFields("Sachbearbeiter").Range.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
odoc.FormFields("Datum").Range.Text = Now.ToShortDateString
odoc.FormFields("KundenNr").Range.Text = KUNDE.AdressenNr
odoc.FormFields("AuftragsNr").Range.Text = AuftragsNr.ToString("000000.##")
If odoc.Range.Bookmarks.Exists("TabelleKarten") Then
If odoc.Bookmarks("TabelleKarten").Range.Tables.Count > 0 Then
oTable = odoc.Bookmarks("TabelleKarten").Range.Tables(1)
Dim i = 1
Dim kfzTmp = ""
For Each r As DataRow In dt.Rows
If r("KfzKennzeichen").ToString <> "" And r("KartenNr").ToString <> "" Then
If cSqlDb.checkNullStr(r("KfzKennzeichen")) <> kfzTmp Then
kfzTmp = cSqlDb.checkNullStr(r("KfzKennzeichen"))
oTable.Rows(i + 1).Cells(1).Range.Text = kfzTmp
Else
oTable.Rows(i + 1).Cells(1).Range.Text = ""
End If
oTable.Rows(i + 1).Cells(2).Range.Text = cSqlDb.checkNullStr(r("KarteBoxBezeichnung"))
oTable.Rows(i + 1).Cells(3).Range.Text = cSqlDb.checkNullStr(r("KartenNr"))
' oTable.Rows(i + 1).Cells(4).Range.Text = cSqlDb.checkNullStr(r("PIN"))
If i < dt.Rows.Count Then oTable.Rows.Add()
i += 1
End If
Next
End If
Else
MessageBox.Show("Textmarke nicht vorhanden!")
End If
odoc.Save() : odoc.Activate()
If autodruck Then
Dim t As New Threading.Thread(Sub()
print(odoc, PrinterName)
End Sub)
t.IsBackground = True
t.Start()
End If
Catch ex As Exception
MessageBox.Show(ex.ToString)
End Try
Return odoc
End Function
Sub print(odoc As Microsoft.Office.Interop.Word.Document, PrinterName As String)
odoc.Application.WordBasic.FilePrintSetup(Printer:=PrinterName, DoNotSetAsSysDefault:=1)
odoc.Application.PrintOut() ': odoc.Close()

View File

@@ -335,8 +335,9 @@ Public Class cRKSV
End If
Return BELEG
End Function
Shared Function getGJ(BelegDat As Date) As Integer
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Shared Function getGJ(BelegDat As Date, Optional FIRMA As String = "") As Integer
If FIRMA = "" Then FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Select Case FIRMA
Case "IMEX", "FRONTOFFICE"
Return BelegDat.Year
Case Else
@@ -345,6 +346,16 @@ Public Class cRKSV
End Function
'Shared Function getGJ_ByRksvId(BelegDat As Date, RksvId As Integer) As Integer
' Select Case RksvId
' Case 1
' Return getGJ(BelegDat, "VERAG")
' Case Else
' Return IIf(BelegDat.Month = 1, BelegDat.Year - 1, BelegDat.Year)
' End Select
'End Function
Shared Function getGJ_EndOfYear(GeschaerftsJahr As Integer) As Date
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -1462,7 +1473,7 @@ Public Class cRKSV
Dim curSteuerbetrag As Double = 0
For Each p In BELEG.POS
Dim dtBetraegeGB = SQL.loadDgvBySql(" SELECT " & getGl_account() & " AS Gegenkonto, isnull(tblEABelegposition.Betrag,0) AS Nettobetrag, " &
Dim dtBetraegeGB = SQL.loadDgvBySql(" SELECT " & getGl_account(KBEntry.rksv_id) & " AS Gegenkonto, isnull(tblEABelegposition.Betrag,0) AS Nettobetrag, " &
" isnull((cast((CASE WHEN [Steuerpflichtig]=1 THEN [Betrag] ELSE 0 END)* [Steuersatz] as decimal(8,2))),0) AS Steuerbetrag " &
" FROM tblSteuersätze INNER JOIN tblEABelegnummer ON tblSteuersätze.Nr = tblEABelegnummer.Steuerschlüssel INNER JOIN tblEABelegposition INNER JOIN Leistungen ON tblEABelegposition.LeistungsNr = Leistungen.LeistungsNr ON tblEABelegnummer.Mandant = tblEABelegposition.Mandant AND tblEABelegnummer.Niederlassung = tblEABelegposition.Niederlassung AND tblEABelegnummer.Benutzer = tblEABelegposition.Benutzer AND tblEABelegnummer.BelegDat = tblEABelegposition.BelegDat AND tblEABelegnummer.BelegNr = tblEABelegposition.BelegNr " &
" WHERE tblEABelegposition.Mandant='" & BELEG.Mandant & "' AND tblEABelegposition.Niederlassung='" & BELEG.Niederlassung & "' AND tblEABelegposition.Benutzer='" & BELEG.Benutzer & "' AND tblEABelegposition.BelegDat='" & BELEG.BelegDat.ToShortDateString & "' AND tblEABelegposition.BelegNr='" & BELEG.BelegNr & "' AND tblEABelegposition.LeistungsNr=" & p.LeistungsNr & " AND tblEABelegposition.PreislistenPos='" & p.PreislistenPos & "' " &
@@ -1561,7 +1572,8 @@ Public Class cRKSV
End Function
Public Shared Function getGl_account()
Public Shared Function getGl_account(rksv_id)
If rksv_id = 1 Then Return "Leistungen.Gl_account" ' VERAG-Kasse bei IMEX
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : Return "Leistungen.IMEX_Gl_account"
Case Else : Return "Leistungen.Gl_account"