Abrechnungsmaske, FIBU, Spedbuch, etc.

SDL/Classes/cRKSV.vb

@@ -2700,21 +2700,21 @@ Public Class cRKSV
                 zsZeilenNr += 1
                 Dim buchungsbetrag1 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, kassenkonto, "Soll", buchungsbetrag1)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag1, Double), "EUR", zsZeilenNr, "KO", kassenkonto, beleg.KundenNr, "S", BelegNrUID)
 
                 ' 2) Debitor (Haben)
                 zsZeilenNr += 1
                 Dim buchungsbetrag2 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, beleg.KundenNr, "Haben", buchungsbetrag2)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag2, Double), "EUR", zsZeilenNr, "DE", beleg.KundenNr, kassenkonto, "H", BelegNrUID)
 
                 ' 3) Forderung (Haben)
                 zsZeilenNr += 1
                 Dim buchungsbetrag3 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, forderungskonto, "Haben", buchungsbetrag3)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag3, Double), "EUR", zsZeilenNr, "DB", forderungskonto, kassenkonto, "H", BelegNrUID)
             End If
         ElseIf typ = "AUSZAHLUNG" Then
@@ -2724,35 +2724,35 @@ Public Class cRKSV
                 zsZeilenNr += 1
                 Dim buchungsbetrag1 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, bestandskonto, "Soll", buchungsbetrag1)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag1, Double), "EUR", zsZeilenNr, "KO", bestandskonto, 0, "S", BelegNrUID)
 
                 ' 2) Kassa (Haben) = +betrag (cash out)
                 zsZeilenNr += 1
                 Dim buchungsbetrag2 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, kassenkonto, "Haben", buchungsbetrag2)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag2, Double), "EUR", zsZeilenNr, "KO", kassenkonto, 0, "H", BelegNrUID)
 
                 ' 3) Debitor (Soll)
                 zsZeilenNr += 1
                 Dim buchungsbetrag3 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, beleg.KundenNr, "Soll", buchungsbetrag3)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag3, Double), "EUR", zsZeilenNr, "DE", beleg.KundenNr, 0, "S", BelegNrUID)
 
                 ' 4) Forderung (Soll)
                 zsZeilenNr += 1
                 Dim buchungsbetrag4 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, forderungskonto, "Soll", buchungsbetrag4)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag4, Double), "EUR", zsZeilenNr, "DB", forderungskonto, 0, "S", BelegNrUID)
 
                 ' 5) Bestandskonto (Haben)
                 zsZeilenNr += 1
                 Dim buchungsbetrag5 As Decimal = betrag
                 UpdateDtKontenAmount(dtKonten, bestandskonto, "Haben", buchungsbetrag5)
-                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(beleg.Belegart),
+                InsertBelegszeile_new(sql, mandant, jahr, periode, rel_periode, SafeIntToSql(i_beleg_refid), beleg.BelegDat.ToShortDateString, SafeString(beleg.BelegNr), SafeString(1),
                                   buchungstext, CType(buchungsbetrag5, Double), "EUR", zsZeilenNr, "KO", bestandskonto, 0, "H", BelegNrUID)
             End If
         End If

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -105,7 +105,7 @@ Public Class frmAbrechnungsMaske
             Case "ATILLA"
                 cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=7", False, "FMZOLL")
                 cboFirma.changeItem("7")
-                cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  isnull(mit_firmaFMZoll,0)=7  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=199 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
+                cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  isnull(mit_firmaFMZoll,0)=7  and mit_gekuendigt=0 AND  (mit_FakturierungsGruppe IN ('ATL') OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=199 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
                 FilialNrRestriction = 4813
 
             Case "VERAGIMEX"

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -24,8 +24,8 @@ Partial Class frmMDM_USTVAntrag
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag))
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnlBottom = New System.Windows.Forms.Panel()
         Me.pbXMLExport = New System.Windows.Forms.PictureBox()
         Me.btnRMCQuartal = New System.Windows.Forms.Button()
@@ -120,7 +120,6 @@ Partial Class frmMDM_USTVAntrag
         Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
         Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
