Kundenblatt, cFakt.

SDL/Fakturierung/cFakturierung.vb

@@ -2119,7 +2119,7 @@ Public Class cFakturierung
             'für öffentliche Auftraggeber oder anderer Referenzinformationen für interne Zuordnungsprozesse.
             'Die Leitweg-ID ist in Deutschland eine Pflichtangabe für elektronische Rechnungen an die Bundesverwaltung und muss vom Rechnungssteller vom Auftraggeber erhalten werden. 
 
-            desc.ReferenceOrderNo = IIf(RECHNUNG.KdAuftragsNr Is Nothing, "", RECHNUNG.KdAuftragsNr)
+            desc.ReferenceOrderNo = IIf(RECHNUNG.KdAuftragsNr Is Nothing, "-", RECHNUNG.KdAuftragsNr)
 
             If RECHNUNG.Besonderheiten IsNot Nothing Then desc.AddNote(RECHNUNG.Besonderheiten.ToString, SubjectCodes.AAI)
             If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI)

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()
@@ -149,8 +150,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()
@@ -182,6 +185,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()
@@ -192,7 +196,9 @@ 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.btn_FIBU_speichern = New System.Windows.Forms.Button()
         Me.lblZNB_verrechnet = New System.Windows.Forms.Label()
         Me.lblZNB_offen = New System.Windows.Forms.Label()
         Me.Label18 = New System.Windows.Forms.Label()
@@ -203,7 +209,6 @@ Partial Class frmKundenblatt
         Me.txtZinsbelastung = New System.Windows.Forms.TextBox()
         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()
@@ -241,11 +246,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.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.pnlInfo.SuspendLayout()
         Me.tbFirmendaten.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -347,6 +347,16 @@ Partial Class frmKundenblatt
         Me.Panel4.Size = New System.Drawing.Size(1638, 1503)
         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, 1503)
+        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
+        '
         'tbcntrMain
         '
         Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons
@@ -635,7 +645,7 @@ Partial Class frmKundenblatt
         Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
         Me.dgvUmsaetze.RowHeadersVisible = False
         Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 884)
+        Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 901)
         Me.dgvUmsaetze.TabIndex = 182
         '
         'Label13
@@ -739,7 +749,7 @@ Partial Class frmKundenblatt
         Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
         Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False
         Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 923)
+        Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 940)
         Me.dgvUmsatzNachLeistngsNr.TabIndex = 183
         '
         'lblAdressenzusatz
@@ -1758,11 +1768,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, 1477)
+        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)
@@ -1770,7 +1790,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, 1477)
+        Me.tbLKW.Size = New System.Drawing.Size(178, 39)
         Me.tbLKW.TabIndex = 4
         Me.tbLKW.Text = "LKWs"
         Me.tbLKW.UseVisualStyleBackColor = True
@@ -1782,9 +1802,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, 1454)
+        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)
@@ -1793,7 +1826,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, 1454)
+        Me.pnlLKW.Size = New System.Drawing.Size(306, 33)
         Me.pnlLKW.TabIndex = 3
         '
         'dgvLKW
@@ -1834,7 +1867,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, 1280)
+        Me.dgvLKW.Size = New System.Drawing.Size(306, 0)
         Me.dgvLKW.TabIndex = 2
         '
         'pnlLKWBottom
@@ -1846,7 +1879,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, 1342)
+        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
@@ -1987,7 +2020,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, 1477)
+        Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39)
         Me.tbVERAGCard.TabIndex = 6
         Me.tbVERAGCard.Text = "VERAG Card"
         Me.tbVERAGCard.UseVisualStyleBackColor = True
@@ -1999,7 +2032,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, 1454)
+        Me.Panel3.Size = New System.Drawing.Size(172, 33)
         Me.Panel3.TabIndex = 0
         '
         'tbDokumente
@@ -2017,7 +2050,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, 1477)
+        Me.tbDokumente.Size = New System.Drawing.Size(178, 39)
         Me.tbDokumente.TabIndex = 8
         Me.tbDokumente.Text = "Dokumente"
         Me.tbDokumente.UseVisualStyleBackColor = True
