diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index cd9d4f34..b6cd762b 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -352,7 +352,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige CLOSED_DUMMY.SAVE() - GesSichRef.CalcSaldo() + GesSichRef.CalcSaldo_new() Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 5fed6893..3b6e3ea6 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -22,7 +22,6 @@ Partial Class usrcntlKundeBearbeitenFull 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -61,8 +60,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFremdspedition = New System.Windows.Forms.ComboBox() Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox() Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.tbcntrAbf = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label18 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() @@ -76,6 +77,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbfVerb_Abfertigungsverbot = New System.Windows.Forms.CheckBox() Me.txtAbfVerb_AbfertigungsverbotSeit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbAufschub = New System.Windows.Forms.TabPage() + Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label78 = New System.Windows.Forms.Label() Me.cbxAbf_ZollVM = New System.Windows.Forms.CheckBox() @@ -100,6 +102,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.tbFiskal = New System.Windows.Forms.TabPage() + Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.cbxHR_autoselect = New System.Windows.Forms.CheckBox() Me.cbxPDFMerge = New System.Windows.Forms.CheckBox() @@ -111,7 +114,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.btnAddKundeUID = New System.Windows.Forms.Button() Me.cboUSt_UstIdNrLand2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtUSt_UstIdNr2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.dgvKundenUID = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvKundenUID = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Label117 = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label115 = New System.Windows.Forms.Label() @@ -419,6 +422,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbKontakt = New System.Windows.Forms.TabControl() Me.TabPage10 = New System.Windows.Forms.TabPage() Me.TabPage11 = New System.Windows.Forms.TabPage() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label50 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() Me.pnlNeukunde = New System.Windows.Forms.Panel() @@ -437,18 +441,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtERROR = New System.Windows.Forms.TextBox() Me.btnDatevExport = New System.Windows.Forms.Button() Me.Label98 = New System.Windows.Forms.Label() - Me.cnsBankverbindungen = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.cnsBankverbindungen = New System.Windows.Forms.ContextMenuStrip() Me.ArchivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentHinzufügenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() - Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() - Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -498,6 +498,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.SuspendLayout() Me.pnlNeukunde.SuspendLayout() Me.cnsBankverbindungen.SuspendLayout() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'tbcntrDetails @@ -643,6 +644,16 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxBesonderheitenNEU.Text = "Besonderheiten NEU" Me.cbxBesonderheitenNEU.UseVisualStyleBackColor = True ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' 'tbcntrAbf ' Me.tbcntrAbf.Controls.Add(Me.TabPage4) @@ -669,6 +680,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage4.Text = " Aviso / E-Mail Benachrichtigung" Me.TabPage4.UseVisualStyleBackColor = True ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 + ' 'rtbLKWFreigabeSenden ' Me.rtbLKWFreigabeSenden.Location = New System.Drawing.Point(485, 33) @@ -837,6 +857,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAufschub.Text = "Aufschubkonten" Me.tbAufschub.UseVisualStyleBackColor = True ' + 'usrCntlAufschubkonten + ' + Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) + Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" + Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) + Me.usrCntlAufschubkonten.TabIndex = 0 + ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.Label78) @@ -1142,6 +1170,15 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal.Text = "Fiskal" Me.tbFiskal.UseVisualStyleBackColor = True ' + 'UsrCntlKundeFiskaldaten1 + ' + Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" + Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) + Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + ' 'tbVerrechnung ' Me.tbVerrechnung.Controls.Add(Me.cbxHR_autoselect) @@ -4127,6 +4164,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbSonstiges ' + Me.tbSonstiges.Controls.Add(Me.PictureBox1) Me.tbSonstiges.Controls.Add(Me.cbxIDSMautberichtNachOrt) Me.tbSonstiges.Controls.Add(Me.txtSonst_weitereKdNrWOELFL) Me.tbSonstiges.Controls.Add(Me.lblIDS_Rabatte) @@ -5839,6 +5877,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.Text = "Spezifisch" Me.TabPage11.UseVisualStyleBackColor = True ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) + Me.ucKundenKontakte.TabIndex = 0 + ' 'Label50 ' Me.Label50.AutoSize = True @@ -6119,49 +6165,16 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'ucKundenKontakte + 'PictureBox1 ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) - Me.ucKundenKontakte.TabIndex = 0 - ' - 'UsrCntlKundenBesonderheiten1 - ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 - Me.UsrCntlKundenBesonderheiten1.Visible = False - ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 - ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 - ' - 'usrCntlAufschubkonten - ' - Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) - Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" - Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) - Me.usrCntlAufschubkonten.TabIndex = 0 - ' - 'UsrCntlKundeFiskaldaten1 - ' - Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" - Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) - Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.pdf_s + Me.PictureBox1.Location = New System.Drawing.Point(290, 191) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(20, 20) + Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox1.TabIndex = 150 + Me.PictureBox1.TabStop = False ' 'usrcntlKundeBearbeitenFull ' @@ -6272,6 +6285,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.pnlNeukunde.ResumeLayout(False) Me.pnlNeukunde.PerformLayout() Me.cnsBankverbindungen.ResumeLayout(False) + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -6674,4 +6688,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents cbxPDFMerge As CheckBox Friend WithEvents cbxHR_autoselect As CheckBox Friend WithEvents cbxIDSMautberichtNachOrt As CheckBox + Friend WithEvents PictureBox1 As PictureBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 23de4ee1..45bb9998 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -1,4 +1,7 @@ -Imports MDM_Worker +Imports com.sun.xml.internal.rngom +Imports DAKOSY_Worker +Imports MDM_Worker +Imports Tamir.SharpSsh.jsch Imports VERAG_PROG_ALLGEMEIN Public Class usrcntlKundeBearbeitenFull @@ -405,6 +408,7 @@ Public Class usrcntlKundeBearbeitenFull cbxSonst_CsvUTA.Checked = loadValue(ADRESSE.UTAExportCSV, False) cbxUIDMehrfachverwendung.Checked = KUNDE_ERW.kde_UIDMehrfachverwendung cbxkeineMWSt.Checked = loadValue(KUNDE_ERW.kde_keineMWSt, False) + cbxIDSMautberichtNachOrt.Checked = loadValue(ADRESSE.IDSMautbericht_nachOrt, False) ' ----- Provision Dienstleistungen ----- cbxProvDL.Checked = KUNDE_ERW.kde_Provisionsverguetung @@ -2828,8 +2832,8 @@ Public Class usrcntlKundeBearbeitenFull End If Button6.Enabled = True - Else - Button6.Enabled = False + Else + Button6.Enabled = False End If End Sub @@ -2843,7 +2847,7 @@ Public Class usrcntlKundeBearbeitenFull For Each r As DataGridViewRow In dgvKundenUID.SelectedRows Dim UID_KUNDE As New cKundenveranlagungUID(KUNDE.KundenNr, r.Cells("UstIdKz").Value) - UID_KUNDE.DELETE + UID_KUNDE.DELETE() Next initdgvKUNDENUID(KUNDE.KundenNr) @@ -2854,5 +2858,216 @@ Public Class usrcntlKundeBearbeitenFull End If + End Sub + + Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click + Dim ids As New cIDS + Dim gruppierungNachOrt As Boolean = False + If ADRESSE.IDSMautbericht_nachOrt IsNot Nothing AndAlso Not IsDBNull(ADRESSE.IDSMautbericht_nachOrt) Then + gruppierungNachOrt = ADRESSE.IDSMautbericht_nachOrt + End If + + Dim rechnungsdatum = ids.getCurrentInvoicedate(KUNDE.KundenNr) + + If rechnungsdatum <> "" AndAlso IsDate(rechnungsdatum) Then + + Dim f As New frmDatumsabfrage("IDS-Mautbericht Datum ", True) + f.dtp_date.Value = CDate(rechnungsdatum) + f.ShowDialog() + If f.DialogResult = DialogResult.OK Then + + + Dim dt_ids = ids.genIDSMautberichtDatatByKdNr(KUNDE.KundenNr, CDate(rechnungsdatum), "IDS", False) ' + Dim dt_ids_at = ids.genIDSMautberichtDatatByKdNr(KUNDE.KundenNr, CDate(rechnungsdatum), "IDS_AT", gruppierungNachOrt) + + If dt_ids.Rows.Count = 0 AndAlso dt_ids_at.Rows.Count = 0 Then + MsgBox("Zum eingegebenen Datum existieren keine Daten!") + Exit Sub + End If + + + If dt_ids.Rows.Count > 0 Then createBericht(dt_ids, KUNDE.KundenNr, -1, CDate(rechnungsdatum), False) + If dt_ids_at.Rows.Count > 0 Then createBericht(dt_ids_at, KUNDE.KundenNr, -1, CDate(rechnungsdatum), gruppierungNachOrt) + + End If + + Else + + End If + + + + + + + + + End Sub + + Private Sub createBericht(dt As DataTable, kdnr As String, idsKdnr As String, rechnungsdatum As Date, Gruppierung_nach_Ort As Boolean) + Try + + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + + Dim rpt As New rptIDS_Anhang + + rpt.DataSource = dt + + rpt.txtKunde.Text = kdnr & " " & New VERAG_PROG_ALLGEMEIN.cAdressen(kdnr).FullName + + rpt.lblIDSKdNr.Text = idsKdnr + + rpt.lblRgDatum.Text = rechnungsdatum.ToShortDateString + + rpt.GroupHeaderKz.DataField = "OutletCountry" + + rpt.Label4.Text = rechnungsdatum.ToShortDateString + + + Dim curRabattbetragProLiter As Double = 0 + Dim curRabattbetrag As Double = 0 + Dim curGesamtbetrag As Double = 0 + + + Dim sumLiter As Double = 0 + + Dim sumBrutto As Double = 0 + + Dim sumLiterLand As Double = 0 + + Dim sumLiterKat As Double = 0 + + Dim sumBruttoLand As Double = 0 + + Dim sumBruttoKat As Double = 0 + + Dim sumLiterGes As Double = 0 + + Dim sumBruttoGes As Double = 0 + + Dim cntKat = 0 + Dim cnt = 0 + + rpt.GroupFooterKat.Visible = False + + AddHandler rpt.Detail.Format, Sub() + ' If cnt = 0 Then + curRabattbetrag = 0 - sql.isDbnullEmptyDbl(rpt.Fields.Item("SummevonRabattbetrag").Value, 2, "") '=0-[Summe von Rabattbetrag] + curRabattbetragProLiter = 0 - IIf(sql.isDbnullEmpty(rpt.Fields.Item("KZ").Value, "") = "P", sql.isDbnullEmptyDbl(rpt.Fields.Item("RabattbetragProLiter").Value, 4, 0), sql.isDbnullEmptyDbl(rpt.Fields.Item("Rechenwert").Value, 4, 0)) '=0-Wenn([Kz]="P";[RabattbetragProLiter];[Rechenwert]) + curGesamtbetrag = CDbl(sql.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, 0) + curRabattbetrag + sql.isDbnullEmptyDbl(rpt.Fields.Item("Steuerbetrag").Value, 2, 0)) '=[Nettobetrag]+[curRabattbetrag]+[Steuerbetrag] + + rpt.txtKunde.Text = sql.isDbnullEmpty(rpt.Fields.Item("AdressenNr").Value, "") + rpt.txtKunde.Text &= " " & sql.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "") + + Dim Station As String = "" + If Gruppierung_nach_Ort Then + Station = sql.isDbnullEmpty(rpt.Fields.Item("OutletOrt").Value, "") + If Station <> "" Then + Station = " (" & Station & ")" + End If + End If + + + rpt.txtProduktBeschreibung.Text = sql.isDbnullEmpty(rpt.Fields.Item("ProductDescription").Value, "") & Station + + rpt.txtLiter.Text = sql.isDbnullEmpty(rpt.Fields.Item("Liter").Value, "") + rpt.txtPreis.Text = sql.isDbnullEmptyDbl(rpt.Fields.Item("NettopreisProLiter").Value, 4, "") + rpt.txtBetrag.Text = sql.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "") + + rpt.txtRabattPreis.Text = curRabattbetragProLiter + rpt.txtRabattBetrag.Text = curRabattbetrag + + rpt.lblMWST.Text = "zuzüglich MWST " + + 'SPANIEN, POLEN : für alle Produkte gilt eine Reduzierung der MwSt. auf 10 % bzw. 8%, mit Ausnahme von AdBlue (bleibt bei 21 % MwSt.) -> Regelung der MWST-Anzeige erfolgt über IDS-Länder, allerdings wird auf Datenbasis hier kein Unterschied zw. ProductCode gemacht, daher hardcodiert -> weil es nur um Anzeige geht! + + '20.07.2026 -> Änderungen wieder deaktivert! + + 'If (SQL.isDbnullEmpty(rpt.Fields.Item("OutletCountry").Value, "") = "Spain" Or SQL.isDbnullEmpty(rpt.Fields.Item("OutletCountry").Value, "") = "Poland") And SQL.isDbnullEmpty(rpt.Fields.Item("ProductDescription").Value, "") <> "Ad Blue" Then + + ' Select Case SQL.isDbnullEmpty(rpt.Fields.Item("OutletCountry").Value, "") + ' Case "Spain" : rpt.lblMWST.Text &= "10 %" + ' Case "Poland" : rpt.lblMWST.Text &= "8 %" + ' End Select + + 'Else + + rpt.lblMWST.Text &= IIf(sql.isDbnullEmptyDbl(rpt.Fields.Item("Steuersatz").Value, 2, "") <> "", sql.isDbnullEmptyDbl(rpt.Fields.Item("Steuersatz").Value, 2, "") * 100 & " %", "") + + 'End If + + rpt.txtMWST.Text = sql.isDbnullEmptyDbl(rpt.Fields.Item("Steuerbetrag").Value, 2, "") + + rpt.txtPreisProLiter.Text = sql.isDbnullEmptyDbl(rpt.Fields.Item("NettopreisProLiter").Value, 4, 0) + curRabattbetragProLiter '=[NettopreisProLiter]+[curRabattbetragProLiter] + + rpt.txtGesamtbetrag.Text = curGesamtbetrag + + sumLiter += sql.isDbnullEmptyDbl(rpt.Fields.Item("Liter").Value, 2, 0) + + sumBrutto += curGesamtbetrag + + cnt += 1 + End Sub + + + + AddHandler rpt.GroupHeaderKz.Format, Sub() + rpt.txtOutletCountry.Text = sql.isDbnullEmpty(rpt.Fields.Item("OutletCountry").Value, "") + End Sub + + AddHandler rpt.GroupFooterKz.Format, Sub() + + sumLiterLand += sumLiter + sumBruttoLand += sumBrutto + + + rpt.txtNettoKzSum.Text = sumLiterLand.ToString("N2") + rpt.txtMWSTKzSum.Text = "" + rpt.txtBruttoKzSum.Text = sumBruttoLand.ToString("N2") + cntKat += 1 + + sumLiter = 0 + sumBrutto = 0 + + sumLiterGes += sumLiterLand + sumBruttoGes += sumBruttoLand + + sumLiterLand = 0 + sumBruttoLand = 0 + + rpt.txtOutletCountry.Text = rpt.txtOutletCountry.Text.Replace("Land", sql.isDbnullEmpty(rpt.Fields.Item("OutletCountry").Value, "")) + + End Sub + + + + AddHandler rpt.ReportFooter1.Format, Sub() + + rpt.txtNettoGesSum.Text = sumLiterGes.ToString("N2") + rpt.txtBruttoGesSum.Text = sumBruttoGes.ToString("N2") + + If cntKat <= 1 Then + rpt.GroupFooterKat.Visible = False + End If + End Sub + + + + Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("IDS_ " & kdnr & "_IDS_Mautbericht.pdf", ".pdf", , False) + Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport + rpt.Run(False) + p.Export(rpt.Document, tmpPath) + Process.Start(tmpPath) + rpt.Dispose() + + + + + + Catch ex As System.Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb index 33179bdc..9fc84513 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb @@ -245,6 +245,107 @@ Public Class cAufschubKonten Return brgakto_gs_aktSaldo End Function + Public Function CalcSaldo_new(Optional dtDate As DataTable = Nothing, Optional Stichtag As Date? = Nothing, Optional showMessage As Boolean = False) As String + + Dim datumBis As Date = + If(Stichtag.HasValue, Stichtag.Value.Date, Today.Date) + + Dim datumBisSql As String = + datumBis.ToString("yyyy-MM-dd") + + Dim standort As String = + brgakto_gs_standort.Replace("'", "''") + + + Dim saldoSql As String = "DECLARE @Stichtag date = '" & datumBisSql & "'; Declare @Standort varchar(100) = '" & standort & "'; " & "DECLARE @Referenzbetrag decimal(18,2); + /* Referenzbetrag vor dem Stichtag */ +SELECT TOP (1) + @Referenzbetrag = r.brgarefb_refbetrag +FROM [ADMIN].[dbo].[tblBrgAufschubKonten] AS k +INNER JOIN [ADMIN].[dbo].[tblBrgAufschubReferenzberaege] AS r + ON r.brgarefb_gsid = k.brgakto_id +WHERE k.brgakto_gs_standort = @Standort + AND ISNULL(r.brgarefb_gs_aktiv, 1) = 1 + AND r.brgarefb_gueltig_ab < @Stichtag + AND ( + r.brgarefb_gueltig_bis IS NULL + OR r.brgarefb_gueltig_bis >= @Stichtag + ) +ORDER BY + r.brgarefb_gueltig_ab DESC, + r.brgarefb_id DESC; + + +/* Bewegungen vor dem Stichtag */ +SELECT + ISNULL(@Referenzbetrag, 0) + + ISNULL(SUM(Betrag), 0) AS GesamtSicherheitsSaldo +FROM +( + /* Eingänge vor dem Stichtag */ + SELECT + ISNULL(gs.gs_sicherheitsbetrag, 0) * -1 AS Betrag + FROM dbo.tblGesamtsicherheit AS gs + WHERE gs.gs_standort = @Standort + AND gs.gs_datum < @Stichtag + AND ISNULL(gs.gs_ReferenzAenderung, 0) = 0 + + UNION ALL + + /* Ausgänge vor dem Stichtag */ + SELECT + ISNULL(gsp.gsp_sicherheitsbetrag, 0) AS Betrag + FROM dbo.tblGesamtsicherheitsPositionen AS gsp + WHERE gsp.gsp_datum < @Stichtag + AND EXISTS + ( + SELECT 1 + FROM dbo.tblGesamtsicherheit AS gs + WHERE gs.gs_gsId = gsp.gsp_gsId + AND gs.gs_standort = @Standort + AND gs.gs_datum < @Stichtag + AND ISNULL(gs.gs_ReferenzAenderung, 0) = 0 + ) +) AS Bewegungen;" + + + Dim dt As DataTable = + SQL.loadDgvBySql(saldoSql, "AVISO", 100, True) + + Dim saldo As Decimal = 0D + + If dt IsNot Nothing AndAlso + dt.Rows.Count > 0 AndAlso + Not IsDBNull(dt.Rows(0).Item("GesamtSicherheitsSaldo")) Then + + saldo = Convert.ToDecimal( + dt.Rows(0).Item("GesamtSicherheitsSaldo") + ) + End If + + + brgakto_gs_aktSaldo = CDbl(saldo) + + + If showMessage Then + MsgBox( + "Saldo zum Stichtag " & + datumBis.ToShortDateString() & + ":" & vbNewLine & + brgakto_gs_aktSaldo.ToString("N2") + ) + End If + + + If Not Stichtag.HasValue Then + updateSaldo() + End If + + + Return brgakto_gs_aktSaldo.ToString() + + End Function + Public Function getReferenzbetrag(nowDate As Date) As Double Try diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 6ddd193d..110d9ea9 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -3,6 +3,7 @@ Imports System.Data.SqlClient Imports System.IO Imports System.Net Imports System.Reflection +Imports System.Windows.Forms Public Class cIDS @@ -757,6 +758,77 @@ Public Class cIDS End Function + + + Function genIDSMautberichtDatatByKdNr(KdNr As String, rechnungsdatum As Date, art As String, Gruppierung_nach_Ort As Boolean) As DataTable + + + Dim dt As New DataTable + + Dim displayFilter = False + Dim sqlstr As String = "" + + Dim sqljoin_nachOrt As String = "" + Dim sqlgroup_nachOrt = "" + Dim sqlselect_nachOrt = "" + If Gruppierung_nach_Ort Then + sqljoin_nachOrt = "INNER JOIN tbl_IDS_Stationen ON tblIDSTransactionsNew.OutletCountryCode = tbl_IDS_Stationen.OutletCountryCode and tblIDSTransactionsNew.OutletCode = tbl_IDS_Stationen.OutletCode and tbl_IDS_Stationen.[OutletCountryCode]=740543" + sqlgroup_nachOrt = ",tbl_IDS_Stationen.OutletOrt" + sqlselect_nachOrt = "tbl_IDS_Stationen.OutletOrt," + End If + + + Select Case art + Case "IDS" 'Offert17 + + sqlstr = "SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], tblIDSTransactionsNew.[OutletCountry], tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([TotalNetAmount])/Sum([TransactionVolume]) END AS NettopreisProLiter, + Sum(tblIDSTransactionsNew.Rabattbetrag) As [SummevonRabattbetrag], + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([Rabattbetrag])/Sum([TransactionVolume]) END AS RabattbetragProLiter + FROM((tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode) INNER JOIN tbl_IDS_Produkte On tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode ) INNER JOIN Adressen On tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr + Where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & rechnungsdatum.ToShortDateString & "' AND tblIDSTransactionsNew.[OutletCountryCode]<>740543 AND tblIDSTransactionsNew.KdNrVERAG = " & KdNr & " + GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], tblIDSTransactionsNew.[OutletCountry], tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz" + + + + Case "IDS_AT" 'Offert21 + + sqlstr = " SELECT Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 And 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END AS OutletCountry, tbl_IDS_Produkte.ProductDescription," & sqlselect_nachOrt & " tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz, Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Nettobetrag, Sum(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag, + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([TotalNetAmount])/Sum([TransactionVolume]) END AS NettopreisProLiter, + Sum(tblIDSTransactionsNew.Rabattbetrag) As [SummevonRabattbetrag], + Case when Sum([TransactionVolume]) =0 THEN 0 ELSE Sum([Rabattbetrag])/Sum([TransactionVolume]) END AS RabattbetragProLiter + FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode INNER JOIN tbl_IDS_Produkte On tblIDSTransactionsNew.[ProductTypeCode] = tbl_IDS_Produkte.ProductTypeCode " & sqljoin_nachOrt & " INNER JOIN Adressen On tblIDSTransactionsNew.KdNrVERAG = Adressen.AdressenNr + Where cast(tblIDSTransactionsNew.YearMonthDay As Date) = '" & rechnungsdatum.ToShortDateString & "' And tblIDSTransactionsNew.[OutletCountryCode]=740543 AND tblIDSTransactionsNew.KdNrVERAG = " & KdNr & " + GROUP BY Adressen.AdressenNr, Adressen.[Name 1], Adressen.[Name 2], Adressen.Straße, Adressen.LandKz, Adressen.PLZ, Adressen.Ort, Adressen.UstIdKz, Adressen.UstIdNr, tblIDSTransactionsNew.[CustomerCode], CASE WHEN tblIDSTransactionsNew.OutletCode BETWEEN 4473 AND 4474 THEN 'Austria Suben' ELSE tblIDSTransactionsNew.OutletCountry END, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Länder.Steuersatz, tblIDSTransactionsNew.Rechenwert, tblIDSTransactionsNew.Kz" & sqlgroup_nachOrt + + End Select + + + dt = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL") + + Return dt + + + + End Function + + Public Function getCurrentInvoicedate(kdNr As String) As String + + Dim datum As String = "" + + If kdNr <> "" AndAlso IsNumeric(kdNr) Then + Dim rechnungsdatum As String = SQL.getValueTxtBySql(" select top(1) cast(tblIDSTransactionsNew.YearMonthDay As Date) from tblIDSTransactionsNew Where tblIDSTransactionsNew.KdNrVERAG = " & kdNr & " order by tblIDSTransactionsNew.YearMonthDay desc", "FMZOLL") + If rechnungsdatum <> "" AndAlso IsDate(rechnungsdatum) Then + datum = rechnungsdatum + End If + End If + + Return datum + + End Function + + + Public Class Paramter Shared apiSettingsloaded As Boolean = False diff --git a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb index 1f43963f..b8892d5c 100644 --- a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb +++ b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb @@ -71,7 +71,10 @@ Public Class frmDatumsabfrage End Sub Private Sub frmDatumsabfrage(sender As Object, e As EventArgs) Handles Me.Load - dtp_date.Value = Now.ToShortDateString + + + + 'dtp_date.Value = Now.ToShortDateString pnlKunde.Visible = panelKunde MyPanel2.Visible = panelLaender