Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -693,6 +693,7 @@ Public Class frmFormulare
                         AddHandler c.LOADED, Sub()
                                                  If param IsNot Nothing Then
                                                      c.cboSprache.changeItem(param(0))
+                                                     c.MyComboBox1.changeItem(param(1))
                                                      c.btnStandardPreiseLaden.PerformClick()
                                                  End If
                                              End Sub
@@ -1492,51 +1493,51 @@ Public Class frmFormulare
                 Case FormularVorlagenGruppe.NeukundeAT
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.AT_Vollmacht_EV)
-                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_EV"})
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ_EV"})
                     addForm(FormularManagerArten.VUB_CS)
                     addForm(FormularManagerArten.CBAM_Checkliste, {1})
                 Case FormularVorlagenGruppe.NeukundeATFiskal
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.AT_Fiskal)
-                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL"})
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ_FISKAL"})
                     addForm(FormularManagerArten.VUB_CS)
                     addForm(FormularManagerArten.AT_InformationsblattFiskalverzollung)
                     addForm(FormularManagerArten.CBAM_Checkliste, {1})
                 Case FormularVorlagenGruppe.NeukundeDE
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.DE_Vollmacht)
-                    addForm(FormularManagerArten.Verzollungspreise)
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ"})
                     addForm(FormularManagerArten.VUB_AG)
                     addForm(FormularManagerArten.CBAM_Checkliste, {1})
                 Case FormularVorlagenGruppe.NeukundeDEFiskal
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.DE_Fiskal)
                     addForm(FormularManagerArten.DE_Vollmacht)
-                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL_DE"})
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ_FISKAL_DE"})
                     addForm(FormularManagerArten.VUB_AG)
                     addForm(FormularManagerArten.DE_InformationsblattFiskalverzollung)
                     addForm(FormularManagerArten.CBAM_Checkliste, {1})
                 Case FormularVorlagenGruppe.NeukundeAT_IMEX
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.AT_Vollmacht_EV)
-                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_EV"})
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ_EV"})
                     addForm(FormularManagerArten.VUB_IMEX)
                 Case FormularVorlagenGruppe.NeukundeATFiskal_IMEX
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.AT_Fiskal)
-                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL"})
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ_FISKAL"})
                     addForm(FormularManagerArten.VUB_IMEX)
                     addForm(FormularManagerArten.AT_InformationsblattFiskalverzollung)
                 Case FormularVorlagenGruppe.NeukundeDE_IMEX
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.DE_Vollmacht)
-                    addForm(FormularManagerArten.Verzollungspreise)
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ"})
                     addForm(FormularManagerArten.VUB_IMEX)
                 Case FormularVorlagenGruppe.NeukundeDEFiskal_IMEX
                     MyFlowLayoutPanel1.Controls.Clear()
                     addForm(FormularManagerArten.DE_Fiskal)
                     addForm(FormularManagerArten.DE_Vollmacht)
-                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL_DE"})
+                    addForm(FormularManagerArten.Verzollungspreise, {"DE", "VZ_FISKAL_DE"})
                     addForm(FormularManagerArten.VUB_IMEX)
                     addForm(FormularManagerArten.DE_InformationsblattFiskalverzollung)
             End Select

SDL/buchhaltung/frmBU_Mahnlauf.vb

@@ -487,7 +487,7 @@ Public Class frmBU_Mahnlauf
 
             Select Case FIRMA.Firma_ID
                 Case 1 : rpt.picVERAG.Image = My.Resources.Verag_AG_Logo : rpt.Picture1.Image = My.Resources.aeo 'is eh standard
-                Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med ': rpt.Picture1.Image = Nothing
+                Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.lblFirmaFax.Visible = False  'leider hardcodiert!!! ': rpt.Picture1.Image = Nothing
                 Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = Nothing
                 Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex
                 Case 21 : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Picture1.Image = My.Resources.unisped_aeo_AT
@@ -525,10 +525,9 @@ Public Class frmBU_Mahnlauf
                         rpt.lblTelefon.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_telefonnr + "-" + VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
                     End If
 
-
-
                 Case Else
                     rpt.lblEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag")
+
             End Select
 
 
@@ -858,7 +857,7 @@ Public Class frmBU_Mahnlauf
 
                         End If
 
-                        If Firma_ID = 7 AndAlso (cbxNewDGV IsNot Nothing And cbxNewDGV.Checked) Then
+                        If Firma_ID = 7 Then
                             Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an (ATILLA)")
                             Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an (ATILLA)")
                             Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an (ATILLA)")
