diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 30dd407c..d8b757df 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -718,13 +718,13 @@ Public Class cFakturierung 'End Function - Public Shared Function doRechnungsDruck_SRorER(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printStbVdb As Boolean = False, Optional AnlageEinzelRg As Boolean = False) As Boolean + Public Shared Function doRechnungsDruck_SRorER(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printStbVdb As Boolean = False, Optional AnlageEinzelRg As Boolean = False, Optional sammelrechnungKopie As Boolean = False) As Boolean If RK_ID <= 0 Then Return False Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID) If RG_TMP.Sammelrechnung = 0 Then Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, , printStbVdb) ElseIf RG_TMP.Sammelrechnung = 6 Then - Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, True, Rechnugnsdruck, Path, False,,,,,,,, True, True,,,, True) + Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, True, Rechnugnsdruck, Path, False,,,,,,,, True, True, sammelrechnungKopie,,, , True) Else Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, , Rechnugnsdruck, Path, True) End If @@ -4536,8 +4536,6 @@ Public Class cFakturierung initRgFirmaSammelRg(rpt, FIRMA, RechnungsNr, ROW("LandKz"), ROW("Buchungsjahr")) - - 'rpt.lblFirmaOrt.Text = If(FIRMA.Firma_Ort, "") 'rpt.lblFirmaStrasse.Text = If(FIRMA.Firma_Straße, "") 'rpt.lblFirmaTel.Text = If(FIRMA.Firma_Telefon, "") diff --git a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb index aca90ab3..a16b44c5 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb @@ -1562,7 +1562,7 @@ Partial Class frmRechnungenSuche Me.MenuStrip2.Location = New System.Drawing.Point(3, 27) Me.MenuStrip2.Name = "MenuStrip2" Me.MenuStrip2.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2) - Me.MenuStrip2.Size = New System.Drawing.Size(263, 28) + Me.MenuStrip2.Size = New System.Drawing.Size(143, 28) Me.MenuStrip2.TabIndex = 45 Me.MenuStrip2.Text = "Kundenauswertungen" ' @@ -1581,28 +1581,28 @@ Partial Class frmRechnungenSuche ' Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.statistik_small Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(276, 26) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(272, 24) Me.ToolStripMenuItem3.Text = "Nach Rechnungsanschrift" ' 'NachRechnungslandToolStripMenuItem ' Me.NachRechnungslandToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.NachRechnungslandToolStripMenuItem.Name = "NachRechnungslandToolStripMenuItem" - Me.NachRechnungslandToolStripMenuItem.Size = New System.Drawing.Size(276, 26) + Me.NachRechnungslandToolStripMenuItem.Size = New System.Drawing.Size(272, 24) Me.NachRechnungslandToolStripMenuItem.Text = "Nach Rechnungsland" ' 'NachLeistungsnummerToolStripMenuItem ' Me.NachLeistungsnummerToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.NachLeistungsnummerToolStripMenuItem.Name = "NachLeistungsnummerToolStripMenuItem" - Me.NachLeistungsnummerToolStripMenuItem.Size = New System.Drawing.Size(276, 26) + Me.NachLeistungsnummerToolStripMenuItem.Size = New System.Drawing.Size(272, 24) Me.NachLeistungsnummerToolStripMenuItem.Text = "Nach Leistungsnummer" ' 'NachZollabfertigungspreisenToolStripMenuItem ' Me.NachZollabfertigungspreisenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.NachZollabfertigungspreisenToolStripMenuItem.Name = "NachZollabfertigungspreisenToolStripMenuItem" - Me.NachZollabfertigungspreisenToolStripMenuItem.Size = New System.Drawing.Size(276, 26) + Me.NachZollabfertigungspreisenToolStripMenuItem.Size = New System.Drawing.Size(272, 24) Me.NachZollabfertigungspreisenToolStripMenuItem.Text = "Nach Zollabf.-preisen (LNr: 340)" ' 'Button3 diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index 9acda1aa..98c09063 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -375,7 +375,7 @@ Public Class frmRechnungenSuche End If End Sub - Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick ', DataGridView.CellContentDoubleClick + Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick, DataGridView.CellContentClick ', DataGridView.CellContentDoubleClick If DataGridView.SelectedRows.Count = 0 Then Exit Sub Dim f As New frmKundenUebersichtZollRgDetails(DataGridView.SelectedRows(0).Cells("RK_ID").Value) @@ -993,4 +993,5 @@ Public Class frmRechnungenSuche getJahrString = getJahrString.Substring(0, getJahrString.Length - 1) End Function + End Class \ No newline at end of file diff --git a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb index 15848575..7f551724 100644 --- a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb +++ b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb @@ -6,7 +6,7 @@ Public Class frmKundenUebersichtZollRgDetails Dim RK_ID As Integer = -1 Dim SQL As New SQL - + Dim sammelrechnungskopie As Boolean Dim filialeTmp As String Dim abfertigungsNrTmp As String @@ -16,6 +16,15 @@ Public Class frmKundenUebersichtZollRgDetails Me.RK_ID = RK_ID ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + End Sub + + Sub New(RK_ID, Kopie) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + Me.RK_ID = RK_ID + Me.sammelrechnungskopie = Kopie + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + End Sub Private Sub frmKundenUebersichtZollRg_Load(sender As Object, e As EventArgs) Handles Me.Load Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, /*[SteuerpflichtigerGesamtbetrag]*[Steuersatz %]*/ SteuerpflichtigerGesamtbetrag/(1+[Steuersatz %])*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0) @@ -77,10 +86,6 @@ Public Class frmKundenUebersichtZollRgDetails End With - End Sub - - Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint - End Sub Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click @@ -103,7 +108,6 @@ Public Class frmKundenUebersichtZollRgDetails End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - 'cFakturierung.doRechnungsDruck(RK_ID,, True, 3) - cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 3) + cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 3,,,,, sammelrechnungskopie) End Sub End Class \ No newline at end of file diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 4d7a53ff..e1a5541d 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -53,6 +53,7 @@ Partial Class frmKundenblatt Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -148,8 +149,10 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -181,6 +184,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -191,9 +195,21 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() + Me.Label12 = New System.Windows.Forms.Label() + Me.rtbGespreachsbericht = New System.Windows.Forms.RichTextBox() + Me.btnFirmendatenFormularSpeichern = New System.Windows.Forms.Button() Me.Label9 = New System.Windows.Forms.Label() Me.txtFIBUKuerzel = New System.Windows.Forms.TextBox() + Me.tbRechnungen = New System.Windows.Forms.TabPage() + Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.btnRgPdf = New System.Windows.Forms.Button() + Me.btnMonat = New System.Windows.Forms.Button() + Me.Button10 = New System.Windows.Forms.Button() + Me.Button11 = New System.Windows.Forms.Button() + Me.Label40 = New System.Windows.Forms.Label() Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -213,6 +229,7 @@ Partial Class frmKundenblatt Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem9 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem() Me.pnl = New System.Windows.Forms.Panel() Me.lblINAKTIV = New System.Windows.Forms.Label() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() @@ -220,23 +237,6 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.btnFirmendatenFormularSpeichern = New System.Windows.Forms.Button() - Me.tbRechnungen = New System.Windows.Forms.TabPage() - Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) - Me.btnRgPdf = New System.Windows.Forms.Button() - Me.btnMonat = New System.Windows.Forms.Button() - Me.Button10 = New System.Windows.Forms.Button() - Me.Button11 = New System.Windows.Forms.Button() - Me.Label40 = New System.Windows.Forms.Label() - Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() - Me.rtbGespreachsbericht = New System.Windows.Forms.RichTextBox() - Me.Label12 = New System.Windows.Forms.Label() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -286,14 +286,14 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.SuspendLayout() Me.tbUSTVAntrage.SuspendLayout() Me.tbFIBU.SuspendLayout() + Me.tbRechnungen.SuspendLayout() + CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).BeginInit() + Me.MyPanel1.SuspendLayout() Me.cntxtExcel.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip3.SuspendLayout() Me.mne.SuspendLayout() Me.pnl.SuspendLayout() - Me.tbRechnungen.SuspendLayout() - CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).BeginInit() - Me.MyPanel1.SuspendLayout() Me.SuspendLayout() ' 'pnlInfo @@ -337,6 +337,16 @@ Partial Class frmKundenblatt Me.Panel4.Size = New System.Drawing.Size(1638, 1333) Me.Panel4.TabIndex = 0 ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1333) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -354,7 +364,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1368) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1385) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -395,7 +405,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1339) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1356) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -476,7 +486,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 751) + Me.TabControl1.Size = New System.Drawing.Size(718, 768) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -488,7 +498,7 @@ Partial Class frmKundenblatt Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(710, 725) + Me.TabPage1.Size = New System.Drawing.Size(710, 742) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -547,7 +557,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 690) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 707) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -1090,7 +1100,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1295) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1312) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1737,11 +1747,21 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 1307) + Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) + Me.usrcntlKarten.TabIndex = 0 + ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1749,7 +1769,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1630, 1307) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1761,9 +1781,22 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 1301) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) + Me.UsrCntlLKW1.TabIndex = 0 + ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1772,7 +1805,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 1301) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1813,7 +1846,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 1127) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1825,7 +1858,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 1189) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1966,7 +1999,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 1307) + Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1978,7 +2011,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1624, 1301) + Me.Panel3.Size = New System.Drawing.Size(172, 33) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1996,7 +2029,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1630, 1307) + Me.tbDokumente.Size = New System.Drawing.Size(178, 39) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2196,7 +2229,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 1307) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2205,7 +2238,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 1307) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2221,6 +2254,16 @@ Partial Class frmKundenblatt Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1339) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) @@ -2354,11 +2397,19 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 1313) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'tbFIBU ' Me.tbFIBU.Controls.Add(Me.Label12) @@ -2373,6 +2424,35 @@ Partial Class frmKundenblatt Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label12.Location = New System.Drawing.Point(8, 57) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(93, 13) + Me.Label12.TabIndex = 19 + Me.Label12.Text = "Gesprächsbericht:" + ' + 'rtbGespreachsbericht + ' + Me.rtbGespreachsbericht.Location = New System.Drawing.Point(11, 78) + Me.rtbGespreachsbericht.Name = "rtbGespreachsbericht" + Me.rtbGespreachsbericht.Size = New System.Drawing.Size(628, 324) + Me.rtbGespreachsbericht.TabIndex = 18 + Me.rtbGespreachsbericht.Text = "" + ' + 'btnFirmendatenFormularSpeichern + ' + Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1397, 18) + Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" + Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) + Me.btnFirmendatenFormularSpeichern.TabIndex = 17 + Me.btnFirmendatenFormularSpeichern.Text = "Speichern" + Me.btnFirmendatenFormularSpeichern.UseVisualStyleBackColor = True + ' 'Label9 ' Me.Label9.AutoSize = True @@ -2392,6 +2472,116 @@ Partial Class frmKundenblatt Me.txtFIBUKuerzel.Size = New System.Drawing.Size(289, 20) Me.txtFIBUKuerzel.TabIndex = 3 ' + 'tbRechnungen + ' + Me.tbRechnungen.Controls.Add(Me.dgvRg) + Me.tbRechnungen.Controls.Add(Me.MyPanel1) + Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) + Me.tbRechnungen.Name = "tbRechnungen" + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1356) + Me.tbRechnungen.TabIndex = 14 + Me.tbRechnungen.Text = "Rechnungen" + Me.tbRechnungen.UseVisualStyleBackColor = True + ' + 'dgvRg + ' + Me.dgvRg.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvRg.AllowUserToAddRows = False + Me.dgvRg.AllowUserToDeleteRows = False + Me.dgvRg.AllowUserToResizeColumns = False + Me.dgvRg.AllowUserToResizeRows = False + Me.dgvRg.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvRg.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvRg.Location = New System.Drawing.Point(0, 60) + Me.dgvRg.Name = "dgvRg" + Me.dgvRg.ReadOnly = True + Me.dgvRg.RowHeadersVisible = False + Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvRg.Size = New System.Drawing.Size(1644, 1296) + Me.dgvRg.TabIndex = 3 + ' + 'MyPanel1 + ' + Me.MyPanel1.Controls.Add(Me.btnRgPdf) + Me.MyPanel1.Controls.Add(Me.btnMonat) + Me.MyPanel1.Controls.Add(Me.Button10) + Me.MyPanel1.Controls.Add(Me.Button11) + Me.MyPanel1.Controls.Add(Me.Label40) + Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Top + Me.MyPanel1.Location = New System.Drawing.Point(0, 0) + Me.MyPanel1.Name = "MyPanel1" + Me.MyPanel1.Size = New System.Drawing.Size(1644, 60) + Me.MyPanel1.TabIndex = 2 + ' + 'btnRgPdf + ' + Me.btnRgPdf.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1 + Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnRgPdf.Location = New System.Drawing.Point(1531, 0) + Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.btnRgPdf.Name = "btnRgPdf" + Me.btnRgPdf.Size = New System.Drawing.Size(105, 57) + Me.btnRgPdf.TabIndex = 212 + Me.btnRgPdf.Text = "Als PDF" + Me.btnRgPdf.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnRgPdf.UseVisualStyleBackColor = True + ' + 'btnMonat + ' + Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnMonat.ForeColor = System.Drawing.Color.Black + Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnMonat.Location = New System.Drawing.Point(194, 29) + Me.btnMonat.Margin = New System.Windows.Forms.Padding(0) + Me.btnMonat.Name = "btnMonat" + Me.btnMonat.Size = New System.Drawing.Size(103, 23) + Me.btnMonat.TabIndex = 53 + Me.btnMonat.Text = "September" + Me.btnMonat.UseVisualStyleBackColor = True + ' + 'Button10 + ' + Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button10.ForeColor = System.Drawing.Color.Black + Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button10.Location = New System.Drawing.Point(161, 29) + Me.Button10.Margin = New System.Windows.Forms.Padding(0) + Me.Button10.Name = "Button10" + Me.Button10.Size = New System.Drawing.Size(34, 23) + Me.Button10.TabIndex = 52 + Me.Button10.Text = "<<" + Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button10.UseVisualStyleBackColor = True + ' + 'Button11 + ' + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button11.ForeColor = System.Drawing.Color.Black + Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.Location = New System.Drawing.Point(296, 29) + Me.Button11.Margin = New System.Windows.Forms.Padding(0) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(34, 23) + Me.Button11.TabIndex = 54 + Me.Button11.Text = ">>" + Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.UseVisualStyleBackColor = True + ' + 'Label40 + ' + Me.Label40.AutoSize = True + Me.Label40.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.Label40.Location = New System.Drawing.Point(22, 29) + Me.Label40.Name = "Label40" + Me.Label40.Size = New System.Drawing.Size(111, 20) + Me.Label40.TabIndex = 39 + Me.Label40.Text = "Rechnungen" + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2534,6 +2724,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2597,6 +2788,20 @@ Partial Class frmKundenblatt Me.ToolStripMenuItem7.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.ToolStripMenuItem7.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay ' + 'ToolStripMenuItem10 + ' + Me.ToolStripMenuItem10.AutoSize = False + Me.ToolStripMenuItem10.ForeColor = System.Drawing.Color.White + Me.ToolStripMenuItem10.Image = Global.SDL.My.Resources.Resources.rechnung1 + Me.ToolStripMenuItem10.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.ToolStripMenuItem10.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" + Me.ToolStripMenuItem10.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(122, 60) + Me.ToolStripMenuItem10.Text = "Rechnungen" + Me.ToolStripMenuItem10.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.ToolStripMenuItem10.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay + ' 'pnl ' Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -2681,217 +2886,13 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'btnFirmendatenFormularSpeichern - ' - Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(1507, 18) - Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" - Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) - Me.btnFirmendatenFormularSpeichern.TabIndex = 17 - Me.btnFirmendatenFormularSpeichern.Text = "Speichern" - Me.btnFirmendatenFormularSpeichern.UseVisualStyleBackColor = True - ' - 'tbRechnungen - ' - Me.tbRechnungen.Controls.Add(Me.dgvRg) - Me.tbRechnungen.Controls.Add(Me.MyPanel1) - Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) - Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1339) - Me.tbRechnungen.TabIndex = 14 - Me.tbRechnungen.Text = "Rechnungen" - Me.tbRechnungen.UseVisualStyleBackColor = True - ' - 'dgvRg - ' - Me.dgvRg.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvRg.AllowUserToAddRows = False - Me.dgvRg.AllowUserToDeleteRows = False - Me.dgvRg.AllowUserToResizeColumns = False - Me.dgvRg.AllowUserToResizeRows = False - Me.dgvRg.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvRg.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvRg.Location = New System.Drawing.Point(0, 60) - Me.dgvRg.Name = "dgvRg" - Me.dgvRg.ReadOnly = True - Me.dgvRg.RowHeadersVisible = False - Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 1279) - Me.dgvRg.TabIndex = 3 - ' - 'MyPanel1 - ' - Me.MyPanel1.Controls.Add(Me.btnRgPdf) - Me.MyPanel1.Controls.Add(Me.btnMonat) - Me.MyPanel1.Controls.Add(Me.Button10) - Me.MyPanel1.Controls.Add(Me.Button11) - Me.MyPanel1.Controls.Add(Me.Label40) - Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Top - Me.MyPanel1.Location = New System.Drawing.Point(0, 0) - Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(1644, 60) - Me.MyPanel1.TabIndex = 2 - ' - 'btnRgPdf - ' - Me.btnRgPdf.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnRgPdf.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnRgPdf.Image = Global.SDL.My.Resources.Resources.pdf1 - Me.btnRgPdf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRgPdf.Location = New System.Drawing.Point(1474, 3) - Me.btnRgPdf.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) - Me.btnRgPdf.Name = "btnRgPdf" - Me.btnRgPdf.Size = New System.Drawing.Size(105, 57) - Me.btnRgPdf.TabIndex = 212 - Me.btnRgPdf.Text = "Als PDF" - Me.btnRgPdf.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnRgPdf.UseVisualStyleBackColor = True - ' - 'btnMonat - ' - Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnMonat.ForeColor = System.Drawing.Color.Black - Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMonat.Location = New System.Drawing.Point(194, 29) - Me.btnMonat.Margin = New System.Windows.Forms.Padding(0) - Me.btnMonat.Name = "btnMonat" - Me.btnMonat.Size = New System.Drawing.Size(103, 23) - Me.btnMonat.TabIndex = 53 - Me.btnMonat.Text = "September" - Me.btnMonat.UseVisualStyleBackColor = True - ' - 'Button10 - ' - Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button10.ForeColor = System.Drawing.Color.Black - Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(161, 29) - Me.Button10.Margin = New System.Windows.Forms.Padding(0) - Me.Button10.Name = "Button10" - Me.Button10.Size = New System.Drawing.Size(34, 23) - Me.Button10.TabIndex = 52 - Me.Button10.Text = "<<" - Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.UseVisualStyleBackColor = True - ' - 'Button11 - ' - Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button11.ForeColor = System.Drawing.Color.Black - Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.Location = New System.Drawing.Point(296, 29) - Me.Button11.Margin = New System.Windows.Forms.Padding(0) - Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(34, 23) - Me.Button11.TabIndex = 54 - Me.Button11.Text = ">>" - Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.UseVisualStyleBackColor = True - ' - 'Label40 - ' - Me.Label40.AutoSize = True - Me.Label40.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.Label40.Location = New System.Drawing.Point(22, 29) - Me.Label40.Name = "Label40" - Me.Label40.Size = New System.Drawing.Size(111, 20) - Me.Label40.TabIndex = 39 - Me.Label40.Text = "Rechnungen" - ' - 'ToolStripMenuItem10 - ' - Me.ToolStripMenuItem10.AutoSize = False - Me.ToolStripMenuItem10.ForeColor = System.Drawing.Color.White - Me.ToolStripMenuItem10.Image = Global.SDL.My.Resources.Resources.rechnung1 - Me.ToolStripMenuItem10.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.ToolStripMenuItem10.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(122, 60) - Me.ToolStripMenuItem10.Text = "Rechnungen" - Me.ToolStripMenuItem10.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.ToolStripMenuItem10.TextImageRelation = System.Windows.Forms.TextImageRelation.Overlay - ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1333) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 1301) - Me.usrcntlKarten.TabIndex = 0 - ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1339) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 1307) - Me.UsrCntlUSTV.TabIndex = 0 - ' - 'rtbGespreachsbericht - ' - Me.rtbGespreachsbericht.Location = New System.Drawing.Point(11, 78) - Me.rtbGespreachsbericht.Name = "rtbGespreachsbericht" - Me.rtbGespreachsbericht.Size = New System.Drawing.Size(628, 324) - Me.rtbGespreachsbericht.TabIndex = 18 - Me.rtbGespreachsbericht.Text = "" - ' - 'Label12 - ' - Me.Label12.AutoSize = True - Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label12.Location = New System.Drawing.Point(8, 57) - Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(93, 13) - Me.Label12.TabIndex = 19 - Me.Label12.Text = "Gesprächsbericht:" - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1595, 1497) + Me.ClientSize = New System.Drawing.Size(1595, 1514) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) @@ -2968,6 +2969,10 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.ResumeLayout(False) Me.tbFIBU.ResumeLayout(False) Me.tbFIBU.PerformLayout() + Me.tbRechnungen.ResumeLayout(False) + CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).EndInit() + Me.MyPanel1.ResumeLayout(False) + Me.MyPanel1.PerformLayout() Me.cntxtExcel.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip3.ResumeLayout(False) @@ -2975,10 +2980,6 @@ Partial Class frmKundenblatt Me.mne.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - Me.tbRechnungen.ResumeLayout(False) - CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).EndInit() - Me.MyPanel1.ResumeLayout(False) - Me.MyPanel1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index fe77f72b..0e4e5897 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2271,7 +2271,7 @@ Public Class frmKundenblatt Sub initRechnungen() With dgvRg Dim sqlStr = "" - sqlStr &= " SELECT TOP 1000 RK_ID,[RechnungsNr],[RechnungsDatum]," + sqlStr &= " SELECT TOP 1000 RK_ID,[RechnungsNr],[RechnungsDatum],case when [DruckDatumZeit] is null then 0 else 1 end as gedruckt, " sqlStr &= " ( SELECT SUM(isnull([SteuerpflichtigerBetrag],0)+isnull([SteuerfreierBetrag],0)) FROM [RechnungsausgangPositionen] where [RechnungsausgangPositionen].RK_ID=[Rechnungsausgang].RK_ID ) as Rechnungsbetrag," sqlStr &= " Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum], isnull(cast(RechnungsKundenNr as nvarchar(7)) + ' ','') + [RechnungsName 1] as [RechnungAn], " sqlStr &= " isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter " @@ -2356,5 +2356,16 @@ Public Class frmKundenblatt RG_MONAT = RG_MONAT.AddMonths(-1) initBtns("Monat") End Sub + + Private Sub dgvRg_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvRg.DoubleClick, dgvRg.CellContentClick + + If dgvRg.SelectedRows.Count = 0 Then Exit Sub + + Dim f As New frmKundenUebersichtZollRgDetails(dgvRg.SelectedRows(0).Cells("RK_ID").Value, dgvRg.SelectedRows(0).Cells("gedruckt").Value) + f.ShowDialog() + + dgvRg.RELOAD() + + End Sub End Class