From b5cbe59199ef1d7459849e9503a2842f1ed8aa24 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 14 Dec 2022 21:21:57 +0100 Subject: [PATCH] Gutschrift-SR, VerzPreise, div. --- SDL/Fakturierung/cFakturierung.vb | 9 +++++++-- .../FormulareBaukasten/usrcntlVerzollungspreise.vb | 3 +++ SDL/Formulare/KDFormulare/frmFormulare.vb | 7 ++++--- SDL/SMS/frmSendSMS.vb | 1 + SDL/kunden/frmKundenUebersichtZOLL.vb | 5 +++-- VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb | 4 ++++ VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb | 6 ++++-- VERAG_PROG_ALLGEMEIN/cAllgemein.vb | 2 +- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index a45318a9..e0ee8132 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2793,10 +2793,15 @@ Public Class cFakturierung 'If RECHNUNG.DruckDatumZeit IsNot Nothing Then rpt.lblUeberschriftRG_GS.Text &= " - KOPIE" + Dim Gesamt_RG_Betrag As Double = 0 + If ROW("SteuerFreierBetrag") IsNot DBNull.Value AndAlso IsNumeric(ROW("SteuerFreierBetrag")) Then Gesamt_RG_Betrag += ROW("SteuerFreierBetrag") + If ROW("SteuerpflichtigerBetrag") IsNot DBNull.Value AndAlso IsNumeric(ROW("SteuerpflichtigerBetrag")) Then Gesamt_RG_Betrag += ROW("SteuerpflichtigerBetrag") + Dim BelegartenKz = If(Gesamt_RG_Betrag < 0, "AG", "AR") + Select Case ROW("RechnungSprache") Case "EN" ' MsgBox(("EN")) - Select Case ROW("BelegartenKz") + Select Case BelegartenKz Case "AR" rpt.lblUeberschriftRG_GS.Text = "COLLECTIVE INVOICE" rpt.lblSummeUeberschrift.Text = "Invoice Amount:" @@ -2809,7 +2814,7 @@ Public Class cFakturierung rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:" End Select Case Else - Select Case ROW("BelegartenKz") + Select Case BelegartenKz Case "AR" rpt.lblUeberschriftRG_GS.Text = "SAMMELRECHNUNG" Case "AG" diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb index 03654ed6..c4a025d9 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb @@ -118,6 +118,9 @@ MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Fiskal AT", "VZ_FISKAL")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Fiskal DE", "VZ_FISKAL_DE")) End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", Me.FindForm) Then + cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED Ltd", "IMEX")) + End If MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handling", "HANDLING")) MyComboBox1.changeItem("VZ") End Select diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 44399c8a..4af68417 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1902,7 +1902,7 @@ Public Class FormularManagerNEU Case "WAI" : rpt.txtGrenzstelle.Text = "WAIDHAUS" Case "SBG" : rpt.txtGrenzstelle.Text = "BAD REICHENHALL" Case "SFD" : rpt.txtGrenzstelle.Text = "SPIELFELD" - Case "DTB" : rpt.txtGrenzstelle.Text = "DETTELBACH" + Case "DTB", "FO_WIHD" : rpt.txtGrenzstelle.Text = "DETTELBACH" Case Else : rpt.txtGrenzstelle.Text = AVISO.Grenzstelle.Replace("???", "") End Select End If @@ -1914,7 +1914,7 @@ Public Class FormularManagerNEU Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" Select Case AVISO.Grenzstelle - Case "DTB" '--> VERAG + Case "DTB", "FO_WIHD" '--> VERAG ort = "Dettelbach" rpt.txtFirmaInfo_VERAG.Visible = False rpt.TextBox11.Visible = True @@ -1969,7 +1969,7 @@ Public Class FormularManagerNEU Case "NKD" : ort = "Nickelsdorf" Case "NEU" : ort = "Neuhaus am Inn" - Case "DTB" + Case "DTB", "FO_WIHD" ort = "Dettelbach" rpt.txtFirmaInfo_VERAG.Visible = False rpt.TextBox11.Visible = True @@ -2262,6 +2262,7 @@ Public Class FormularManagerNEU Case "WAI" : rpt.txtGrenzstelle.Text = "WAIDHAUS" Case "SBG" : rpt.txtGrenzstelle.Text = "BAD REICHENHALL" Case "SFD" : rpt.txtGrenzstelle.Text = "SPIELFELD" + Case "DTB", "FO_WIHD" : rpt.txtGrenzstelle.Text = "DETTELBACH" Case Else : rpt.txtGrenzstelle.Text = AVISO.Grenzstelle.Replace("???", "") End Select End If diff --git a/SDL/SMS/frmSendSMS.vb b/SDL/SMS/frmSendSMS.vb index e7d58d50..048a709e 100644 --- a/SDL/SMS/frmSendSMS.vb +++ b/SDL/SMS/frmSendSMS.vb @@ -232,6 +232,7 @@ Public Class frmSendSMS If Kennzeichen <> "" Then txtNachricht.Text &= vbNewLine & lkwTxt & Kennzeichen + template_ParamMFGAdditional &= " | " & lkwTxt & Kennzeichen End If If FirmaTmp = "FRONTOFFICE" Then diff --git a/SDL/kunden/frmKundenUebersichtZOLL.vb b/SDL/kunden/frmKundenUebersichtZOLL.vb index 5ef3151b..842f2c3f 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.vb @@ -55,7 +55,7 @@ Public Class frmKundenUebersichtZOLL 'strip, such as context menu strip just add additional code 'line under InitializeComponent(), and it will work; InitializeComponent() - MenuStripKunden.Renderer = New MyRenderer() + ' MenuStripKunden.Renderer = New MyRenderer() Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) @@ -67,7 +67,7 @@ Public Class frmKundenUebersichtZOLL Try InitializeComponent() Me.kdNr = KdNr - MenuStripKunden.Renderer = New MyRenderer() + 'MenuStripKunden.Renderer = New MyRenderer() Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) @@ -209,6 +209,7 @@ Public Class frmKundenUebersichtZOLL btnUbersicht.Visible = True End If + VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) End Sub diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb index 86cd1e0a..e08636c6 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb @@ -33,6 +33,8 @@ Public Class cGlobal Public Const Status_Freigegeben = 1 Public Const Status_NichtEingetroffen = 2 Public Const Status_Ankunft = 3 + Public Const Status_ATILLA_VERIMEX = 6 + Public Const Status_ATILLA_INDONESIEN = 7 Shared Function getStatusText(i As Integer) As String @@ -43,6 +45,8 @@ Public Class cGlobal Case 3 : Return "Ankunft" Case 4 : Return "Vorbereitet" Case 5 : Return "Vorgeschrieben" + Case 6 : Return "An VERIMEX" + Case 7 : Return "An INDONESIEN" Case 99 : Return "In Vorbereitung" Case Else : Return "" End Select diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb index 0929a874..f44f0551 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb @@ -21,7 +21,8 @@ Dim sqlatr = " SELECT (SELECT TOP 1 CONVERT(varchar, [dySt_ergZeitpunkt] ,104 ) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 ) as Datum, ncts_Befoerderungsmittel_KennzeichenAbgang as Kennzeichen, isnull(ncts_MRN,'') as MRN, ncts_SumA_Befoerderer_Land as Land, nctsSA_AbgabenBetrag as GarantieBetrag, ncts_SumA_Befoerderer_Name as Firma " & " " & If(_BRG_TEXT.Contains("TOBB") Or _BRG_TEXT.Contains("OREGON"), ", isnull(ncts_BestimmungsstelleDienststellennummer,'') as Bestimmungsstelle ", "") & " " & " ,ncts_ObjectName as Bezugsnummer " & - "FROM [tblDakosy_NCTSOut] INNER JOIN [tblDakosy_NCTSOut_Sicherheitsangaben] on ncts_Id=[nctsSA_NctsId] " + " , nctsSA_GRN as GRN " & + " FROM [tblDakosy_NCTSOut] INNER JOIN [tblDakosy_NCTSOut_Sicherheitsangaben] on ncts_Id=[nctsSA_NctsId] " sqlatr &= " WHERE nctsSA_GRN IN (" & _BRG_VALUE & ") and ncts_Status between 50 and 60 " ' CONVERT(date, ncts_Trans_DatumZeit ,104 ) BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'" sqlatr &= where @@ -38,8 +39,9 @@ sqlatr = " Select TOP 100 AnmeldungsDatum As Datum , (Select [CrossIdnt] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID ) As Kennzeichen, isnull(CRN,'') as MRN, (select [CrossIdntNat] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID ) as Land, cast(GarantieWert as Decimal(17,2)) as GarantieBetrag,(SELECT [Na] FROM [ezoll].[dbo].[zsAnmCarrTra] where [zsAnmCarrTra].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID) as Firma " sqlatr &= " " & If(_BRG_TEXT.Contains("TOBB") Or _BRG_TEXT.Contains("OREGON"), ", isnull(Bestimmungszollstelle,'') as Bestimmungsstelle ", "") & " " sqlatr &= " ,LRN as Bezugsnummer " + sqlatr &= " , GRN " sqlatr &= " FROM vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu " - sqlatr &= " WHERE GRN IN (" & _BRG_VALUE & ") and cast( AnmeldungsDatum as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "' " + sqlatr &= " WHERE GRN IN (" & _BRG_VALUE & ") and cast( AnmeldungsDatum as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "' " sqlatr &= " ORDER BY Datum " Dim dt2 As DataTable = SQL.loadDgvBySql(sqlatr, "EZOLL", 120) diff --git a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb index 705472f5..01d7518b 100644 --- a/VERAG_PROG_ALLGEMEIN/cAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/cAllgemein.vb @@ -450,7 +450,7 @@ Public Class cNCTS_GUARANTEES Public Shared TOBB() As String = {"17TR0004000032349", "20TR0004000069756", "13TR0004000009323", "21TR0004000097157", "12TR0004000004665", "15TR0004000020917", "17TR0004000029518", "20DE0000000078205", "19IT01TR000003323", "21TR0004000079552", "21TR0004000078157", "21TR0004000090364", "21TR0004000092350", "20TR0004000069557", "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356"} - 'old: {"15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518", "21TR0004000079552", "21TR0004000078157", "21TR0004000092350", "20TR0004000069756", "21TR0004000090364", "21TR0004000097157"} + 'old: {"15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518"f, "21TR0004000079552", "21TR00x04000078157", "21TR0004000092350", "20TR0004000069756", "21TR0004000090364", "21TR0004000097157"} Public Shared OREGON() As String = {"18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153", "21DE0000000079716", "21DE0000000081910"} Public Shared VERAG() As String = {"17DE0000000071678", "05AT510000G000FP7"} Public Shared IMEX() As String = {"16AT520000G000VA6"}