@@ -2217,7 +2250,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, 1477)
+        Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39)
         Me.tbBesuchsberichte.TabIndex = 9
         Me.tbBesuchsberichte.Text = "Besuchsberichte"
         Me.tbBesuchsberichte.UseVisualStyleBackColor = True
@@ -2226,7 +2259,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, 1477)
+        Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39)
         Me.tbFremdrechnungen.TabIndex = 10
         Me.tbFremdrechnungen.Text = "Fremdrechnungen"
         Me.tbFremdrechnungen.UseVisualStyleBackColor = True
@@ -2242,6 +2275,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, 1509)
+        Me.UsrCntlOfferte1.TabIndex = 0
+        '
         'tbUSTV
         '
         Me.tbUSTV.Controls.Add(Me.tbcntrUSTV)
@@ -2375,13 +2418,22 @@ 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, 1483)
+        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.btn_FIBU_speichern)
         Me.tbFIBU.Controls.Add(Me.lblZNB_verrechnet)
         Me.tbFIBU.Controls.Add(Me.lblZNB_offen)
         Me.tbFIBU.Controls.Add(Me.Label18)
@@ -2392,7 +2444,6 @@ Partial Class frmKundenblatt
         Me.tbFIBU.Controls.Add(Me.txtZinsbelastung)
         Me.tbFIBU.Controls.Add(Me.Label12)
         Me.tbFIBU.Controls.Add(Me.rtbGespreachsbericht)
-        Me.tbFIBU.Controls.Add(Me.btnFirmendatenFormularSpeichern)
         Me.tbFIBU.Controls.Add(Me.Label9)
         Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel)
         Me.tbFIBU.Location = New System.Drawing.Point(4, 25)
@@ -2402,6 +2453,15 @@ Partial Class frmKundenblatt
         Me.tbFIBU.Text = "FIBU"
         Me.tbFIBU.UseVisualStyleBackColor = True
         '
+        'btn_FIBU_speichern
+        '
+        Me.btn_FIBU_speichern.Location = New System.Drawing.Point(1468, 9)
+        Me.btn_FIBU_speichern.Name = "btn_FIBU_speichern"
+        Me.btn_FIBU_speichern.Size = New System.Drawing.Size(79, 30)
+        Me.btn_FIBU_speichern.TabIndex = 29
+        Me.btn_FIBU_speichern.Text = "speichern"
+        Me.btn_FIBU_speichern.UseVisualStyleBackColor = True
+        '
         'lblZNB_verrechnet
         '
         Me.lblZNB_verrechnet.AutoSize = True
@@ -2507,17 +2567,6 @@ Partial Class frmKundenblatt
         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(-2874, 3)
-        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
@@ -2789,7 +2838,7 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '
@@ -2951,57 +3000,6 @@ Partial Class frmKundenblatt
         Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
         Me.tbiVERAGCard.Text = "VERAG Card"
         '
-        '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, 1503)
-        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, 1454)
-        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, 1509)
-        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, 1460)
-        Me.UsrCntlUSTV.TabIndex = 0
-        '
         'frmKundenblatt
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3277,7 +3275,6 @@ Partial Class frmKundenblatt
     Friend WithEvents ToolStripMenuItem9 As ToolStripMenuItem
     Friend WithEvents Label9 As Label
     Friend WithEvents txtFIBUKuerzel As TextBox
-    Friend WithEvents btnFirmendatenFormularSpeichern As Button
     Friend WithEvents tbRechnungen As TabPage
     Friend WithEvents dgvRg As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel
@@ -3298,4 +3295,5 @@ Partial Class frmKundenblatt
     Friend WithEvents Label16 As Label
     Friend WithEvents dgvZinsnachberechnung As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents btnBestelldateiErzeugen As Button
+    Friend WithEvents btn_FIBU_speichern As Button
 End Class

SDL/kunden/frmKundenblatt.vb

@@ -2225,25 +2225,6 @@ Public Class frmKundenblatt
         changeTab(4, sender)
     End Sub
 
