neu

2021-09-14 13:00:45 +02:00
parent 0a0ac4a065
commit 13f28aa1d8
16 changed files with 373 additions and 52 deletions
--- a/SDL/SMS/usrCntlSMS.vb
+++ b/SDL/SMS/usrCntlSMS.vb
@@ -164,7 +164,7 @@ Public Class usrCntlSMS
        Dim sqlstr As String = ""


-        sqlstr &= " SELECT " & TopMax & " [sms_id],[sms_Datum],[sms_Account], sms_Vorwahl + '' + [sms_Handynummer] as Nummer,[sms_Nachricht],[sms_Sachbearbeiter],CASE WHEN sms_Status=3 then 'OK' when sms_Status='4' THEN 'FEHLER' ELSE '' END as Status,sms_BatchId,sms_MessageIds FROM [tblSMS]  WHERE 1=1 "
+        sqlstr &= " SELECT " & TopMax & " [sms_id],[sms_Datum],[sms_Account], sms_Vorwahl + '' + [sms_Handynummer] as Nummer,[sms_Nachricht],[sms_Sachbearbeiter],CASE WHEN sms_Status IN (2,10) then 'OK' when sms_Status IN (3,4,5,6,8,11) THEN 'FEHLER' when sms_Status IN (0,1,7,9) THEN 'WARTEND' ELSE '' END as Status,sms_BatchId,sms_MessageIds FROM [tblSMS]  WHERE 1=1 "

        With MyDatagridview1
            '  .DataSource = myTable
--- a/SDL/Speditionsbuch/rptSpeditionsberichtRg.Designer.vb
+++ b/SDL/Speditionsbuch/rptSpeditionsberichtRg.Designer.vb
@@ -21,7 +21,7 @@ Partial Public Class rptSpeditionsberichtRg
        Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
        Me.lblVon = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblBis = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblAbfArt = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblAbfArt = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
        Me.lblBarzahlungsbetrag = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblAbfAnz = New GrapeCity.ActiveReports.SectionReportModel.Label()
        Me.lblAbfArtNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -141,6 +141,7 @@ Partial Public Class rptSpeditionsberichtRg
        Me.lblAbfArt.HyperLink = Nothing
        Me.lblAbfArt.Left = 1.924803!
        Me.lblAbfArt.Name = "lblAbfArt"
+        Me.lblAbfArt.CanGrow = False
        Me.lblAbfArt.Style = "font-size: 9pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
    "ar-set: 1"
        Me.lblAbfArt.Text = "Abfertigungsart"
@@ -665,7 +666,7 @@ Partial Public Class rptSpeditionsberichtRg
    Public WithEvents GroupFooter1 As GrapeCity.ActiveReports.SectionReportModel.GroupFooter
    Public WithEvents lblVon As GrapeCity.ActiveReports.SectionReportModel.Label
    Public WithEvents lblBis As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblAbfArt As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblAbfArt As GrapeCity.ActiveReports.SectionReportModel.TextBox
    Public WithEvents lblBarzahlungsbetrag As GrapeCity.ActiveReports.SectionReportModel.Label
    Public WithEvents lblAbfAnz As GrapeCity.ActiveReports.SectionReportModel.Label
    Public WithEvents lblAbfArtNr As GrapeCity.ActiveReports.SectionReportModel.Label
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb
@@ -56,6 +56,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlOpt = New System.Windows.Forms.Panel()
        Me.pnlBerichte = New System.Windows.Forms.Panel()
+        Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button()
        Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
        Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -181,7 +182,6 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.Label45 = New System.Windows.Forms.Label()
        Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
-        Me.Button12 = New System.Windows.Forms.Button()
        Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
        Me.pnlRechts.SuspendLayout()
        CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -671,7 +671,7 @@ Partial Class usrCntlSpeditionsBuchSuche
        '
        'pnlBerichte
        '
