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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-06-06 22:23:57 +02:00
parent 4082808ef7 28e4cfa1d3
commit 51406da174
10 changed files with 472 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SDL/My Project/licenses.licx
View File

@@ -1 +1,2 @@
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff

10
SDL/SDL.vbproj
View File

@@ -899,10 +899,10 @@
<Compile Include="USTV\usrCntlUSTV.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.Designer.vb">
<DependentUpon>usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.vb</DependentUpon>
<Compile Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb">
<DependentUpon>usrCntlMDMDatenverarbeitungAuswertungen_divers.vb</DependentUpon>
</Compile>
<Compile Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.vb">
<Compile Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_divers.vb">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="mdm\usrCntlMSE_KonvertCSV.Designer.vb">
@@ -3275,8 +3275,8 @@
<EmbeddedResource Include="USTV\usrCntlUSTV.resx">
<DependentUpon>usrCntlUSTV.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.resx">
<DependentUpon>usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.vb</DependentUpon>
<EmbeddedResource Include="mdm\usrCntlMDMDatenverarbeitungAuswertungen_divers.resx">
<DependentUpon>usrCntlMDMDatenverarbeitungAuswertungen_divers.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="mdm\usrCntlMSE_KonvertCSV.resx">
<DependentUpon>usrCntlMSE_KonvertCSV.vb</DependentUpon>

11
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -313,13 +313,18 @@ Public Class frmMDM_USTVAntrag
USTV_POS.UStVPo_Zeitstempel = Now()
' Berechnungen
Dim umrechKurs = 1
Dim umrechKurs As Double = 1
If (CDbl(r.Item("rmc_betragBrutto")) > 0 AndAlso CDbl(r.Item("rmc_euroBrutto")) > 0) Then
umrechKurs = CDbl(r.Item("rmc_betragBrutto") / r.Item("rmc_euroBrutto"))
Dim eur As Double = CDbl(r.Item("rmc_euroBrutto"))
Dim frmdw As Double = CDbl(r.Item("rmc_betragBrutto"))
umrechKurs = eur / frmdw
End If
If CDbl(r.Item("rmc_betragMWST")) > 0 Then
USTV_POS.UStVPo_USteuerbetragEUR = CDbl(r.Item("rmc_betragMWST") * umrechKurs)
USTV_POS.UStVPo_USteuerbetragEUR = Math.Round((r.Item("rmc_betragMWST") * umrechKurs), 2)
USTV_POS.UStVPo_Umrechnungskurs = umrechKurs
USTV_POS.UStVPo_USteuerbetrag = r.Item("rmc_betragMWST")
End If

3
SDL/kunden/frmKundenblatt.Designer.vb generated
View File

@@ -2094,6 +2094,7 @@ Partial Class frmKundenblatt
'
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
Me.cntxtCntxtMDM.Text = "cntxtMDM"
'
@@ -2177,7 +2178,7 @@ Partial Class frmKundenblatt
Me.KdSearchBox1._display_Name1 = False
Me.KdSearchBox1._displayAVISO_Email = False
Me.KdSearchBox1._displayFullName = False
Me.KdSearchBox1._displayWoelflKd = False
Me.KdSearchBox1._displayWoelflKd = True
Me.KdSearchBox1._hideIfListEmpty = True
Me.KdSearchBox1._loadKdData = False
Me.KdSearchBox1._searchName1 = True

254
SDL/mdm/frmMDMDatenverarbetiung.Designer.vb generated
View File