@@ -131,7 +130,6 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlErstattungsdetails = New System.Windows.Forms.Panel()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button3 = New System.Windows.Forms.Button()
@@ -148,6 +146,8 @@ Partial Class frmMDM_USTVAntrag
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
+        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
         Me.pnlBottom.SuspendLayout()
         CType(Me.pbXMLExport, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1590,8 +1590,8 @@ Partial Class frmMDM_USTVAntrag
         Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500
         Me.dgvUSTVPositionen.AllowUserToAddRows = False
         Me.dgvUSTVPositionen.AllowUserToDeleteRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1627,14 +1627,6 @@ Partial Class frmMDM_USTVAntrag
         Me.Panel2.Size = New System.Drawing.Size(1428, 263)
         Me.Panel2.TabIndex = 1
         '
-        'UstCntlUSTV_AntragPosition1
-        '
-        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
-        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
-        '
         'Panel4
         '
         Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1752,8 +1744,8 @@ Partial Class frmMDM_USTVAntrag
         Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500
         Me.dgvErstattungspositionen.AllowUserToAddRows = False
         Me.dgvErstattungspositionen.AllowUserToDeleteRows = False
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1780,14 +1772,6 @@ Partial Class frmMDM_USTVAntrag
         Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261)
         Me.pnlErstattungsdetails.TabIndex = 0
         '
-        'UstCntlUSTV_AntragErstattungen1
-        '
-        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
-        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
-        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
-        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
-        '
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1906,6 +1890,22 @@ Partial Class frmMDM_USTVAntrag
         Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
         Me.FakturiertToolStripMenuItem.Visible = False
         '
+        'UstCntlUSTV_AntragPosition1
+        '
+        Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
+        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261)
+        Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
+        '
+        'UstCntlUSTV_AntragErstattungen1
+        '
+        Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0)
+        Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1"
+        Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259)
+        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
+        '
         'frmMDM_USTVAntrag
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -3800,8 +3800,10 @@ Public Class frmMDM_USTVAntrag
             scanUSTVA.INIT(USTV_ANTRAG.UStVAn_KuNr, "MDM", "USTVA_KI_" & USTV_ANTRAG.UStVAn_ID)
             btnPDFauslesen.Enabled = scanUSTVA.getDS().da_id > 0
             cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
+            scanUSTVA.Enabled = Not btnPDFauslesen.Enabled
         Else
             cbxKIUploaddelete.Enabled = False
+            scanUSTVA.Enabled = False
         End If
 
 
@@ -4558,6 +4560,7 @@ Public Class frmMDM_USTVAntrag
 
     End Function
 
+
     Public Shared Function rearangePosNrByLeistender(UStVAn_ID As Integer)
 
         If UStVAn_ID > 0 Then

SDL/buchhaltung/usrCntlBH.Designer.vb

@@ -154,6 +154,7 @@ Partial Class usrCntlBH
         Me.Button7 = New System.Windows.Forms.Button()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
         Me.GroupBox14 = New System.Windows.Forms.GroupBox()
+        Me.Label63 = New System.Windows.Forms.Label()
         Me.Label66 = New System.Windows.Forms.Label()
         Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label64 = New System.Windows.Forms.Label()
@@ -189,7 +190,9 @@ Partial Class usrCntlBH
         Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label51 = New System.Windows.Forms.Label()
         Me.txtJahr_FIBU = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label63 = New System.Windows.Forms.Label()
+        Me.Button16 = New System.Windows.Forms.Button()
+        Me.Label67 = New System.Windows.Forms.Label()
+        Me.cboFirma_FIBUFilialen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.pnl.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.GroupBox13.SuspendLayout()
@@ -687,7 +690,7 @@ Partial Class usrCntlBH
         '
         Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label32.ForeColor = System.Drawing.SystemColors.ControlDarkDark
-        Me.Label32.Location = New System.Drawing.Point(7, 104)
+        Me.Label32.Location = New System.Drawing.Point(7, 124)
         Me.Label32.Name = "Label32"
         Me.Label32.Size = New System.Drawing.Size(298, 18)
         Me.Label32.TabIndex = 12
@@ -697,15 +700,15 @@ Partial Class usrCntlBH
         '
         Me.GroupBox7.Controls.Add(Me.Label33)
         Me.GroupBox7.Controls.Add(Me.Button6)
-        Me.GroupBox7.Location = New System.Drawing.Point(6, 116)
+        Me.GroupBox7.Location = New System.Drawing.Point(6, 137)
         Me.GroupBox7.Name = "GroupBox7"
-        Me.GroupBox7.Size = New System.Drawing.Size(369, 69)
+        Me.GroupBox7.Size = New System.Drawing.Size(369, 48)
         Me.GroupBox7.TabIndex = 13
         Me.GroupBox7.TabStop = False
         '
         'Label33
         '
