diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb
index e46fdbf6..76fa0099 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.Designer.vb
@@ -53,6 +53,8 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxEinmaligeVollmachtCarnetATA = New System.Windows.Forms.CheckBox()
Me.txtEinmalig_CarnetATA = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtVmDat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label9 = New System.Windows.Forms.Label()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -140,7 +142,7 @@ Partial Class usrcntlVollmacht_DE_indirekt
'
'btn
'
- Me.btn.BackgroundImage = Global.SDL.My.Resources.search
+ Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.search
Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn.Location = New System.Drawing.Point(937, 34)
@@ -163,12 +165,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtAnsprechpartner._DateTimeOnly = False
Me.txtAnsprechpartner._numbersOnly = False
Me.txtAnsprechpartner._numbersOnlyKommastellen = ""
+ Me.txtAnsprechpartner._numbersOnlyTrennzeichen = True
Me.txtAnsprechpartner._Prozent = False
Me.txtAnsprechpartner._ShortDateNew = False
Me.txtAnsprechpartner._ShortDateOnly = False
Me.txtAnsprechpartner._TimeOnly = False
+ Me.txtAnsprechpartner._TimeOnly_Seconds = False
Me.txtAnsprechpartner._value = Nothing
Me.txtAnsprechpartner._Waehrung = False
+ Me.txtAnsprechpartner._WaehrungZeichen = True
Me.txtAnsprechpartner.ForeColor = System.Drawing.Color.Black
Me.txtAnsprechpartner.Location = New System.Drawing.Point(653, 9)
Me.txtAnsprechpartner.MaxLineLength = -1
@@ -183,12 +188,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtEinmalig_RgDat._DateTimeOnly = False
Me.txtEinmalig_RgDat._numbersOnly = False
Me.txtEinmalig_RgDat._numbersOnlyKommastellen = ""
+ Me.txtEinmalig_RgDat._numbersOnlyTrennzeichen = True
Me.txtEinmalig_RgDat._Prozent = False
Me.txtEinmalig_RgDat._ShortDateNew = False
Me.txtEinmalig_RgDat._ShortDateOnly = False
Me.txtEinmalig_RgDat._TimeOnly = False
+ Me.txtEinmalig_RgDat._TimeOnly_Seconds = False
Me.txtEinmalig_RgDat._value = Nothing
Me.txtEinmalig_RgDat._Waehrung = False
+ Me.txtEinmalig_RgDat._WaehrungZeichen = True
Me.txtEinmalig_RgDat.Enabled = False
Me.txtEinmalig_RgDat.ForeColor = System.Drawing.Color.Black
Me.txtEinmalig_RgDat.Location = New System.Drawing.Point(653, 162)
@@ -204,12 +212,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtEinmalig_RgNr._DateTimeOnly = False
Me.txtEinmalig_RgNr._numbersOnly = False
Me.txtEinmalig_RgNr._numbersOnlyKommastellen = ""
+ Me.txtEinmalig_RgNr._numbersOnlyTrennzeichen = True
Me.txtEinmalig_RgNr._Prozent = False
Me.txtEinmalig_RgNr._ShortDateNew = False
Me.txtEinmalig_RgNr._ShortDateOnly = False
Me.txtEinmalig_RgNr._TimeOnly = False
+ Me.txtEinmalig_RgNr._TimeOnly_Seconds = False
Me.txtEinmalig_RgNr._value = Nothing
Me.txtEinmalig_RgNr._Waehrung = False
+ Me.txtEinmalig_RgNr._WaehrungZeichen = True
Me.txtEinmalig_RgNr.Enabled = False
Me.txtEinmalig_RgNr.ForeColor = System.Drawing.Color.Black
Me.txtEinmalig_RgNr.Location = New System.Drawing.Point(363, 162)
@@ -225,12 +236,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtEmail._DateTimeOnly = False
Me.txtEmail._numbersOnly = False
Me.txtEmail._numbersOnlyKommastellen = ""
+ Me.txtEmail._numbersOnlyTrennzeichen = True
Me.txtEmail._Prozent = False
Me.txtEmail._ShortDateNew = False
Me.txtEmail._ShortDateOnly = False
Me.txtEmail._TimeOnly = False
+ Me.txtEmail._TimeOnly_Seconds = False
Me.txtEmail._value = Nothing
Me.txtEmail._Waehrung = False
+ Me.txtEmail._WaehrungZeichen = True
Me.txtEmail.ForeColor = System.Drawing.Color.Black
Me.txtEmail.Location = New System.Drawing.Point(254, 136)
Me.txtEmail.MaxLineLength = -1
@@ -245,12 +259,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtFax._DateTimeOnly = False
Me.txtFax._numbersOnly = False
Me.txtFax._numbersOnlyKommastellen = ""
+ Me.txtFax._numbersOnlyTrennzeichen = True
Me.txtFax._Prozent = False
Me.txtFax._ShortDateNew = False
Me.txtFax._ShortDateOnly = False
Me.txtFax._TimeOnly = False
+ Me.txtFax._TimeOnly_Seconds = False
Me.txtFax._value = Nothing
Me.txtFax._Waehrung = False
+ Me.txtFax._WaehrungZeichen = True
Me.txtFax.ForeColor = System.Drawing.Color.Black
Me.txtFax.Location = New System.Drawing.Point(653, 117)
Me.txtFax.MaxLineLength = -1
@@ -265,12 +282,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtTel._DateTimeOnly = False
Me.txtTel._numbersOnly = False
Me.txtTel._numbersOnlyKommastellen = ""
+ Me.txtTel._numbersOnlyTrennzeichen = True
Me.txtTel._Prozent = False
Me.txtTel._ShortDateNew = False
Me.txtTel._ShortDateOnly = False
Me.txtTel._TimeOnly = False
+ Me.txtTel._TimeOnly_Seconds = False
Me.txtTel._value = Nothing
Me.txtTel._Waehrung = False
+ Me.txtTel._WaehrungZeichen = True
Me.txtTel.ForeColor = System.Drawing.Color.Black
Me.txtTel.Location = New System.Drawing.Point(254, 117)
Me.txtTel.MaxLineLength = -1
@@ -285,12 +305,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtEori._DateTimeOnly = False
Me.txtEori._numbersOnly = False
Me.txtEori._numbersOnlyKommastellen = ""
+ Me.txtEori._numbersOnlyTrennzeichen = True
Me.txtEori._Prozent = False
Me.txtEori._ShortDateNew = False
Me.txtEori._ShortDateOnly = False
Me.txtEori._TimeOnly = False
+ Me.txtEori._TimeOnly_Seconds = False
Me.txtEori._value = Nothing
Me.txtEori._Waehrung = False
+ Me.txtEori._WaehrungZeichen = True
Me.txtEori.ForeColor = System.Drawing.Color.Black
Me.txtEori.Location = New System.Drawing.Point(653, 98)
Me.txtEori.MaxLineLength = -1
@@ -305,12 +328,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtUid._DateTimeOnly = False
Me.txtUid._numbersOnly = False
Me.txtUid._numbersOnlyKommastellen = ""
+ Me.txtUid._numbersOnlyTrennzeichen = True
Me.txtUid._Prozent = False
Me.txtUid._ShortDateNew = False
Me.txtUid._ShortDateOnly = False
Me.txtUid._TimeOnly = False
+ Me.txtUid._TimeOnly_Seconds = False
Me.txtUid._value = Nothing
Me.txtUid._Waehrung = False
+ Me.txtUid._WaehrungZeichen = True
Me.txtUid.ForeColor = System.Drawing.Color.Black
Me.txtUid.Location = New System.Drawing.Point(254, 98)
Me.txtUid.MaxLineLength = -1
@@ -325,12 +351,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtAdresse2._DateTimeOnly = False
Me.txtAdresse2._numbersOnly = False
Me.txtAdresse2._numbersOnlyKommastellen = ""
+ Me.txtAdresse2._numbersOnlyTrennzeichen = True
Me.txtAdresse2._Prozent = False
Me.txtAdresse2._ShortDateNew = False
Me.txtAdresse2._ShortDateOnly = False
Me.txtAdresse2._TimeOnly = False
+ Me.txtAdresse2._TimeOnly_Seconds = False
Me.txtAdresse2._value = Nothing
Me.txtAdresse2._Waehrung = False
+ Me.txtAdresse2._WaehrungZeichen = True
Me.txtAdresse2.ForeColor = System.Drawing.Color.Black
Me.txtAdresse2.Location = New System.Drawing.Point(254, 72)
Me.txtAdresse2.MaxLineLength = -1
@@ -345,12 +374,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtAdresse1._DateTimeOnly = False
Me.txtAdresse1._numbersOnly = False
Me.txtAdresse1._numbersOnlyKommastellen = ""
+ Me.txtAdresse1._numbersOnlyTrennzeichen = True
Me.txtAdresse1._Prozent = False
Me.txtAdresse1._ShortDateNew = False
Me.txtAdresse1._ShortDateOnly = False
Me.txtAdresse1._TimeOnly = False
+ Me.txtAdresse1._TimeOnly_Seconds = False
Me.txtAdresse1._value = Nothing
Me.txtAdresse1._Waehrung = False
+ Me.txtAdresse1._WaehrungZeichen = True
Me.txtAdresse1.ForeColor = System.Drawing.Color.Black
Me.txtAdresse1.Location = New System.Drawing.Point(254, 53)
Me.txtAdresse1.MaxLineLength = -1
@@ -365,12 +397,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtFirma._DateTimeOnly = False
Me.txtFirma._numbersOnly = False
Me.txtFirma._numbersOnlyKommastellen = ""
+ Me.txtFirma._numbersOnlyTrennzeichen = True
Me.txtFirma._Prozent = False
Me.txtFirma._ShortDateNew = False
Me.txtFirma._ShortDateOnly = False
Me.txtFirma._TimeOnly = False
+ Me.txtFirma._TimeOnly_Seconds = False
Me.txtFirma._value = Nothing
Me.txtFirma._Waehrung = False
+ Me.txtFirma._WaehrungZeichen = True
Me.txtFirma.ForeColor = System.Drawing.Color.Black
Me.txtFirma.Location = New System.Drawing.Point(254, 34)
Me.txtFirma.MaxLineLength = -1
@@ -382,7 +417,7 @@ Partial Class usrcntlVollmacht_DE_indirekt
'
'pic
'
- Me.pic.BackgroundImage = Global.SDL.My.Resources.pdf
+ Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
Me.pic.Location = New System.Drawing.Point(5, 5)
@@ -397,14 +432,14 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.lblVollmachtDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblVollmachtDE.Location = New System.Drawing.Point(43, 9)
Me.lblVollmachtDE.Name = "lblVollmachtDE"
- Me.lblVollmachtDE.Size = New System.Drawing.Size(118, 20)
+ Me.lblVollmachtDE.Size = New System.Drawing.Size(193, 20)
Me.lblVollmachtDE.TabIndex = 1
- Me.lblVollmachtDE.Text = "Vollmacht DE"
+ Me.lblVollmachtDE.Text = "Vollmacht DE - indirekt"
'
'btnDown
'
Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnDown.BackgroundImage = Global.SDL.My.Resources.pfeil_unten
+ Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten
Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnDown.Location = New System.Drawing.Point(976, 42)
@@ -416,7 +451,7 @@ Partial Class usrcntlVollmacht_DE_indirekt
'btnUp
'
Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnUp.BackgroundImage = Global.SDL.My.Resources.pfeil_oben
+ Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben
Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnUp.Location = New System.Drawing.Point(976, 22)
@@ -428,7 +463,7 @@ Partial Class usrcntlVollmacht_DE_indirekt
'btnDel
'
Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnDel.BackgroundImage = Global.SDL.My.Resources.del
+ Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnDel.Location = New System.Drawing.Point(976, -1)
@@ -472,12 +507,15 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtEinmalig_CarnetATA._DateTimeOnly = False
Me.txtEinmalig_CarnetATA._numbersOnly = False
Me.txtEinmalig_CarnetATA._numbersOnlyKommastellen = ""
+ Me.txtEinmalig_CarnetATA._numbersOnlyTrennzeichen = True
Me.txtEinmalig_CarnetATA._Prozent = False
Me.txtEinmalig_CarnetATA._ShortDateNew = False
Me.txtEinmalig_CarnetATA._ShortDateOnly = False
Me.txtEinmalig_CarnetATA._TimeOnly = False
+ Me.txtEinmalig_CarnetATA._TimeOnly_Seconds = False
Me.txtEinmalig_CarnetATA._value = Nothing
Me.txtEinmalig_CarnetATA._Waehrung = False
+ Me.txtEinmalig_CarnetATA._WaehrungZeichen = True
Me.txtEinmalig_CarnetATA.Enabled = False
Me.txtEinmalig_CarnetATA.ForeColor = System.Drawing.Color.Black
Me.txtEinmalig_CarnetATA.Location = New System.Drawing.Point(390, 181)
@@ -488,12 +526,46 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.txtEinmalig_CarnetATA.Size = New System.Drawing.Size(174, 20)
Me.txtEinmalig_CarnetATA.TabIndex = 34
'
- 'usrcntlVollmacht_DE
+ 'txtVmDat
+ '
+ Me.txtVmDat._DateTimeOnly = False
+ Me.txtVmDat._numbersOnly = False
+ Me.txtVmDat._numbersOnlyKommastellen = ""
+ Me.txtVmDat._numbersOnlyTrennzeichen = True
+ Me.txtVmDat._Prozent = False
+ Me.txtVmDat._ShortDateNew = False
+ Me.txtVmDat._ShortDateOnly = False
+ Me.txtVmDat._TimeOnly = False
+ Me.txtVmDat._TimeOnly_Seconds = False
+ Me.txtVmDat._value = Nothing
+ Me.txtVmDat._Waehrung = False
+ Me.txtVmDat._WaehrungZeichen = True
+ Me.txtVmDat.ForeColor = System.Drawing.Color.Black
+ Me.txtVmDat.Location = New System.Drawing.Point(47, 165)
+ Me.txtVmDat.MaxLineLength = -1
+ Me.txtVmDat.MaxLines_Warning = ""
+ Me.txtVmDat.MaxLines_Warning_Label = Nothing
+ Me.txtVmDat.Name = "txtVmDat"
+ Me.txtVmDat.Size = New System.Drawing.Size(89, 20)
+ Me.txtVmDat.TabIndex = 35
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = True
+ Me.Label9.Location = New System.Drawing.Point(44, 149)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(88, 13)
+ Me.Label9.TabIndex = 36
+ Me.Label9.Text = "Vollmacht-datum:"
+ '
+ 'usrcntlVollmacht_DE_indirekt
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.Controls.Add(Me.Label9)
+ Me.Controls.Add(Me.txtVmDat)
Me.Controls.Add(Me.txtEinmalig_CarnetATA)
Me.Controls.Add(Me.cbxEinmaligeVollmachtCarnetATA)
Me.Controls.Add(Me.Label12)
@@ -525,7 +597,7 @@ Partial Class usrcntlVollmacht_DE_indirekt
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.txtFirma)
Me.Controls.Add(Me.lbl)
- Me.Name = "usrcntlVollmacht_DE"
+ Me.Name = "usrcntlVollmacht_DE_indirekt"
Me.Size = New System.Drawing.Size(1000, 202)
CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
@@ -563,5 +635,6 @@ Partial Class usrcntlVollmacht_DE_indirekt
Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cbxEinmaligeVollmachtCarnetATA As System.Windows.Forms.CheckBox
Friend WithEvents txtEinmalig_CarnetATA As VERAG_PROG_ALLGEMEIN.MyTextBox
-
+ Friend WithEvents txtVmDat As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label9 As Label
End Class
diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.vb
index 085544c7..3cf61b9e 100644
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVollmacht_DE_indirekt.vb
@@ -81,7 +81,7 @@
initControlsHandler()
cboSprache.Items.Clear()
cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
- 'cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
+ cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
If KdNR > 0 Then initKdNR(KdNR)
End Sub
diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb
index 1e6f0c0e..3bdb6226 100644
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -1959,7 +1959,9 @@ Public Class FormularManagerNEU
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
- listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT))
+ listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT))
+
+ listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVmDat.Text, 25, 260, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT))
Dim top = 0
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
@@ -1972,9 +1974,9 @@ Public Class FormularManagerNEU
listTowrite = addEinmaligeVMCarnetATA(listTowrite, 0, top + 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_CarnetATA.Text, "")
End If
-
Select Case usrCntl.cboSprache._value
Case "EN"
+
Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT_EN", listTowrite)
Case Else
Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "VOLLMACHTEN", getUO2, "", "VM_DE_INDIREKT", listTowrite)
diff --git a/SDL/Resources/Zoll/EORI_UID.dotx b/SDL/Resources/Zoll/EORI_UID.dotx
new file mode 100644
index 00000000..dad3d234
Binary files /dev/null and b/SDL/Resources/Zoll/EORI_UID.dotx differ
diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index 8b6c1fdd..b29cb9ec 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -4907,6 +4907,9 @@
+
+ Always
+
Reference.map
diff --git a/SDL/kunden/frmKundenUIDEORI_List.Designer.vb b/SDL/kunden/frmKundenUIDEORI_List.Designer.vb
index 322c6dcf..121abf91 100644
--- a/SDL/kunden/frmKundenUIDEORI_List.Designer.vb
+++ b/SDL/kunden/frmKundenUIDEORI_List.Designer.vb
@@ -25,7 +25,10 @@ Partial Class frmKundenUIDEORI_List
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenUIDEORI_List))
Me.dgv = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.Button1 = New System.Windows.Forms.Button()
CType(Me.dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.Panel1.SuspendLayout()
Me.SuspendLayout()
'
'dgv
@@ -44,23 +47,49 @@ Partial Class frmKundenUIDEORI_List
Me.dgv.ReadOnly = True
Me.dgv.RowHeadersVisible = False
Me.dgv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgv.Size = New System.Drawing.Size(800, 450)
+ Me.dgv.Size = New System.Drawing.Size(800, 391)
Me.dgv.TabIndex = 0
'
+ 'Panel1
+ '
+ Me.Panel1.Controls.Add(Me.Button1)
+ Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom
+ Me.Panel1.Location = New System.Drawing.Point(0, 391)
+ Me.Panel1.Name = "Panel1"
+ Me.Panel1.Size = New System.Drawing.Size(800, 59)
+ Me.Panel1.TabIndex = 1
+ '
+ 'Button1
+ '
+ Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+ Me.Button1.Image = Global.SDL.My.Resources.Resources.android_note12
+ Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.Button1.Location = New System.Drawing.Point(704, 7)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(75, 49)
+ Me.Button1.TabIndex = 0
+ Me.Button1.Text = "Bericht"
+ Me.Button1.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.Button1.UseVisualStyleBackColor = True
+ '
'frmKundenUIDEORI_List
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(800, 450)
Me.Controls.Add(Me.dgv)
+ Me.Controls.Add(Me.Panel1)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmKundenUIDEORI_List"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Liste"
CType(Me.dgv, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.Panel1.ResumeLayout(False)
Me.ResumeLayout(False)
End Sub
Friend WithEvents dgv As VERAG_PROG_ALLGEMEIN.MyDatagridview
+ Friend WithEvents Panel1 As Panel
+ Friend WithEvents Button1 As Button
End Class
diff --git a/SDL/kunden/frmKundenUIDEORI_List.vb b/SDL/kunden/frmKundenUIDEORI_List.vb
index 4d8bc8bc..c932ba99 100644
--- a/SDL/kunden/frmKundenUIDEORI_List.vb
+++ b/SDL/kunden/frmKundenUIDEORI_List.vb
@@ -1,3 +1,108 @@
-Public Class frmKundenUIDEORI_List
+
+Imports Microsoft.Office.Interop
+Public Class frmKundenUIDEORI_List
+ Dim ART = "" 'UID/EORI
+ Dim kdNr As Integer = 0
+ Dim kundenSQL As New kundenSQL
+ Private Sub frmKundenUIDEORI_List_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+ End Sub
+
+ Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+ genReport()
+
+ Select Case ART
+ Case "UID"
+ Case "EORI"
+ End Select
+ End Sub
+
+
+ Public Function genReport(dt As DataTable) As Microsoft.Office.Interop.Word.Document
+ Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing
+ Try
+ Dim pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\Zoll\EORI_UID.dotx"
+ ' Select Case language
+ 'Case "DE" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_DE.dotx"
+ 'Case "YU" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_YU.dotx"
+ 'Case "RO" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_RO.dotx"
+ 'Case "TR" : pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Abholbereit\Abholbereit_TR.dotx"
+ 'Case Else : MsgBox("Keine Sprache ausgewählt!") : Return odoc
+ ' End Select
+
+ Dim cGenWord As New cGenWord
+ Dim oWord As New Microsoft.Office.Interop.Word.Application
+ odoc = cGenWord.openWord(pfadWord, True, oWord)
+
+
+ ' Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=210 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'")
+ Dim KUNDE = kundenSQL.getKundeFMZOLLByKdNr(kdNr)
+ If KUNDE Is Nothing Then MsgBox("Kunde nicht gefunden!") : Return odoc
+ ' Dim PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr)
+
+ Dim oTable As Word.Table
+
+ odoc.FormFields("Adresse1").Range.Text = KUNDE.Name_1 & " " & If(KUNDE.Name_2, "")
+ odoc.FormFields("Adresse2").Range.Text = KUNDE.Straße
+ odoc.FormFields("Adresse3").Range.Text = KUNDE.LandKz & " " & KUNDE.PLZ & " " & KUNDE.Ort
+ If KUNDE.Telefax <> "" Then
+ odoc.FormFields("Adresse5").Range.Text = "FAX: " & KUNDE.Telefax
+ ElseIf KUNDE.E_Mail <> "" Then
+ odoc.FormFields("Adresse5").Range.Text = "E-Mail: " & KUNDE.E_Mail
+ End If
+
+
+ ' odoc.FormFields("KdNrVERAG").Range.Text = KUNDE.KundenNr
+ ' odoc.FormFields("KdNrMST").Range.Text = PartnerKdNrFromFMZOLL.MSEKundenNr
+ odoc.FormFields("Datum").Range.Text = Now.ToShortDateString
+ odoc.FormFields("KundenNr").Range.Text = KUNDE.AdressenNr
+ odoc.FormFields("AuftragsNr").Range.Text = ART
+
+ Dim pinVisible = False
+ If odoc.Range.Bookmarks.Exists("TabelleKarten") Then
+ If odoc.Bookmarks("TabelleKarten").Range.Tables.Count > 0 Then
+ oTable = odoc.Bookmarks("TabelleKarten").Range.Tables(1)
+ Dim i = 1
+ Dim kfzTmp = ""
+ ' MsgBox(dt.Rows.Count)
+ For Each r As DataRow In dt.Rows
+ If r("KfzKennzeichen").ToString <> "" Or r("KartenNr").ToString <> "" Then
+ If cSqlDb.checkNullStr(r("KfzKennzeichen")) <> kfzTmp Then
+ kfzTmp = cSqlDb.checkNullStr(r("KfzKennzeichen"))
+ oTable.Rows(i + 1).Cells(1).Range.Text = kfzTmp
+ Else
+ oTable.Rows(i + 1).Cells(1).Range.Text = ""
+ End If
+ oTable.Rows(i + 1).Cells(2).Range.Text = cSqlDb.checkNullStr(r("KarteBoxBezeichnung"))
+ oTable.Rows(i + 1).Cells(3).Range.Text = cSqlDb.checkNullStr(r("KartenNr"))
+ oTable.Rows(i + 1).Cells(4).Range.Text = cSqlDb.checkNullStr(r("PIN"))
+ If i < dt.Rows.Count Then oTable.Rows.Add()
+ ' MsgBox(cSqlDb.checkNullStr(r("KarteBoxBezeichnung")))
+ i += 1
+
+
+ End If
+ Next
+ End If
+ Else
+ MessageBox.Show("Textmarke nicht vorhanden!")
+ End If
+
+
+ odoc.Save() : odoc.Activate()
+
+ 'If autodruck Then
+ ' Dim t As New Threading.Thread(Sub()
+ ' Print(odoc, PrinterName)
+ ' End Sub)
+ ' t.IsBackground = True
+ ' t.Start()
+ 'End If
+
+ Catch ex As Exception
+ MessageBox.Show(ex.ToString)
+ End Try
+ Return odoc
+ End Function
End Class
\ No newline at end of file