@@ -38,11 +38,14 @@ Partial Class frmMDMDatenverarbetiung
Me.btn = New System.Windows.Forms.Button()
Me.Button7 = New System.Windows.Forms.Button()
Me.Button8 = New System.Windows.Forms.Button()
Me.Button4 = New System.Windows.Forms.Button()
Me.Button9 = New System.Windows.Forms.Button()
Me.btnDatenLaden = New System.Windows.Forms.Button()
Me.Label1 = New System.Windows.Forms.Label()
Me.lbl = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.lblTTRSum = New System.Windows.Forms.Label()
Me.txtTTRSum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lblProzPruef = New System.Windows.Forms.Label()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.pic = New System.Windows.Forms.PictureBox()
@@ -55,6 +58,7 @@ Partial Class frmMDMDatenverarbetiung
Me.Button1 = New System.Windows.Forms.Button()
Me.btnKunde = New System.Windows.Forms.Button()
Me.Label4 = New System.Windows.Forms.Label()
Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cbx = New System.Windows.Forms.CheckBox()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.Label43 = New System.Windows.Forms.Label()
@@ -65,16 +69,12 @@ Partial Class frmMDMDatenverarbetiung
Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar()
Me.lblPloseAnh_Proz = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label()
Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button2 = New System.Windows.Forms.Button()
Me.Button4 = New System.Windows.Forms.Button()
Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.txtTTRSum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button9 = New System.Windows.Forms.Button()
Me.pnl.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel4.SuspendLayout()
@@ -247,6 +247,28 @@ Partial Class frmMDMDatenverarbetiung
Me.Button8.Text = "ASFINAG"
Me.Button8.UseVisualStyleBackColor = False
'
'Button4
'
Me.Button4.BackColor = System.Drawing.Color.FloralWhite
Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button4.Location = New System.Drawing.Point(381, 3)
Me.Button4.Name = "Button4"
Me.Button4.Size = New System.Drawing.Size(120, 23)
Me.Button4.TabIndex = 3
Me.Button4.Text = "IDS"
Me.Button4.UseVisualStyleBackColor = False
'
'Button9
'
Me.Button9.BackColor = System.Drawing.Color.FloralWhite
Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button9.Location = New System.Drawing.Point(507, 3)
Me.Button9.Name = "Button9"
Me.Button9.Size = New System.Drawing.Size(120, 23)
Me.Button9.TabIndex = 4
Me.Button9.Text = "MSE"
Me.Button9.UseVisualStyleBackColor = False
'
'btnDatenLaden
'
Me.btnDatenLaden.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -316,6 +338,32 @@ Partial Class frmMDMDatenverarbetiung
Me.lblTTRSum.Text = "Prüfsumme TTR:"
Me.lblTTRSum.Visible = False
'
'txtTTRSum
'
Me.txtTTRSum._DateTimeOnly = False
Me.txtTTRSum._numbersOnly = False
Me.txtTTRSum._numbersOnlyKommastellen = ""
Me.txtTTRSum._numbersOnlyTrennzeichen = True
Me.txtTTRSum._Prozent = False
Me.txtTTRSum._ShortDateNew = False
Me.txtTTRSum._ShortDateOnly = False
Me.txtTTRSum._TimeOnly = False
Me.txtTTRSum._TimeOnly_Seconds = False
Me.txtTTRSum._value = ""
Me.txtTTRSum._Waehrung = False
Me.txtTTRSum._WaehrungZeichen = True
Me.txtTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtTTRSum.ForeColor = System.Drawing.Color.Black
Me.txtTTRSum.Location = New System.Drawing.Point(1051, 92)
Me.txtTTRSum.MaxLineLength = -1
Me.txtTTRSum.MaxLines_Warning = ""
Me.txtTTRSum.MaxLines_Warning_Label = Nothing
Me.txtTTRSum.Name = "txtTTRSum"
Me.txtTTRSum.Size = New System.Drawing.Size(100, 20)
Me.txtTTRSum.TabIndex = 51
Me.txtTTRSum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.txtTTRSum.Visible = False
'
'lblProzPruef
'
Me.lblProzPruef.Location = New System.Drawing.Point(63, 92)
@@ -353,7 +401,7 @@ Partial Class frmMDMDatenverarbetiung
Me.pnlAsfinag.Controls.Add(Me.bntDatumsetzen)
Me.pnlAsfinag.Location = New System.Drawing.Point(616, 6)
Me.pnlAsfinag.Name = "pnlAsfinag"
Me.pnlAsfinag.Size = New System.Drawing.Size(311, 53)
Me.pnlAsfinag.Size = New System.Drawing.Size(311, 32)
Me.pnlAsfinag.TabIndex = 29
Me.pnlAsfinag.Visible = False
'
@@ -381,9 +429,9 @@ Partial Class frmMDMDatenverarbetiung
'
Me.Panel3.BackColor = System.Drawing.Color.White
Me.Panel3.Controls.Add(Me.Button6)
Me.Panel3.Location = New System.Drawing.Point(626, 73)
Me.Panel3.Location = New System.Drawing.Point(616, 9)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(301, 41)
Me.Panel3.Size = New System.Drawing.Size(311, 105)
Me.Panel3.TabIndex = 48
'
'Button6
@@ -441,6 +489,31 @@ Partial Class frmMDMDatenverarbetiung
Me.Label4.TabIndex = 44
Me.Label4.Text = "Prüfsumme brutto:"
'
'txtPruefsummeBrutto
'
Me.txtPruefsummeBrutto._DateTimeOnly = False
Me.txtPruefsummeBrutto._numbersOnly = False
Me.txtPruefsummeBrutto._numbersOnlyKommastellen = ""
Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True
Me.txtPruefsummeBrutto._Prozent = False
Me.txtPruefsummeBrutto._ShortDateNew = False
Me.txtPruefsummeBrutto._ShortDateOnly = False
Me.txtPruefsummeBrutto._TimeOnly = False
Me.txtPruefsummeBrutto._TimeOnly_Seconds = False
Me.txtPruefsummeBrutto._value = ""
Me.txtPruefsummeBrutto._Waehrung = False
Me.txtPruefsummeBrutto._WaehrungZeichen = True
Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black
Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69)
Me.txtPruefsummeBrutto.MaxLineLength = -1
Me.txtPruefsummeBrutto.MaxLines_Warning = ""
Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing
Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto"
Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20)
Me.txtPruefsummeBrutto.TabIndex = 43
Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'cbx
'
Me.cbx.AutoSize = True
@@ -537,115 +610,6 @@ Partial Class frmMDMDatenverarbetiung
Me.Label3.TabIndex = 38
Me.Label3.Text = "Prüfsumme netto:"
'
'Label2
'
Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(953, 19)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(42, 13)
Me.Label2.TabIndex = 36
Me.Label2.Text = "Anzahl:"
'
'Button3
'
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.Location = New System.Drawing.Point(12, 43)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(120, 23)
Me.Button3.TabIndex = 29
Me.Button3.Text = "Daten prüfen"
Me.Button3.UseVisualStyleBackColor = True
'
'Button2
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Location = New System.Drawing.Point(12, 14)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(120, 23)
Me.Button2.TabIndex = 28
Me.Button2.Text = "Summenbericht"
Me.Button2.UseVisualStyleBackColor = True
'
'Button4
'
Me.Button4.BackColor = System.Drawing.Color.FloralWhite
Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button4.Location = New System.Drawing.Point(381, 3)
Me.Button4.Name = "Button4"
Me.Button4.Size = New System.Drawing.Size(120, 23)
Me.Button4.TabIndex = 3
Me.Button4.Text = "IDS"
Me.Button4.UseVisualStyleBackColor = False
'
'MyDatagridview1
'
Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
Me.MyDatagridview1.AllowUserToAddRows = False
Me.MyDatagridview1.AllowUserToDeleteRows = False
Me.MyDatagridview1.AllowUserToResizeColumns = False
Me.MyDatagridview1.AllowUserToResizeRows = False
Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill
Me.MyDatagridview1.Location = New System.Drawing.Point(0, 100)
Me.MyDatagridview1.Name = "MyDatagridview1"
Me.MyDatagridview1.ReadOnly = True
Me.MyDatagridview1.RowHeadersWidth = 62
Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577)
Me.MyDatagridview1.TabIndex = 0
'
'txtTTRSum
'
Me.txtTTRSum._DateTimeOnly = False
Me.txtTTRSum._numbersOnly = False
Me.txtTTRSum._numbersOnlyKommastellen = ""
Me.txtTTRSum._numbersOnlyTrennzeichen = True
Me.txtTTRSum._Prozent = False
Me.txtTTRSum._ShortDateNew = False
Me.txtTTRSum._ShortDateOnly = False
Me.txtTTRSum._TimeOnly = False
Me.txtTTRSum._TimeOnly_Seconds = False
Me.txtTTRSum._value = ""
Me.txtTTRSum._Waehrung = False
Me.txtTTRSum._WaehrungZeichen = True
Me.txtTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtTTRSum.ForeColor = System.Drawing.Color.Black
Me.txtTTRSum.Location = New System.Drawing.Point(1051, 92)
Me.txtTTRSum.MaxLineLength = -1
Me.txtTTRSum.MaxLines_Warning = ""
Me.txtTTRSum.MaxLines_Warning_Label = Nothing
Me.txtTTRSum.Name = "txtTTRSum"
Me.txtTTRSum.Size = New System.Drawing.Size(100, 20)
Me.txtTTRSum.TabIndex = 51
Me.txtTTRSum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.txtTTRSum.Visible = False
'
'txtPruefsummeBrutto
'
Me.txtPruefsummeBrutto._DateTimeOnly = False
Me.txtPruefsummeBrutto._numbersOnly = False
Me.txtPruefsummeBrutto._numbersOnlyKommastellen = ""
Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True
Me.txtPruefsummeBrutto._Prozent = False
Me.txtPruefsummeBrutto._ShortDateNew = False
Me.txtPruefsummeBrutto._ShortDateOnly = False
Me.txtPruefsummeBrutto._TimeOnly = False
Me.txtPruefsummeBrutto._TimeOnly_Seconds = False
Me.txtPruefsummeBrutto._value = ""
Me.txtPruefsummeBrutto._Waehrung = False
Me.txtPruefsummeBrutto._WaehrungZeichen = True
Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black
Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69)
Me.txtPruefsummeBrutto.MaxLineLength = -1
Me.txtPruefsummeBrutto.MaxLines_Warning = ""
Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing
Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto"
Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20)
Me.txtPruefsummeBrutto.TabIndex = 43
Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'txtPruefsummeNetto
'
Me.txtPruefsummeNetto._DateTimeOnly = False
@@ -671,6 +635,16 @@ Partial Class frmMDMDatenverarbetiung
Me.txtPruefsummeNetto.TabIndex = 37
Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'Label2
'
Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(953, 19)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(42, 13)
Me.Label2.TabIndex = 36
Me.Label2.Text = "Anzahl:"
'
'txtAnzahl
'
Me.txtAnzahl._DateTimeOnly = False
@@ -696,16 +670,42 @@ Partial Class frmMDMDatenverarbetiung
Me.txtAnzahl.TabIndex = 35
Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'Button9
'Button3
'
Me.Button9.BackColor = System.Drawing.Color.FloralWhite
Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button9.Location = New System.Drawing.Point(507, 3)
Me.Button9.Name = "Button9"
Me.Button9.Size = New System.Drawing.Size(120, 23)
Me.Button9.TabIndex = 4
Me.Button9.Text = "MSE"
Me.Button9.UseVisualStyleBackColor = False
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.Location = New System.Drawing.Point(12, 43)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(120, 23)
Me.Button3.TabIndex = 29
Me.Button3.Text = "Daten prüfen"
Me.Button3.UseVisualStyleBackColor = True
'
'Button2
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Location = New System.Drawing.Point(12, 14)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(120, 23)
Me.Button2.TabIndex = 28
Me.Button2.Text = "Summenbericht"
Me.Button2.UseVisualStyleBackColor = True
'
'MyDatagridview1
'
Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1
Me.MyDatagridview1.AllowUserToAddRows = False
Me.MyDatagridview1.AllowUserToDeleteRows = False
Me.MyDatagridview1.AllowUserToResizeColumns = False
Me.MyDatagridview1.AllowUserToResizeRows = False
Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill
Me.MyDatagridview1.Location = New System.Drawing.Point(0, 100)
Me.MyDatagridview1.Name = "MyDatagridview1"
Me.MyDatagridview1.ReadOnly = True
Me.MyDatagridview1.RowHeadersWidth = 62
Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577)
Me.MyDatagridview1.TabIndex = 0
'
'frmMDMDatenverarbetiung
'

