From 43dc1c3d23892a72d319cdc9634a31b724fcad32 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 16 Mar 2023 22:49:07 +0100 Subject: [PATCH] SDL Brief, MDM BU Soll/Haben, Beleg-Bugfix --- SDL/Classes/cRKSV.vb | 2 +- SDL/Formulare/CARNET-TIR/frmTIR.Designer.vb | 10 +- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb | 2 + .../subrptBriefSDL_PLOSE_MEDPASS.Designer.vb | 194 ++++++++++++++++++ .../subrptBriefSDL_PLOSE_MEDPASS.resx | 126 ++++++++++++ .../BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.vb | 45 ++++ .../subrptBriefSDL_VERAGCARD.Designer.vb | 194 ++++++++++++++++++ .../BriefSDl/subrptBriefSDL_VERAGCARD.resx | 126 ++++++++++++ .../MDM/BriefSDl/subrptBriefSDL_VERAGCARD.vb | 45 ++++ SDL/SDL.vbproj | 18 ++ SDL/buchhaltung/frmMDM_BH_SollHaben.vb | 4 +- SDL/kassenbuch/frmBelegNeu.vb | 8 +- 13 files changed, 765 insertions(+), 13 deletions(-) create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.Designer.vb create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.resx create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.vb create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.Designer.vb create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.resx create mode 100644 SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.vb diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index f5e97ff7..3c745913 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -119,7 +119,7 @@ Public Class cRKSV " WHERE [Mandant]='" & PERSONAL.Mandant & "' AND [Niederlassung]='" & PERSONAL.Niederlassung & "' AND [Benutzer]='" & PERSONAL.ID & "' AND [Geschäftsjahr]='" & cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma) & "' AND [BelegNr] ='" & BELEG.BelegNr & "' and Steuer <=0 AND Soll <> 0", "FMZOLL") - If zm Is DBNull.Value Or zm = Nothing Then + If zm Is DBNull.Value Or zm Is Nothing Then Return "-" End If diff --git a/SDL/Formulare/CARNET-TIR/frmTIR.Designer.vb b/SDL/Formulare/CARNET-TIR/frmTIR.Designer.vb index 7eaf0f93..3b1bfe50 100644 --- a/SDL/Formulare/CARNET-TIR/frmTIR.Designer.vb +++ b/SDL/Formulare/CARNET-TIR/frmTIR.Designer.vb @@ -67,7 +67,7 @@ Partial Class frmTIR Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(865, 40) + Me.Panel2.Size = New System.Drawing.Size(873, 40) Me.Panel2.TabIndex = 1 ' 'Label3 @@ -145,7 +145,7 @@ Partial Class frmTIR Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel3.Location = New System.Drawing.Point(0, 1058) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(865, 69) + Me.Panel3.Size = New System.Drawing.Size(873, 69) Me.Panel3.TabIndex = 5 ' 'cboAbriss777 @@ -281,8 +281,9 @@ Partial Class frmTIR ' 'Button1 ' + Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(745, 14) + Me.Button1.Location = New System.Drawing.Point(770, 14) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(98, 48) Me.Button1.TabIndex = 3 @@ -301,7 +302,8 @@ Partial Class frmTIR ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(865, 1127) + Me.AutoScroll = True + Me.ClientSize = New System.Drawing.Size(873, 1127) Me.Controls.Add(Me.UsrCntlTIR1) Me.Controls.Add(Me.Panel3) Me.Controls.Add(Me.Panel2) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index aa81d43e..3259a66c 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb b/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb index 7ed298e1..54eac980 100644 --- a/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb +++ b/SDL/Reports/MDM/BriefSDl/rptSDLBrief.vb @@ -58,6 +58,8 @@ Public Class rptSDLBrief Case 214 : SubReport.Report = New subrptBriefSDL_PLOSE(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case 215 : SubReport.Report = New subrptBriefSDL_PLOSE_IT(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case 216 : SubReport.Report = New subrptBriefSDL_PLOSE_CZ(sqlStr & " AND SDLNr=" & sdlNr & " " & order) + Case 217 : SubReport.Report = New subrptBriefSDL_PLOSE_medpass(sqlStr & " AND SDLNr=" & sdlNr & " " & order) + Case 501, 502 : SubReport.Report = New subrptBriefSDL_VERAGCARD(sqlStr & " AND SDLNr=" & sdlNr & " " & order) Case Else : MsgBox("Für diese Leistung kann kein Bericht erstellt werden!") End Select End Sub diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.Designer.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.Designer.vb new file mode 100644 index 00000000..b7fcf3ba --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.Designer.vb @@ -0,0 +1,194 @@ + +Partial Public Class subrptBriefSDL_PLOSE_MEDPASS + Inherits GrapeCity.ActiveReports.SectionReport + + 'Form overrides dispose to clean up the component list. + Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing Then + End If + MyBase.Dispose(disposing) + End Sub + + 'NOTE: The following procedure is required by the ActiveReports Designer + 'It can be modified using the ActiveReports Designer. + 'Do not modify it using the code editor. + Private WithEvents Detail As GrapeCity.ActiveReports.SectionReportModel.Detail + + Private Sub InitializeComponent() + Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(subrptBriefSDL_PLOSE_MEDPASS)) + Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() + Me.lblKartenNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblLKWKz = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblOBUId = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() + Me.TextBox5 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox6 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox7 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox11 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() + Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line() + CType(Me.lblKartenNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblLKWKz, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblOBUId, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox11, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() + ' + 'Detail + ' + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblKartenNr, Me.lblNr, Me.lblLKWKz, Me.lblOBUId}) + Me.Detail.Height = 0.1783464! + Me.Detail.Name = "Detail" + ' + 'lblKartenNr + ' + Me.lblKartenNr.Height = 0.1586614! + Me.lblKartenNr.Left = 1.732284! + Me.lblKartenNr.Name = "lblKartenNr" + Me.lblKartenNr.Style = "font-size: 10pt; font-weight: normal; text-align: left; ddo-char-set: 1" + Me.lblKartenNr.Text = "Karten-Nr" + Me.lblKartenNr.Top = 0.01968504! + Me.lblKartenNr.Width = 1.575984! + ' + 'lblNr + ' + Me.lblNr.Height = 0.1586614! + Me.lblNr.Left = 0.0! + Me.lblNr.Name = "lblNr" + Me.lblNr.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.lblNr.Style = "font-size: 10pt; text-align: right; ddo-char-set: 1" + Me.lblNr.Text = "999" + Me.lblNr.Top = 0.01968504! + Me.lblNr.Width = 0.3543307! + ' + 'lblLKWKz + ' + Me.lblLKWKz.Height = 0.1586614! + Me.lblLKWKz.Left = 0.3543298! + Me.lblLKWKz.Name = "lblLKWKz" + Me.lblLKWKz.Style = "font-size: 10pt; ddo-char-set: 1" + Me.lblLKWKz.Text = "SD 123 ASD" + Me.lblLKWKz.Top = 0.01968512! + Me.lblLKWKz.Width = 1.377953! + ' + 'lblOBUId + ' + Me.lblOBUId.Height = 0.1586614! + Me.lblOBUId.Left = 3.308267! + Me.lblOBUId.Name = "lblOBUId" + Me.lblOBUId.Style = "font-size: 10pt; ddo-char-set: 1" + Me.lblOBUId.Text = "OBUID" + Me.lblOBUId.Top = 0.01968512! + Me.lblOBUId.Width = 1.940551! + ' + 'GroupHeader1 + ' + Me.GroupHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.TextBox5, Me.TextBox6, Me.TextBox7, Me.TextBox11, Me.Line2}) + Me.GroupHeader1.Height = 0.1852909! + Me.GroupHeader1.Name = "GroupHeader1" + ' + 'TextBox5 + ' + Me.TextBox5.Height = 0.1586614! + Me.TextBox5.Left = 1.732284! + Me.TextBox5.Name = "TextBox5" + Me.TextBox5.Style = "font-size: 10pt; font-weight: bold; text-align: left; ddo-char-set: 1" + Me.TextBox5.Text = "Karten-Nr" + Me.TextBox5.Top = 0.0! + Me.TextBox5.Width = 1.575984! + ' + 'TextBox6 + ' + Me.TextBox6.Height = 0.1586614! + Me.TextBox6.Left = 0.0000002384186! + Me.TextBox6.Name = "TextBox6" + Me.TextBox6.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.TextBox6.Style = "font-size: 10pt; font-weight: bold; text-align: right; ddo-char-set: 1" + Me.TextBox6.Text = "Nr" + Me.TextBox6.Top = 0.00000007450581! + Me.TextBox6.Width = 0.3543307! + ' + 'TextBox7 + ' + Me.TextBox7.Height = 0.1586614! + Me.TextBox7.Left = 0.3543308! + Me.TextBox7.Name = "TextBox7" + Me.TextBox7.Style = "font-size: 10pt; font-weight: bold; ddo-char-set: 1" + Me.TextBox7.Text = "Kennzeichen" + Me.TextBox7.Top = 0.00000007450581! + Me.TextBox7.Width = 1.377953! + ' + 'TextBox11 + ' + Me.TextBox11.Height = 0.1586614! + Me.TextBox11.Left = 3.308268! + Me.TextBox11.Name = "TextBox11" + Me.TextBox11.Style = "font-size: 10pt; font-weight: bold; ddo-char-set: 1" + Me.TextBox11.Text = "OBUID" + Me.TextBox11.Top = 0.0! + Me.TextBox11.Width = 1.940551! + ' + 'GroupFooter1 + ' + Me.GroupFooter1.Height = 0.0! + Me.GroupFooter1.Name = "GroupFooter1" + ' + 'Line2 + ' + Me.Line2.Height = 0.0001809001! + Me.Line2.Left = 0.0! + Me.Line2.LineWeight = 1.0! + Me.Line2.Name = "Line2" + Me.Line2.Top = 0.1852522! + Me.Line2.Width = 6.496063! + Me.Line2.X1 = 0.0! + Me.Line2.X2 = 6.496063! + Me.Line2.Y1 = 0.1854331! + Me.Line2.Y2 = 0.1852522! + ' + 'subrptBriefSDL_cz + ' + Me.MasterReport = False + Me.PageSettings.Margins.Bottom = 0.0! + Me.PageSettings.Margins.Left = 0.0! + Me.PageSettings.Margins.Right = 0.0! + Me.PageSettings.Margins.Top = 0.0! + Me.PageSettings.PaperHeight = 11.0! + Me.PageSettings.PaperWidth = 8.5! + Me.PrintWidth = 6.496063! + Me.Sections.Add(Me.GroupHeader1) + Me.Sections.Add(Me.Detail) + Me.Sections.Add(Me.GroupFooter1) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" & + "l; font-size: 10pt; color: Black; ddo-char-set: 204", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 16pt; font-weight: bold", "Heading1", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" & + "lic", "Heading2", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal")) + CType(Me.lblKartenNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblLKWKz, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblOBUId, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox11, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me, System.ComponentModel.ISupportInitialize).EndInit() + + End Sub + Private WithEvents GroupHeader1 As GrapeCity.ActiveReports.SectionReportModel.GroupHeader + Private WithEvents GroupFooter1 As GrapeCity.ActiveReports.SectionReportModel.GroupFooter + Private WithEvents lblKartenNr As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblNr As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblLKWKz As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblOBUId As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox5 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox6 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox7 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox11 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents Line2 As GrapeCity.ActiveReports.SectionReportModel.Line +End Class diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.resx b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.resx new file mode 100644 index 00000000..e8cbd0f3 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0 + + + 0, 0 + + \ No newline at end of file diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.vb new file mode 100644 index 00000000..10796a46 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_PLOSE_MEDPASS.vb @@ -0,0 +1,45 @@ +Imports GrapeCity.ActiveReports +Imports GrapeCity.ActiveReports.Document + +Public Class subrptBriefSDL_PLOSE_MEDPASS + Public sqlStr = "" + + + Sub New(sqlStr) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.sqlStr = sqlStr + End Sub + Private Sub subrptAuswertungUeberfaelligeBestellungen_ReportStart(sender As Object, e As EventArgs) Handles MyBase.ReportStart + + Dim kundenSQL As New kundenSQL + Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "SDL") + + End Sub + + Dim dummycount As Integer = 0 + Private Sub Detail1_Format(sender As System.Object, e As System.EventArgs) Handles Detail.Format + + dummycount = dummycount + 1 + lblNr.Text = dummycount + lblLKWKz.Text = cSqlDb.checkNullStr(Fields.Item("KfzKennzeichen").Value) + ' lblBestellDat.Text = cSqlDb.checkNullDate(Fields.Item("Bestelldatum").Value).ToShortDateString + ' lblLieferDat.Text = cSqlDb.checkNullDate(Fields.Item("Lieferdatum").Value).ToShortDateString + lblOBUId.Text = cSqlDb.checkNullStr(Fields.Item("OBUID").Value) + lblKartenNr.Text = cSqlDb.checkNullStr(Fields.Item("KartenNr").Value) + + + 'Abwechselnd grauen und weißen Hintergrund + If (dummycount Mod 2) = 0 Then + Detail.BackColor = Color.White + Else + Detail.BackColor = Color.FromArgb(250, 250, 250) + End If + End Sub + + + +End Class diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.Designer.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.Designer.vb new file mode 100644 index 00000000..76b76317 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.Designer.vb @@ -0,0 +1,194 @@ + +Partial Public Class subrptBriefSDL_VERAGCARD + Inherits GrapeCity.ActiveReports.SectionReport + + 'Form overrides dispose to clean up the component list. + Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing Then + End If + MyBase.Dispose(disposing) + End Sub + + 'NOTE: The following procedure is required by the ActiveReports Designer + 'It can be modified using the ActiveReports Designer. + 'Do not modify it using the code editor. + Private WithEvents Detail As GrapeCity.ActiveReports.SectionReportModel.Detail + + Private Sub InitializeComponent() + Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail() + Me.lblKartenNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblLKWKz = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.lblOBUId = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader() + Me.TextBox5 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox6 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox7 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.TextBox11 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line() + Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter() + CType(Me.lblKartenNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblNr, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblLKWKz, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lblOBUId, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox11, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() + ' + 'Detail + ' + Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblKartenNr, Me.lblNr, Me.lblLKWKz, Me.lblOBUId}) + Me.Detail.Height = 0.1783464! + Me.Detail.Name = "Detail" + ' + 'lblKartenNr + ' + Me.lblKartenNr.Height = 0.1586614! + Me.lblKartenNr.Left = 1.732284! + Me.lblKartenNr.Name = "lblKartenNr" + Me.lblKartenNr.Style = "font-size: 10pt; font-weight: normal; text-align: left; ddo-char-set: 1" + Me.lblKartenNr.Text = "Karten-Nr" + Me.lblKartenNr.Top = 0.01968504! + Me.lblKartenNr.Width = 1.575984! + ' + 'lblNr + ' + Me.lblNr.Height = 0.1586614! + Me.lblNr.Left = 0! + Me.lblNr.Name = "lblNr" + Me.lblNr.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.lblNr.Style = "font-size: 10pt; text-align: right; ddo-char-set: 1" + Me.lblNr.Text = "999" + Me.lblNr.Top = 0.01968504! + Me.lblNr.Width = 0.3543307! + ' + 'lblLKWKz + ' + Me.lblLKWKz.Height = 0.1586614! + Me.lblLKWKz.Left = 0.3543298! + Me.lblLKWKz.Name = "lblLKWKz" + Me.lblLKWKz.Style = "font-size: 10pt; ddo-char-set: 1" + Me.lblLKWKz.Text = "SD 123 ASD" + Me.lblLKWKz.Top = 0.01968512! + Me.lblLKWKz.Width = 1.377953! + ' + 'lblOBUId + ' + Me.lblOBUId.Height = 0.1586614! + Me.lblOBUId.Left = 3.308267! + Me.lblOBUId.Name = "lblOBUId" + Me.lblOBUId.Style = "font-size: 10pt; ddo-char-set: 1" + Me.lblOBUId.Text = "OBUID" + Me.lblOBUId.Top = 0.01968512! + Me.lblOBUId.Visible = False + Me.lblOBUId.Width = 1.940551! + ' + 'GroupHeader1 + ' + Me.GroupHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.TextBox5, Me.TextBox6, Me.TextBox7, Me.TextBox11, Me.Line2}) + Me.GroupHeader1.Height = 0.1852909! + Me.GroupHeader1.Name = "GroupHeader1" + ' + 'TextBox5 + ' + Me.TextBox5.Height = 0.1586614! + Me.TextBox5.Left = 1.732284! + Me.TextBox5.Name = "TextBox5" + Me.TextBox5.Style = "font-size: 10pt; font-weight: bold; text-align: left; ddo-char-set: 1" + Me.TextBox5.Text = "Karten-Nr" + Me.TextBox5.Top = 0! + Me.TextBox5.Width = 1.575984! + ' + 'TextBox6 + ' + Me.TextBox6.Height = 0.1586614! + Me.TextBox6.Left = 0.0000002384186! + Me.TextBox6.Name = "TextBox6" + Me.TextBox6.Padding = New GrapeCity.ActiveReports.PaddingEx(0, 0, 2, 0) + Me.TextBox6.Style = "font-size: 10pt; font-weight: bold; text-align: right; ddo-char-set: 1" + Me.TextBox6.Text = "Nr" + Me.TextBox6.Top = 0.00000007450581! + Me.TextBox6.Width = 0.3543307! + ' + 'TextBox7 + ' + Me.TextBox7.Height = 0.1586614! + Me.TextBox7.Left = 0.3543308! + Me.TextBox7.Name = "TextBox7" + Me.TextBox7.Style = "font-size: 10pt; font-weight: bold; ddo-char-set: 1" + Me.TextBox7.Text = "Kennzeichen" + Me.TextBox7.Top = 0.00000007450581! + Me.TextBox7.Width = 1.377953! + ' + 'TextBox11 + ' + Me.TextBox11.Height = 0.1586614! + Me.TextBox11.Left = 3.308268! + Me.TextBox11.Name = "TextBox11" + Me.TextBox11.Style = "font-size: 10pt; font-weight: bold; ddo-char-set: 1" + Me.TextBox11.Text = "OBUID" + Me.TextBox11.Top = 0! + Me.TextBox11.Visible = False + Me.TextBox11.Width = 1.940551! + ' + 'Line2 + ' + Me.Line2.Height = 0.0001809001! + Me.Line2.Left = 0! + Me.Line2.LineWeight = 1.0! + Me.Line2.Name = "Line2" + Me.Line2.Top = 0.1852522! + Me.Line2.Width = 6.496063! + Me.Line2.X1 = 0! + Me.Line2.X2 = 6.496063! + Me.Line2.Y1 = 0.1854331! + Me.Line2.Y2 = 0.1852522! + ' + 'GroupFooter1 + ' + Me.GroupFooter1.Height = 0! + Me.GroupFooter1.Name = "GroupFooter1" + ' + 'subrptBriefSDL_VERAGCARD + ' + Me.PageSettings.Margins.Bottom = 0! + Me.PageSettings.Margins.Left = 0! + Me.PageSettings.Margins.Right = 0! + Me.PageSettings.Margins.Top = 0! + Me.PageSettings.PaperHeight = 11.0! + Me.PageSettings.PaperWidth = 8.5! + Me.PrintWidth = 6.496063! + Me.Sections.Add(Me.GroupHeader1) + Me.Sections.Add(Me.Detail) + Me.Sections.Add(Me.GroupFooter1) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" & + "l; font-size: 10pt; color: Black; ddo-char-set: 204", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 16pt; font-weight: bold", "Heading1", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" & + "lic", "Heading2", "Normal")) + Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal")) + CType(Me.lblKartenNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblNr, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblLKWKz, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lblOBUId, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox11, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me, System.ComponentModel.ISupportInitialize).EndInit() + + End Sub + Private WithEvents GroupHeader1 As GrapeCity.ActiveReports.SectionReportModel.GroupHeader + Private WithEvents GroupFooter1 As GrapeCity.ActiveReports.SectionReportModel.GroupFooter + Private WithEvents lblKartenNr As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblNr As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblLKWKz As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents lblOBUId As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox5 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox6 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox7 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents TextBox11 As GrapeCity.ActiveReports.SectionReportModel.TextBox + Private WithEvents Line2 As GrapeCity.ActiveReports.SectionReportModel.Line +End Class diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.resx b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.resx new file mode 100644 index 00000000..e8cbd0f3 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0 + + + 0, 0 + + \ No newline at end of file diff --git a/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.vb b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.vb new file mode 100644 index 00000000..d81b3339 --- /dev/null +++ b/SDL/Reports/MDM/BriefSDl/subrptBriefSDL_VERAGCARD.vb @@ -0,0 +1,45 @@ +Imports GrapeCity.ActiveReports +Imports GrapeCity.ActiveReports.Document + +Public Class subrptBriefSDL_VERAGCARD + Public sqlStr = "" + + + Sub New(sqlStr) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.sqlStr = sqlStr + End Sub + Private Sub subrptAuswertungUeberfaelligeBestellungen_ReportStart(sender As Object, e As EventArgs) Handles MyBase.ReportStart + + Dim kundenSQL As New kundenSQL + Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "SDL") + + End Sub + + Dim dummycount As Integer = 0 + Private Sub Detail1_Format(sender As System.Object, e As System.EventArgs) Handles Detail.Format + + dummycount = dummycount + 1 + lblNr.Text = dummycount + lblLKWKz.Text = cSqlDb.checkNullStr(Fields.Item("KfzKennzeichen").Value) + ' lblBestellDat.Text = cSqlDb.checkNullDate(Fields.Item("Bestelldatum").Value).ToShortDateString + ' lblLieferDat.Text = cSqlDb.checkNullDate(Fields.Item("Lieferdatum").Value).ToShortDateString + lblOBUId.Text = cSqlDb.checkNullStr(Fields.Item("OBUID").Value) + lblKartenNr.Text = cSqlDb.checkNullStr(Fields.Item("KartenNr").Value) + + + 'Abwechselnd grauen und weißen Hintergrund + If (dummycount Mod 2) = 0 Then + Detail.BackColor = Color.White + Else + Detail.BackColor = Color.FromArgb(250, 250, 250) + End If + End Sub + + + +End Class diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 65937e33..ce8f503a 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -692,6 +692,18 @@ True Resources.resx + + subrptBriefSDL_VERAGCARD.vb + + + Component + + + subrptBriefSDL_PLOSE_MEDPASS.vb + + + Component + rptKontrolleLKW_TELOTEC.vb @@ -2921,6 +2933,12 @@ usrCntlSDLLeistungVERAGCardNEU.vb + + subrptBriefSDL_VERAGCARD.vb + + + subrptBriefSDL_PLOSE_MEDPASS.vb + rptKontrolleLKW_TELOTEC.vb diff --git a/SDL/buchhaltung/frmMDM_BH_SollHaben.vb b/SDL/buchhaltung/frmMDM_BH_SollHaben.vb index 149f84f1..4b644b37 100644 --- a/SDL/buchhaltung/frmMDM_BH_SollHaben.vb +++ b/SDL/buchhaltung/frmMDM_BH_SollHaben.vb @@ -131,8 +131,8 @@ Public Class frmMDM_BH_SollHaben lblFehler.Visible = True Button1.Visible = True Me.Cursor = Cursors.Default - MsgBox("ER01: " & ex.Message) - + MsgBox("ER01: " & ex.Message & ex.StackTrace) + Return False End Try lblSoll.Text = "SOLL Auszifferung OK" diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index 07779db0..d7b3e550 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -314,7 +314,7 @@ Public Class frmBelegNeu Sub init() 'lblRgNr.Text = "12345 / TR" lblBelegDatum.Text = BELEG.BelegDat.ToShortDateString - lblZahlungsmittel.Text = cRKSV.getZahlungsmittel(BELEG, PERSONAL, PERSONAL.cRKSV_Kasse.rksv_firma) + lblZahlungsmittel.Text = cRKSV.getZahlungsmittel(BELEG, PERSONAL, KASSE.rksv_firma) lblkundeKdNr.Text = IIf(BELEG.KundenNr > 0, BELEG.KundenNr, "") kdkunde.Text = BELEG.Ordnungsbegriff If BELEG.KundenNr > 0 Then kdkunde.KdNr = BELEG.KundenNr @@ -1523,10 +1523,10 @@ Public Class frmBelegNeu If Not vbYes = MsgBox("Bei Zahlung/Druckvorgang werden die Beleg-Daten ins Kassenbuch eingetragen. Danach sind keine Änderungen mehr möglich." & vbNewLine & vbNewLine & "Soll der Vorgang gestartet werden?", vbYesNoCancel) Then Me.Cursor = Cursors.Default : Return False End If End If - Return True Me.Cursor = Cursors.Default + Return True Catch ex As Exception Me.DialogResult = Windows.Forms.DialogResult.None Me.Cursor = Cursors.Default @@ -1535,7 +1535,7 @@ Public Class frmBelegNeu warnClose = False Me.Close() End Try - + Return False End Function Private Sub setRKSV() @@ -1643,7 +1643,7 @@ Public Class frmBelegNeu Select Case BELEG.Belegart Case "1" - If True Then 'cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then + If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then 'WARTEN printErfolgreich = True End If