Fibu-Konten, BH, etc.

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -4152,10 +4152,15 @@ Nächste_Textzeile_lesen:
                             If UST_ID > 0 Then
                                 SQL.doSQL("UPDATE [tblUStVPositionen] SET UStVPo_VZ_RKID = NULL WHERE [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) =" & RECHNUNG.RK_ID, "FMZOLL")
                                 SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1 WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0 AND [UStVAn_ID] = " & UST_ID & " )", "FMZOLL")
+                            Else
+                                SQL.doSQL("UPDATE [tblMDM_Bankspesen] SET RK_ID = NULL, verrechnet = NULL  WHERE isnull(RK_ID,0) =" & RECHNUNG.RK_ID, "FMZOLL")
                             End If
 
                         ElseIf SPEDBUCH.FilialenNr = 8001 Then
                             SQL.doSQL("UPDATE [tblMDM_Zinsberechnung] SET RK_ID = NULL, verrechnet = NULL  WHERE isnull(RK_ID,0) =" & RECHNUNG.RK_ID, "FMZOLL")
+
+
+
                         End If
                     End If
 

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -2375,7 +2375,7 @@ Public Class frmMDM_USTVAntrag
 
                 If UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value = -1 OrElse UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId_loeschbar Then 'nur Dokumente löschen, die nicht über Schnittstellen geladen wurden!
 
-                    If UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId < 0 OrElse UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId Is Nothing Then
+                    If UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value < 0 OrElse UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId Is Nothing Then
 
                         Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & "_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr)
 
@@ -2389,9 +2389,9 @@ Public Class frmMDM_USTVAntrag
 
                             End If
                         End If
-                    End If
 
-                ElseIf UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId > 0 Then
+
+                    ElseIf UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value > 0 Then
 
                         Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId)
 
@@ -2405,6 +2405,8 @@ Public Class frmMDM_USTVAntrag
                     End If
 
                 End If
+            End If
+
 
 
         End If
@@ -3596,6 +3598,7 @@ Public Class frmMDM_USTVAntrag
                             If r.Cells("UStVPo_SchnittstellenNr").Value = -1 OrElse r.Cells("UStVPo_daId_loeschbar").Value Then  'nur Dokumente löschen, die nicht über Schnittstellen geladen wurden oder löschbar sind!
 
                                 If Not IsDBNull(r.Cells("UStVPo_daId").Value) Then
+
                                     If r.Cells("UStVPo_daId").Value Is Nothing Then
 
                                         Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UStVAn_ID & "_" & r.Cells("UStVPo_ID").Value, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr)

SDL/buchhaltung/frmLeistundenFIBUKonten.Designer.vb

@@ -287,7 +287,6 @@ Partial Class frmLeistundenFIBUKonten
         Me.btnAdd.Size = New System.Drawing.Size(24, 20)
         Me.btnAdd.TabIndex = 103
         Me.btnAdd.UseVisualStyleBackColor = True
-        Me.btnAdd.Visible = False
         '
         'btnDelete
         '

SDL/buchhaltung/frmLeistundenFIBUKonten.vb

@@ -48,7 +48,7 @@ Public Class frmLeistundenFIBUKonten
         End If
 
         If searchparam <> "" Then
-            SQLWHere &= " AND (FIBU.SachkontoInlandSteuerpflichtig like '%" & searchparam & "%' OR FIBU.SachkontoInlandSteuerfrei like '%" & searchparam & "%' OR FIBU.SachkontoEUSteuerpflichtig like '%" & searchparam & "%' OR FIBU.SachkontoEUSteuerfrei like '%" & searchparam & "%' OR FIBU.Sachkonto3Land like '%" & searchparam & "%')"
+            SQLWHere &= " AND (FIBU.SachkontoInlandSteuerpflichtig like '%" & searchparam & "%' OR FIBU.SachkontoInlandSteuerfrei like '%" & searchparam & "%' OR FIBU.SachkontoEUSteuerpflichtig like '%" & searchparam & "%' OR FIBU.SachkontoEUSteuerfrei like '%" & searchparam & "%' OR FIBU.Sachkonto3Land like '%" & searchparam & "%' OR l.LeistungsBez like '%" & searchparam & "%')"
         End If
 
         If leistungsNr > 0 Then
@@ -275,4 +275,5 @@ Public Class frmLeistundenFIBUKonten
         End If
     End Sub
 
+
 End Class

SDL/buchhaltung/usrCntlBH.vb

@@ -2429,8 +2429,19 @@ Public Class usrCntlBH
                             .btnPreisliste.Visible = False
                             .dgvHandling.RowHeadersVisible = False
                             .Button2.Text = "Importieren"