@@ -982,6 +981,11 @@ Public Class frmBU_Mahnlauf
 
         Select Case FIRMA.Firma_ID'VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
 
+            Case 7 '"VERAG360"
+                rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim
+                rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim
+                rpt.lblFirmaEmail.Text = IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "mahnung@atilla-spedition.com")
+
             Case 19 '"VERAG360"
                 rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim
                 rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim

SDL/buchhaltung/usrCntlBH.vb

@@ -84,6 +84,8 @@ Public Class usrCntlBH
                 Next
         End Select
 
+        btnfortlRENr.Enabled = VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED
+
         txtOPUmsatzVon.Text = "01.01." & (Now.Year - 1)
         txtOPUmsatzBis.Text = "31.12." & (Now.Year - 1)
         txtBagatellgrenzeBei._value = 800

SDL/frmLogin.vb

@@ -1,5 +1,6 @@
 Imports GrapeCity.DataVisualization.Chart
 Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.TESTJSON
 
 Public Class frmLogin
     Public ConnStrInfo As String
@@ -49,6 +50,7 @@ Public Class frmLogin
         End If
     End Sub
 
+
     Private Sub frmLogin_FormClosed(sender As Object, e As FormClosedEventArgs) Handles Me.FormClosed
         Application.Exit()
     End Sub
@@ -233,7 +235,20 @@ Public Class frmLogin
                 txtUser.Text = "daniel"
                 txtPwd.Text = "debug"
             End If
-        End If
+
+        ElseIf e.Modifiers = Keys.Control And e.KeyCode = Keys.G Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = Not VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED
+                VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER = "[SQLGUIDE01.verag.ost.dmn]"
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+                    Panel1.BackColor = Color.Red
+                    Panel1.ForeColor = Color.White
+                Else
+                    Panel1.BackColor = Color.White
+                    Panel1.ForeColor = Color.FromArgb(0, 54, 128)
+                End If
+                e.Handled = True
+            End If
+
 
     End Sub
 

SDL/frmMain.vb

@@ -104,6 +104,10 @@ Public Class frmMain
             picAVISOMessenger.Visible = True
         End If
 
+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+        '    pnlHeader.BackColor = Color.Red
+        'End If
+
 
         lblVersion.Text = "V " & Application.ProductVersion
         lblMs.Text = ""

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -219,6 +219,7 @@ Public Class usrCntlKundenuebersicht
             PictureBox6.Visible = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CREDITSAFE_Prüfung", "SDL")
 
 
+
             If kdNr > 0 Then setKD(kdNr)
 
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -641,7 +642,7 @@ Public Class usrCntlKundenuebersicht
             txtZahlungsziel.Text = If(KUNDE.Zahlungsziel, "-") & " Tage"
 
 
-
+            If tbcntrAllg.SelectedIndex <> 0 Then tbcntrAllg.SelectedIndex = 0
 
             '            UsrCntlKundenAvisoMailBenachrichtigung1.init(KUNDE, KUNDE_ERW)
 

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -1,4 +1,5 @@
-Imports System.Reflection
+Imports System.IO
+Imports System.Reflection
 Imports com.sun.tools.corba.se.idl
 Imports DocumentFormat.OpenXml.VariantTypes
 Imports Microsoft.Office.Interop
@@ -1121,9 +1122,18 @@ Public Class usrcntlFremdrechnungen
         Mail.HTMLBody &= "<br>"
         Mail.HTMLBody &= cFakturierung.getSignature("DE", 19, True, True)
 
+        Dim filesOK As Boolean = True
+
         If pdflist.Count > 0 Then
             For Each pdf In pdflist
-                Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , )
+
+                Dim file As New FileInfo(pdf)
+
+                If file.Exists Then
+                    Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                Else
+                    filesOK = False
+                End If
             Next
         End If
 
@@ -1176,7 +1186,7 @@ Public Class usrcntlFremdrechnungen
 
                     If Mail IsNot Nothing Then
 
-                        If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(API.api_EMail, API.api_EMailSubject, API.api_EMailText, "mmdabrechnung@verag.ag", False, False, API.api_EMailCC, API.api_EMailBCC, pdflist,, "mmdabrechnung@verag.ag") Then
+                        If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(API.api_EMail, API.api_EMailSubject, API.api_EMailText & IIf(Not filesOK, vbNewLine & "ACHTUNG Mind. eine Datei konnte nicht ermittelt werden! ", ""), "mmdabrechnung@verag.ag", False, False, API.api_EMailCC, API.api_EMailBCC, pdflist,, "mmdabrechnung@verag.ag") Then
                             API.UPDTAE_OK()
 
                         Else