-    Private Sub btnFirmendatenFormularSpeichern_Click(sender As Object, e As EventArgs) Handles btnFirmendatenFormularSpeichern.Click
-        KUNDE_ERW.kde_BezFIBU = checkNullStr(txtFIBUKuerzel.Text)
-
-        If txtZinsbelastung.Text <> "" AndAlso txtZinsbelastung.Text.Contains(",") Then
-            txtZinsbelastung.Text = txtZinsbelastung.ToString.Replace(",", ".")
-        End If
-
-        KUNDE_ERW.kde_zinssatz = checkNullStr(txtZinsbelastung.Text)
-
-
-        KUNDE_ERW.SAVE()
-
-        If KUNDE.Gesprächsbericht <> "" AndAlso checkNullStr(rtbGespreachsbericht.Text) = "" OrElse KUNDE.Gesprächsbericht = "" AndAlso checkNullStr(rtbGespreachsbericht.Text) <> "" Then
-            KUNDE.Gesprächsbericht = checkNullStr(rtbGespreachsbericht.Text)
-            KUNDE.SAVE()
-        End If
-
-    End Sub
-
     Private Sub ToolStripMenuItem10_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem10.Click
         changeTab(7, sender)
     End Sub
@@ -2624,7 +2605,22 @@ Public Class frmKundenblatt
         End Try
     End Sub
 
+    Private Sub btn_FIBU_speichern_Click(sender As Object, e As EventArgs) Handles btn_FIBU_speichern.Click
+        KUNDE_ERW.kde_BezFIBU = checkNullStr(txtFIBUKuerzel.Text)
+
+        If txtZinsbelastung.Text <> "" AndAlso txtZinsbelastung.Text.Contains(",") Then
+            txtZinsbelastung.Text = txtZinsbelastung.ToString.Replace(",", ".")
+        End If
+
+        KUNDE_ERW.kde_zinssatz = checkNullStr(txtZinsbelastung.Text)
 
 
+        KUNDE_ERW.SAVE()
+
+        If KUNDE.Gesprächsbericht <> "" AndAlso checkNullStr(rtbGespreachsbericht.Text) = "" OrElse KUNDE.Gesprächsbericht = "" AndAlso checkNullStr(rtbGespreachsbericht.Text) <> "" Then
+            KUNDE.Gesprächsbericht = checkNullStr(rtbGespreachsbericht.Text)
+            KUNDE.SAVE()
+        End If
+    End Sub
 End Class
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -30,7 +30,7 @@ Public Class frmMDMDatenverarbetiung
             Case "PLOSE" : genSummenbericht_PLOSE()
             Case "ASFINAG" : genSummenbericht_ASFINAG()
             Case "UTA" : genSummenbericht_UTA()
-            Case "IDS" : genSummenbericht_IDS(17) : genSummenbericht_IDS(21)
+            Case "IDS" : genSummenbericht_IDS(17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(21, cbxIDSmitVerag.Checked)
             Case "MSE" : genSummenbericht_MSE()
             Case Else : MsgBox("Nicht verfügbar!")
         End Select
@@ -551,15 +551,17 @@ Public Class frmMDMDatenverarbetiung
     End Sub
 
 
-    Sub genSummenbericht_IDS(typ As Integer)
+    Sub genSummenbericht_IDS(typ As Integer, mitVerag360_VeragAG As Boolean)
         Dim displayFilter = False
         Dim sqlstr As String = ""
 
         Dim sqlwhere = ""
 
+
+
         Select Case typ
-            Case 17 : sqlwhere = "<>740543"
+            Case 17 : sqlwhere = "<>740543" & IIf(mitVerag360_VeragAG, "", " and tblIDSTransactionsNew.KdNrVERAG not in (756150, 711104)")
-            Case 21 : sqlwhere = " =740543"
+            Case 21 : sqlwhere = " =740543" & IIf(mitVerag360_VeragAG, "", " and tblIDSTransactionsNew.KdNrVERAG not in (756150, 711104)")
         End Select
 
         sqlstr &= "SELECT Adressen.AdressenNr, Adressen.[Name 1] as Name, tblIDSTransactionsNew.[CustomerCode], Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.AmminclVAT) AS Brutto, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Netto, Sum(tblIDSTransactionsNew.Rabattbetrag) AS Rabatt