FIBU, cFakt, etc.

SDL/Fakturierung/cFakturierung.vb

@@ -2329,8 +2329,10 @@ Public Class cFakturierung
             rpt.lblLeistungUeberschrift.Text = "RechnungsNr"
             rpt.lblAnzahlUeberschrift.Text = "Tage"
             rpt.lblSteuerpflichtigUeberschrift.Alignment = GrapeCity.ActiveReports.Document.Section.TextAlignment.Center
-            rpt.lblSteuerfreiUeberschrift.Text = "Zinsen p.a."
             rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag"
+            rpt.lbl_onlyZR_VZUeberschrift.Text = "Zinsen % p.a."
+            rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen"
+
 
             rpt.lbl_onlyZR_ReDatUeberschrift.Visible = True
             rpt.lbl_onlyZR_FaelligUeberschrift.Visible = True

SDL/buchhaltung/usrCntlBH.vb

@@ -61,7 +61,17 @@ Public Class usrCntlBH
 
                 Dim isMDM As Boolean = False
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "MDM" OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_nname = "Breimaier" Then isMDM = True
-                If isMDM Then txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0")
+                If isMDM Then
+                    txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0")
+                    If IsNumeric(txtnichtabrechneteKunden.Text) AndAlso CInt(txtnichtabrechneteKunden.Text) > 0 Then
+                        btnDel_.Visible = True
+                    Else
+                        btnDel_.Visible = False
+                    End If
+
+                Else
+
+                    End If
 
                     MyListBox1.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM [VERAG].[dbo].[tblFirma] where Firma_ID NOT IN (20) order by [Firma_ID] ", False, "FMZOLL")
 
@@ -836,29 +846,29 @@ Public Class usrCntlBH
                 
                                 
                 SELECT 
+                op_debitor.i_personenkonto AS KDNR, 
                 op_debitor.c_urbelegid AS BelegNr, 
-                op_debitor.i_personenkonto AS KundenNr, 
-                op_debitor.d_rechnung AS Belegdatum, 
-                --ISNULL(op_debitor.OWNFIELD_Belegdatum, '01.01.2000') AS origbelegdatum, 
-                op_debitor.eur_bruttobetrag AS Bruttobetrag, 
-                op_debitor.eur_zahlung AS Zahlungsbetrag,
-                op_debitor.d_netto AS Nettodatum, 
                 op_debitor.c_bemerkung AS Buchungstext,
+                op_debitor.d_rechnung AS Belegdatum,
+                op_debitor.d_netto AS Fällig, 
                 op_debitor.d_zahlung AS Zahlungsdatum, 
-                ISNULL(op_debitor.c_zahlziel, '0/0/20') AS ZZ_in_OP, 
+                --ISNULL(op_debitor.OWNFIELD_Belegdatum, '01.01.2000') AS origbelegdatum,
-                isnull(kde_zinssatz," & zinssatz.ToString.Replace(",", ".") & ") AS Zinssatz_Kunde,
-                ISNULL(fibu_konto.c_zahlziel, '0/0/20') AS ZZ_in_Debitor, 
-                ISNULL(dbo.fibu_zahlziel.si_ntage,20) as ZZinTage,
-				DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung) as ReZielZahlungsdatum,
                 DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + 0 ), op_debitor.d_rechnung), op_debitor.d_zahlung) as ÜberschreitungInTagen,
-				
+                op_debitor.eur_zahlung AS Zahlungsbetrag,
+                isnull(kde_zinssatz," & zinssatz.ToString.Replace(",", ".") & ") AS Zinssatz_Kunde,
                  case when DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & " ), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 then
 
-                    Round(op_debitor.eur_bruttobetrag * isnull(kde_zinssatz,9.5)  / 100 * DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & " ), op_debitor.d_rechnung), op_debitor.d_zahlung) / 360,2)
+                    Round(op_debitor.eur_bruttobetrag * isnull(kde_zinssatz,9.5)  / 100 * DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) ), op_debitor.d_rechnung), op_debitor.d_zahlung) / 360,2)
 
                 else 0 end as Zinsbetrag,
