neu

2019-09-10 13:51:31 +02:00
parent 8f8b0f4252
commit 021cce6f04
48 changed files with 6001 additions and 727 deletions
--- a/SDL/zoll/usrCntlAuswertungenFiskal_IntrastatMeldung.vb
+++ b/SDL/zoll/usrCntlAuswertungenFiskal_IntrastatMeldung.vb
@@ -64,7 +64,7 @@ Public Class usrCntlAuswertungenFiskal_IntrastatMeldung
                        Outputline &= " " 'Blank3
                        Outputline &= "      " 'Blank4
                        Outputline &= "      " 'Blank5
-                        Outputline &= r("Warennummer") 'Warennummer
+                        Outputline &= r("Warennummer")  'Warennummer
                        Outputline &= "   " 'Blank6
                        Outputline &= "  " 'Blank7
                        Outputline &= "     " 'Blank8
@@ -121,7 +121,7 @@ Public Class usrCntlAuswertungenFiskal_IntrastatMeldung
    Function getFiskal_Data() As DataTable
        Dim sqlStr = ""

-        sqlStr &= "   SELECT 	  basman_nr as Mandant, basman_nl as Niederlassung, zbant_beznr as Bezugsnummer, zbpos_posnr as Positionsnummer, zbabg_regkz as Registrierkennzeichen,  Bestimmungsland, isnull(zbant_gesart,99) as Geschäftsart,  Verkehrszweig,  Warennummer, zbpos_eigm as Eigenmasse, zbpos_wmahst as BesondereMasseinheit,  CASE WHEN GesamtRechnungspreis>0  THEN CASE WHEN zbpos_posnr=1 THEN GesamtRechnungspreis ELSE 0 END ELSE zbapo_eustwe END AS Rechnungsbetrag, zbapo_zollw as StatistischerWert,  zbant_dsenda as Bezugszeitraum, zbpos_wabes as Warenbeschreibung,GesamtRechnungspreis "
+        sqlStr &= "   SELECT 	  basman_nr as Mandant, basman_nl as Niederlassung, zbant_beznr as Bezugsnummer, zbpos_posnr as Positionsnummer, zbabg_regkz as Registrierkennzeichen,  Bestimmungsland, isnull(zbant_gesart,99) as Geschäftsart,  Verkehrszweig,  isnull(Warennummer,'00000000') as Warennummer, isnull(zbpos_eigm,'0') as Eigenmasse, zbpos_wmahst as BesondereMasseinheit,  CASE WHEN GesamtRechnungspreis>0  THEN CASE WHEN zbpos_posnr=1 THEN GesamtRechnungspreis ELSE 0 END ELSE zbapo_eustwe END AS Rechnungsbetrag, isnull(zbapo_zollw,'0') as StatistischerWert,  zbant_dsenda as Bezugszeitraum, zbpos_wabes as Warenbeschreibung,GesamtRechnungspreis "
        sqlStr &= "   FROM ( "

        If CheckBox2.Checked Then
--- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
+++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
@@ -113,6 +113,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Label35 = New System.Windows.Forms.Label()
        Me.tbcntr = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.PictureBox7 = New System.Windows.Forms.PictureBox()
        Me.Label52 = New System.Windows.Forms.Label()
        Me.PictureBox6 = New System.Windows.Forms.PictureBox()
        Me.GroupBox8 = New System.Windows.Forms.GroupBox()
@@ -165,7 +166,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage4 = New System.Windows.Forms.TabPage()
        Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste()
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.PictureBox7 = New System.Windows.Forms.PictureBox()
        Me.GroupBox1.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -180,6 +180,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.GroupBox5.SuspendLayout()
        Me.tbcntr.SuspendLayout()
        Me.TabPage1.SuspendLayout()
+        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox8.SuspendLayout()
        Me.GroupBox7.SuspendLayout()
@@ -192,7 +193,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage3.SuspendLayout()
        Me.TabPage4.SuspendLayout()
        Me.pnl.SuspendLayout()
