iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
@@ -1642,18 +1542,103 @@
296, 17
-
- True
-
-
- True
-
-
- True
-
-
- True
-
+
+
+ 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
+ AElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAytJREFUOE+d
+ kmtIU2EYx3df01qiZYX0JfuYBEFF2U2JEgqESCgScYpQZlYalV20mpUVRuk03+k2L7Plpt0sO5ouK7tf
+ zcsSnYlCecl5vLy7uXOezuYpEhOqHzzwwvv8f/CHh/MTHo/H9/PznxUt25+kLiQGr98wkunpWTG+vn4+
+ fD6fy679EZIkJx5CoVAUvDYsVqU1jpdXN43nEv2WHMJC3qlpHG9u73VGRspC/f3ne09sT8Uj4nJ5/OUr
+ N8Yo9C3DOY8HB98NA27HgHtsgM1WwPc7qd6OfiupUun2sbkpeERSqa/05Nky52F9f9+tLsCPBwC7ZZ9G
+ AX8YAfzMAriszTXwtOF997JlK9ew2Ul4ROvWb086eqnKcbEBsLoZsFv2sBdwPSOs6wdc2QO4qNk1ml5q
+ /pKRka1ns5PwiKJk578HJzc1h2TaamN1zobLL6iurNd0i/wRZUwhXLXKRtqS+ZweOWjAnUplEcFmJ+ER
+ 7Yw8M7TqwMfWoNQxtC3fUXCkiiqT19Pa1Ic0SqqkmHHd3qF23N2lHG3IzdVMLwoJjZKFx+QNbM1xoORK
+ F1K8pZHeDOhmF6DCFkByI41kWkeBvNT8LSUlY3qRROLts+9o4VCczqa5+opGNb2AmuyATE5AL4YBlZgA
+ pVVTqvonr1tFIrEXm52ER8QcAGfJkuCQs4r7HZpGu/rN0Hj+IEWjURpQu51SVXW71ApFOWRmFn/dvGlL
+ uFjAEXvSv8GKOByBQCRZsWJzXOL+C905xcSn9j6LvmeALLtn/NhXcfNBa3LyxdaiwsrOiuxjddd2Lyzx
+ 9ebOnUhO8Ev0kwULAleHhcl00dGHiLi4I0RERAIhEAi9REKh+FxCrMGkDQer6TRk7w0smT+bG8DGpoqm
+ Q8DjiOPXzdR2KIPAZToJuOkEXNmzWDOPlf21yM1MMWdOYqikpA0tZWTHYYyRZcUvKmZqzvknkRufGdyA
+ hA1emrY8t+wEU/MM5MUvNNjGyBnsyt/jI+EGJIZIis3ump/ToOelBiinXcp+/xtMzbmJG7wMhqvHQH7q
+ GthsjMjd738Gj5ASh80mtVrtUpqmOT8ASDXvdskQmQUAAAAASUVORK5CYII=
+
+
True
@@ -1898,9 +1883,6 @@
174, 17
-
- 404, 17
-
596, 17
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 5e7f3be..658911d 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -6,6 +6,7 @@ Imports System.Management
Imports System.Data.SqlClient
Imports iTextSharp.text.pdf
Imports Microsoft.Office.Interop
+Imports DocumentFormat.OpenXml.Presentation
Public Class frmSendungsdetailsNEU
Public AvisoId As Integer
@@ -295,7 +296,7 @@ Public Class frmSendungsdetailsNEU
End If
-
+
End If
initVorpapiere()
@@ -900,7 +901,8 @@ Public Class frmSendungsdetailsNEU
b_add.Size = New Size(30, 30)
b_add.Margin = New Padding(2, 22, 0, 0)
b_add.Text = "+"
- b_add.Font = New Font(b_add.Font.FontFamily, 14, FontStyle.Bold)
+ 'b_add.Font = New Font()
+ 'b_add.Font.FontFamily, 14, FontStyle.Bold)
b_add.BackColor = Color.LightGray()
AddHandler b_add.Click, Sub(send As Object, ev As EventArgs)
If AVISO.Abgeschlossen Then Exit Sub
@@ -2916,12 +2918,12 @@ Public Class frmSendungsdetailsNEU
End If
End If
End If
- End If
End If
+ End If
- txtAnzahlPos.Visible = (cboFiliale._value = "7001")
+ txtAnzahlPos.Visible = (cboFiliale._value = "7001")
Label4.Visible = (cboFiliale._value = "7001")
Dim tmp = cboAbfertigungsart._value
@@ -3977,20 +3979,20 @@ Public Class frmSendungsdetailsNEU
Dim TextHTML = ""
TextHTML &= "Sehr geehrte Damen und Herren,
"
TextHTML &= "
"
- TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.
"
- TextHTML &= "
"
+ TextHTML &= "beiliegend senden wir Ihnen die Sendungsunterlagen für den o.g. LKW/Container. Wir bitten um Zusendung der ATA-Nummer.
"
+ TextHTML &= "
"
- TextHTML &= "Mit freundlichen Grüßen
"
- TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
- TextHTML &= "
"
+ TextHTML &= "Mit freundlichen Grüßen
"
+ TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
+ TextHTML &= "
"
- Mail.HTMLBody = "" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
"
+ Mail.HTMLBody = "" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
"
- AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
+ AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "ATA-Nr fehlt (Fremdanmeldung) - angefordert", 33)
- End If
+ End If
- Mail.Display()
+ Mail.Display()
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
@@ -4087,7 +4089,7 @@ Public Class frmSendungsdetailsNEU
DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = True
End If
Else
- If pnlKundenInfo.Controls.Count > 0 Then
+ If pnlKundenInfo.Controls.Count > 0 Then
DirectCast(pnlKundenInfo.Controls(0), SDL.usrCntlKundenuebersicht).Visible = False
End If
End If
@@ -4718,7 +4720,7 @@ Public Class frmSendungsdetailsNEU
Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr)
If AD IsNot Nothing Then
Blatt.Range("E13").Value = AD.Name_1
- Blatt.Range("E14").Value = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "") & " " & If(AD.Straße, "")).trim
+ Blatt.Range("E14").Value = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "") & " " & If(AD.Straße, "")).Trim
End If
Blatt.Range("E13").Value = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer
Else
@@ -5365,41 +5367,19 @@ Public Class frmSendungsdetailsNEU
Me.Cursor = Cursors.Default
End Sub
- Private Sub Button17_Click_2(sender As Object, e As EventArgs) Handles Button17.Click
- Dim f As New SDL.frmCMR
+ Sub calculateFreightCosts()
- f.btnCMRtoAkt.Visible = True
- f.txtCMRName.Visible = True
+ Dim frachkosten = New frmFrachtkostenBerechnen(txtAbsenderKdNr._value, txtEmpfaengerKdNr._value, txtGewicht.Text)
- If txtAbsender.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtAbsender.Text = txtAbsender.KdData_ADRESSEN.getAdressFromatted()
- If txtFrachtfuehrer.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtFrachtführer.Text = txtFrachtfuehrer.KdData_ADRESSEN.getAdressFromatted()
- If txtEmpfaenger.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtEmpfänger.Text = txtEmpfaenger.KdData_ADRESSEN.getAdressFromatted()
-
- f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "")))
-
- f.uCmr.txtKfz.Text = AVISO.LKW_Nr
- f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr
-
- If f.ShowDialog(Me) Then
-
- Dim da_id = -1
- Dim anhId = -1
- Dim destPath = ""
-
- Dim Typ = ""
-
- If f.PDF_Path <> "" Then
- Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR")
- frmSendungAnhangImport.saveToDS(AvisoId, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID)
- initAnhang()
-
- End If
+ If frachkosten.ShowDialog() = DialogResult.OK Then
+ ' TODO -> Rückgabewert von Frachkostenberechnung
End If
+
End Sub
Private Sub Button18_Click_1(sender As Object, e As EventArgs) Handles Button18.Click
- MsgBox("Funktion noch nicht verfügbar!")
+ calculateFreightCosts()
End Sub
End Class