-        Me.pnlBerichte.Controls.Add(Me.Button12)
+        Me.pnlBerichte.Controls.Add(Me.btnSpedBuchEinnahmen)
        Me.pnlBerichte.Controls.Add(Me.lblKdAusFortschritt)
        Me.pnlBerichte.Controls.Add(Me.MenuStrip1)
        Me.pnlBerichte.Controls.Add(Me.cboHandlingssatz)
@@ -704,6 +704,21 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.pnlBerichte.TabIndex = 6
        Me.pnlBerichte.Visible = False
        '
+        'btnSpedBuchEinnahmen
+        '
+        Me.btnSpedBuchEinnahmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSpedBuchEinnahmen.Image = Global.SDL.My.Resources.Resources.statistik_small
+        Me.btnSpedBuchEinnahmen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnSpedBuchEinnahmen.Location = New System.Drawing.Point(9, 114)
+        Me.btnSpedBuchEinnahmen.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnSpedBuchEinnahmen.Name = "btnSpedBuchEinnahmen"
+        Me.btnSpedBuchEinnahmen.Size = New System.Drawing.Size(127, 41)
+        Me.btnSpedBuchEinnahmen.TabIndex = 90
+        Me.btnSpedBuchEinnahmen.Text = "Speditionsbericht Einnahmen"
+        Me.btnSpedBuchEinnahmen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnSpedBuchEinnahmen.UseVisualStyleBackColor = True
+        Me.btnSpedBuchEinnahmen.Visible = False
+        '
        'lblKdAusFortschritt
        '
        Me.lblKdAusFortschritt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2495,21 +2510,6 @@ Partial Class usrCntlSpeditionsBuchSuche
        Me.SplitContainer.SplitterWidth = 2
        Me.SplitContainer.TabIndex = 3
        '
-        'Button12
-        '
-        Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button12.Image = Global.SDL.My.Resources.Resources.statistik_small
-        Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button12.Location = New System.Drawing.Point(9, 114)
-        Me.Button12.Margin = New System.Windows.Forms.Padding(0)
-        Me.Button12.Name = "Button12"
-        Me.Button12.Size = New System.Drawing.Size(127, 41)
-        Me.Button12.TabIndex = 90
-        Me.Button12.Text = "Speditionsbericht Einnahmen"
-        Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button12.UseVisualStyleBackColor = True
-        Me.Button12.Visible = False
-        '
        'usrCntlSpeditionsBuchSuche
        '
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2711,5 +2711,5 @@ Partial Class usrCntlSpeditionsBuchSuche
    Friend WithEvents ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents lblKdAusFortschritt As Label
    Friend WithEvents cbxEIDR As CheckBox
-    Friend WithEvents Button12 As Button
+    Friend WithEvents btnSpedBuchEinnahmen As Button
 End Class
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx
@@ -174,7 +174,7 @@
        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEwAACxMBAJqcGAAAB3VJREFUSEu9VntQ1NUe
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAB3VJREFUSEu9VntQ1NUe
        /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r
        ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ
        UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C
--- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
+++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
@@ -513,7 +513,6 @@ Public Class usrCntlSpeditionsBuchSuche
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Then
            btnQSAufteilung.Visible = True
            btnCSAufteilung.Visible = True
-            Button12.Visible = True
        End If
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then
            pnlBerichte.Visible = True
@@ -521,6 +520,10 @@ Public Class usrCntlSpeditionsBuchSuche
            Button17.Visible = True
        End If

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen_Erlöse", "SDL") Then
+            btnSpedBuchEinnahmen.Visible = True
+        End If
+
        If KDSearch > 0 Then
            kdtxtAuftraggeber.KdNr = KDSearch
            txtAbfertDat._value = dat_von.ToShortDateString
@@ -1937,7 +1940,7 @@ Public Class usrCntlSpeditionsBuchSuche
        cbxEIDR.Visible = cboFiliale._value = "7001"
    End Sub

-    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click
+    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnSpedBuchEinnahmen.Click
        Dim displayFilter = cbxFilterInBericht.Checked
        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then
            Dim sqlstr As String = ""