-        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'Label3
@@ -1142,7 +1142,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.tbcntr.Location = New System.Drawing.Point(0, 57)
        Me.tbcntr.Name = "tbcntr"
        Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(915, 1270)
+        Me.tbcntr.Size = New System.Drawing.Size(898, 1270)
        Me.tbcntr.TabIndex = 22
        '
        'TabPage1
@@ -1175,11 +1175,22 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(907, 1244)
+        Me.TabPage1.Size = New System.Drawing.Size(890, 1244)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Bürgschaften"
        Me.TabPage1.UseVisualStyleBackColor = True
        '
+        'PictureBox7
+        '
+        Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.IMEX_LOGO_simple
+        Me.PictureBox7.InitialImage = Global.SDL.My.Resources.Resources.durmaz
+        Me.PictureBox7.Location = New System.Drawing.Point(579, 387)
+        Me.PictureBox7.Name = "PictureBox7"
+        Me.PictureBox7.Size = New System.Drawing.Size(133, 24)
+        Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox7.TabIndex = 26
+        Me.PictureBox7.TabStop = False
+        '
        'Label52
        '
        Me.Label52.AutoSize = True
@@ -1632,7 +1643,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(924, 1244)
+        Me.TabPage2.Size = New System.Drawing.Size(907, 1244)
        Me.TabPage2.TabIndex = 1
        Me.TabPage2.Text = "Kunden"
        Me.TabPage2.UseVisualStyleBackColor = True
@@ -1662,7 +1673,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage3.Location = New System.Drawing.Point(4, 22)
        Me.TabPage3.Name = "TabPage3"
        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(924, 1244)
+        Me.TabPage3.Size = New System.Drawing.Size(890, 1244)
        Me.TabPage3.TabIndex = 2
        Me.TabPage3.Text = "Fiskalvertretung"
        Me.TabPage3.UseVisualStyleBackColor = True
@@ -1688,7 +1699,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
        Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Size = New System.Drawing.Size(924, 1244)
+        Me.TabPage4.Size = New System.Drawing.Size(907, 1244)
        Me.TabPage4.TabIndex = 3
        Me.TabPage4.Text = "Aufschubdaten"
        Me.TabPage4.UseVisualStyleBackColor = True
@@ -1707,20 +1718,9 @@ Partial Class usrCntlZOLLAuswertungen
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(915, 57)
+        Me.pnl.Size = New System.Drawing.Size(898, 57)
        Me.pnl.TabIndex = 23
        '
-        'PictureBox7
-        '
-        Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.IMEX_LOGO_simple
-        Me.PictureBox7.InitialImage = Global.SDL.My.Resources.Resources.durmaz
-        Me.PictureBox7.Location = New System.Drawing.Point(579, 387)
-        Me.PictureBox7.Name = "PictureBox7"
-        Me.PictureBox7.Size = New System.Drawing.Size(133, 24)
-        Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBox7.TabIndex = 26
-        Me.PictureBox7.TabStop = False
-        '
        'usrCntlZOLLAuswertungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1730,7 +1730,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Controls.Add(Me.tbcntr)
        Me.Controls.Add(Me.pnl)
        Me.Name = "usrCntlZOLLAuswertungen"
-        Me.Size = New System.Drawing.Size(915, 926)
+        Me.Size = New System.Drawing.Size(898, 926)
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
@@ -1751,6 +1751,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.tbcntr.ResumeLayout(False)
        Me.TabPage1.ResumeLayout(False)
        Me.TabPage1.PerformLayout()
+        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupBox8.ResumeLayout(False)
        Me.GroupBox8.PerformLayout()
@@ -1767,7 +1768,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage4.ResumeLayout(False)
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
-        CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
--- a/SDL/zoll/usrCntlZOLLAuswertungen.vb
+++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb
@@ -506,4 +506,8 @@ Public Class usrCntlZOLLAuswertungen
    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click

    End Sub
+
+    Private Sub UsrCntlAuswertungenFiskal_IntrastatMeldung1_Load(sender As Object, e As EventArgs) Handles UsrCntlAuswertungenFiskal_IntrastatMeldung1.Load
+
+    End Sub
 End Class