Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024
This commit is contained in:
@@ -1094,8 +1094,8 @@ Public Class cFakturierung
|
||||
|
||||
|
||||
rpt.lblFirmenbuch.Text = If(FIRMA.Firma_Firmenbuch, "").ToString.Replace("Firmenbuch:", "").Trim
|
||||
rpt.lblUID.Text = If(FIRMA.Firma_UID, "")
|
||||
rpt.lblEORI.Text = If(FIRMA.Firma_EORI, "")
|
||||
rpt.lblUID.Text = If(FIRMA.Firma_UID, "").ToString.Replace("UID: ", "").Trim
|
||||
rpt.lblEORI.Text = If(FIRMA.Firma_EORI, "").ToString.Replace("EORI: ", "").Trim
|
||||
|
||||
'Für Vorschau:
|
||||
If Buchungsjahr Is DBNull.Value Then Buchungsjahr = Now.Year
|
||||
@@ -1450,9 +1450,9 @@ Public Class cFakturierung
|
||||
rpt.lblLKWId.Text = If(Rechnung.AvisoID, "")
|
||||
|
||||
Dim sachbearbeiterAufRechnung = getSBRgName(Rechnung.Firma_ID, Rechnung.Sachbearbeiter)
|
||||
Select Case Rechnung.Firma_ID
|
||||
Case 24 : rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu" Or sachbearbeiterAufRechnung = "Frau Wallner", "Verrechnung", sachbearbeiterAufRechnung) 'AMBAR HALT---ohne Worte
|
||||
End Select
|
||||
|
||||
rpt.lblSachbearbeiter.Text = IIf((sachbearbeiterAufRechnung = "Herr Ordu" Or sachbearbeiterAufRechnung = "Frau Wallner") And Rechnung.Firma_ID = 24, "Verrechnung", sachbearbeiterAufRechnung) 'AMBAR HALT---ohne Worte
|
||||
|
||||
'If(RECHNUNG.Sachbearbeiter, "")
|
||||
|
||||
rpt.txtAbsender.Text = If(Rechnung.AbsenderName_1, "") & " " & If(Rechnung.AbsenderName_2, "") & vbNewLine & If(Rechnung.AbsenderOrt, "").ToString.Trim
|
||||
@@ -2248,7 +2248,7 @@ Public Class cFakturierung
|
||||
rpt.lblLKWId.Text = If(RECHNUNG.AvisoID, "")
|
||||
|
||||
Dim sachbearbeiterAufRechnung = getSBRgName(RECHNUNG.Firma_ID, RECHNUNG.Sachbearbeiter)
|
||||
rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu", "Verrechnung", sachbearbeiterAufRechnung) 'If(RECHNUNG.Sachbearbeiter, "")
|
||||
rpt.lblSachbearbeiter.Text = IIf((sachbearbeiterAufRechnung = "Herr Ordu" Or sachbearbeiterAufRechnung = "Frau Wallner") And RECHNUNG.Firma_ID = 24, "Verrechnung", sachbearbeiterAufRechnung) 'If(RECHNUNG.Sachbearbeiter, "")
|
||||
|
||||
If firma.Firma_ID = 4 Then
|
||||
rpt.lblWarenWertUeberschrift.Visible = False
|
||||
@@ -5023,14 +5023,15 @@ Public Class cFakturierung
|
||||
'rpt.lblAbfertigungsDatum.Text = RECHNUNG.Abfertigungsdatum.ToShortDateString
|
||||
'rpt.lblLKWId.Text = If(RECHNUNG.AvisoID, "")
|
||||
|
||||
|
||||
Dim sachbearbeiterAufRechnung = getSBRgName(Row("Firma_ID"), VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, Row("Sachbearbeiter"), True)
|
||||
rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu", "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
|
||||
rpt.lblSachbearbeiter.Text = IIf((sachbearbeiterAufRechnung = "Herr Ordu" Or sachbearbeiterAufRechnung = "Frau Wallner") And Row("Firma_ID") = 24, "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
|
||||
|
||||
|
||||
'rpt.lblSachbearbeiter.Text = getSBRgName(Firma.Firma_ID, VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben
|
||||
rpt.lblFirmenbuch.Text = If(Firma.Firma_Firmenbuch, "").ToString.Replace("Firmenbuch: ", "").Trim
|
||||
rpt.lblUID.Text = If(Firma.Firma_UID, "").ToString.Replace("UID: ", "").Trim
|
||||
rpt.lblEORI.Text = If(Firma.Firma_EORI, "")
|
||||
rpt.lblEORI.Text = If(Firma.Firma_EORI, "").ToString.Replace("EORI: ", "").Trim
|
||||
|
||||
rpt.txtKdAuftragsnummer.Text = If(Row("KdAuftragsNr") IsNot DBNull.Value, Row("KdAuftragsNr"), "")
|
||||
|
||||
@@ -5453,7 +5454,7 @@ Public Class cFakturierung
|
||||
'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben
|
||||
rpt.lblFirmenbuch.Text = If(Firma.Firma_Firmenbuch, "").ToString.Replace("Firmenbuch: ", "").Trim
|
||||
rpt.lblUID.Text = If(Firma.Firma_UID, "").ToString.Replace("UID: ", "").Trim
|
||||
rpt.lblEORI.Text = If(Firma.Firma_EORI, "")
|
||||
rpt.lblEORI.Text = If(Firma.Firma_EORI, "").ToString.Replace("EORI: ", "").Trim
|
||||
|
||||
'rpt.txtKdAuftragsnummer.Text = If(Row("KdAuftragsNr") IsNot DBNull.Value, Row("KdAuftragsNr"), "")
|
||||
|
||||
@@ -5868,7 +5869,10 @@ Public Class cFakturierung
|
||||
'rpt.lblAbfertigungsDatum.Text = RECHNUNG.Abfertigungsdatum.ToShortDateString
|
||||
'rpt.lblLKWId.Text = If(RECHNUNG.AvisoID, "")
|
||||
Dim sachbearbeiterAufRechnung = getSBRgName(ROW("Firma_ID"), VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, ROW("Sachbearbeiter"), True)
|
||||
rpt.lblSachbearbeiter.Text = IIf(sachbearbeiterAufRechnung = "Herr Ordu", "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
|
||||
|
||||
rpt.lblSachbearbeiter.Text = IIf((sachbearbeiterAufRechnung = "Herr Ordu" Or sachbearbeiterAufRechnung = "Frau Wallner") And ROW("Firma_ID") = 24, "Verrechnung", sachbearbeiterAufRechnung) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - NEU
|
||||
|
||||
|
||||
|
||||
'rpt.lblSachbearbeiter.Text = getSBRgName(ROW("Firma_ID"), VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) 'könnten ja mehrerer SB die Rg-Anlagen geschreiben haben - ALT
|
||||
|
||||
|
||||
@@ -313,12 +313,15 @@ Partial Class usrcntlVerzollungspreise
|
||||
'cbxAusDB
|
||||
'
|
||||
Me.cbxAusDB.AutoSize = True
|
||||
Me.cbxAusDB.Checked = True
|
||||
Me.cbxAusDB.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.cbxAusDB.Location = New System.Drawing.Point(243, 13)
|
||||
Me.cbxAusDB.Name = "cbxAusDB"
|
||||
Me.cbxAusDB.Size = New System.Drawing.Size(61, 17)
|
||||
Me.cbxAusDB.TabIndex = 40
|
||||
Me.cbxAusDB.Text = "aus DB"
|
||||
Me.cbxAusDB.UseVisualStyleBackColor = True
|
||||
Me.cbxAusDB.Visible = False
|
||||
'
|
||||
'usrcntlVerzollungspreise
|
||||
'
|
||||
|
||||
@@ -75,52 +75,62 @@
|
||||
End Sub
|
||||
|
||||
Private Sub usrcntlVollmacht_AT_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
initControlsHandler()
|
||||
|
||||
Select VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
initControlsHandler()
|
||||
MyComboBox1.Items.Clear()
|
||||
|
||||
Dim SQLWhere As String = " WHERE Firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' and Aktiv = 1 "
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" AndAlso Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
SQLWhere &= " AND NOT TarifCode like '%FISKAL%'"
|
||||
End If
|
||||
|
||||
MyComboBox1.fillWithSQL("SELECT TarifCode, Bezeichnung FROM tblVZPreislistentypen " & SQLWhere, False, "FMZOLL")
|
||||
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Case "IMEX"
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Customs Service GmbH", "IMEX"))
|
||||
cboFirma.changeItem("IMEX")
|
||||
MyComboBox1.Items.Clear()
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
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
|
||||
'MyComboBox1.Items.Clear()
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
''MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
'' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
''If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
'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
|
||||
MyComboBox1.changeItem("VZ")
|
||||
Case "UNISPED"
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED Speditions GmbH", "UNISPED"))
|
||||
cboFirma.changeItem("UNISPED")
|
||||
MyComboBox1.Items.Clear()
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
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
|
||||
'MyComboBox1.Items.Clear()
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
''MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
'' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
''If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
'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
|
||||
MyComboBox1.changeItem("VZ")
|
||||
Case "IMEX"
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX Customs Service GmbH", "IMEX"))
|
||||
cboFirma.changeItem("IMEX")
|
||||
MyComboBox1.Items.Clear()
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
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"))
|
||||
'MyComboBox1.Items.Clear()
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
''MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
'' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
''If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
'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
|
||||
MyComboBox1.changeItem("VZ")
|
||||
Case "ATILLA"
|
||||
@@ -129,34 +139,36 @@
|
||||
Case "AMBAR"
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR Logistic Services GmbH", "AMBAR"))
|
||||
cboFirma.changeItem("AMBAR")
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Fiskal DE", "VZ_FISKAL_DE"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "VZ"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Fiskal DE", "VZ_FISKAL_DE"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "VZ"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
Case Else
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Spedition AG", "AG"))
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG Customs Service GmbH", "CS"))
|
||||
cboFirma.changeItem("AG")
|
||||
MyComboBox1.Items.Clear()
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
'MyComboBox1.Items.Clear()
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung EV", "VZ_EV"))
|
||||
'' MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Lebensmittel Backwaren", "VZ_SPECIAL_2"))
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FISKAL_Preise", Me.FindForm) Then
|
||||
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"))
|
||||
'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
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BREXIT", "AVISO") Then
|
||||
cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-UNISPED Ltd", "LTD"))
|
||||
End If
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handling", "HANDLING"))
|
||||
MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Privatperson", "PRIVAT"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handling", "HANDLING"))
|
||||
'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Privatperson", "PRIVAT"))
|
||||
MyComboBox1.changeItem("VZ")
|
||||
End Select
|
||||
|
||||
|
||||
@@ -8,11 +8,6 @@ Imports System.Reflection
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports System.Windows.Documents
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
Imports com.sun.tools.internal.ws.wsdl.document.mime
|
||||
Imports com.sun.xml.internal.ws.message.stream
|
||||
Imports com.sun.org.apache.xerces.internal.xs
|
||||
Imports DocumentFormat.OpenXml.Drawing.Diagrams
|
||||
Imports DAKOSY_Worker.VERAG_KundenStamm_Export
|
||||
|
||||
Public Class frmFormulare
|
||||
Dim isSingleForm = False
|
||||
@@ -1487,7 +1482,7 @@ Public Class frmFormulare
|
||||
|
||||
Private Sub cboVorlage_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboVorlage.SelectedIndexChanged
|
||||
If cboVorlage._value = "" Then Exit Sub
|
||||
If MyFlowLayoutPanel1.Controls.Count = 0 OrElse vbYes = MsgBox("Beim Laden einer Vorlagengruppe werden alle vohanden Elemente gelöscht. Möchten Sie fortfahren?", vbYesNoCancel) Then
|
||||
If MyFlowLayoutPanel1.Controls.Count = 0 OrElse vbYes = MsgBox("Beim Laden einer Vorlagengruppe werden alle vorhandenen Elemente gelöscht. Möchten Sie fortfahren?", vbYesNoCancel) Then
|
||||
Select Case cboVorlage._value
|
||||
Case FormularVorlagenGruppe.NeukundeAT
|
||||
MyFlowLayoutPanel1.Controls.Clear()
|
||||
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.5.2.4")>
|
||||
<Assembly: AssemblyFileVersion("1.5.2.4")>
|
||||
<Assembly: AssemblyVersion("1.5.2.6")>
|
||||
<Assembly: AssemblyFileVersion("1.5.2.6")>
|
||||
|
||||
1133
SDL/USTV/frmMDM_USTVAntrag.Designer.vb
generated
1133
SDL/USTV/frmMDM_USTVAntrag.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -542,6 +542,8 @@ Public Class frmMDM_USTVAntrag
|
||||
btnRMCQuartal.Visible = False
|
||||
End If
|
||||
|
||||
If USTV_ANTRAG.UStVAn_LandKz IsNot Nothing Then pbXMLExport.Visible = setXMLExportVisible(USTV_ANTRAG.UStVAn_LandKz)
|
||||
|
||||
Else
|
||||
Dim sqlWhere As String = ""
|
||||
'neuer USTVA-Antrag
|
||||
@@ -609,6 +611,8 @@ Public Class frmMDM_USTVAntrag
|
||||
End If
|
||||
|
||||
|
||||
pbXMLExport.Visible = False
|
||||
|
||||
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then
|
||||
btnAntrageeinarbeiten.Enabled = False
|
||||
FlowLayoutPanel.Enabled = False
|
||||
@@ -4069,7 +4073,7 @@ Public Class frmMDM_USTVAntrag
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
|
||||
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles pbXMLExport.Click
|
||||
|
||||
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
@@ -4088,6 +4092,10 @@ Public Class frmMDM_USTVAntrag
|
||||
Dim KUNDE As New cKunde(USTV_ANTRAG.UStVAn_KuNr)
|
||||
Dim KUNDE_ERW As New cKundenErweitert(USTV_ANTRAG.UStVAn_KuNr)
|
||||
|
||||
Dim BANK_OWNER As String = ""
|
||||
Dim BANK_IBAN As String = ""
|
||||
Dim BANK_BIC As String = ""
|
||||
|
||||
If IsDBNull(ADR.UstIdNr) OrElse ADR.UstIdNr Is Nothing Then
|
||||
MsgBox("UID-Nr ist nicht im Kunden hinterlegt!")
|
||||
End If
|
||||
@@ -4120,6 +4128,27 @@ Public Class frmMDM_USTVAntrag
|
||||
End If
|
||||
|
||||
|
||||
Select Case Antrag_LandKz
|
||||
Case "AT", "DE", "CZ", "BE", "SI"
|
||||
BANK_OWNER = FIRMA.Firma_Bez
|
||||
BANK_IBAN = FIRMA.Firma_IBAN1
|
||||
BANK_BIC = FIRMA.Firma_BIC1
|
||||
|
||||
Case Else
|
||||
'Bank aus Kunden!
|
||||
Dim dtBank As New DataTable
|
||||
dtBank = SQL.loadDgvBySql("SELECT isnull(bnk_name,'') as bnk_name ,bnk_anschrift,ISNULL(bnk_iban,'') as bnk_iban,ISNULL(bnk_bic,'') as bnk_bic FROM [tblBankverbindungen] WHERE isnull(bnk_hauptkonto,0) = 0 and bnk_archiv = 0 and bnk_KundenNr = " & KUNDE.KundenNr, "FMZOLL")
|
||||
|
||||
If dtBank.Rows.Count > 0 Then
|
||||
BANK_OWNER = ADR.Name_1
|
||||
BANK_IBAN = dtBank.Rows(0).Item("bnk_iban")
|
||||
BANK_BIC = dtBank.Rows(0).Item("bnk_bic")
|
||||
End If
|
||||
'wenn nicht hinterlegt, dann leer lassen!
|
||||
|
||||
End Select
|
||||
|
||||
|
||||
Dim app As New VATRefundApplication() With {
|
||||
.CodF1 = New FormInfo With {.FormType = "D318", .FormId = 318, .UniversalCode = "D318_A1.0.0"},
|
||||
.RefundPeriod = New Period With {.StartDate = CDate(USTV_ANTRAG.UStVAn_ReDatVon).Month, .EndDate = CDate(USTV_ANTRAG.UStVAn_ReDatBis).Month},
|
||||
@@ -4130,7 +4159,7 @@ Public Class frmMDM_USTVAntrag
|
||||
.Currency = USTV_ANTRAG.UStVAn_Währungscode,
|
||||
.ApplicationType = 1,
|
||||
.ReferenceNumber = "",
|
||||
.Annual = 0,
|
||||
.Annual = IIf(CDate(USTV_ANTRAG.UStVAn_ReDatVon).Month = 1 And CDate(USTV_ANTRAG.UStVAn_ReDatBis).Month = 12, 1, 0),
|
||||
.an_r = CDate(USTV_ANTRAG.UStVAn_ReDatBis).Year,
|
||||
.d_rec = 0,
|
||||
.luna_r = CDate(USTV_ANTRAG.UStVAn_ReDatBis).Month,
|
||||
@@ -4159,11 +4188,11 @@ Public Class frmMDM_USTVAntrag
|
||||
},
|
||||
.DetailedBankAccount = New BankAccount With {
|
||||
.Total = txtSummeEUR._value.ToString.Replace(",", "."),
|
||||
.Currency = "EUR",
|
||||
.Currency = USTV_ANTRAG.UStVAn_Währungscode,
|
||||
.OwnerType = 1,
|
||||
.OwnerName = "VERAG 360 GMBH",
|
||||
.IBAN = "AT053445500004210225",
|
||||
.BIC = "RZOOAT2L455"
|
||||
.OwnerName = BANK_OWNER,
|
||||
.IBAN = BANK_IBAN,
|
||||
.BIC = BANK_BIC
|
||||
},
|
||||
.NumberOfDocuments = New NumberOfDocuments With {.AtachatedFiles = 0, .PurchaseOrders = dgvUSTVPositionen.SelectedRows.Count, .ImportOrders = 0},
|
||||
.ApplicantSignature = New Signature With {.NameFree = "LUXBAUER BRIGITTE", .Position = "IMPUTERNICIT"}
|
||||
@@ -4190,7 +4219,7 @@ Public Class frmMDM_USTVAntrag
|
||||
End If
|
||||
|
||||
LeistenderName = row.Cells("UStVPo_Leistender").Value
|
||||
LeistenderName.ToString.Replace(Antrag_LandKz, "")
|
||||
LeistenderName = LeistenderName.ToString.Replace(Antrag_LandKz, "")
|
||||
|
||||
Dim Nettobetrag As Double = 0
|
||||
If Not IsDBNull(row.Cells("UStVPo_Nettobetrag").Value) AndAlso IsNumeric(row.Cells("UStVPo_Nettobetrag").Value) Then Nettobetrag = CDbl(row.Cells("UStVPo_Nettobetrag").Value)
|
||||
@@ -4200,22 +4229,23 @@ Public Class frmMDM_USTVAntrag
|
||||
Dim Bez As String = row.Cells("UStVPo_Leistungsbezeichnung").Value
|
||||
Bez = Bez.ToLower
|
||||
|
||||
If row.Cells("UStVPo_SchnittstellenNr").Value = 10 Then
|
||||
'UTA überspringen
|
||||
ElseIf row.Cells("UStVPo_SchnittstellenNr").Value = 9 Then
|
||||
maut = True 'MSE immer MAUT
|
||||
Else
|
||||
If Bez.Contains("maut") Or Bez.Contains("toll") Then maut = True
|
||||
If Bez.Contains("diesel") Or Bez.Contains("fuel") Then diesel = True
|
||||
If Bez.Contains("parkplatz") Then parkplatz = True
|
||||
If Bez.Contains("zubeh") Then zubeh = True
|
||||
If Bez.Contains("übern") Then uebernachtung = True
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Dim goods As New GoodsDescription With {.GoodsItem = New List(Of GoodsItem)}
|
||||
|
||||
'diesel Code 1 SubCode 1.1.2
|
||||
'maut Code 4 SubCode 4.1
|
||||
'Zubehör Code 3 SubCode 3.1.5
|
||||
'parkplatz Code 3 SubCode 3.1.4
|
||||
'Übernachtung Code 6 SubCode 6.5
|
||||
|
||||
Dim goods As New GoodsDescription With {.GoodsItem = New List(Of GoodsItem)}
|
||||
|
||||
If diesel Then
|
||||
goods.GoodsItem.Add(New GoodsItem With {.Code = 1, .SubCode = "1.1.2", .FreeText = ""})
|
||||
@@ -4237,6 +4267,13 @@ Public Class frmMDM_USTVAntrag
|
||||
goods.GoodsItem.Add(New GoodsItem With {.Code = 6, .SubCode = "6.5", .FreeText = ""})
|
||||
End If
|
||||
|
||||
Select Case Antrag_LandKz
|
||||
Case "DE", "CZ", "LU"
|
||||
For Each good In goods.GoodsItem
|
||||
good.SubCode = "" 'SUbcodes leeren
|
||||
Next
|
||||
End Select
|
||||
|
||||
|
||||
app.PurchaseInformation.Invoices.Add(New Invoice With {
|
||||
.SequenceNumber = counter,
|
||||
@@ -4433,4 +4470,21 @@ Public Class frmMDM_USTVAntrag
|
||||
End If
|
||||
End Function
|
||||
|
||||
Private Function setXMLExportVisible(ISOLand As String)
|
||||
|
||||
Dim valid As Boolean = False
|
||||
|
||||
If ISOLand = "" Then Return valid
|
||||
|
||||
Select Case ISOLand
|
||||
Case "RO" : valid = True
|
||||
Case Else : valid = False
|
||||
|
||||
End Select
|
||||
|
||||
Return valid
|
||||
|
||||
|
||||
End Function
|
||||
|
||||
End Class
|
||||
@@ -1547,7 +1547,7 @@ Public Class cFormularManager
|
||||
|
||||
|
||||
|
||||
Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional filename As String = "", Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String
|
||||
Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional filename As String = "", Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True, Optional showError As Boolean = True) As String
|
||||
Try
|
||||
If targetPath = "" Then
|
||||
If filename <> "" Then
|
||||
@@ -1584,10 +1584,78 @@ Public Class cFormularManager
|
||||
|
||||
Return targetPath
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, IIf(Not showError, "LOG", ""))
|
||||
End Try
|
||||
Return ""
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Function getFile_FromURLStream(URL As String, Optional filename As String = "", Optional targetPath As String = "", Optional showError As Boolean = True) As String
|
||||
Try
|
||||
Using webClient As New Net.WebClient()
|
||||
|
||||
' Download data
|
||||
Dim data() As Byte = webClient.DownloadData(URL)
|
||||
|
||||
' Read Content-Type header
|
||||
Dim contentType As String = webClient.ResponseHeaders("Content-Type")
|
||||
|
||||
If contentType IsNot Nothing Then
|
||||
contentType = contentType.ToLower()
|
||||
Else
|
||||
contentType = ""
|
||||
End If
|
||||
|
||||
' Determine extension from Content-Type
|
||||
Dim extension As String = ""
|
||||
|
||||
If contentType.Contains("pdf") Then
|
||||
extension = ".pdf"
|
||||
|
||||
ElseIf contentType.Contains("excel") OrElse contentType.Contains("spreadsheetml") OrElse contentType.Contains("ms-excel") Then
|
||||
|
||||
' xlsx or xls
|
||||
If contentType.Contains("spreadsheetml") Then
|
||||
extension = ".xlsx"
|
||||
Else
|
||||
extension = ".xls"
|
||||
End If
|
||||
End If
|
||||
|
||||
' Build target path
|
||||
Dim fullPath As String = System.IO.Path.Combine(System.IO.Path.GetTempPath(), filename & extension)
|
||||
|
||||
' Handle based on file type
|
||||
If extension = ".pdf" Then
|
||||
|
||||
Using stream As New MemoryStream(data)
|
||||
Dim doc As New Spire.Pdf.PdfDocument()
|
||||
doc.LoadFromStream(stream)
|
||||
doc.SaveToFile(fullPath)
|
||||
targetPath = fullPath
|
||||
|
||||
End Using
|
||||
|
||||
ElseIf extension = ".xls" OrElse extension = ".xlsx" Then
|
||||
System.IO.File.WriteAllBytes(fullPath, data)
|
||||
targetPath = fullPath
|
||||
Else
|
||||
' Unknown file type – save raw
|
||||
fullPath = fullPath & ".bin"
|
||||
System.IO.File.WriteAllBytes(fullPath, data)
|
||||
End If
|
||||
|
||||
End Using
|
||||
|
||||
|
||||
|
||||
Return targetPath
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, IIf(Not showError, "LOG", ""))
|
||||
End Try
|
||||
Return ""
|
||||
End Function
|
||||
|
||||
Public Shared Sub PrintViaGS(PDFFile As String, printerName As String)
|
||||
Try
|
||||
Dim assembly = System.Reflection.Assembly.GetExecutingAssembly()
|
||||
|
||||
Reference in New Issue
Block a user