edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gutschrift-SR, VerzPreise, div.

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-12-14 21:21:57 +01:00
parent 92f1e75562
commit b5cbe59199
8 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SDL/Fakturierung/cFakturierung.vb
View File

@@ -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"

3
SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb
View File

@@ -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

7
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -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

1
SDL/SMS/frmSendSMS.vb
View File

@@ -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

5
SDL/kunden/frmKundenUebersichtZOLL.vb
View File

@@ -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

4
VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb
View File

@@ -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

6
VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb
View File

@@ -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)

2
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

@@ -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"}