-                            '.cbxDivers.Visible = True
+                            .cbxDivers.Visible = True
-                            '.cbxDivers.Text = "VZ und RZ-Beträge im Antrag erhöhen"
+                            .cbxDivers.Text = "KundenNr aus Excel übernehmen"
+
+                            If visibleKdNrCheck Then
+                                .cbxDivers.Checked = True
+                            Else
+                                .cbxDivers.Checked = False
+                                .cbxDivers.Enabled = False
+                            End If
+
+
+
+
                         End With
 
                         frm.ShowDialog()
@@ -2438,14 +2449,21 @@ Public Class usrCntlBH
                         If frm.DialogResult = DialogResult.OK Then
 
 
-
                             Dim counter = 0
                             Dim dateTemp
                             For Each r As DataGridViewRow In frm.dgvHandling.SelectedRows
 
                                 Dim Datum = r.Cells("Datum").Value
                                 Dim TYP = cbxBankspesentyp._value
-                                Dim KdNr = r.Cells("KdNr").Value
+                                Dim KdNr = 0
+
+                                If frm.cbxDivers.Checked AndAlso visibleKdNrCheck Then
+                                    If r.Cells("KdNrCheck").Value <> "" AndAlso IsNumeric(r.Cells("KdNrCheck").Value) Then KdNr = CInt(r.Cells("KdNrCheck").Value)
+                                Else
+                                    KdNr = r.Cells("KdNr").Value
+                                End If
+
+
                                 dateTemp = Datum
                                 If KdNr > 0 Then
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1,8 +1,7 @@
 Imports System.Data.OleDb
+Imports System.DirectoryServices.ActiveDirectory
 Imports System.IO
-Imports com.sun.xml.internal.rngom
 Imports itextsharp.text.pdf
-Imports jdk.nashorn.internal.objects.annotations
 Imports MDM_Worker
 Imports VERAG_PROG_ALLGEMEIN
 
@@ -40,7 +39,7 @@ Public Class frmMDMDatenverarbetiung
             Case "UTA" : genSummenbericht_UTA(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString)
             Case "IDS" : genSummenbericht_IDS(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString, 17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString, 21, cbxIDSmitVerag.Checked)
             Case "MSE" : genSummenbericht_MSE(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString)
-            Case "BANK" : genSummenbericht_Bank(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString)
+            Case "BANK" : genSummenbericht_Bank(LIEFERANT & "_Summenbericht_" & Now.ToShortDateString, cbxIDSmitVerag.Checked)
             Case Else : MsgBox("Nicht verfügbar!")
         End Select
     End Sub
@@ -200,9 +199,15 @@ Public Class frmMDMDatenverarbetiung
                 End If
 
             Case "BANK"
+
+                If cbxIDSmitVerag.Checked Then
+                    MsgBox("Abrechnung ohne RMC/Durmaz-Kunden!")
+                    Exit Sub
+                End If
+
                 Dim dTLANDEU = (New SQL).loadDgvBySql("select LandKz, MitgliedslandEU from Währungstabelle where LandKz is not null", "FMZOLL")
 
-                If genRG_Bank(dTLANDEU) Then
+                If genRG_Bank(dTLANDEU, cbxIDSmitVerag.Checked) Then
                     setFakturiert(LIEFERANT)
                 End If
 
@@ -802,13 +807,13 @@ Public Class frmMDMDatenverarbetiung
         print.Show()
     End Sub
 
-    Sub genSummenbericht_Bank(Berichtsname As String)
+    Sub genSummenbericht_Bank(Berichtsname As String, mitRM_CDurmaz_Daten As Boolean)
         Dim displayFilter = False
         Dim sqlstr As String = ""
 
         sqlstr &= " SELECT spesen.kundenNr as KundenNr, Adressen.[Name 1] as Name, datum , (spesen.betrag * -1) as Betrag, spesen.gebuehr , spesen.buchungstext,spesen.kontoauszug, spesen.iban, spesen.bic  FROM [tblMDM_Bankspesen] as spesen
                             inner join adressen ON spesen.kundenNr = Adressen.AdressenNr 
-                             where datum between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and spesen.typ = 'Q' and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null"
+                             where datum between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and spesen.typ = 'Q' and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null " & IIf(mitRM_CDurmaz_Daten, "", " AND Left(spesen.KundenNr,2) <> 14 AND Left(spesen.KundenNr,2) <> 15")
 
         Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
 