+                cast(0 as bit) as abgerechnet,
+
+                op_debitor.eur_bruttobetrag AS Bruttobetrag, 
+                ISNULL(op_debitor.c_zahlziel, '0/0/20') AS ZZ_in_OP, 
+                ISNULL(fibu_konto.c_zahlziel, '0/0/20') AS ZZ_in_Debitor, 
+                ISNULL(dbo.fibu_zahlziel.si_ntage,20) as ZZinTage,
+				DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung) as ReZielZahlungsdatum
 				
-                cast(0 as bit) as abgerechnet
 				
                 FROM op_debitor INNER JOIN fibu_konto ON (op_debitor.i_personenkonto = fibu_konto.i_konto)
                 inner join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenErweitert] on kde_KundenNr = op_debitor.i_personenkonto
@@ -871,7 +881,7 @@ Public Class usrCntlBH
                 AND op_debitor.i_personenkonto >= @KundeVon AND op_debitor.i_personenkonto <= @KundeBis 
                 AND op_debitor.d_zahlung >= @ZahlungVon AND op_debitor.d_zahlung <= @ZahlungBis 
                 AND DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 
-                AND Left(op_debitor.c_bemerkung,2) <> 'AR'
+                AND Left(op_debitor.c_bemerkung,2) <> 'AR' AND Left(op_debitor.c_bemerkung,2) <> 'DA' AND Left(op_debitor.c_bemerkung,2) <> 'AU' AND Left(op_debitor.c_bemerkung,2) <> 'RE' AND Left(op_debitor.c_bemerkung,2) <> 'VI' AND Left(op_debitor.c_bemerkung,2) <> 'Ha'
 				AND op_debitor.c_bemerkung not like '%nicht verzinsen%' 
                 
                 ORDER BY op_debitor.i_personenkonto, op_debitor.c_urbelegid desc, op_debitor.d_rechnung, ISNULL(op_debitor.OWNFIELD_Belegdatum, '01.01.2000')"
@@ -889,7 +899,7 @@ Public Class usrCntlBH
 
                     If r.Item("Zinsbetrag") > 0 Then
 
-                        Dim zins As New cMDMZinsberechnung(r.Item("KundenNr"), r.Item("BelegNr"))
+                        Dim zins As New cMDMZinsberechnung(r.Item("KDNR"), r.Item("BelegNr"))
 
                         If zins.hasEntry AndAlso zins.verrechnet IsNot Nothing Then
                             counter += 1
@@ -928,9 +938,24 @@ Public Class usrCntlBH
                 Dim dtTemp As New DataTable
 
                 dtTemp = dt.Select("Zinsbetrag > 0").CopyToDataTable
+
+                If dtTemp.Columns.Contains("Bruttobetrag") Then dtTemp.Columns.Remove("Bruttobetrag")
+                If dtTemp.Columns.Contains("ZZ_in_OP") Then dtTemp.Columns.Remove("ZZ_in_OP")
+                If dtTemp.Columns.Contains("ZZ_in_Debitor") Then dtTemp.Columns.Remove("ZZ_in_Debitor")
+                If dtTemp.Columns.Contains("ZZinTage") Then dtTemp.Columns.Remove("ZZinTage")
+                If dtTemp.Columns.Contains("ReZielZahlungsdatum") Then dtTemp.Columns.Remove("ReZielZahlungsdatum")
+
+
                 If dtTemp.Rows.Count > 0 Then
-                    cProgramFunctions.genExcelFromDT_NEW(dtTemp, {"D1:D" & (dt.Rows.Count + 1), "E1:E" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1)})
+                    cProgramFunctions.genExcelFromDT_NEW(dtTemp, {"H1:H" & (dt.Rows.Count + 1), "J1:J" & (dt.Rows.Count + 1)})
                     txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0")
+
+                    If IsNumeric(txtnichtabrechneteKunden.Text) AndAlso CInt(txtnichtabrechneteKunden.Text) > 0 Then
+                        btnDel_.Visible = True
+                    Else
+                        btnDel_.Visible = False
+                    End If
+
                 End If
 
             End If
@@ -1199,8 +1224,12 @@ Public Class usrCntlBH
     End Sub
 
     Private Sub btnZNBverrechnen_Click(sender As Object, e As EventArgs) Handles btnZNBverrechnen.Click