158
SDL/mdm/frmMDMDatenverarbetiung.vb
View File

@@ -33,7 +33,7 @@ Public Class frmMDMDatenverarbetiung
Select Case LIEFERANT
Case "PLOSE" : genSummenbericht_PLOSE()
Case "ASFINAG" : genSummenbericht_ASFINAG()
Case "UTA" : MsgBox("Nicht verfügbar!") : Exit Sub
Case "UTA" : genSummenbericht_UTA()
Case "IDS" : MsgBox("Nicht verfügbar!") : Exit Sub
Case "MSE" : MsgBox("Nicht verfügbar!") : Exit Sub
Case Else : MsgBox("Nicht verfügbar!")
@@ -51,7 +51,7 @@ Public Class frmMDMDatenverarbetiung
Select Case LIEFERANT
Case "PLOSE" : pruef = pruefData_PLOSE()
Case "ASFINAG" : pruef = pruefData_ASFINAG()
Case "UTA" : MsgBox("Nicht verfügbar!") : Exit Sub
Case "UTA" : pruef = pruefData_UTA()
Case "IDS" : MsgBox("Nicht verfügbar!") : Exit Sub
Case "MSE" : MsgBox("Nicht verfügbar!") : Exit Sub
Case Else : MsgBox("Nicht verfügbar!") : Exit Sub
@@ -353,6 +353,92 @@ Public Class frmMDMDatenverarbetiung
print.Show()
End Sub
Sub genSummenbericht_UTA()
Dim displayFilter = False
Dim sqlstr As String = ""
sqlstr &= "SELECT Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer, Sum(Gesamtbetrag_Netto_in_Darstellwährung) AS SummevonGesamtbetrag_Netto_in_Darstellwährung, Sum(Gesamtbetrag_Brutto_in_Darstellwährung) AS SummevonGesamtbetrag_Brutto_in_Darstellwährung from (
SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort, Adressen.UTAExportCSV, Adressen.Rechnungsdruck, Offertenpositionen.KundenNr, Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.*
FROM tblUTAFakturierwarenarten
INNER JOIN (((Adressen INNER JOIN tblUTAImport ON Adressen.UTAKundenNr = tblUTAImport.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr)
AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp
GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort, Lieferland, Kartennummer"
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
'DataGridView.DataSource = dt
Dim print As New frmPrintLayout
print.Text = "uta"
Dim rpt As New rptASFINAG_TransaktionenSumary
rpt.DataSource = dt
'If cbxProdukt.Checked Then
' rpt.GroupHeader2.DataField = "prod_descr"
'Else
' rpt.GroupHeader2.Visible = False
' rpt.GroupFooter2.Visible = False
'End If
Dim sum = 0
rpt.lblUeberschrift.Text = "UTA Summenbericht " & CDate(Now.ToShortDateString)
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
Dim sumNetto As Double = 0
Dim sumMWST As Double = 0
Dim sumBrutto As Double = 0
Dim sumperKdNrNetto As Double = 0
Dim sumperKdNrMWST As Double = 0
Dim sumperKdNrBrutto As Double = 0
AddHandler rpt.Detail.Format, Sub()
rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("KundenNr").Value, "")
rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "")
rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Kartennummer").Value, "") & " - " & SQL.isDbnullEmpty(rpt.Fields.Item("Lieferland").Value, "")
rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value, 2, "")
rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value) - CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value), 2, "")
rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value, 2, "")
rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value, 2, "")
rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value) - CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value), 2, "")
rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value, 2, "")
sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value, 4, 0)
sumMWST += SQL.isDbnullEmptyDbl(CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value) - CDbl(rpt.Fields.Item("SummevonGesamtbetrag_Netto_in_Darstellwährung").Value), 4, 0)
sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("SummevonGesamtbetrag_Brutto_in_Darstellwährung").Value, 4, 0)
End Sub
AddHandler rpt.ReportFooter1.Format, Sub()
rpt.lblSumNetto.Text = sumNetto.ToString("N2")
rpt.lblSumMwst.Text = sumMWST.ToString("N2")
rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
End Sub
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
End Sub
Sub initDgv_PLOSE()
@@ -440,7 +526,7 @@ Public Class frmMDMDatenverarbetiung
Sub initDgv_UTA()
With MyDatagridview1
.Columns.Clear()
Exit Sub
'Exit Sub
'MsgBox(.sql)
.SET_SQL(" SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.LandKz, Adressen.Ort,Offertenpositionen.OffertenNr, Offertenpositionen.LeistungsNr, Offertenpositionen.LeistungsBez, tblUTAFakturierwarenarten.Warenart, tblUTAImport.Fakturierwarenart
@@ -453,15 +539,10 @@ Public Class frmMDMDatenverarbetiung
'MsgBox(.GET_SQL())
If .Columns.Count > 0 Then
'.Columns("plose_POLSEKundennummer").HeaderText = "PLOSE KdNr"
'.Columns("plose_ProduktCode").HeaderText = "ProduktCode"
'.Columns("plose_Produktbeschreibung").HeaderText = "Beschreibung"
'.Columns("plose_Produktbeschreibung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
'.Columns("plose_Menge").HeaderText = "Menge"
'.Columns("plose_Preis").HeaderText = "Preis"
'.Columns("plose_NettobetragWaehrungAbbuchung").HeaderText = "Netto"
'.Columns("plose_MWSTBetragWaehrungAbbuchung").HeaderText = "MWST"
'.Columns("plose_BruttobetragWaehrungAbbuchung").HeaderText = "Brutto"
.Columns("AdressenNr").HeaderText = "KdNr"
.Columns("Name 1").HeaderText = "Kunde"
.Columns("LandKz").HeaderText = "Land"
.Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
'.Columns("VERAGLeistungsNr").ReadOnly = False
'.Columns("VERAGKdNr").ReadOnly = False
@@ -597,15 +678,15 @@ Public Class frmMDMDatenverarbetiung
Case "PLOSE"
Panel4.Visible = True
pnlAsfinag.Visible = False
Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_PLOSE(Me)
Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT)
Panel3.Controls.Add(c)
c.Dock = DockStyle.Fill
Case "UTA"
Panel4.Visible = False
pnlAsfinag.Visible = False
'Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_UTA(Me)
'Panel3.Controls.Add(c)
'c.Dock = DockStyle.Fill
Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_divers(Me, Me.LIEFERANT)
Panel3.Controls.Add(c)
c.Dock = DockStyle.Fill
Case "ASFINAG"
cbxASFINAGAbgerechnet.Visible = True
cbxBelegeerstellt.Visible = True
@@ -2532,6 +2613,51 @@ Public Class frmMDMDatenverarbetiung
End Try
End Function
Function pruefData_UTA() As Boolean
pruefData_UTA = True
Try
Dim dtUTAKundennummern As DataTable = SQL.loadDgvBySql("SELECT Distinct(tblUTAImport.Kundennummer)
FROM tblUTAImport LEFT JOIN Adressen ON tblUTAImport.Kundennummer = Adressen.UTAKundenNr
GROUP BY tblUTAImport.Kundennummer, Adressen.UTAKundenNr
HAVING (((Adressen.UTAKundenNr) Is Null))", "FMZOLL")
If dtUTAKundennummern.Rows.Count > 0 Then
pruefData_UTA = False
If dtUTAKundennummern.Rows.Count = 1 AndAlso dtUTAKundennummern.Rows(0).Item("Kundennummer").Value = "868070" Then pruefData_UTA = True 'ist VERAG -> OK
End If
Dim dtUTAFakturierwarenarten As DataTable = SQL.loadDgvBySql("SELECT tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland
FROM tblUTAImport LEFT JOIN tblUTALeistungen ON (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
GROUP BY tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))", "FMZOLL")
If dtUTAFakturierwarenarten.Rows.Count > 0 Then
pruefData_UTA = False
End If
Dim dtUTAOffertenPositionen As DataTable = SQL.loadDgvBySql("SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2", "FMZOLL")
If dtUTAOffertenPositionen.Rows.Count > 0 Then
pruefData_UTA = False
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
pruefData_UTA = False
End Try
End Function
Function pruefData_PLOSE_old() As Boolean
pruefData_PLOSE_old = True
Try

11
SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.Designer.vb → SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.Designer.vb generated
View File

@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Partial Class usrCntlMDMDatenverarbeitungAuswertungen_divers
Inherits System.Windows.Forms.UserControl
'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -48,7 +48,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button1.Location = New System.Drawing.Point(13, 70)
Me.Button1.Location = New System.Drawing.Point(13, 64)
Me.Button1.Name = "Button1"
Me.Button1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
Me.Button1.Size = New System.Drawing.Size(149, 41)
@@ -56,7 +56,6 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Me.Button1.Text = "Auswertung nach" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Länder EU Kunden"
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button1.UseVisualStyleBackColor = True
Me.Button1.Visible = False
'
'cbxNurEULander
'
@@ -67,6 +66,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Me.cbxNurEULander.TabIndex = 50
Me.cbxNurEULander.Text = "nur EU Länder"
Me.cbxNurEULander.UseVisualStyleBackColor = True
Me.cbxNurEULander.Visible = False
'
'Button2
'
@@ -92,8 +92,9 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Me.cbxConsFakt.Text = "Fakturiert"
Me.cbxConsFakt.ThreeState = True
Me.cbxConsFakt.UseVisualStyleBackColor = True
Me.cbxConsFakt.Visible = False
'
'usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
'usrCntlMDMDatenverarbeitungAuswertungen_divers
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -103,7 +104,7 @@ Partial Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Me.Controls.Add(Me.cbxNurEULander)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Button6)
Me.Name = "usrCntlMDMDatenverarbeitungAuswertungen_PLOSE"
Me.Name = "usrCntlMDMDatenverarbeitungAuswertungen_divers"
Me.Size = New System.Drawing.Size(301, 114)
Me.ResumeLayout(False)
Me.PerformLayout()