@@ -1161,7 +1166,7 @@ Public Class frmMDMDatenverarbetiung
 
             .SET_SQL("    SELECT spesen.kundenNr as KdNr, Adressen.[Name 1] as Name, datum as Datum , (spesen.betrag * -1) as Betrag, spesen.gebuehr as Gebühr , spesen.buchungstext as Buchnungstext,spesen.kontoauszug as Kontoauszug, spesen.iban as IBAN, spesen.bic as BIC  FROM [tblMDM_Bankspesen] as spesen
                             inner join adressen ON spesen.kundenNr = Adressen.AdressenNr 
-                             where datum between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'  and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null", "FMZOLL")
+                             where datum between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' and spesen.typ = 'Q'  and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null " & IIf(cbxIDSmitVerag.Checked, " ", " AND Left(spesen.KundenNr,2) <> 14 AND Left(spesen.KundenNr,2) <> 15 "), "FMZOLL")
 
             .LOAD()
 
@@ -1410,6 +1415,7 @@ Public Class frmMDMDatenverarbetiung
                 c.Dock = DockStyle.Fill
                 pnlIDS.Visible = True
                 cbxKopie.Visible = True
+                cbxIDSmitVerag.Text = "Daten mit Verag/Verag360"
                 cbxIDSmitVerag.Visible = True
 
             Case "MSE"
@@ -1420,6 +1426,8 @@ Public Class frmMDMDatenverarbetiung
 
             Case "BANK"
                 Panel4.Visible = True
+                cbxIDSmitVerag.Text = "Daten mit RMC/Durmaz"
+                cbxIDSmitVerag.Visible = True
         End Select
 
         init()
@@ -1799,14 +1807,14 @@ Public Class frmMDMDatenverarbetiung
     End Function
 
 
-    Function genRG_Bank(dtLand As DataTable) As Boolean
+    Function genRG_Bank(dtLand As DataTable, mitRM_CDurmaz_Daten As Boolean) As Boolean
         Dim top = ""
         'top = " TOP 20 "
         Dim sqlWhere = ""
 
         Dim SQLStr = "SELECT spesen.kundenNr, Adressen.[Name 1], sum(spesen.gebuehr) as gebuehr FROM [tblMDM_Bankspesen] as spesen
                       inner join adressen ON spesen.kundenNr = Adressen.AdressenNr 
-                      where datum between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' and spesen.typ = 'Q' and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null group by spesen.kundenNr,Adressen.[Name 1]"
+                      where datum between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' and spesen.typ = 'Q' and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null  " & IIf(mitRM_CDurmaz_Daten, "", " AND Left(spesen.KundenNr,2) <> 14 AND Left(spesen.KundenNr,2) <> 15") & "group by spesen.kundenNr, Adressen.[Name 1]"
 
         Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200)
 
@@ -1818,9 +1826,95 @@ Public Class frmMDMDatenverarbetiung
 
 
         Dim cnt = 0
+
         If vbYes = MsgBox("Es wurden Daten von " & dt_Main.Rows.Count & " Kunden gefunden " & vbNewLine & " Möchten Sie die Rechnungen erstellen?", vbYesNoCancel) Then
 
 