+        Dim LimitBEtrag As Integer = -1
+        If txtAbBetragAbrechnen._value <> "" AndAlso IsNumeric(txtAbBetragAbrechnen._value) Then
+            LimitBEtrag = CInt(txtAbBetragAbrechnen._value)
+        End If
 
-        Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("Select [kundenNr], zahlungsperiode_start,zahlungsperiode_ende FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where [verrechnet] Is null group by [kundenNr], zahlungsperiode_start, zahlungsperiode_ende ", "FMZOLL")
+        Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("Select [kundenNr],SUM([zinsbetrag]) as Zinsbetrag, zahlungsperiode_start,zahlungsperiode_ende FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where [verrechnet] Is null group by [kundenNr], zahlungsperiode_start, zahlungsperiode_ende" & IIf(LimitBEtrag > 0, " having SUM([zinsbetrag]) >= " & LimitBEtrag, ""), "FMZOLL")
 
         If dt_Main.Rows.Count > 0 Then
             Dim kundenNr As String = ""
@@ -1234,8 +1263,14 @@ Public Class usrCntlBH
 
             End If
 
+            If dt_Main.Rows.Count = 0 Then
+                MsgBox("keine zu verrechnenden Datensätze!")
+                Exit Sub
+            End If
+
+
+            If vbYes = MsgBox("Möchten Sie für " & dt_Main.Rows.Count & " Kunden die Zinsbelastung verrechnen?" & vbNewLine & "Es werden nur Rechnungen erstellt, deren Gesamtbelastung über " & LimitBEtrag & " EUR liegt!", vbYesNoCancel) Then
 
-            If vbYes = MsgBox("Möchten Sie für " & dt_Main.Rows.Count & " Kunden die Zinsbelastung verrechnen?", vbYesNoCancel) Then
 
 
                 For Each R In dt_Main.Rows
@@ -1311,14 +1346,14 @@ Public Class usrCntlBH
     End Sub
 
     Private Sub txtUID_Monat_TextChanged(sender As Object, e As EventArgs) Handles txtUID_Monat.TextChanged
-        calcUIDPruefungen()
+        countIDPruefungen()
     End Sub
 
     Private Sub cbxFirmaUID_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxFirmaUID.SelectedIndexChanged
-        calcUIDPruefungen()
+        countIDPruefungen()
     End Sub
 
-    Private Sub calcUIDPruefungen()
+    Private Sub countIDPruefungen()
 
         If txtUID_Jahr.Text <> "" AndAlso IsNumeric(txtUID_Jahr.Text) AndAlso txtUID_Jahr.Text.Length = 4 Then
 
@@ -1348,4 +1383,19 @@ Public Class usrCntlBH
 
         End If
     End Sub
+
+    Private Sub btnWikiStatusmails_Click(sender As Object, e As EventArgs) Handles btnWikiStatusmails.Click
+
+        Dim webAddress As String = "https://wiki.verag.ag/software/sdl/zinsnachberechnung"
+        Process.Start(webAddress)
+
+    End Sub
+
+    Private Sub btnDel__Click(sender As Object, e As EventArgs) Handles btnDel_.Click
+
+        If vbYes = MsgBox("Möchten Sie die alle nicht verrechneten Zinsbelastungen löschen?", vbYesNoCancel) Then
+            SQL.doSQL("delete from [tblMDM_Zinsberechnung] WHERE [verrechnet] Is null", "FMZOLL")
+        End If
+
+    End Sub
 End Class

SDL/kunden/frmKundenZOLLVollmachten.Designer.vb

@@ -29,6 +29,14 @@ Partial Class frmKundenZOLLVollmachten
         Me.btnNeu = New System.Windows.Forms.Button()
         Me.dgvVollmachtenEmbedded = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.pb_merge = New System.Windows.Forms.PictureBox()
+        Me.picDeletePDF2 = New System.Windows.Forms.PictureBox()
+        Me.picPDF2 = New System.Windows.Forms.PictureBox()
+        Me.picDeleteEmail = New System.Windows.Forms.PictureBox()
+        Me.picEmail = New System.Windows.Forms.PictureBox()
+        Me.picDeletePDF = New System.Windows.Forms.PictureBox()
+        Me.picPDF = New System.Windows.Forms.PictureBox()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.cbxErhaltenAm = New System.Windows.Forms.CheckBox()
@@ -39,11 +47,6 @@ Partial Class frmKundenZOLLVollmachten
         Me.cbxVMarchivieren = New System.Windows.Forms.CheckBox()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.picDeleteEmail = New System.Windows.Forms.PictureBox()
