diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb index 0a3435c2..8eaa86f5 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb @@ -419,7 +419,7 @@ Public Class usrcntlVorauskasse End Sub Private Sub MyComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged - cboSprache.Visible = False + 'cboSprache.Visible = False Label17.Visible = False Select Case cboFirma._value Case "1", "11" @@ -440,7 +440,7 @@ Public Class usrcntlVorauskasse txtEustProzent.changeItem("0,0") lblWaehrung.Text = "GBP" Case "24" - cboSprache.Visible = True + 'cboSprache.Visible = True Label17.Visible = True txtEustProzent.changeItem("0,0") Case Else diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 96b9d2f7..5ecf2c97 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -4890,10 +4890,17 @@ Public Class FormularManagerNEU listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.txtGesamtsumme.Text, w), 170, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT)) + Select Case usrCntl.cboSprache._value + Case "EN" + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("IMPORTANT NOTICE:", 12, 250, 70, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2)) + Dim cbamTxt = "From 1 October 2023, a reporting requirement (CBAM) was introduced for the import of certain goods from third countries. As an importer, you are responsible for submitting this report. For further information, visit www.zoll.de or www.customs-consulting.at (search for ‘CBAM’)." + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(cbamTxt, 12, 258, 180, 30, "bold", 13, , itextsharp.text.Element.ALIGN_LEFT, 2)) + Case Else + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("WICHTIGER HINWEIS:", 12, 250, 70, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2)) + Dim cbamTxt = "Ab 01.10.2023 wurde eine Meldepflicht (CBAM) beim Import bestimmter Waren aus Drittländern eingeführt. Sie als Importeur sind für diese Meldung eigenverantwortlich. Informationen unter www.zoll.de oder www.customs-consulting.at Stichwort CBAM" + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(cbamTxt, 12, 258, 180, 30, "bold", 13, , itextsharp.text.Element.ALIGN_LEFT, 2)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("WICHTIGER HINWEIS:", 12, 250, 70, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2)) - Dim cbamTxt = "Ab 01.10.2023 wurde eine Meldepflicht (CBAM) beim Import bestimmter Waren aus Drittländern eingeführt. Sie als Importeur sind für diese Meldung eigenverantwortlich. Informationen unter www.zoll.de oder www.customs-consulting.at Stichwort CBAM" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(cbamTxt, 12, 258, 180, 30, "bold", 13, , itextsharp.text.Element.ALIGN_LEFT, 2)) + End Select @@ -4936,15 +4943,28 @@ Public Class FormularManagerNEU Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK", listTowrite) End Select Case "UNISPED" - Select Case usrCntl.cboFirma._value Case "21", "23" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "VORAUSKASSE_AT", listTowrite) Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK", listTowrite) End Select Case Else Select Case usrCntl.cboFirma._value - Case "11" : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_CS_NEU2", listTowrite) - Case Else : destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_AG_NEU2", listTowrite) + + Case "11" + If usrCntl.cboSprache._value = "EN" Then + destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK_CS_EN", listTowrite) + Else + destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_CS_NEU2", listTowrite) + End If + + Case Else + If usrCntl.cboSprache._value = "EN" Then + destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_VK_EN", listTowrite) + Else + destPath = fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Importaviso_AG_NEU2", listTowrite) + End If + + End Select End Select diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 4cbe29d3..844b9c5d 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2295,8 +2295,7 @@ Public Class frmMDMDatenverarbetiung FROM tblUTAFakturierwarenarten INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart WHERE cast(Rechnungsdatum as Date) = '" & datPloseAnhang.Text & "' and chargedDatetime is not null " & sqlWhere & " ) as qryUTA_Fakturierungspositionen - WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0)) - order by KundenNr, LicencePlateNumber, Belegdatum" + WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0))" @@ -2372,8 +2371,7 @@ Public Class frmMDMDatenverarbetiung left Join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left Join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.[invoice_id] = bills.[invoice_number] And inv.customer_number = cust.[customer_id] And trans.transaction_country = inv.country Left Join adressen ON cust.[customer_id] = Adressen.MSEKundenNr - where bills.invoice_date = '" & datPloseAnhang.Text & "' and trans.chargedDatetime is not null " & sqlWhere & - "order by Adressen.AdressenNr " + where bills.invoice_date = '" & datPloseAnhang.Text & "' and trans.chargedDatetime is not null " & sqlWhere Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") @@ -2402,7 +2400,7 @@ Public Class frmMDMDatenverarbetiung [VAT Amount], [Total Amount], [Billingdate] - )" + ) " If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then