+            If dt_Main.Rows.Count > 0 Then
+                Dim kundenNr As String = ""
+                If dt_Main.Columns.Contains("kundenNr") Then
+                    Dim dtNew As DataTable = dt_Main.Rows.Cast(Of DataRow)().Where(Function(row) Not row.ItemArray.All(Function(field) field Is DBNull.Value Or field.Equals(""))).CopyToDataTable()
+                    If dtNew.Rows.Count > 0 Then
+                        Dim counter = 0
+                        For Each r As DataRow In dtNew.Rows
+                            kundenNr &= r.Item(0)
+                            counter = counter + 1
+                            If (dtNew.Rows.Count <> 0 And counter <> dtNew.Rows.Count) Then
+                                kundenNr &= ","
+                            End If
+                        Next
+                    End If
+                End If
+
+
+                Dim sqlStringFehlendeOffertenNr = "select KundenNr from Offertenpositionen where KundenNr in (" & kundenNr & ")
+                                            GROUP by KundenNr
+                                            EXCEPT 
+                                            select KundenNr from Offertenpositionen where LeistungsNr = 424 and KundenNr in (" & kundenNr & ")
+                                            GROUP by KundenNr"
+
+                Dim dtfehlendeOfferten As DataTable = SQL.loadDgvBySql(sqlStringFehlendeOffertenNr, "FMZOLL")
+
+
+                If dtfehlendeOfferten.Rows.Count > 0 Then
+
+                    Dim result As MsgBoxResult = MsgBox("Bei " & dt_Main.Rows.Count & " Kunden fehlt das Offert im Kundenstamm " & vbNewLine & "Möchten Sie das Offert automatisch anlegen, andernfalls werden die Bankspesen bei diesen Kunden nicht verrechnet?", vbYesNoCancel)
+
+                    Select Case result
+                        Case MsgBoxResult.Cancel : Return False
+
+                        Case MsgBoxResult.Yes
+
+
+
+                            For Each R As DataRow In dtfehlendeOfferten.Rows
+                                If Not IsDBNull(R.Item("KundenNr")) AndAlso R.Item("KundenNr") IsNot Nothing AndAlso IsNumeric(R.Item("KundenNr")) Then
+                                    Dim OffertenNr As Integer = -1
+                                    Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(R.Item("KundenNr"))
+
+                                    If AD.LandKz = "RO" Then
+
+                                        OffertenNr = 31
+                                    Else
+                                        If dtLand IsNot Nothing Then
+
+                                            Dim isEU As Boolean = dtLand.AsEnumerable().Where(Function(res) res.Field(Of String)("LandKz") = AD.LandKz).Select(Function(res) res.Field(Of Boolean)("MitgliedslandEU")).FirstOrDefault()
+
+                                            If isEU Then
+                                                OffertenNr = 14
+                                            Else
+                                                OffertenNr = 15
+                                            End If
+
+                                        End If
+
+
+                                    End If
+
+
+
+
+                                    Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(R.Item("KundenNr"), OffertenNr, False)
+                                    o.Art = "Neuanlage"
+                                    o.SAVE() 'speichern
+                                    o.LOAD_POSITIONEN() 'positionen Laden
+                                    If o.POSITIONEN.Count = 0 Then 'wenn keine POS --> neues Offert
+                                        o.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, "", "DE") '--> Standartofferten laden
+                                    End If
+                                End If
+
+                            Next
+
+                    End Select
+
+
+
+                End If
+
+            End If
+
+
+
             For Each BANK In dt_Main.Rows
 
                 Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
@@ -3803,9 +3897,6 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
 
             'End If
 
-
-
-
             Select Case Lieferant
                 Case "PLOSE" : OffertenNr = 80 : Abfertigungsart = 10 : RG.Anlage_1 = anh_Bez
                 Case "ASFINAG" : OffertenNr = 11 : Abfertigungsart = 10 : RG.Anlage_1 = anh_Bez
@@ -4934,7 +5025,7 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
         Try
 
             Dim fehlendeKundenr As Integer = CInt((New SQL).getValueTxtBySql("select count(*) from tblMDM_Bankspesen as spesen
-                                      WHERE datum between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'   and spesen.typ = 'Q' and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null and spesen.kundenNr <= 0 ", "FMZOLL"))
+                                      WHERE datum between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "'   and spesen.typ = 'Q' and isnull(spesen.RK_ID,0) = 0 and spesen.SR_datum is null and spesen.kundenNr <= 0 ", "FMZOLL"))
 
             If fehlendeKundenr > 0 Then
                 pruefData_Bank = False
@@ -4942,7 +5033,6 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land
                 Return False
             End If
 
-
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
             pruefData_Bank = False
@@ -5875,7 +5965,13 @@ RabattBerechnen:
     End Function
 
     Private Sub cbxIDSmitVerag_CheckedChanged(sender As Object, e As EventArgs) Handles cbxIDSmitVerag.CheckedChanged
-        initDgv_IDS()
+
+        Select Case LIEFERANT
+            Case "IDS" : initDgv_IDS()
+            Case "BANK" : initDgv_Bank()
+        End Select
+
+
     End Sub
 
     Private Sub btnImportdet_Click(sender As Object, e As EventArgs) Handles btnImportdet.Click

VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb

@@ -118,19 +118,21 @@ Public Class cTimasAPI
 
             Dim success As Boolean
             rest.ClearAllQueryParams()
-
-            rest.IdleTimeoutMs = 30000
             rest.AddQueryParam("format", datetimeformat)
 
             If timeStamp_deadline <> "" AndAlso IsDate(timeStamp_deadline) Then
                 rest.AddQueryParam("stamp", CDate(timeStamp_deadline).ToString("yyyy-MM-dd"))
+                rest.IdleTimeoutMs = 300000
+            Else
+                rest.IdleTimeoutMs = 30000 'defualt
+
             End If
 
             Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance")
             If (rest.LastMethodSuccess <> True) Then
                 Debug.WriteLine(rest.LastErrorText)
                 isEndpointRunning = rest.LastMethodSuccess
-                rest.IdleTimeoutMs = 30000 'defualt
+
                 Return timesaldo
             End If