-        Me.Label33.Location = New System.Drawing.Point(145, 30)
+        Me.Label33.Location = New System.Drawing.Point(150, 21)
         Me.Label33.Name = "Label33"
         Me.Label33.Size = New System.Drawing.Size(224, 17)
         Me.Label33.TabIndex = 3
@@ -717,7 +720,7 @@ Partial Class usrCntlBH
         Me.Button6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.Button6.Location = New System.Drawing.Point(6, 12)
         Me.Button6.Name = "Button6"
-        Me.Button6.Size = New System.Drawing.Size(121, 49)
+        Me.Button6.Size = New System.Drawing.Size(121, 31)
         Me.Button6.TabIndex = 1
         Me.Button6.Text = "zum Mahnlauf"
         Me.Button6.UseVisualStyleBackColor = True
@@ -888,6 +891,9 @@ Partial Class usrCntlBH
         '
         'GroupBox2
         '
+        Me.GroupBox2.Controls.Add(Me.cboFirma_FIBUFilialen)
+        Me.GroupBox2.Controls.Add(Me.Label67)
+        Me.GroupBox2.Controls.Add(Me.Button16)
         Me.GroupBox2.Controls.Add(Me.txtMonateSyskavergleich)
         Me.GroupBox2.Controls.Add(Me.Label61)
         Me.GroupBox2.Controls.Add(Me.Button15)
@@ -896,7 +902,7 @@ Partial Class usrCntlBH
         Me.GroupBox2.Controls.Add(Me.Button1)
         Me.GroupBox2.Location = New System.Drawing.Point(6, 15)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(461, 86)
+        Me.GroupBox2.Size = New System.Drawing.Size(461, 107)
         Me.GroupBox2.TabIndex = 4
         Me.GroupBox2.TabStop = False
         '
@@ -915,7 +921,7 @@ Partial Class usrCntlBH
         Me.txtMonateSyskavergleich._Waehrung = False
         Me.txtMonateSyskavergleich._WaehrungZeichen = False
         Me.txtMonateSyskavergleich.ForeColor = System.Drawing.Color.Black
-        Me.txtMonateSyskavergleich.Location = New System.Drawing.Point(383, 58)
+        Me.txtMonateSyskavergleich.Location = New System.Drawing.Point(377, 58)
         Me.txtMonateSyskavergleich.MaxLength = 2
         Me.txtMonateSyskavergleich.MaxLineLength = -1
         Me.txtMonateSyskavergleich.MaxLines_Warning = ""
@@ -929,11 +935,11 @@ Partial Class usrCntlBH
         'Label61
         '
         Me.Label61.AutoSize = True
-        Me.Label61.Location = New System.Drawing.Point(145, 61)
+        Me.Label61.Location = New System.Drawing.Point(133, 61)
         Me.Label61.Name = "Label61"
-        Me.Label61.Size = New System.Drawing.Size(226, 13)
+        Me.Label61.Size = New System.Drawing.Size(247, 13)
         Me.Label61.TabIndex = 30
-        Me.Label61.Text = "Kunden ohne FIBU-Filiale der letzten x Monate"
+        Me.Label61.Text = "akt. Kunden ohne FIBU-Filiale der letzten x Monate"
         '
         'Button15
         '
@@ -942,9 +948,9 @@ Partial Class usrCntlBH
         Me.Button15.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.Button15.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button15.Location = New System.Drawing.Point(6, 49)
+        Me.Button15.Location = New System.Drawing.Point(6, 51)
         Me.Button15.Name = "Button15"
-        Me.Button15.Size = New System.Drawing.Size(121, 31)
+        Me.Button15.Size = New System.Drawing.Size(121, 27)
         Me.Button15.TabIndex = 29
         Me.Button15.Text = "          Excel"
         Me.Button15.UseVisualStyleBackColor = True
@@ -1959,6 +1965,15 @@ Partial Class usrCntlBH
         Me.GroupBox14.TabIndex = 38
         Me.GroupBox14.TabStop = False
         '
+        'Label63
+        '
+        Me.Label63.AutoSize = True
+        Me.Label63.Location = New System.Drawing.Point(725, 70)
+        Me.Label63.Name = "Label63"
+        Me.Label63.Size = New System.Drawing.Size(103, 13)
+        Me.Label63.TabIndex = 76
+        Me.Label63.Text = "*wenn leer dann alle"
+        '
         'Label66
         '
         Me.Label66.AutoSize = True