@@ -1988,12 +1991,26 @@ Public Class usrCntlSpeditionsBuchSuche
                    rpt.lblFilterTxt.Text = "Beschreibung:"
                End If
            End If
-            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+
+
+            'Problem mit beträge
+            If cboFiliale._value = "" Then
+                rpt.Dispose() : print.Dispose()
+                MsgBox("Bitte Filiale angeben!")
+                Exit Sub
+            End If
+
+            Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            If cboFiliale._value <> "" Then
+                FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value)
+            End If
+            Select Case FirmaTmp
                Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH"
                Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition"
-                Case "UNISPED" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "UNISPED Spedition"
-                Case "AMBAR" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "AMBAR"
-                Case "FRONTOFFICE" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "FRONTOFFICE"
+                Case "UNISPED" : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Label28.Text = "UNISPED Spedition"
+                Case "AMBAR" : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Label28.Text = "AMBAR"
+                Case "FRONTOFFICE" : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Label28.Text = "FRONTOFFICE"
                Case Else
            End Select

@@ -2001,6 +2018,7 @@ Public Class usrCntlSpeditionsBuchSuche
            If CheckBox1.Checked Then
                rpt.GroupHeader1.DataField = "FilialenNr" 'Gruppierung
            End If
+
            If rpt.DataSource.rows.count = 0 Then
                rpt.Dispose() : print.Dispose()
                MsgBox("Keine Daten vorhanden!")
@@ -2035,7 +2053,7 @@ Public Class usrCntlSpeditionsBuchSuche
                                              rpt.lblAbfArt.Text = If(rpt.Fields.Item("Abfertigungsbezeichnung").Value Is DBNull.Value, "-", rpt.Fields.Item("Abfertigungsbezeichnung").Value)


-                                              Dim BarBetrag As Double = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value()).ToString("C")
+                                              Dim BarBetrag As Double = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value())
                                              Dim sqlstrRg = " SELECT isnull( sum(RechnungsausgangPositionen.SteuerfreierBetrag+RechnungsausgangPositionen.SteuerpflichtigerBetrag),0) as RgBetrag
                                                                FROM  Speditionsbuch LEFT JOIN Abfertigungsarten ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart 
                                                                 inner JOIN   Rechnungsausgang ON Rechnungsausgang.FilialenNr=Speditionsbuch.FilialenNr and Rechnungsausgang.AbfertigungsNr=Speditionsbuch.AbfertigungsNr and Rechnungsausgang.SpeditionsbuchUnterNr=Speditionsbuch.UnterNr 
@@ -2059,7 +2077,7 @@ Public Class usrCntlSpeditionsBuchSuche

                                              Dim ZwSum = RgBetrag + BarBetrag - VkBetrag

-                                              rpt.lblBarzahlungsbetrag.Text = BarBetrag
+                                              rpt.lblBarzahlungsbetrag.Text = BarBetrag.ToString("C")
                                              rpt.Label8.Text = (RgBetrag).ToString("C")
                                              rpt.Label13.Text = (VkBetrag).ToString("C")
                                              rpt.Label14.Text = (ZwSum).ToString("C")
--- a/SDL/kunden/frmKundenUebersichtZollRgDetails.vb
+++ b/SDL/kunden/frmKundenUebersichtZollRgDetails.vb
@@ -18,7 +18,7 @@ Public Class frmKundenUebersichtZollRgDetails

    End Sub
    Private Sub frmKundenUebersichtZollRg_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, [SteuerpflichtigerGesamtbetrag]*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0)
+        Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, /*[SteuerpflichtigerGesamtbetrag]*[Steuersatz %]*/ SteuerpflichtigerGesamtbetrag/(1+[Steuersatz %])*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0)

        lblRgNr.Text = dt("RechnungsNr").ToString
        lblRgBetrag.Text = CDbl(dt("RgBetrag")).ToString("N2", CultureInfo.CurrentCulture)