0
SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.resx → SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.resx
View File

185
SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_PLOSE.vb → SDL/mdm/usrCntlMDMDatenverarbeitungAuswertungen_divers.vb
View File

@@ -1,7 +1,8 @@
Public Class usrCntlMDMDatenverarbeitungAuswertungen_PLOSE
Public Class usrCntlMDMDatenverarbeitungAuswertungen_divers
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim MAIN As frmMDMDatenverarbetiung
Dim Lieferant As String
Sub New()
' Dieser Aufruf ist für den Designer erforderlich.
@@ -10,15 +11,40 @@
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Sub New(MAIN As frmMDMDatenverarbetiung)
Sub New(MAIN As frmMDMDatenverarbetiung, Lieferant As String)
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
Me.MAIN = MAIN
Me.Lieferant = Lieferant
init()
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Sub init()
Select Case Lieferant
Case "PLOSE"
Button6.Text = "Auswertung IT Maut (Konsortium)"
Button2.Text = "Auswert. Kunden (Konsortium)"
Button1.Text = "Auswertung nach Länder EU Kunden"
Button1.Visible = False
cbxConsFakt.Visible = True
cbxNurEULander.Visible = True
Case "UTA"
Button6.Text = "Kundennummern"
Button2.Text = "Fakturierwarenart"
Button1.Text = "Offertenpositionen"
Case Else
End Select
End Sub
Function getSQLPLOSE(plp_ProductCode_IN As String, plp_ProductCode_NOTIN As String, plose_POLSEKundennummer As String, plp_Kategorie_IN As String, onlyEUCountries As Boolean) As String
Return " SELECT Adressennr KundenNr, [Name 1] Firma,Adressen.LandKz,plz,Ort,CASE WHEN MitgliedslandEU =1 THEN 'JA' ELSE 'NEIN' END as EU, plose_POLSEKundennummer PLOSEKundennummer,sum(plose_NettobetragWaehrungAbbuchung) as Netto, sum(plose_MWSTBetragWaehrungAbbuchung) as MWST , sum(plose_BruttobetragWaehrungAbbuchung) as Brutto
@@ -38,6 +64,64 @@
End Function
Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
Select Case Lieferant
Case "PLOSE"
genKonsortiumPLOSE()
Case "UTA"
genUTABericht("KDNR")
Case Else
MsgBox("nicht definiert!")
End Select
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Select Case Lieferant
Case "PLOSE"
genLaendergesamtPLOSE()
Case "UTA"
genUTABericht("OP")
End Select
End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
Select Case Lieferant
Case "PLOSE"
genKundenbericht_PLOSE()
Case "UTA"
genUTABericht("FKWA")
End Select
End Sub
Sub genKonsortiumPLOSE()
Dim sqlstr = getSQLPLOSE("", "", "", "", cbxNurEULander.Checked) ' 262
@@ -113,9 +197,12 @@
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Sub genLaendergesamtPLOSE()
Dim sqlstr = "SELECT plp_Land, CASE WHEN MitgliedslandEU =1 THEN 'JA' ELSE 'NEIN' END as EU, sum(plose_NettobetragWaehrungAbbuchung) as Netto, sum(plose_MWSTBetragWaehrungAbbuchung) as MWST , sum(plose_BruttobetragWaehrungAbbuchung) as Brutto
FROM tblPLOSE_Details inner join Adressen on PLOSEKundenNr=plose_POLSEKundennummer
inner join tblPLOSE_Produktbeschreibung on plp_ProductCode=plose_ProduktCode
@@ -180,11 +267,99 @@
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
genKundenbericht_PLOSE()
Sub genUTABericht(art As String)
Dim sqlstr = ""
Select Case art
Case "KDNR"
sqlstr = "SELECT tblUTAImport.Kundennummer
FROM tblUTAImport LEFT JOIN Adressen ON tblUTAImport.Kundennummer = Adressen.UTAKundenNr
GROUP BY tblUTAImport.Kundennummer, Adressen.UTAKundenNr
HAVING (((Adressen.UTAKundenNr) Is Null))"
Case "FKWA"
sqlstr = "SELECT tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland
FROM tblUTAImport LEFT JOIN tblUTALeistungen ON (tblUTAImport.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) AND (tblUTAImport.Lieferland = tblUTALeistungen.Lieferland)
GROUP BY tblUTAImport.Fakturierwarenart, tblUTAImport.Lieferland, tblUTALeistungen.Fakturierwarenart, tblUTALeistungen.Lieferland
HAVING (((tblUTALeistungen.Fakturierwarenart) Is Null) AND ((tblUTALeistungen.Lieferland) Is Null))"
Case "OP"
sqlstr = "SELECT * FROM vwUTA_PrüfungInkonsistenzVERAGOffertenpositionen2"
Case Else
MsgBox("Auswertungsart nicht definiert!")
Exit Sub
End Select
Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
Dim print As New frmPrintLayout
print.Text = "UTA"
If dt Is Nothing OrElse dt.Rows.Count = 0 Then
MsgBox("Keine Daten!")
Exit Sub
End If
Dim rpt As New rptPLOSE_LaenderGesamt
rpt.DataSource = dt
Dim sum = 0
' rpt.lblUeberschrift.Text = "PLOSE Summenbericht " & dat_Sum_Von.Text & " bis " & dat_Sum_Bis.Text
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
'Dim cnt As Integer = 0
rpt.lblDat.Text = Now.ToLongDateString
'Dim sumPreis As Double = 0
'Dim sumNetto As Double = 0
'Dim sumMWST As Double = 0
'Dim sumBrutto As Double = 0
'Dim sumBruttoAlleLeistungen As Double = 0
'Dim sumMenge As Double = 0
'AddHandler rpt.Detail.Format, Sub()
' rpt.lblLand.Text = SQL.isDbnullEmpty(rpt.Fields.Item("plp_Land").Value, "")
' rpt.lblEU.Text = SQL.isDbnullEmpty(rpt.Fields.Item("EU").Value, "")
' rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 2, "")
' rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("MWST").Value, 2, "")
' rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 2, "")
' sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netto").Value, 4, 0)
' sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("MWST").Value, 4, 0)
' sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Brutto").Value, 4, 0)
' End Sub
'AddHandler rpt.ReportFooter1.Format, Sub()
' rpt.lblSumNetto.Text = sumNetto.ToString("N2")
' rpt.lblSumMwst.Text = sumMWST.ToString("N2")
' rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
' End Sub
print.Viewer.LoadDocument(rpt)
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
print.Show()
End Sub
Sub genKundenbericht_PLOSE()
Dim displayFilter = False
Dim sqlstr As String = ""

2
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -306,7 +306,7 @@ Public Class cAdressen
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE UstIdKz + UstIdNr='" & UIDNr & "' AND WölflKundenNr = " & woelflKdNr, conn)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND WölflKundenNr = " & woelflKdNr, conn)
Dim dr = cmd.ExecuteReader()
If dr.Read Then