@@ -2513,14 +2528,40 @@ Partial Class usrCntlBH
         Me.txtJahr_FIBU.TabIndex = 76
         Me.txtJahr_FIBU.Text = "0"
         '
-        'Label63
+        'Button16
         '
-        Me.Label63.AutoSize = True
+        Me.Button16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.Label63.Location = New System.Drawing.Point(725, 70)
+        Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Label63.Name = "Label63"
+        Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Label63.Size = New System.Drawing.Size(103, 13)
+        Me.Button16.Image = Global.SDL.My.Resources.Resources.Excel_logo
-        Me.Label63.TabIndex = 76
+        Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Label63.Text = "*wenn leer dann alle"
+        Me.Button16.Location = New System.Drawing.Point(6, 81)
+        Me.Button16.Name = "Button16"
+        Me.Button16.Size = New System.Drawing.Size(121, 23)
+        Me.Button16.TabIndex = 44
+        Me.Button16.Text = "          Excel"
+        Me.Button16.UseVisualStyleBackColor = True
+        '
+        'Label67
+        '
+        Me.Label67.AutoSize = True
+        Me.Label67.Location = New System.Drawing.Point(145, 87)
+        Me.Label67.Name = "Label67"
+        Me.Label67.Size = New System.Drawing.Size(105, 13)
+        Me.Label67.TabIndex = 45
+        Me.Label67.Text = "Vergleich UID-Syska"
+        '
+        'cboFirma_FIBUFilialen
+        '
+        Me.cboFirma_FIBUFilialen._allowedValuesFreiText = Nothing
+        Me.cboFirma_FIBUFilialen._allowFreiText = False
+        Me.cboFirma_FIBUFilialen._value = ""
+        Me.cboFirma_FIBUFilialen.DropDownWidth = 150
+        Me.cboFirma_FIBUFilialen.FormattingEnabled = True
+        Me.cboFirma_FIBUFilialen.Location = New System.Drawing.Point(406, 57)
+        Me.cboFirma_FIBUFilialen.Name = "cboFirma_FIBUFilialen"
+        Me.cboFirma_FIBUFilialen.Size = New System.Drawing.Size(54, 21)
+        Me.cboFirma_FIBUFilialen.TabIndex = 43
         '
         'usrCntlBH
         '
@@ -2744,4 +2785,7 @@ Partial Class usrCntlBH
     Friend WithEvents txtKundeNrBis As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label65 As Label
     Friend WithEvents Label63 As Label
+    Friend WithEvents cboFirma_FIBUFilialen As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label67 As Label
+    Friend WithEvents Button16 As Button
 End Class

SDL/buchhaltung/usrCntlBH.vb

@@ -1,5 +1,6 @@
 Imports System.Globalization
 Imports System.Text