-        Me.picEmail = New System.Windows.Forms.PictureBox()
-        Me.picDeletePDF = New System.Windows.Forms.PictureBox()
-        Me.picPDF = New System.Windows.Forms.PictureBox()
         Me.lblGueltigBis = New System.Windows.Forms.Label()
         Me.txtGueltigVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtGueltigBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -55,17 +58,21 @@ Partial Class frmKundenZOLLVollmachten
         Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnl.SuspendLayout()
         CType(Me.dgvVollmachtenEmbedded, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.pnlDetails.SuspendLayout()
         Me.Panel1.SuspendLayout()
+        CType(Me.pb_merge, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.picDeletePDF2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.picPDF2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picDeleteEmail, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picEmail, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picDeletePDF, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.pnlDetails.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnl
         '
+        Me.pnl.AllowDrop = True
         Me.pnl.BackColor = System.Drawing.Color.White
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.pnl.Controls.Add(Me.lblPDFavailable)
@@ -135,6 +142,98 @@ Partial Class frmKundenZOLLVollmachten
         Me.MyComboBox1.TabIndex = 15
         Me.MyComboBox1.Visible = False
         '
+        'Panel1
+        '
+        Me.Panel1.AllowDrop = True
+        Me.Panel1.Controls.Add(Me.pb_merge)
+        Me.Panel1.Controls.Add(Me.picDeletePDF2)
+        Me.Panel1.Controls.Add(Me.picPDF2)
+        Me.Panel1.Controls.Add(Me.picDeleteEmail)
+        Me.Panel1.Controls.Add(Me.picEmail)
+        Me.Panel1.Controls.Add(Me.picDeletePDF)
+        Me.Panel1.Controls.Add(Me.picPDF)
+        Me.Panel1.Location = New System.Drawing.Point(233, 190)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(204, 74)
+        Me.Panel1.TabIndex = 17
+        Me.Panel1.Visible = False
+        '
+        'pb_merge
+        '
+        Me.pb_merge.BackgroundImage = Global.SDL.My.Resources.Resources.picboxPrevious_Enter
+        Me.pb_merge.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.pb_merge.Location = New System.Drawing.Point(125, 38)
+        Me.pb_merge.Name = "pb_merge"
+        Me.pb_merge.Size = New System.Drawing.Size(19, 13)
+        Me.pb_merge.TabIndex = 22
+        Me.pb_merge.TabStop = False
+        Me.pb_merge.Visible = False
+        '
+        'picDeletePDF2
+        '
+        Me.picDeletePDF2.Image = Global.SDL.My.Resources.Resources.del
+        Me.picDeletePDF2.Location = New System.Drawing.Point(159, 1)
+        Me.picDeletePDF2.Name = "picDeletePDF2"
+        Me.picDeletePDF2.Size = New System.Drawing.Size(20, 20)
+        Me.picDeletePDF2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picDeletePDF2.TabIndex = 21
+        Me.picDeletePDF2.TabStop = False
+        Me.picDeletePDF2.Visible = False
+        '
+        'picPDF2
+        '
+        Me.picPDF2.Image = Global.SDL.My.Resources.Resources.pdf_gray
+        Me.picPDF2.Location = New System.Drawing.Point(146, 23)
+        Me.picPDF2.Name = "picPDF2"
+        Me.picPDF2.Size = New System.Drawing.Size(44, 48)
+        Me.picPDF2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picPDF2.TabIndex = 20
+        Me.picPDF2.TabStop = False
+        Me.picPDF2.Visible = False
+        '
+        'picDeleteEmail
+        '
+        Me.picDeleteEmail.Image = Global.SDL.My.Resources.Resources.del
+        Me.picDeleteEmail.Location = New System.Drawing.Point(27, 0)
+        Me.picDeleteEmail.Name = "picDeleteEmail"
+        Me.picDeleteEmail.Size = New System.Drawing.Size(20, 20)
+        Me.picDeleteEmail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picDeleteEmail.TabIndex = 19
+        Me.picDeleteEmail.TabStop = False
+        Me.picDeleteEmail.Visible = False
+        '
+        'picEmail
+        '
+        Me.picEmail.Image = Global.SDL.My.Resources.Resources.email_big_gray
+        Me.picEmail.Location = New System.Drawing.Point(13, 23)
+        Me.picEmail.Name = "picEmail"
+        Me.picEmail.Size = New System.Drawing.Size(44, 48)
+        Me.picEmail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picEmail.TabIndex = 18
+        Me.picEmail.TabStop = False
+        '
+        'picDeletePDF
+        '
+        Me.picDeletePDF.Image = Global.SDL.My.Resources.Resources.del
+        Me.picDeletePDF.Location = New System.Drawing.Point(90, 1)
+        Me.picDeletePDF.Name = "picDeletePDF"
+        Me.picDeletePDF.Size = New System.Drawing.Size(20, 20)
+        Me.picDeletePDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picDeletePDF.TabIndex = 16
+        Me.picDeletePDF.TabStop = False
+        Me.picDeletePDF.Visible = False
+        '
+        'picPDF
+        '
+        Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf_gray
+        Me.picPDF.Location = New System.Drawing.Point(79, 23)
+        Me.picPDF.Name = "picPDF"
+        Me.picPDF.Size = New System.Drawing.Size(44, 48)
+        Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picPDF.TabIndex = 17
+        Me.picPDF.TabStop = False
+        Me.picPDF.Visible = False
+        '
         'Button1
         '
         Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -265,61 +364,6 @@ Partial Class frmKundenZOLLVollmachten
         Me.txtVermerk.Size = New System.Drawing.Size(364, 23)
         Me.txtVermerk.TabIndex = 25
         '
-        'Panel1
-        '
-        Me.Panel1.Controls.Add(Me.picDeleteEmail)
-        Me.Panel1.Controls.Add(Me.picEmail)
-        Me.Panel1.Controls.Add(Me.picDeletePDF)
-        Me.Panel1.Controls.Add(Me.picPDF)
-        Me.Panel1.Location = New System.Drawing.Point(307, 190)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(130, 74)
-        Me.Panel1.TabIndex = 17
-        Me.Panel1.Visible = False
-        '
-        'picDeleteEmail
-        '
-        Me.picDeleteEmail.Image = Global.SDL.My.Resources.Resources.del
-        Me.picDeleteEmail.Location = New System.Drawing.Point(27, 0)
-        Me.picDeleteEmail.Name = "picDeleteEmail"
-        Me.picDeleteEmail.Size = New System.Drawing.Size(20, 20)
-        Me.picDeleteEmail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.picDeleteEmail.TabIndex = 19
-        Me.picDeleteEmail.TabStop = False
-        Me.picDeleteEmail.Visible = False
-        '
-        'picEmail
-        '
-        Me.picEmail.Image = Global.SDL.My.Resources.Resources.email_big_gray
-        Me.picEmail.Location = New System.Drawing.Point(13, 23)
-        Me.picEmail.Name = "picEmail"
-        Me.picEmail.Size = New System.Drawing.Size(44, 48)
-        Me.picEmail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.picEmail.TabIndex = 18
-        Me.picEmail.TabStop = False
-        '
-        'picDeletePDF
-        '
-        Me.picDeletePDF.Image = Global.SDL.My.Resources.Resources.del
-        Me.picDeletePDF.Location = New System.Drawing.Point(90, 1)
-        Me.picDeletePDF.Name = "picDeletePDF"
-        Me.picDeletePDF.Size = New System.Drawing.Size(20, 20)
-        Me.picDeletePDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.picDeletePDF.TabIndex = 16
-        Me.picDeletePDF.TabStop = False
-        Me.picDeletePDF.Visible = False
-        '
-        'picPDF
-        '
-        Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf_gray
-        Me.picPDF.Location = New System.Drawing.Point(79, 23)
-        Me.picPDF.Name = "picPDF"
-        Me.picPDF.Size = New System.Drawing.Size(44, 48)
-        Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.picPDF.TabIndex = 17
-        Me.picPDF.TabStop = False
-        Me.picPDF.Visible = False
-        '
         'lblGueltigBis
         '
         Me.lblGueltigBis.AutoSize = True
@@ -448,13 +492,16 @@ Partial Class frmKundenZOLLVollmachten
         Me.pnl.ResumeLayout(False)
         Me.pnl.PerformLayout()
         CType(Me.dgvVollmachtenEmbedded, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.pnlDetails.ResumeLayout(False)
-        Me.pnlDetails.PerformLayout()
         Me.Panel1.ResumeLayout(False)
+        CType(Me.pb_merge, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.picDeletePDF2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.picPDF2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.picDeleteEmail, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.picEmail, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.picDeletePDF, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.picPDF, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.pnlDetails.ResumeLayout(False)
+        Me.pnlDetails.PerformLayout()
         Me.ContextMenuStrip1.ResumeLayout(False)
         Me.ResumeLayout(False)
 
@@ -488,4 +535,7 @@ Partial Class frmKundenZOLLVollmachten
     Friend WithEvents lblWarning As Label
     Friend WithEvents picDeleteEmail As PictureBox
     Friend WithEvents picEmail As PictureBox
+    Friend WithEvents picDeletePDF2 As PictureBox
+    Friend WithEvents picPDF2 As PictureBox
+    Friend WithEvents pb_merge As PictureBox
 End Class

SDL/kunden/frmKundenZOLLVollmachten.vb

@@ -1,5 +1,10 @@
 
 
+Imports System.IO
+Imports System.Text
+Imports GrapeCity.ActiveReports.ReportsCore.Tools
+Imports GrapeCity.Viewer.Common.Model
+
 Public Class frmKundenZOLLVollmachten
     Public kdnr As Integer = -1
     Public filePath As String
@@ -203,7 +208,7 @@ Public Class frmKundenZOLLVollmachten
             .Columns.Clear()
 
 
-            .DataSource = ksql.loadDgvBySql("SELECT abf.kdvm_Id,art.kdvma_Id,  art.kdvma_Bezeichnung, abf.[kdvm_KundenNr], abf.[kdvm_erhalten],abf.[kdvm_erhalten_Datum], abf.kdvm_datenarchivId,abf.kdvm_Info, abf.[kdvm_archiviert], abf.[kdvm_gueltig_bis], abf.[kdvm_vermerk], abf.[kdvm_geloescht]" &
+            .DataSource = ksql.loadDgvBySql("SELECT abf.kdvm_Id,art.kdvma_Id,  art.kdvma_Bezeichnung, abf.[kdvm_KundenNr], abf.[kdvm_erhalten],abf.[kdvm_erhalten_Datum], abf.kdvm_datenarchivId, kdvm_datenarchivId_2,abf.kdvm_Info, abf.[kdvm_archiviert], abf.[kdvm_gueltig_bis], abf.[kdvm_vermerk], abf.[kdvm_geloescht]" &
                                                     " FROM [tblKundenVollmachtenArt] as art " &
                                                     " INNER  JOIN (select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId]" &
                                                     " WHERE art.kdvma_visible=1 AND abf.kdvm_erhalten = 1 AND ISNULL(abf.[kdvm_geloescht],0) != 1 AND [kdvm_KundenNr]='" & kdnr & "' AND [kdvm_kdvmaId]='" & vollmachtartId & "'" & where &
@@ -214,6 +219,7 @@ Public Class frmKundenZOLLVollmachten
             .Columns("kdvma_Id").Visible = False
             .Columns("kdvm_KundenNr").Visible = False
             .Columns("kdvm_datenarchivId").Visible = False
+            .Columns("kdvm_datenarchivId_2").Visible = False
             .Columns("kdvma_Bezeichnung").Visible = False
             .Columns("kdvma_Bezeichnung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             .Columns("kdvma_Bezeichnung").HeaderText = "Bezeichnung"
@@ -360,18 +366,48 @@ Public Class frmKundenZOLLVollmachten
 
     Sub checkPDFisPresent()
 
+        'pdf2 nur anzeigen, wenn pdf1 befüllt!
+
         If currentVM.kdvm_datenarchivId > 0 Then
             picDeletePDF.Visible = True
             picPDF.Visible = True
             picPDF.Image = My.Resources.pdf
+            picPDF.AllowDrop = False
             picPDF.Cursor = Cursors.Default
+
+            picPDF2.Visible = True
+            picPDF2.Image = My.Resources.pdf_gray
+            picPDF2.AllowDrop = True
+            picPDF2.Cursor = Cursors.Hand
+
         Else
             picDeletePDF.Visible = False
             picPDF.Visible = True
             picPDF.Image = My.Resources.pdf_gray
+            picPDF.AllowDrop = True
             picPDF.Cursor = Cursors.Hand
 
+            picDeletePDF2.Visible = False
+            picPDF2.Visible = False
+
         End If
+
+        If currentVM.kdvm_datenarchivId_2 > 0 Then
+
+            picDeletePDF2.Visible = True
+            picPDF2.Visible = True
+            picPDF2.Image = My.Resources.pdf
+            picPDF2.AllowDrop = False
+            picPDF2.Cursor = Cursors.Default
+
+        End If
+
+        If currentVM.kdvm_datenarchivId_2 > 0 AndAlso currentVM.kdvm_datenarchivId > 0 Then
+            pb_merge.Visible = True
+        Else
+            pb_merge.Visible = False
+        End If
+
     End Sub
 
     Sub checkEmailIsPresent()
@@ -507,12 +543,33 @@ Public Class frmKundenZOLLVollmachten
     End Sub
 
 
-    Private Sub picPDF_Click(sender As Object, e As EventArgs) Handles picPDF.Click
+    Private Sub picPDF_Click(sender As Object, e As EventArgs) Handles picPDF.Click, picPDF2.Click
 
         If Me.MyComboBox1._value < 0 Then Exit Sub
 
         Dim DS As Object
 
+        Select Case sender.Name
+            Case "picPDF2"
+
+                If currentVM.kdvm_datenarchivId_2 > 0 Then
+                    DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId_2)
+                    DS.OPEN_SINGLE()
+                    'MsgBox("Open PDF")
+                Else
+                    DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & vmId, "", "", "PDF_" & MyComboBox1.Text & "_2", kdnr)
+                    Dim path = DS.uploadDataToDATENSERVERFileDialog()
+
+                    If path <> "" Then
+                        currentVM.kdvm_datenarchivId_2 = DS.da_id
+                    End If
+
+                    picDeletePDF2.Visible = True = (currentVM.kdvm_datenarchivId_2 > 0)
+                    saveVM(currentVM)
+                End If
+
+            Case Else
+
                 If currentVM.kdvm_datenarchivId > 0 Then
                     DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId)
                     DS.OPEN_SINGLE()
@@ -529,15 +586,40 @@ Public Class frmKundenZOLLVollmachten
                     saveVM(currentVM)
                 End If
 
+        End Select
+
+
+
         dgvVollmachtenEmbedded.GetOrder()
         initDGVVollmachtenEmbedded(True)
         dgvVollmachtenEmbedded.SetOrder()
 
     End Sub
 
-    Private Sub picDeletePDF_Click(sender As Object, e As EventArgs) Handles picDeletePDF.Click
+    Private Sub picDeletePDF_Click(sender As Object, e As EventArgs) Handles picDeletePDF.Click, picDeletePDF2.Click
 
         lblPDFavailable.Cursor = Cursors.WaitCursor
+
+        Select Case sender.Name
+            Case "picDeletePDF2"
+
+                If (currentVM.kdvm_datenarchivId_2 > 0) Then
+                    If vbYes = MsgBox("Möchten Sie das PDF wirklich löschen?", vbYesNoCancel) Then
+
+                        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId_2)
+                        DS.DELETE_COMPLETE()
+
+                        currentVM.kdvm_datenarchivId_2 = -1
+                        If currentVM.SAVE Then
+                            currentVM.kdvm_datenarchivId_2 = -1 : picDeletePDF2.Visible = False
+                            picPDF2.Image = My.Resources.pdf_gray
+                            picPDF2.AllowDrop = True
+                        End If
+                    End If
+                End If
+
+            Case Else
+
                 If (currentVM.kdvm_datenarchivId > 0) Then
                     If vbYes = MsgBox("Möchten Sie das PDF wirklich löschen?", vbYesNoCancel) Then
 
@@ -548,9 +630,14 @@ Public Class frmKundenZOLLVollmachten
                         If currentVM.SAVE Then
                             currentVM.kdvm_datenarchivId = -1 : picDeletePDF.Visible = False
                             picPDF.Image = My.Resources.pdf_gray
+                            picPDF.AllowDrop = True
                         End If
                     End If
                 End If
+
+        End Select
+
+
         lblPDFavailable.Cursor = Cursors.Default
 
         dgvVollmachtenEmbedded.GetOrder()
@@ -622,9 +709,67 @@ Public Class frmKundenZOLLVollmachten
         picPDF.Visible = False
         picDeleteEmail.Visible = False
         picEmail.Visible = False
+
+        picDeletePDF2.Visible = False
+        picPDF2.Visible = False
+
+        pb_merge.Visible = False
+
     End Sub
 
     Private Sub btnUploadPDF_Click(sender As Object, e As EventArgs)
 
     End Sub
+
+    Private Sub pb_merge_Click(sender As Object, e As EventArgs) Handles pb_merge.Click
+
+        If currentVM.kdvm_datenarchivId_2 > 0 AndAlso currentVM.kdvm_datenarchivId > 0 Then
+
+            If vbYes = MsgBox("Möchten sie die zwei PDF-Dokumente miteinander verbinden?", vbYesNoCancel) Then
+
+
+                Dim list As New List(Of String)
+
+                Dim path_File1 As String = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(currentVM.kdvm_datenarchivId)
+                Dim path_File2 As String = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(currentVM.kdvm_datenarchivId_2)
+
+                list.Add(path_File1)
+                list.Add(path_File2)
+
+                Dim pathPDF = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Vollmachten_" & Now.ToString("ddMMyyyyHHmmss") & ".pdf", ".pdf", False, False)
+
+                If FormularManagerNEU.MergePdfFiles(list, pathPDF) Then
+
+                    Dim DS1 As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId)
+                    DS1.DELETE_COMPLETE()
+                    currentVM.kdvm_datenarchivId = -1
+
+                    Dim DS2 As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(currentVM.kdvm_datenarchivId_2)
+                    DS2.DELETE_COMPLETE()
+                    currentVM.kdvm_datenarchivId_2 = -1
+
+
+                    Dim DS_NEW = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & vmId, "", "", "PDF_" & MyComboBox1.Text, kdnr)
+                    If DS_NEW.uploadDataToDATENSERVER(pathPDF) Then
+                        If pathPDF <> "" Then
+                            currentVM.kdvm_datenarchivId = DS_NEW.da_id
+                        End If
+                    End If
+
+                    If currentVM.SAVE Then
+                        currentVM.kdvm_datenarchivId_2 = -1 : picDeletePDF2.Visible = False
+                        picPDF2.Image = My.Resources.pdf_gray
+                        picPDF2.AllowDrop = True
+                    End If
+
+                    picDeletePDF.Visible = True = (currentVM.kdvm_datenarchivId > 0)
+                    checkPDFisPresent()
+                End If
+
+            End If
+
+        End If
+
+    End Sub
+
 End Class

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -1,8 +1,6 @@
 Imports System.Data.SqlClient
 Imports System.Globalization
 Imports System.IO
-Imports System.ServiceModel.Configuration
-Imports GrapeCity.DataVisualization.TypeScript
 Imports SDL.EORI
 Imports VERAG_PROG_ALLGEMEIN
 

VERAG_PROG_ALLGEMEIN/Classes/cKundenVollmachten.vb

@@ -10,6 +10,7 @@ Public Class cKundenVollmachten
     Property kdvm_erhalten_Datum As Object = Nothing
     Property kdvm_Info As String
     Property kdvm_datenarchivId As Object = Nothing
+    Property kdvm_datenarchivId_2 As Object = Nothing
     Property kdvm_archiviert As Boolean = False
     Property kdvm_gueltig_bis As Object = Nothing
     Property kdvm_gueltig_ab As Object = Nothing
@@ -43,6 +44,7 @@ Public Class cKundenVollmachten
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_erhalten_Datum", kdvm_erhalten_Datum))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_Info", kdvm_Info))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_datenarchivId", kdvm_datenarchivId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_datenarchivId_2", kdvm_datenarchivId_2))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_archiviert", kdvm_archiviert))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_gueltig_bis", kdvm_gueltig_bis))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdvm_gueltig_ab", kdvm_gueltig_ab))