+Imports ClosedXML.Excel
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class usrCntlBH
@@ -29,6 +30,9 @@ Public Class usrCntlBH
         cboAbfVerbFirma.fillWithSQL("SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True)
         cboAbfVerbFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
 
+        cboFirma_FIBUFilialen.fillWithSQL("SELECT distinct([Firma]) FROM [VERAG].[dbo].[Filialen] order by [Firma]", False, "FMZOLL", True)
+        cboFirma_FIBUFilialen.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+
         cbxFirma_RE.fillWithSQL("SELECT Firma_ID, Firma_Bez FROM [VERAG].[dbo].[tblFirma] where Firma_ID in (1,4,7,11,19,20,21,22,23,24,26)", False, "FMZOLL", True)
 
         txtRE_Jahr.Text = Now().Year
@@ -1601,11 +1605,12 @@ Public Class usrCntlBH
         If txtMonateSyskavergleich.Text <> "" AndAlso IsNumeric(txtMonateSyskavergleich.Text) Then
 
             Dim SQLString = "select RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr, MAX(cast(RechnungsDatum as Date)) as aktuellsteRE from Rechnungsausgang 
-        inner join Kunden on Kunden.KundenNr = Rechnungsausgang.KundenNrZentrale
+                inner join Kunden on Kunden.KundenNr = Rechnungsausgang.RechnungsKundenNr
-        inner join Adressen on Adressen.AdressenNr = Kunden.KundenNr
+                inner join Adressen on Adressen.AdressenNr = Kunden.KundenNr
-        where cast(RechnungsDatum as date) >= DATEADD(MONTH,-" & txtMonateSyskavergleich.Text & ", GETDATE()) and Kunden.FiBuSchnittstelle = 0 and Kunden.FiBuSchnittstelleNr is null
+                inner join Filialen On Filialen.FilialenNr=Kunden.FilialenNr 
-        group by RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr
+                where cast(RechnungsDatum as date) >= DATEADD(MONTH,-" & txtMonateSyskavergleich.Text & ", GETDATE()) and Kunden.FiBuSchnittstelle = 0 and Kunden.FiBuSchnittstelleNr is null and Adressen.Auswahl = 'A'" & IIf(cboFirma_FIBUFilialen._value <> "", " And Filialen.Firma = '" & cboFirma_FIBUFilialen._value & "'", "") &
-        order by MAX(cast(RechnungsDatum as Date)) "
+                " group by RechnungsKundenNr, Adressen.[Name 1], Kunden.FilialenNr
+                order by MAX(cast(RechnungsDatum as Date)) "
 
             Me.Cursor = Cursors.WaitCursor
             Dim dt_RE As DataTable = SQL.loadDgvBySql(SQLString, "FMZOLL")
@@ -2001,4 +2006,35 @@ Public Class usrCntlBH
 
     End Sub
 
+    Private Sub Button16_Click_1(sender As Object, e As EventArgs) Handles Button16.Click
+
+        Dim firmenlist As New List(Of MyListItem)
+        firmenlist.Add(New MyListItem("VERAG AG", 1))
+        firmenlist.Add(New MyListItem("VERAG CS", 11))
+        firmenlist.Add(New MyListItem("ATILLA", 7))
+
+        Dim dtList As New List(Of DataTable)
+
+        For Each i In firmenlist
+            Dim sql As New SQL
+            Dim sqlstrKunden = "   select * from ( SELECT  [KundenNr] as KundenNr,[Name 1], Adressen.LandKz, (isnull(Adressen.UstIdKz,'') + isnull(Adressen.UstIdNr,'')) as UIDNrKunden, isnull(c_ustidnr,'') as UIDNrKundenDeb, [i_firm_refid] as MandantFIBU,  FiBuSchnittstelleNr as MandantAVISO FROM [VERAG].[dbo].[Kunden] 
+                                        inner join Adressen on Adressen.AdressenNr = Kunden.KundenNr
+                                        inner join Buchhaltung.[FIBU2].[dbo].[fibu_konto] on Kunden.KundenNrZentrale = i_konto
+                                        where isnull(KundenNrZentrale,0) <> 0 and Auswahl = 'A' And isnull(FiBuSchnittstelleNr,0) = " & i.Value & " ANd [i_firm_refid] = " & i.Value & "  ) as temp  where UIDNrKunden <> UIDNrKundenDeb"
+
+
+            Dim dtKunden As DataTable = sql.loadDgvBySql(sqlstrKunden, "FMZOLL")
+            If dtKunden.Rows.Count > 0 Then
+                dtKunden.TableName = i.Text
+                dtList.Add(dtKunden)
+            End If
+
+        Next
+
+        If dtList.Count > 0 Then
+            cProgramFunctions.genExcelFromMultibleDT_NEW(dtList,,,,,,,,,,,, True)
+        End If
+
+
+    End Sub
 End Class

SDL/cProgramFunctions.vb

@@ -1277,7 +1277,7 @@ Public Class cProgramFunctions
         End Try
     End Function
 
-    Public Shared Function genExcelFromMultibleDT_NEW(datatables As IEnumerable(Of DataTable), Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True, Optional fitWideToOnePage As Boolean = False) As String
+    Public Shared Function genExcelFromMultibleDT_NEW(datatables As IEnumerable(Of DataTable), Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True, Optional fitWideToOnePage As Boolean = False, Optional useTableName As Boolean = False) As String
         Try
 
             Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -1288,7 +1288,7 @@ Public Class cProgramFunctions
             Dim wb As New XLWorkbook
             Dim counter = 0
             For Each dt In datatables
-                wb.Worksheets.Add(dt, "DATEN" & IIf(counter > 0, "_" & counter, ""))
+                wb.Worksheets.Add(dt, IIf(useTableName, dt.TableName, "DATEN" & IIf(counter > 0, "_" & counter, "")))
                 wb.Worksheets(counter).Tables.FirstOrDefault().ShowAutoFilter = ShowAutoFilter
 
 

SDL/kassenbuch/frmBelegNeu.vb

@@ -1,7 +1,5 @@
 Imports System.Drawing.Printing
 Imports System.Globalization
-Imports java.awt.geom
-Imports javax.print.attribute.standard
 Imports Microsoft.Win32
 Imports SDL.RKSVServer
 Imports VERAG_PROG_ALLGEMEIN

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -2312,8 +2312,8 @@ Public Class frmMDMDatenverarbetiung
                                                     Datenquelle,
                                                     [Customer No],
                                                     [Licence Plate Number],
-                                                    [Transaction Country],
                                                     [Transaction Date],                                                    
+                                                    [Transaction Country],
                                                     [Product description],
                                                     [Card Number],
                                                     [Entry Terminal],

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -1585,7 +1585,9 @@ Public Class usrCntlMDMAuswertungen
                                      AND weitereWölflKundenNr IS NOT NULL
                                 THEN ', ' ELSE '' 
                             END +
-                            ISNULL(CAST(weitereWölflKundenNr AS nvarchar(50)), '') AS RMC_KundenNr
+                            ISNULL(CAST(weitereWölflKundenNr AS nvarchar(50)), '') AS RMC_KundenNr,
+							isnull(kde_VZ,0) as VZ_Kunde,
+							isnull(kde_AnmerkungVZ,'') as VZ_Intervall
                         
                         FROM Adressen AD
                         INNER JOIN Kunden KD ON KD.KundenNr = AD.AdressenNr

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -1,5 +1,4 @@
 Imports System.Data.SqlClient
-Imports javax.xml.bind.annotation
 
 Public Class cSendungen
     Implements ICloneable

VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb

@@ -191,8 +191,6 @@ Public Class cSpeditionsbuch
     Property Zollstelle As Object = Nothing
     Property Zollsystem_Land As Object = Nothing
 
-    Property AUTO_created As Boolean = False
-
     Property UNTERPOS As New List(Of cSpeditionsbuchUnterPos)
     Property VORKOSTEN As New List(Of cVorkosten)
     Property ENDEMPFAENGER As New List(Of cEndEmpfaener)
@@ -520,7 +518,6 @@ Public Class cSpeditionsbuch
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zollsystem_Land", Zollsystem_Land))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMRNr", SB_CMRNr))
 
-
         Return list
     End Function
 

VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb

@@ -1,6 +1,7 @@
 Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Reflection
+Imports com.sun.xml.internal.rngom.digested
 
 Public Class cUTA
 
@@ -1055,7 +1056,8 @@ Public Class cUTA
 
         Dim counTrans As Integer = 0
         Dim savedTrans As Integer = 0
-        Dim MDMEinarb As New cMDMEinarbeitung("UTA", Now())
+        Dim Einarbeitung_Lief = "UTA"
+        Dim MDMEinarb As New cMDMEinarbeitung(Einarbeitung_Lief, Now())
         'MDMEinarb.setInvoicingDate(Now(), MDMEinarb)
 
         Dim lngRecordCount As Long
@@ -1258,8 +1260,13 @@ Public Class cUTA
 
                             If lngRecordCount = 2 Then
                                 MDMEinarb.invoicedate = .[Rechnungsdatum]
+                                Dim KdNr = .[Kundennummer]
 
-                                Dim MDMEinarb_check As New cMDMEinarbeitung("UTA", .[Rechnungsdatum])
+                                If KdNr = 170582 Then
+                                    Einarbeitung_Lief = "UTA_VERAG"
+                                End If
+
+                                Dim MDMEinarb_check As New cMDMEinarbeitung(Einarbeitung_Lief, .[Rechnungsdatum])
                                 If MDMEinarb_check.hasEntry AndAlso MDMEinarb_check.completed Then Return False
                             End If
 
@@ -1304,6 +1311,12 @@ Public Class cUTA
 
             Loop
 
+            If Einarbeitung_Lief <> "UTA" Then
+                Dim ts_total = MDMEinarb.ds_total
+                MDMEinarb = New cMDMEinarbeitung(Einarbeitung_Lief, MDMEinarb.invoicedate)
+                MDMEinarb.ds_total = ts_total
+            End If
+
             MDMEinarb.ds_count += savedTrans
             MDMEinarb.import_date = Now()
             MDMEinarb.importfilename = fi.Name