diff --git a/SDL/Administration/frmKassenVerwaltung.Designer.vb b/SDL/Administration/frmKassenVerwaltung.Designer.vb index 7f352056..d6e774ae 100644 --- a/SDL/Administration/frmKassenVerwaltung.Designer.vb +++ b/SDL/Administration/frmKassenVerwaltung.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmKassenVerwaltung Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmKassenVerwaltung 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKassenVerwaltung)) Me.DataGridView = New System.Windows.Forms.DataGridView() diff --git a/SDL/Administration/frmZinsnachberechnung.Designer.vb b/SDL/Administration/frmZinsnachberechnung.Designer.vb new file mode 100644 index 00000000..cb923c4b --- /dev/null +++ b/SDL/Administration/frmZinsnachberechnung.Designer.vb @@ -0,0 +1,84 @@ + +Partial Class frmZinsnachberechnung + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmZinsnachberechnung)) + Me.DataGridView = New System.Windows.Forms.DataGridView() + Me.btnSpeichern = New System.Windows.Forms.Button() + Me.lblVerwaltungDerRKSVKassenTabelle = New System.Windows.Forms.Label() + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'DataGridView + ' + Me.DataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.DataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells + Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView.Location = New System.Drawing.Point(12, 29) + Me.DataGridView.Name = "DataGridView" + Me.DataGridView.Size = New System.Drawing.Size(997, 444) + Me.DataGridView.TabIndex = 0 + ' + 'btnSpeichern + ' + Me.btnSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnSpeichern.Location = New System.Drawing.Point(872, 479) + Me.btnSpeichern.Name = "btnSpeichern" + Me.btnSpeichern.Size = New System.Drawing.Size(137, 34) + Me.btnSpeichern.TabIndex = 1 + Me.btnSpeichern.Text = "Speichern" + Me.btnSpeichern.UseVisualStyleBackColor = True + ' + 'lblVerwaltungDerRKSVKassenTabelle + ' + Me.lblVerwaltungDerRKSVKassenTabelle.AutoSize = True + Me.lblVerwaltungDerRKSVKassenTabelle.Location = New System.Drawing.Point(13, 13) + Me.lblVerwaltungDerRKSVKassenTabelle.Name = "lblVerwaltungDerRKSVKassenTabelle" + Me.lblVerwaltungDerRKSVKassenTabelle.Size = New System.Drawing.Size(119, 13) + Me.lblVerwaltungDerRKSVKassenTabelle.TabIndex = 2 + Me.lblVerwaltungDerRKSVKassenTabelle.Text = "Verwaltung der Tabelle:" + ' + 'frmKassenVerwaltung + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.White + Me.ClientSize = New System.Drawing.Size(1021, 517) + Me.Controls.Add(Me.lblVerwaltungDerRKSVKassenTabelle) + Me.Controls.Add(Me.btnSpeichern) + Me.Controls.Add(Me.DataGridView) + Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Name = "frmKassenVerwaltung" + Me.Text = "Administration" + Me.WindowState = System.Windows.Forms.FormWindowState.Maximized + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents DataGridView As System.Windows.Forms.DataGridView + Friend WithEvents btnSpeichern As System.Windows.Forms.Button + Friend WithEvents lblVerwaltungDerRKSVKassenTabelle As System.Windows.Forms.Label +End Class diff --git a/SDL/Administration/frmZinsnachberechnung.resx b/SDL/Administration/frmZinsnachberechnung.resx new file mode 100644 index 00000000..d584bd9e --- /dev/null +++ b/SDL/Administration/frmZinsnachberechnung.resx @@ -0,0 +1,980 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA + AACRbEd5TB+CWC59USZ8USV9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ8USV9USaCWC55TB+RbEd4Sx5mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB4Sx5/VClmMwBuPg5r + OglrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOgluPg5mMwB/VCl0RhhmMwBmMwBnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFmMwBmMwB0RhhzRBVmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBz + RBV3Sh1mMwBnNQJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBnNQJmMwB3Sh18UCRmMwBqOQdnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFqOQdmMwB8UCR9USZmMwBrOQhn + NAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9 + USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwDm4N3///////// + ///////39fR0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////////////// + //////////////////////////////////////////////90SSZmMwBmMwBmMwBmMwBmMwB0SSb39fT/ + //////////////9mMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////////////////+YfWtmMwBmMwBm + MwBmMwB0SSbu6+n////////////39fR0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT///// + ///////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5zUy8X////////////////L + v7itmo1mMwBmMwCYfWv///////90SSZmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhn + NAFmMwBmMwBmMwB0SSb////////////////////////Lv7hmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDu6+n///////////////////////////////////////////////////////////+j + jH1mMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwC3p5z/ + ///////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwCYfWv////////////////Bs6pmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwB0SSb///////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCt + mo3////////////////////////////////////m4N2Mbli3p5z///////+jjH1mMwBmMwBmMwBmMwBm + MwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwCMblj///////////////////////////+M + blhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////////////////// + ///////////////////////////////Lv7hmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////+3 + p5xmMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwDU + y8X///////////////+AXUJmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////90SSZm + MwBmMwBmMwBmMwBmMwBmMwBmMwDLv7j////////////////////////////////////////////39fTm + 4N3///////+3p5xmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwC3 + p5z////////////////////////////d1tFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3 + p5z////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwCjjH3////////////////Lv7hmMwBmMwBmMwBmMwBmMwCAXUL///////////////////90 + SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL39fT////////////Lv7hmMwBmMwBmMwBmMwBmMwBmMwBm + MwC3p5z////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z////////////////////U + y8WAXUJmMwBmMwC3p5z39fT////////////////////Uy8VmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9 + USZ9USZmMwBrOQhnNAFmMwBmMwBmMwDBs6r////////////////u6+n///////////+tmo1mMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj///////////////////90SSZmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj////////////////m4N1mMwBmMwBmMwBm + MwBmMwC3p5z////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////// + ///////////////////////////////////////////////////////Uy8VmMwBmMwBmMwBmMwBmMwBm + MwBmMwD39fT////////////////Lv7hmMwBmMwBmMwBmMwBmMwCAXULu6+n////////////////39fRm + MwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwDm4N3///////////// + //+jjH3////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb///////////// + //////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD3 + 9fT///////////////90SSZmMwBmMwBmMwBmMwDm4N3///////////////+jjH1mMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDu6+n///////////////////////////////////////////////////// + //////+3p5xmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////////////////+MblhmMwBmMwBmMwBmMwBm + MwBmMwCMblj///////////////////90SSZmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhn + NAFmMwBmMwBmMwD39fT///////////////9mMwDLv7j///////////+3p5xmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwDm4N3////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////+YfWtmMwBmMwBmMwCAXUL///////// + ///////39fR0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////// + //////////////////////////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwC3p5z///////// + //////////9mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////+jjH1mMwBmMwBmMwBm + MwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwCMblj////////////////m4N1mMwCAXUL39fT/ + ///////39fSAXUJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r////////////////Uy8VmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////////// + ///////////////////////////////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwDUy8X////////////u6+lmMwBmMwBmMwBmMwCMblj///////////////////90SSZmMwBm + MwBmMwBmMwBmMwBmMwC3p5z///////////////////9mMwBmMwBmMwB0SSb///////////////////// + //////////////+3p5xmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwCjjH3/ + ///////////////Uy8VmMwBmMwC3p5z////////////Lv7hmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwC3p5z////////////////////////////////////////////////////m4N1mMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwCjjH3////////////////////////////////////////////////////////////d + 1tGMblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////////////+tmo1mMwBmMwBmMwCt + mo3////////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////////////////90SSZm + MwBmMwBmMwDm4N3////////////////////////////////Uy8VmMwBmMwBmMwBmMwBnNAFrOQhmMwB9 + USZ9USZmMwBrOQhnNAFmMwBmMwC3p5z///////////////+3p5xmMwBmMwB0SSb39fT///////////+Y + fWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj///////////////////////////////////////// + //////////////9mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb///////////////////////////// + //////////////////////////////////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3 + p5z////////////39fR0SSZmMwBmMwDBs6r////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBm + MwCjjH3///////////////////+jjH1mMwBmMwBmMwDBs6r////////////////////////////////3 + 9fRmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwDUy8X///////////////+t + mo1mMwBmMwBmMwCtmo3////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT///// + //////////////////////////////////////////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwDu6+n///////////////90SSZmMwBmMwBmMwBmMwBmMwCjjH3m4N3////////////////39fR0SSZm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDu6+n///////////+3p5xmMwBmMwDUy8X///////////// + //+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb////////////////////Bs6pmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhn + NAFmMwBmMwDu6+n///////////////+MblhmMwBmMwBmMwBmMwDu6+n///////////+tmo1mMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDd1tH////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////+YfWtmMwBmMwBmMwBmMwBmMwBm + MwB0SSbu6+n///////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////// + ///39fSAXUJmMwD39fT///////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///// + ///////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r////Uy8W3p5y3p5yYfWtmMwBmMwBm + MwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwB0SSb///////////////////90SSZmMwBmMwBmMwBm + MwCtmo3////////////u6+l0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r////////////////m4N1m + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////// + //////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwDLv7j////////////////Bs6pmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDUy8X////////////Lv7h0SSb///////////////////90SSZmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwDu + 6+n///////////////+jjH1mMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwCYfWv///// + ///////////u6+lmMwBmMwBmMwBmMwBmMwBmMwDd1tH///////////+3p5xmMwBmMwBmMwBmMwBmMwBm + MwBmMwCjjH3///////////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwCYfWv////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///// + //////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////////////+tmo3/ + ///////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////// + //+YfWtmMwBmMwBmMwBmMwBmMwCtmo3////////////////u6+lmMwBmMwBmMwBmMwBnNAFrOQhmMwB9 + USZ9USZmMwBrOQhnNAFmMwC3p5z////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwCYfWv///// + //////////+AXUJmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////////////////+MblhmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb////////////////u6+lmMwBm + MwBmMwBmMwBmMwCAXULLv7j///////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwC3p5z////////////////////////////////Lv7hmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDd1tH///////////////////+3p5x0SSZmMwBmMwC3p5z///////////////////+t + mo1mMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwDLv7j////////////////Bs6pm + MwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT/ + //////////////////////////////////////////////////////////90SSZmMwBmMwBmMwBmMwBm + MwBmMwDm4N3////////////////////////////////////////////////////////////Bs6pmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDu6+n///////////////////////////+3 + p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////////////// + ///////////////////////////Lv7hmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhn + NAFmMwDm4N3///////////////+tmo1mMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////////////+Y + fWtmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////////////////////////////////////// + //////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwDLv7j///////////////////////////////////// + ///////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCj + jH3///////////////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwCtmo339fT///////////////////////////////////////+tmo1mMwBmMwBmMwBmMwBmMwBm + MwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAF0SSb///////////////////+MblhmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDLv7j////////////u6+l0SSZmMwBmMwBmMwBmMwBmMwC3p5z///////////////// + //////////////////////////////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwC3p5z///// + ///////////////////////////////////////m4N23p5yMblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH///////////////////////9mMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH23p5z39fT////////////////Uy8W3 + p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9 + USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhn + NAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9 + USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ9USZmMwBrOQhnNAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNAFrOQhmMwB9USZ8UCRmMwBqOQdn + NAFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBnNAFqOQdmMwB8UCR3Sh1mMwBnNQJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBnNQJmMwB3Sh1zRBVmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBz + RBV0RhhmMwBmMwBnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFnNAFn + NAFnNAFnNAFnNAFnNAFnNAFmMwBmMwB0Rhh/VClmMwBuPg5rOglrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhr + OQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOQhrOgluPg5mMwB/VCl4Sx5mMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwB4Sx6RbEd5TB+CWC59USZ8USV9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ9 + USZ9USZ9USZ9USZ9USZ9USZ9USZ9USZ8USV9USaCWC55TB+RbEf///////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////Bs6rBs6qYfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWvBs6rBs6r///// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////Uy8WYfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWvUy8X////////////////////////////////////////B + s6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwCjjH3Bs6rBs6r39fT///////////////////////////////////////////////////////// + ///Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////////////////////////////////// + ///////////////////////////////////////////////////////////////d1tGMblhmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWvm4N3/ + ///////////////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMbljLv7j///////////////// + ///////////////////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X////////////////////////////d1tFmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwCMbljm4N3////////////////////////////////////////////m4N1mMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwC3p5z///////////////////////////////////////////////////////////// + //////////////////////////////////////+tmo1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDLv7j///////// + ///////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////////// + ///////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////////////////////////// + ///////////////////////////////////////////////////////////////////Bs6pmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwCtmo3///////////////////////////////////////+MblhmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCA + XUL///////////////////////////////////////////////////////////////////////////// + ///////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL39fT///////////////// + //+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCtmo3///////////////////////////// + //////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT///////////////////////////////////////// + //////////////////////////////////////////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwDBs6r///////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwDBs6r////////////////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////// + ///////////////////////////////////////////////////////////////////////////d1tFm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6rd1tH////////39fTBs6qAXUJm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb////////////////////Lv7hmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH////////////////////////////Uy8VmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwDLv7j///////////////////////////////////////////////////////// + //////////////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3/ + //////////////////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd + 1tH////////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////// + ///////Uy8XBs6qMblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///// + ///////////////////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj///////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////+AXUJmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwCtmo3///////////////////////////////////////+AXUJmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwC3p5z////////////////////////////////d1tGMblhmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////////////////9mMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwB0SSb///////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL39fT///////////////////// + ///////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCtmo3///////////// + //////+AXUJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj///////////////////////////// + //////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb39fT///////////// + //////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwDBs6r////////////////////////////////////////////d1tFmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwCYfWv///////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0 + SSb///////////////////////////////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDBs6r///////////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwDUy8X///////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///u6+nBs6rBs6rBs6qYfWtmMwBmMwBmMwDu6+n///////////////////////////////////////// + ///Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////+3p5xmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDu6+n////////////////////////////////////////u + 6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj////////////////////////Bs6pm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////u6+l0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCY + fWv////////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////// + //////////////////////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwDm4N3////////////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////u6+m3p5xmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3////////////////////m4N1mMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwDBs6r////////////////////////////////////////////d1tFmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r////////////////////u6+lmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwCMblj///////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////////////Uy8XB + s6p0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////////// + //////////9mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCtmo3///////////////////////// + //////////////////////+AXUJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////// + //////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD///////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////m4N3Bs6qMblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDUy8X///////////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwCMblj///////////////////////////////////////////////+3p5xmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwB0SSb///////////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwDm4N3///////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////Bs6qAXUJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb39fT///////////////////////+jjH1m + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb///////////////////////////////////////// + ///////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT///////////////////+t + mo1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////Lv7hmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r/ + ///////////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///// + ///////////////////////////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwDm4N3////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r/ + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwCAXUL39fT////////////////////////////Uy8VmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////////////////////////////////////90SSZm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH////////////////////Uy8VmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSbm4N3///////////////////// + ///////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////////// + //////////////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///// + ///////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj///////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////Bs6pmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCM + bljm4N3///////////////////////////////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwCjjH3///////////////////////////////////////////////+YfWtmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDLv7j///////////////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwD39fT///////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////39fR0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////////////////////////////////////+M + blhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMblj///////////////////////////////////// + //////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDLv7j///////////////////// + //+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWvBs6r///////////////////////// + //////////////////////////////+tmo1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD///// + //////////////////////////////////////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwDd1tH///////////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDL + v7j///////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////+Mblhm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCtmo3Bs6r///// + ///////////////////////////////////////////////////////////////Bs6pmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////////////////////////////////////+AXUJm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH////////////////////////Bs6pmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////9mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwCtmo3Bs6r39fT///////////////////////////////////////////////////////////////// + ///////////////Uy8VmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDUy8X///////////////// + ///////////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDu6+n///// + ///////////////////d1tFmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////u6+lmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwB0SSbLv7j///////////////////////////////////////////////// + ///////////////////////////////////////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwC3p5z////////////////////////////////////////Uy8VmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwB0SSb////////////////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwCAXUL///////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSbu6+n///////////////////// + //////////////////////////////////////////////////////////////////////////////// + //90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////////////////////////////// + //////+tmo1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCjjH3///////////////////////// + //////90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT///////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwC3p5z////////////////////////////////////39fRmMwBmMwB0SSbBs6rBs6r39fT///////// + //////////////////////////////////+MblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL/ + ///////////////////////////////////u6+lmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwDBs6r///////////////////////////////+YfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwDm4N3///////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////////39fRmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z////////////////////////////////////Bs6pm + MwBmMwBmMwBmMwBmMwBmMwBmMwCtmo3Bs6rBs6r///////////////////////////+3p5xmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD39fT////////////////////////////39fSMblhmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDu6+n///////////////////////////////+3p5xmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDLv7j///////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXUL///////// + ///////////////////////u6+l0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD///////// + ///////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDm4N3///////////// + ///////////u6+mMblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////// + ///////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////+jjH1mMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwCjjH3////////////////////////u6+mAXUJmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwCYfWv////////////////////////////d1tFmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDLv7j////////////////Uy8W3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwDd1tH////////////////////////////////////d1tFmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwCYfWv///////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////Lv7hmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCMbljBs6r////////d1tG3 + p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH///////////////////////// + ///39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////////////////// + ///////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSb///////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////39fR0SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCM + blj///////////////////////////////////90SSZmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSbu6+n/ + //////////////////////////////////////////+AXUJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwD39fT///////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////////////////L + v7hmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH///////////////////////////////////+YfWtmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwDLv7j///////////////////////////////////////////////+jjH1m + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDd1tH///////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////+jjH1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwC3p5z///////////////// + //////////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///////////////////////// + //////////////////////////+3p5xmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDBs6r///// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////39fSAXUJmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwCYfWv////////////////////////////////////////////Bs6pmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDB + s6r////////////////////////////////////////////////////////Lv7hmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwC3p5z///////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////u6+mMblhmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////////////////////////// + ///////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwB0SSbUy8X///////////////////////////////////////////////// + ///////////m4N1mMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCYfWv///////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////+jjH1mMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwDLv7j///////////// + ///////////////////////////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwB0SSbBs6r///////////////////////// + ///////////////////////////////////////////39fRmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwB0SSb///////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////d1tGYfWtmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBm + MwBmMwDBs6r39fT///////////////////////////////////////////////////////////+AXUJm + MwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwCAXULBs6rBs6rm4N3/ + //////////////////////////////////////////////////////////////////////////////+A + XUJmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwBmMwD///////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////39fTBs6rBs6pmMwBmMwBm + MwBmMwBmMwBmMwBmMwBmMwCjjH3Bs6rUy8X///////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + + + \ No newline at end of file diff --git a/SDL/Administration/frmZinsnachberechnung.vb b/SDL/Administration/frmZinsnachberechnung.vb new file mode 100644 index 00000000..c0eb1ed4 --- /dev/null +++ b/SDL/Administration/frmZinsnachberechnung.vb @@ -0,0 +1,37 @@ +Public Class frmZinsnachberechnung + Dim KASSENBind As cEasyBinding + Public table + Public BIND_DB + Sub New(table, BIND_DB) + Me.table = table + Me.BIND_DB = BIND_DB + InitializeComponent() + End Sub + + Private Sub frmZinsnachberechnung_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + KASSENBind = New cEasyBinding(BIND_DB) + Select Case table + Case "" 'Sonderfall + Case Else + KASSENBind.initBinding("SELECT * FROM " & table & " WHERE verrechnet is null", table) + For Each c As DataColumn In KASSENBind.bindingdataTable.Columns + If c.ColumnName = "SSMA_TimeStamp" Then + KASSENBind.bindingdataTable.Columns.Remove(c) + Exit For + End If + Next + ' KASSENBind.initBinding("SELECT * FROM " & table & "", table) + End Select + DataGridView.DataSource = KASSENBind.bindingdataTable + ' DataGridView.AutoSize = True + + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub + + Private Sub btnSpeichern_Click(sender As Object, e As EventArgs) Handles btnSpeichern.Click + KASSENBind.updateBinding() + End Sub +End Class \ No newline at end of file diff --git a/SDL/App.config b/SDL/App.config index 2b5eadde..905de8ae 100644 --- a/SDL/App.config +++ b/SDL/App.config @@ -25,7 +25,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -152,17 +152,17 @@ - - + + - - + + - - + + diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index ce71c433..85abcdfa 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1958,12 +1958,12 @@ Public Class cFakturierung Dim ret = cProgramFunctions.printRpt(rpt, PrinterName, False) - If printStbVdb Then + If printStbVdb AndAlso RECHNUNG.Firma_ID <> 1 Then If (RECHNUNG.[DruckDatumZeit] Is Nothing OrElse vbYes = MsgBox("Zollbeleg drucken?", vbYesNoCancel)) Then printSpedBuchAnhaenge(RECHNUNG, True, True) End If End If - If RECHNUNG.ANHAENGE.Count > 0 Then + If RECHNUNG.ANHAENGE.Count > 0 AndAlso RECHNUNG.Firma_ID <> 1 Then If (RECHNUNG.[DruckDatumZeit] Is Nothing OrElse vbYes = MsgBox("Anhänge drucken?", vbYesNoCancel)) Then printRGAnhaenge(RECHNUNG) End If @@ -2123,7 +2123,7 @@ Public Class cFakturierung 'für öffentliche Auftraggeber oder anderer Referenzinformationen für interne Zuordnungsprozesse. 'Die Leitweg-ID ist in Deutschland eine Pflichtangabe für elektronische Rechnungen an die Bundesverwaltung und muss vom Rechnungssteller vom Auftraggeber erhalten werden. - desc.ReferenceOrderNo = IIf(RECHNUNG.KdAuftragsNr Is Nothing, "", RECHNUNG.KdAuftragsNr) + desc.ReferenceOrderNo = IIf(RECHNUNG.KdAuftragsNr Is Nothing, "-", RECHNUNG.KdAuftragsNr) If RECHNUNG.Besonderheiten IsNot Nothing Then desc.AddNote(RECHNUNG.Besonderheiten.ToString, SubjectCodes.AAI) If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI) @@ -2133,12 +2133,23 @@ Public Class cFakturierung Dim KundePLZ As String = "" Dim KundeOrt As String = "" - If RECHNUNG_AD IsNot Nothing AndAlso RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD IsNot Nothing Then - KundePLZ = RECHNUNG_AD.Postfach - KundeOrt = RECHNUNG_AD.PLZ + If RECHNUNG_AD IsNot Nothing Then + + If RECHNUNG_AD.PLZ IsNot Nothing Then + KundePLZ = RECHNUNG_AD.PLZ + ElseIf RECHNUNG_AD.PLZPF IsNot Nothing Then + KundePLZ = RECHNUNG_AD.PLZPF + End If + + If RECHNUNG_AD.Ort IsNot Nothing Then + KundeOrt = RECHNUNG_AD.Ort + ElseIf RECHNUNG_AD.Postfach IsNot Nothing Then + KundeOrt = RECHNUNG_AD.Postfach + End If End If - desc.SetBuyer(RECHNUNG.RechnungsName_1, IIf(KundePLZ <> "", KundePLZ, RECHNUNG.RechnungsOrt), IIf(KundeOrt <> "", KundeOrt, RECHNUNG.RechnungsOrt), RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, "")) + 'im RECHNUNG.RechnungsOrt befinden sich Ort und PLZ kombiniert! + desc.SetBuyer(RECHNUNG.RechnungsName_1 & IIf(RECHNUNG.RechnungsName_2 <> "", " " & RECHNUNG.RechnungsName_2, ""), IIf(KundePLZ <> "", KundePLZ, RECHNUNG.RechnungsOrt), IIf(KundeOrt <> "", KundeOrt, RECHNUNG.RechnungsOrt), RECHNUNG.RechnungsStraße, GetCountryCodeFromLandKZ(RECHNUNG.RechnungsLandKz, vatBuyer), IIf(Not IsDBNull(RECHNUNG.KundenNrZentrale), RECHNUNG.KundenNrZentrale, "")) Dim FirmaOrt = FIRMA.Firma_Ort FirmaOrt = FirmaOrt.Replace(FIRMA.Firma_LandKz & "-" & FIRMA.Firma_PLZ & " ", "") @@ -2218,7 +2229,7 @@ Public Class cFakturierung 'If RECHNUNG.TextZZ.ToString.Contains("Abbuchungsauftrag") Then ' desc.SetPaymentMeansSepaDirectDebit("", "") 'Else - desc.SetPaymentMeans(PaymentMeansTypeCodes.PaymentToBankAccount, RECHNUNG.TextZZ) + desc.SetPaymentMeans(PaymentMeansTypeCodes.SEPACreditTransfer, RECHNUNG.TextZZ) 'End If Dim isReverseCharge = isReverseChargeSumme(FIRMA, RECHNUNG) @@ -2231,7 +2242,7 @@ Public Class cFakturierung If RECHNUNG.SteuerfreierGesamtbetrag > 0 Then - desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, TaxTypes.VAT, TaxCategoryCodes.Z) + desc.AddApplicableTradeTax(Convert.ToDecimal(RECHNUNG.SteuerfreierGesamtbetrag), 0, 0, TaxTypes.VAT, TaxCategoryCodes.Z) End If If RECHNUNG.SteuerpflichtigerGesamtbetrag > 0 Then @@ -2338,7 +2349,7 @@ Public Class cFakturierung If ROW("KdAuftragsNr") IsNot DBNull.Value AndAlso ROW("KdAuftragsNr") <> "" Then desc.ReferenceOrderNo = ROW("KdAuftragsNr") Else - desc.ReferenceOrderNo = " " + desc.ReferenceOrderNo = "-" End If Dim Rechnugnsname2 As String = "" @@ -2398,10 +2409,21 @@ Public Class cFakturierung Dim KundePLZ As String = "" Dim KundeOrt As String = "" - If RECHNUNG_AD IsNot Nothing AndAlso RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD.PLZ IsNot Nothing AndAlso RECHNUNG_AD.Postfach <> "" AndAlso RECHNUNG_AD.PLZ <> "" Then - KundePLZ = RECHNUNG_AD.Postfach - KundeOrt = RECHNUNG_AD.PLZ + If RECHNUNG_AD IsNot Nothing Then + If RECHNUNG_AD.PLZ IsNot Nothing AndAlso RECHNUNG_AD.PLZ <> "" Then + KundePLZ = RECHNUNG_AD.PLZ + ElseIf RECHNUNG_AD.PLZPF IsNot Nothing AndAlso RECHNUNG_AD.PLZPF <> "" Then + KundePLZ = RECHNUNG_AD.PLZPF + End If + + If RECHNUNG_AD.Ort IsNot Nothing AndAlso RECHNUNG_AD.Ort <> "" Then + KundeOrt = RECHNUNG_AD.Ort + ElseIf RECHNUNG_AD.Postfach IsNot Nothing AndAlso RECHNUNG_AD.Postfach <> "" Then + KundeOrt = RECHNUNG_AD.Postfach + End If + Else + 'Rechnungsort ist kombination aus PLZ und Ort! KundePLZ = RechnungsOrt KundeOrt = RechnungsOrt @@ -2600,7 +2622,7 @@ Public Class cFakturierung If Gesamt_RG_BetragSteuerfrei > 0 Then - desc.AddApplicableTradeTax(Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei), 0, TaxTypes.VAT, TaxCategoryCodes.Z) + desc.AddApplicableTradeTax(Convert.ToDecimal(Gesamt_RG_BetragSteuerfrei), 0, 0, TaxTypes.VAT, TaxCategoryCodes.Z) End If If Gesamt_RG_BetragSteuerpflichtig > 0 Then @@ -2624,7 +2646,7 @@ Public Class cFakturierung Public Shared Function GetCountryCodeFromLandKZ(LandKZ As String, easi As ElectronicAddressSchemeIdentifiers) As CountryCodes - If LandKZ = "" Then Return CountryCodes.Unknown + If LandKZ = "" Then Return Nothing Dim landKZISO2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2Land(LandKZ) Dim cc As CountryCodes @@ -2646,7 +2668,7 @@ Public Class cFakturierung Case "CZ" : cc = CountryCodes.CZ : easi = ElectronicAddressSchemeIdentifiers.CzechRepublicVatNumber Case "DK" : cc = CountryCodes.DK Case "DZ" : cc = CountryCodes.DZ - Case "ES" : cc = CountryCodes.ES + Case "ES" : cc = CountryCodes.ES : easi = ElectronicAddressSchemeIdentifiers.AgenciaEspaOlaDeAdministraciNTributaria Case "FR" : cc = CountryCodes.FR : easi = ElectronicAddressSchemeIdentifiers.FrenchVatNumber Case "FN" : cc = CountryCodes.FI Case "HR" : cc = CountryCodes.HR : easi = ElectronicAddressSchemeIdentifiers.CroatiaVatNumber @@ -2666,7 +2688,7 @@ Public Class cFakturierung Case "SK" : cc = CountryCodes.SK : easi = ElectronicAddressSchemeIdentifiers.SlovakiaVatNumber Case Else - cc = CountryCodes.Unknown + cc = Nothing End Select diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index 999f4fc0..ed523ec6 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -71,6 +71,11 @@ Public Class frmAbrechnungsMaske If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then whereFirma = " AND FIRMENGRUPPE In ('VERAG360','VERAGAG_DE') " End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG", "SDL") Then + whereFirma &= " OR Firma_ID=1 " + End If + cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSR", "MSR")) cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") cboFirma.changeItem("1") diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 5563ba06..8439ed38 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -386,7 +386,7 @@ Public Class frmFaktEmail If Not SR Then - If RECHNUNG.FilialenNr = 4817 And Firma_ID = 19 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then + If RECHNUNG.FilialenNr = 4817 AndAlso RECHNUNG.ErfassungsNr IsNot Nothing Then Dim SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.UnterNr) If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115 Or SPEDBUCH.Abfertigungsart = 10) Then Dim USTV_ANTRAG As New cUSTVAntrag(RECHNUNG.ErfassungsNr) @@ -426,9 +426,19 @@ Public Class frmFaktEmail End If If mailText <> "" Then TextHTML &= mailText & vbNewLine - 'TextHTML &= "


" & cFakturierung.getSignature(RechnungsLandKz, Firma_ID) + End If + + Else + 'sonst alles weg! + replaceKZ("nichtRMC", TextHTML) + replaceKZ("RMC", TextHTML) + replaceKZ("KZ1", TextHTML) + replaceKZ("KZ4", TextHTML) + TextHTML = TextHTML.ToString.Replace("%", "") + + End If End If diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index bb89a1aa..7251998b 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -67,6 +67,10 @@ Public Class usrCntlFaktAbrechnung Firma = 17 cboFiliale.changeItem(5801) + Case "VERAG" + If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "MDM" Then + Firma = 19 + End If End Select @@ -602,18 +606,24 @@ Public Class usrCntlFaktAbrechnung End If pnlDocs.Visible = True Case "VERAG360" + Dim Firmengruppe As String = "'VERAG360'" + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then - whereFirma = " AND FIRMENGRUPPE IN ('VERAG360','VERAGAG_DE') " : pnlDocs.Visible = True - Else - whereFirma = " AND FIRMENGRUPPE IN ('VERAG360') " : pnlDocs.Visible = True + Firmengruppe &= " ,'VERAGAG_DE'" End If + whereFirma = " AND FIRMENGRUPPE IN (" & Firmengruppe & ") " : pnlDocs.Visible = True + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG", "SDL") Then + whereFirma &= " OR Firma_ID=1 " + End If + + + End Select cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID ", True, "FMZOLL", firstEmpty) - - cboFirma.SelectedIndex = 0 diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index d12f54cd..d8da6130 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 4fab5e1b..63a8b55d 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -123,9 +123,9 @@ False ..\..\..\dll\SharpSSH\DiffieHellman.dll - + False - F:\PROGRAMMIERUNG\dll\OpenXML\DocumentFormat.OpenXml.dll + F:\PROGRAMMIERUNG\dll\OpenXML\v2720\DocumentFormat.OpenXml.dll ..\..\..\DISPO\DISPO\packages\DS.Documents.DX.Windows.7.2.2\lib\net461\DS.Documents.DX.Windows.dll @@ -395,8 +395,8 @@ False ..\..\..\dll\RKAesIcm.dll - - ..\..\..\Aviso\AVISO\packages\ZUGFeRD-csharp.16.0.2\lib\net48\s2industries.ZUGFeRD.dll + + ..\packages\ZUGFeRD-csharp.17.4.0\lib\net48\s2industries.ZUGFeRD.dll @@ -410,11 +410,13 @@ - - ..\..\..\AVISO\Aviso\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True - - ..\..\..\AVISO\Aviso\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.4.5.0\lib\net46\System.IO.Packaging.dll @@ -488,6 +490,12 @@ Form + + frmZinsnachberechnung.vb + + + Form + frmKassenVerwaltung.vb @@ -3300,6 +3308,9 @@ frmKasseAbschliessen.vb + + frmZinsnachberechnung.vb + frmKassenVerwaltung.vb diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 833dcd9a..1e3788a7 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -24,13 +24,13 @@ Partial Class frmMDM_USTVAntrag Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) - 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() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlBottom = New System.Windows.Forms.Panel() Me.pbMail = New System.Windows.Forms.PictureBox() Me.pb_Beleg = New System.Windows.Forms.PictureBox() Me.Button5 = New System.Windows.Forms.Button() - Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSummeEUR = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label27 = New System.Windows.Forms.Label() Me.picExcel = New System.Windows.Forms.PictureBox() Me.Button4 = New System.Windows.Forms.Button() @@ -142,6 +142,8 @@ Partial Class frmMDM_USTVAntrag Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label18 = New System.Windows.Forms.Label() Me.pnlBottom.SuspendLayout() CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() @@ -173,10 +175,12 @@ Partial Class frmMDM_USTVAntrag ' Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlBottom.Controls.Add(Me.Label18) + Me.pnlBottom.Controls.Add(Me.txtSumme) Me.pnlBottom.Controls.Add(Me.pbMail) Me.pnlBottom.Controls.Add(Me.pb_Beleg) Me.pnlBottom.Controls.Add(Me.Button5) - Me.pnlBottom.Controls.Add(Me.txtSumme) + Me.pnlBottom.Controls.Add(Me.txtSummeEUR) Me.pnlBottom.Controls.Add(Me.Label27) Me.pnlBottom.Controls.Add(Me.picExcel) Me.pnlBottom.Controls.Add(Me.Button4) @@ -187,7 +191,7 @@ Partial Class frmMDM_USTVAntrag Me.pnlBottom.Controls.Add(Me.Button1) Me.pnlBottom.Controls.Add(Me.lbl_EintrageVerarbetiet) Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlBottom.Location = New System.Drawing.Point(0, 649) + Me.pnlBottom.Location = New System.Drawing.Point(0, 667) Me.pnlBottom.Name = "pnlBottom" Me.pnlBottom.Size = New System.Drawing.Size(1444, 100) Me.pnlBottom.TabIndex = 3 @@ -195,7 +199,7 @@ Partial Class frmMDM_USTVAntrag 'pbMail ' Me.pbMail.Image = CType(resources.GetObject("pbMail.Image"), System.Drawing.Image) - Me.pbMail.Location = New System.Drawing.Point(1110, 17) + Me.pbMail.Location = New System.Drawing.Point(1097, 8) Me.pbMail.Name = "pbMail" Me.pbMail.Size = New System.Drawing.Size(35, 35) Me.pbMail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -205,7 +209,7 @@ Partial Class frmMDM_USTVAntrag 'pb_Beleg ' Me.pb_Beleg.Image = CType(resources.GetObject("pb_Beleg.Image"), System.Drawing.Image) - Me.pb_Beleg.Location = New System.Drawing.Point(899, 60) + Me.pb_Beleg.Location = New System.Drawing.Point(891, 60) Me.pb_Beleg.Name = "pb_Beleg" Me.pb_Beleg.Size = New System.Drawing.Size(35, 35) Me.pb_Beleg.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -218,7 +222,7 @@ Partial Class frmMDM_USTVAntrag Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button5.ForeColor = System.Drawing.Color.Black Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(869, 17) + Me.Button5.Location = New System.Drawing.Point(861, 17) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(103, 39) Me.Button5.TabIndex = 50 @@ -226,45 +230,45 @@ Partial Class frmMDM_USTVAntrag Me.Button5.UseVisualStyleBackColor = True Me.Button5.Visible = False ' - 'txtSumme + 'txtSummeEUR ' - Me.txtSumme._DateTimeOnly = False - Me.txtSumme._numbersOnly = False - Me.txtSumme._numbersOnlyKommastellen = "" - Me.txtSumme._numbersOnlyTrennzeichen = False - Me.txtSumme._Prozent = False - Me.txtSumme._ShortDateNew = False - Me.txtSumme._ShortDateOnly = False - Me.txtSumme._TimeOnly = False - Me.txtSumme._TimeOnly_Seconds = False - Me.txtSumme._value = "" - Me.txtSumme._Waehrung = True - Me.txtSumme._WaehrungZeichen = True - Me.txtSumme.ForeColor = System.Drawing.Color.Black - Me.txtSumme.Location = New System.Drawing.Point(1158, 67) - Me.txtSumme.MaxLineLength = -1 - Me.txtSumme.MaxLines_Warning = "" - Me.txtSumme.MaxLines_Warning_Label = Nothing - Me.txtSumme.Name = "txtSumme" - Me.txtSumme.ReadOnly = True - Me.txtSumme.Size = New System.Drawing.Size(88, 20) - Me.txtSumme.TabIndex = 49 - Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtSummeEUR._DateTimeOnly = False + Me.txtSummeEUR._numbersOnly = False + Me.txtSummeEUR._numbersOnlyKommastellen = "" + Me.txtSummeEUR._numbersOnlyTrennzeichen = False + Me.txtSummeEUR._Prozent = False + Me.txtSummeEUR._ShortDateNew = False + Me.txtSummeEUR._ShortDateOnly = False + Me.txtSummeEUR._TimeOnly = False + Me.txtSummeEUR._TimeOnly_Seconds = False + Me.txtSummeEUR._value = "" + Me.txtSummeEUR._Waehrung = True + Me.txtSummeEUR._WaehrungZeichen = True + Me.txtSummeEUR.ForeColor = System.Drawing.Color.Black + Me.txtSummeEUR.Location = New System.Drawing.Point(1145, 75) + Me.txtSummeEUR.MaxLineLength = -1 + Me.txtSummeEUR.MaxLines_Warning = "" + Me.txtSummeEUR.MaxLines_Warning_Label = Nothing + Me.txtSummeEUR.Name = "txtSummeEUR" + Me.txtSummeEUR.ReadOnly = True + Me.txtSummeEUR.Size = New System.Drawing.Size(88, 20) + Me.txtSummeEUR.TabIndex = 49 + Me.txtSummeEUR.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'Label27 ' Me.Label27.AutoSize = True Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label27.Location = New System.Drawing.Point(1107, 70) + Me.Label27.Location = New System.Drawing.Point(1090, 78) Me.Label27.Name = "Label27" - Me.Label27.Size = New System.Drawing.Size(45, 13) + Me.Label27.Size = New System.Drawing.Size(54, 13) Me.Label27.TabIndex = 48 - Me.Label27.Text = "Summe:" + Me.Label27.Text = "Summe €:" ' 'picExcel ' Me.picExcel.Image = CType(resources.GetObject("picExcel.Image"), System.Drawing.Image) - Me.picExcel.Location = New System.Drawing.Point(1158, 17) + Me.picExcel.Location = New System.Drawing.Point(1145, 8) Me.picExcel.Name = "picExcel" Me.picExcel.Size = New System.Drawing.Size(35, 35) Me.picExcel.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -276,7 +280,7 @@ Partial Class frmMDM_USTVAntrag Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.ForeColor = System.Drawing.Color.Black Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(979, 17) + Me.Button4.Location = New System.Drawing.Point(971, 17) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(103, 39) Me.Button4.TabIndex = 28 @@ -286,7 +290,7 @@ Partial Class frmMDM_USTVAntrag 'picPDF ' Me.picPDF.Image = CType(resources.GetObject("picPDF.Image"), System.Drawing.Image) - Me.picPDF.Location = New System.Drawing.Point(1211, 17) + Me.picPDF.Location = New System.Drawing.Point(1198, 8) Me.picPDF.Name = "picPDF" Me.picPDF.Size = New System.Drawing.Size(35, 35) Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -298,7 +302,7 @@ Partial Class frmMDM_USTVAntrag Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMail.ForeColor = System.Drawing.Color.Black Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMail.Location = New System.Drawing.Point(979, 62) + Me.btnMail.Location = New System.Drawing.Point(971, 62) Me.btnMail.Name = "btnMail" Me.btnMail.Size = New System.Drawing.Size(103, 28) Me.btnMail.TabIndex = 26 @@ -1462,7 +1466,7 @@ Partial Class frmMDM_USTVAntrag Me.pnlBody.Controls.Add(Me.TabControl1) Me.pnlBody.Location = New System.Drawing.Point(0, 206) Me.pnlBody.Name = "pnlBody" - Me.pnlBody.Size = New System.Drawing.Size(1444, 443) + Me.pnlBody.Size = New System.Drawing.Size(1444, 461) Me.pnlBody.TabIndex = 1 ' 'TabControl1 @@ -1473,7 +1477,7 @@ Partial Class frmMDM_USTVAntrag Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1442, 441) + Me.TabControl1.Size = New System.Drawing.Size(1442, 459) Me.TabControl1.TabIndex = 1 ' 'TabPage1 @@ -1483,7 +1487,7 @@ Partial Class frmMDM_USTVAntrag 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(1434, 415) + Me.TabPage1.Size = New System.Drawing.Size(1434, 433) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Antragspositionen" Me.TabPage1.UseVisualStyleBackColor = True @@ -1493,8 +1497,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvUSTVPositionen.AllowUserToAddRows = False Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1506,14 +1510,14 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.RowHeadersVisible = False Me.dgvUSTVPositionen.RowHeadersWidth = 62 Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 140) + Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 158) Me.dgvUSTVPositionen.TabIndex = 0 ' 'pnlAntragsPosDetails ' Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2) Me.pnlAntragsPosDetails.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 149) + Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 167) Me.pnlAntragsPosDetails.Name = "pnlAntragsPosDetails" Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1428, 263) Me.pnlAntragsPosDetails.TabIndex = 2 @@ -1633,7 +1637,7 @@ Partial Class frmMDM_USTVAntrag 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(1444, 415) + Me.TabPage2.Size = New System.Drawing.Size(1434, 415) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Erstattungspositionen" Me.TabPage2.UseVisualStyleBackColor = True @@ -1647,7 +1651,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1438, 409) + Me.Panel3.Size = New System.Drawing.Size(1428, 409) Me.Panel3.TabIndex = 3 ' 'dgvErstattungspositionen @@ -1655,8 +1659,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvErstattungspositionen.AllowUserToAddRows = False Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1668,7 +1672,7 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.RowHeadersVisible = False Me.dgvErstattungspositionen.RowHeadersWidth = 62 Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 143) + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 143) Me.dgvErstattungspositionen.TabIndex = 1 ' 'pnlErstattungsdetails @@ -1680,7 +1684,7 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Dock = System.Windows.Forms.DockStyle.Bottom Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 146) Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" - Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) + Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' 'UstCntlUSTV_AntragErstattungen1 @@ -1688,7 +1692,7 @@ Partial Class frmMDM_USTVAntrag Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259) Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 ' 'Panel1 @@ -1809,11 +1813,46 @@ Partial Class frmMDM_USTVAntrag Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen" Me.FakturiertToolStripMenuItem.Visible = False ' + 'txtSumme + ' + Me.txtSumme._DateTimeOnly = False + Me.txtSumme._numbersOnly = False + Me.txtSumme._numbersOnlyKommastellen = "" + Me.txtSumme._numbersOnlyTrennzeichen = False + Me.txtSumme._Prozent = False + Me.txtSumme._ShortDateNew = False + Me.txtSumme._ShortDateOnly = False + Me.txtSumme._TimeOnly = False + Me.txtSumme._TimeOnly_Seconds = False + Me.txtSumme._value = "" + Me.txtSumme._Waehrung = True + Me.txtSumme._WaehrungZeichen = True + Me.txtSumme.ForeColor = System.Drawing.Color.Black + Me.txtSumme.Location = New System.Drawing.Point(1145, 51) + Me.txtSumme.MaxLineLength = -1 + Me.txtSumme.MaxLines_Warning = "" + Me.txtSumme.MaxLines_Warning_Label = Nothing + Me.txtSumme.Name = "txtSumme" + Me.txtSumme.ReadOnly = True + Me.txtSumme.Size = New System.Drawing.Size(88, 20) + Me.txtSumme.TabIndex = 53 + Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label18.Location = New System.Drawing.Point(1090, 58) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(45, 13) + Me.Label18.TabIndex = 54 + Me.Label18.Text = "Summe:" + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1444, 749) + Me.ClientSize = New System.Drawing.Size(1444, 767) Me.Controls.Add(Me.pnlHeader) Me.Controls.Add(Me.pnlBody) Me.Controls.Add(Me.pnlBottom) @@ -1946,7 +1985,7 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents Label14 As Label Friend WithEvents txtEingereichtAm As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents picExcel As PictureBox - Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSummeEUR As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label27 As Label Friend WithEvents btnAbfertigungsNrVergeben As Button Friend WithEvents Label15 As Label @@ -1974,4 +2013,6 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents FakturiertToolStripMenuItem As ToolStripMenuItem Friend WithEvents FakturiertZurücksetzenToolStripMenuItem As ToolStripMenuItem Friend WithEvents pbMail As PictureBox + Friend WithEvents Label18 As Label + Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 12d9b409..a67ae057 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1322,66 +1322,70 @@ Public Class frmMDM_USTVAntrag Dim leistenderName As String = "" + Dim useNewAdress As Boolean = False + If CDate(USTV_POS.UStVPo_ReDat) >= New Date("2025", "09", "30") Then useNewAdress = True + + Select Case Antrag_LandKz - Case "RO" - leistenderName = "Kuwait Petroleum Romania S.R.L" - Case "SE" - leistenderName = "OK-Q8 AB" - Case "DK" - leistenderName = "Q8 Danmark A/S" - Case "PL" - leistenderName = "Kuwait Petroleum Sp. Z.o.o" - Case "DE" - leistenderName = "Kuwait Petroleum Gmbh" - Case "IT" - leistenderName = "Kuwait Petroleum Italie Spa" - Case "ES" - leistenderName = "Fuel Iberia S.L.U" - Case Else - leistenderName = "IDS EUROPE B.V." + Case "RO" + leistenderName = "Kuwait Petroleum Romania S.R.L" + Case "SE" + leistenderName = "OK-Q8 AB" + Case "DK" + leistenderName = "Q8 Danmark A/S" + Case "PL" + leistenderName = "Kuwait Petroleum Sp. Z.o.o" + Case "DE" + leistenderName = "Kuwait Petroleum Gmbh" + Case "IT" + leistenderName = "Kuwait Petroleum Italie Spa" + Case "ES" + leistenderName = "Fuel Iberia S.L.U" + Case Else + leistenderName = IIf(Not useNewAdress, "IDS EUROPE B.V.", "Q8Truck International B.V.") End Select Dim leistender As New cUStVLeistender(leistenderName & " " & Antrag_LandKz, Antrag_LandKz) - If leistender.UStV_LeistenderId < 1 Then - leistender = New cUStVLeistender(leistenderName) + If leistender.UStV_LeistenderId < 1 Then + leistender = New cUStVLeistender(leistenderName) + End If + + USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString + + USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + USTV_POS.UStVPo_Zeitstempel = Now() + + + Dim umrechKurs As Double = 1 + + 'TODO: IDS liefert Beträge immer in EUR, wir müssen allerdings die Beträge in FREMDW umrechnen, ev. bei IDS nachfragen, ob wir den Fremdwährungsbetrag bekommen können (würde uns einige manuelle Arbeit ersparen oder zumindest den Umrechnungskurs, das IDS einen Mischsatz verwendet und nicht den Umrechnungskurs vom Rechnungsdatum)!! + + Dim UST_EUR = CDbl(r.Item("Steuerbetrag")) 'ist immer EUR + Dim UST_org = CDbl(r.Item("Steuerbetrag")) + + If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then + Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode) + UST_org = Math.Round(kurs.EXCHANGE_EURTOCUR(UST_EUR, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2) + End If + + If (UST_org <> 0 AndAlso UST_org <> UST_EUR) Then + umrechKurs = Math.Floor((UST_org / UST_EUR * 100 + 0.5)) / 100 + End If + + + If UST_org <> 0 Then + USTV_POS.UStVPo_USteuerbetragEUR = UST_EUR + USTV_POS.UStVPo_Umrechnungskurs = umrechKurs + USTV_POS.UStVPo_USteuerbetrag = UST_org + End If + + If USTV_POS.INSERT() Then + cIDS.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdnr, Antrag_LandKz, USTV_POS.UStVAn_ID) + End If + 'tblUStVPositionen End If - USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString - - USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - USTV_POS.UStVPo_Zeitstempel = Now() - - - Dim umrechKurs As Double = 1 - - 'TODO: IDS liefert Beträge immer in EUR, wir müssen allerdings die Beträge in FREMDW umrechnen, ev. bei IDS nachfragen, ob wir den Fremdwährungsbetrag bekommen können (würde uns einige manuelle Arbeit ersparen oder zumindest den Umrechnungskurs, das IDS einen Mischsatz verwendet und nicht den Umrechnungskurs vom Rechnungsdatum)!! - - Dim UST_EUR = CDbl(r.Item("Steuerbetrag")) 'ist immer EUR - Dim UST_org = CDbl(r.Item("Steuerbetrag")) - - If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then - Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode) - UST_org = Math.Round(kurs.EXCHANGE_EURTOCUR(UST_EUR, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2) - End If - - If (UST_org <> 0 AndAlso UST_org <> UST_EUR) Then - umrechKurs = Math.Floor((UST_org / UST_EUR * 100 + 0.5)) / 100 - End If - - - If UST_org <> 0 Then - USTV_POS.UStVPo_USteuerbetragEUR = UST_EUR - USTV_POS.UStVPo_Umrechnungskurs = umrechKurs - USTV_POS.UStVPo_USteuerbetrag = UST_org - End If - - If USTV_POS.INSERT() Then - cIDS.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdnr, Antrag_LandKz, USTV_POS.UStVAn_ID) - End If - 'tblUStVPositionen - End If - Next End If @@ -1662,14 +1666,40 @@ Public Class frmMDM_USTVAntrag End If - 'check if already existing 'überschneidungen prüfen!!!! + 'Start neue Version + 'check if already existing 'überschneidungen prüfen!!!! -> jz wieder doch nicht.......... + Dim StringSQL As String = "SELECT + UStVAn_ID, + UStVAn_ReDatVon, + UStVAn_ReDatBis, + UStVAn_AntragEingereichtAm + FROM tblUStVAntrag b + WHERE + b.UStvAN_KuNr = " & KundenNr & " + AND (ISNULL(b.UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' OR b.UStVAn_AntragArt = '') + AND b.UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " + -- Überschneidungstest (inklusive Grenzen) + AND NOT ( + COALESCE(CAST(b.UStVAn_ReDatBis AS date), '9999-12-31') < '" & CDate(txtVon._value).ToShortDateString & "' + OR COALESCE(CAST(b.UStVAn_ReDatVon AS date), '1900-01-01') > '" & CDate(txtBis._value).ToShortDateString & "' + ) + -- optional: die exakt gleiche Periode ausschließen (wenn gewünscht) + AND NOT ( + COALESCE(CAST(b.UStVAn_ReDatVon AS date),'1900-01-01') = '" & CDate(txtVon._value).ToShortDateString & "' + AND COALESCE(CAST(b.UStVAn_ReDatBis AS date),'9999-12-31') = '" & CDate(txtBis._value).ToShortDateString & "') order by UStVAn_ReDatVon" - Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql("Select UStVAn_ID,UStVAn_ReDatvon, UStVAn_ReDatBis, UStVAn_AntragEingereichtAm from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " - AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' or cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "' ) and (cast(UStVAn_ReDatBis as date) < '" & CDate(txtBis._value).ToShortDateString & "' or cast(UStVAn_ReDatvon as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL") + Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql(StringSQL, "FMZOLL") - 'Dim anzUSTVA = CInt((New SQL).getValueTxtBySql("Select count(*) from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " - ' AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "') or (cast(UStVAn_ReDatvon as date) < '" & CDate(txtBis._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL")) + 'Ende neue Version + + 'alte Version wieder aktiviert. + 'Start alte Version -------------------------------------- + + 'Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql("Select UStVAn_ID,UStVAn_ReDatvon, UStVAn_ReDatBis, UStVAn_AntragEingereichtAm from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " + ' AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' or cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "' ) and (cast(UStVAn_ReDatBis as date) < '" & CDate(txtBis._value).ToShortDateString & "' or cast(UStVAn_ReDatvon as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL") + + 'Ende alte Version -------------------------------------- If dt_existingUSTVA.Rows.Count = 1 Then @@ -1687,7 +1717,34 @@ Public Class frmMDM_USTVAntrag End Select ElseIf dt_existingUSTVA.Rows.Count > 1 Then - If Not vbYes = MsgBox("Es existiert bereits mind. ein " & cboAntragArt._value & "-Eintrag in diesem Zeitbereich von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub + Dim testInfo As String = "Es existieren bereits " & dt_existingUSTVA.Rows.Count & " " & cboAntragArt._value & "-Einträge in diesem Zeitbereich von " & vbNewLine + Dim IDnichteingereicht As Integer = -1 + For Each r In dt_existingUSTVA.Rows + testInfo &= vbNewLine & r.Item("UStVAn_ReDatvon") & " - " & r.Item("UStVAn_ReDatbis") & IIf(Not IsDBNull(r.Item("UStVAn_AntragEingereichtAm")) AndAlso IsDate(r.Item("UStVAn_AntragEingereichtAm")), " bereits eingereicht! ", "") + + If IsDBNull(r.Item("UStVAn_AntragEingereichtAm")) OrElse IsDate(r.Item("UStVAn_AntragEingereichtAm")) Then + IDnichteingereicht = (r.Item("UStVAn_ID")) + End If + + Next + + testInfo &= vbNewLine & vbNewLine & "von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString + + Dim result As MsgBoxResult = MsgBox(testInfo & vbNewLine & "Ja = Antrag speichern" & vbNewLine & "Nein = existierenden Antrag öffnen", vbYesNoCancel) + Select Case result + Case MsgBoxResult.Cancel : Exit Sub + Case MsgBoxResult.No + Me.Close() + If IDnichteingereicht > 0 Then + Dim frm = New frmMDM_USTVAntrag(IDnichteingereicht) + frm.ShowDialog() + Exit Sub + Else + 'Exit Sub + End If + + + End Select End If @@ -2788,7 +2845,7 @@ Public Class frmMDM_USTVAntrag ElseIf TabControl1.SelectedTab Is TabPage2 Then initdgvErstattungen() posTabisSelected = False - txtSumme._value = 0 + txtSummeEUR._value = 0 End If @@ -3389,18 +3446,24 @@ Public Class frmMDM_USTVAntrag Private Sub calcSumme() + Dim countSummeEUR As Double = 0 Dim countSumme As Double = 0 If posTabisSelected Then For i As Integer = 0 To dgvUSTVPositionen.SelectedRows.Count - 1 If Not IsDBNull(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetragEUR").Value) AndAlso IsNumeric(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetragEUR").Value) Then - countSumme += CDbl(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetragEUR").Value) + countSummeEUR += CDbl(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetragEUR").Value) + End If + + If Not IsDBNull(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetrag").Value) AndAlso IsNumeric(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetrag").Value) Then + countSumme += CDbl(dgvUSTVPositionen.SelectedRows(i).Cells("UStVPo_USteuerbetrag").Value) End If Next End If + txtSummeEUR._value = countSummeEUR.ToString txtSumme._value = countSumme.ToString End Sub diff --git a/SDL/USTV/frmUSTVoffeneAntraege.Designer.vb b/SDL/USTV/frmUSTVoffeneAntraege.Designer.vb index bcb4006b..ca36fa2f 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.Designer.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.Designer.vb @@ -47,6 +47,8 @@ Partial Class frmUSTVoffeneAntraege Me.lblKunde = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.pnlLand = New System.Windows.Forms.Panel() + Me.Label6 = New System.Windows.Forms.Label() + Me.cbxLieferant = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label5 = New System.Windows.Forms.Label() Me.cbxKundeLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxNichtEroeffneteAntraege = New System.Windows.Forms.CheckBox() @@ -55,13 +57,12 @@ Partial Class frmUSTVoffeneAntraege Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.AntragEröffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Button4 = New System.Windows.Forms.Button() + Me.cbxKundenMWST = New System.Windows.Forms.CheckBox() Me.txtmaxAnz = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtMWST = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.cbxKundenMWST = New System.Windows.Forms.CheckBox() - Me.Label6 = New System.Windows.Forms.Label() - Me.cbxLieferant = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnPLOSE_DK = New System.Windows.Forms.Button() Me.FlowLayoutPanel.SuspendLayout() Me.Panel4.SuspendLayout() Me.pnlLand.SuspendLayout() @@ -298,6 +299,27 @@ Partial Class frmUSTVoffeneAntraege Me.pnlLand.TabIndex = 42 Me.pnlLand.Visible = False ' + 'Label6 + ' + Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(18, 9) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(51, 13) + Me.Label6.TabIndex = 51 + Me.Label6.Text = "Lieferant:" + ' + 'cbxLieferant + ' + Me.cbxLieferant._allowedValuesFreiText = Nothing + Me.cbxLieferant._allowFreiText = False + Me.cbxLieferant._value = "" + Me.cbxLieferant.FormattingEnabled = True + Me.cbxLieferant.Location = New System.Drawing.Point(92, 6) + Me.cbxLieferant.Name = "cbxLieferant" + Me.cbxLieferant.Size = New System.Drawing.Size(72, 21) + Me.cbxLieferant.TabIndex = 50 + ' 'Label5 ' Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -374,6 +396,20 @@ Partial Class frmUSTVoffeneAntraege Me.Button4.Text = "PDFs prüfen" Me.Button4.UseVisualStyleBackColor = True ' + 'cbxKundenMWST + ' + Me.cbxKundenMWST.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cbxKundenMWST.AutoSize = True + Me.cbxKundenMWST.Checked = True + Me.cbxKundenMWST.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxKundenMWST.Location = New System.Drawing.Point(1654, 78) + Me.cbxKundenMWST.Name = "cbxKundenMWST" + Me.cbxKundenMWST.Size = New System.Drawing.Size(158, 17) + Me.cbxKundenMWST.TabIndex = 47 + Me.cbxKundenMWST.Text = "Kunden-MWST ausblenden" + Me.cbxKundenMWST.UseVisualStyleBackColor = True + Me.cbxKundenMWST.Visible = False + ' 'txtmaxAnz ' Me.txtmaxAnz._DateTimeOnly = False @@ -493,46 +529,23 @@ Partial Class frmUSTVoffeneAntraege Me.MyDatagridview1.Size = New System.Drawing.Size(1770, 528) Me.MyDatagridview1.TabIndex = 30 ' - 'cbxKundenMWST + 'btnPLOSE_DK ' - Me.cbxKundenMWST.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cbxKundenMWST.AutoSize = True - Me.cbxKundenMWST.Checked = True - Me.cbxKundenMWST.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxKundenMWST.Location = New System.Drawing.Point(1654, 78) - Me.cbxKundenMWST.Name = "cbxKundenMWST" - Me.cbxKundenMWST.Size = New System.Drawing.Size(158, 17) - Me.cbxKundenMWST.TabIndex = 47 - Me.cbxKundenMWST.Text = "Kunden-MWST ausblenden" - Me.cbxKundenMWST.UseVisualStyleBackColor = True - Me.cbxKundenMWST.Visible = False - ' - 'Label6 - ' - Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(18, 9) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(51, 13) - Me.Label6.TabIndex = 51 - Me.Label6.Text = "Lieferant:" - ' - 'cbxLieferant - ' - Me.cbxLieferant._allowedValuesFreiText = Nothing - Me.cbxLieferant._allowFreiText = False - Me.cbxLieferant._value = "" - Me.cbxLieferant.FormattingEnabled = True - Me.cbxLieferant.Location = New System.Drawing.Point(92, 6) - Me.cbxLieferant.Name = "cbxLieferant" - Me.cbxLieferant.Size = New System.Drawing.Size(72, 21) - Me.cbxLieferant.TabIndex = 50 + Me.btnPLOSE_DK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btnPLOSE_DK.Location = New System.Drawing.Point(111, 639) + Me.btnPLOSE_DK.Name = "btnPLOSE_DK" + Me.btnPLOSE_DK.Size = New System.Drawing.Size(98, 23) + Me.btnPLOSE_DK.TabIndex = 48 + Me.btnPLOSE_DK.Text = "SE-DK-Logik" + Me.btnPLOSE_DK.UseVisualStyleBackColor = True + Me.btnPLOSE_DK.Visible = False ' 'frmUSTVoffeneAntraege ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1818, 681) + Me.Controls.Add(Me.btnPLOSE_DK) Me.Controls.Add(Me.cbxKundenMWST) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.lblKunde) @@ -598,4 +611,5 @@ Partial Class frmUSTVoffeneAntraege Friend WithEvents cbxKundenMWST As CheckBox Friend WithEvents Label6 As Label Friend WithEvents cbxLieferant As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents btnPLOSE_DK As Button End Class diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index b482af71..cc395cdf 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -1,4 +1,5 @@ Imports System.Windows.Documents +Imports DocumentFormat.OpenXml.Drawing.Diagrams Public Class frmUSTVoffeneAntraege @@ -64,6 +65,21 @@ Public Class frmUSTVoffeneAntraege MyDatagridview1.DataSource = Nothing Me.LIEFERANT = l + If Me.LIEFERANT = "PLOSE" Then + + Dim sqlString = "SELECT COUNT(*) FROM[VERAG].[dbo].[tblPLOSE_Inv_Data] where plInv_SupplierRechnungsNr like 'SE%' and plInv_SupplierCountry = 'DK'" + Dim countDK_PLOSE = (New SQL).getValueTxtBySql(sqlString, "FMZOLL") + If countDK_PLOSE <> "" AndAlso IsNumeric(countDK_PLOSE) AndAlso CInt(countDK_PLOSE) > 0 Then + btnPLOSE_DK.Visible = True + + Else + btnPLOSE_DK.Visible = False + End If + Else + btnPLOSE_DK.Visible = False + + End If + For Each c As Button In FlowLayoutPanel.Controls If c Is btn Then c.BackColor = Color.Wheat @@ -619,14 +635,50 @@ Public Class frmUSTVoffeneAntraege 'bei Einstellung "ALLE KUNDEN" - If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= " AND ( NOT " + If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= " AND NOT EXISTS (SELECT 1 FROM (VALUES " For Each row As DataRow In dtKundeMWST.Rows - landBez = row.Item("abc").ToString.Replace(";", "'") - counter = counter + 1 - sqlwhereLand &= " ( isnull(AdressenNr,0) = " & row.Item("KdNr") & " AND Einreichland in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ")) " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", ")") + ' landBez = row.Item("abc").ToString.Replace(";", "'") + ' counter = counter + 1 + ' sqlwhereLand &= " (" & row.Item("KdNr") & "," & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ") " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, ", ", ") AS Excluded(AdressenNr, Einreichland) WHERE Excluded.AdressenNr = temp.KdNr AND Excluded.Einreichland = temp.Einreichland)") + 'Next + + Dim kdNr_ As String = row("KdNr").ToString() + Dim landBez_ As String = row("abc").ToString() + + ' Entferne führende/mehrfache Semikolons + landBez_ = landBez_.Replace(";;", ";").Trim(";"c, " "c) + + ' Teile die Länder anhand von „;,;“ + Dim laender() As String = landBez_.Split(New String() {",,"}, StringSplitOptions.None) + + ' Fallback: wenn nur einfache Trennung mit „;,“ + If laender.Length = 1 Then + laender = landBez_.Split(New String() {",;"}, StringSplitOptions.RemoveEmptyEntries) + End If + + ' Jede gültige Länderkombination hinzufügen + For Each land In landBez_.Split(New String() {",;"}, StringSplitOptions.RemoveEmptyEntries) + land = land.Replace(";", "").Trim() + If land <> "" Then + Dim landTemp As String = land.Replace(",", "") + counter += 1 + sqlwhereLand &= "(" & kdNr_ & ", '" & landTemp & "'), " + End If + Next Next + If sqlwhereLand.EndsWith(", ") Then + sqlwhereLand = sqlwhereLand.Substring(0, sqlwhereLand.Length - 2) + End If + + ' Abschluss der NOT EXISTS-Klausel + sqlwhereLand &= ") AS Excluded(AdressenNr, Einreichland) " & + "WHERE Excluded.AdressenNr = temp.KdNr " & + "AND Excluded.Einreichland = temp.Einreichland)" + + + Else 'bei Einstellung "SPEZIFISCHER KUNDE" @@ -640,10 +692,13 @@ Public Class frmUSTVoffeneAntraege End If End If + End If + + If year >= 2025 Then SQLPLOSEUMSTELLUNG = " @@ -792,7 +847,7 @@ Public Class frmUSTVoffeneAntraege left join tblUStVAntrag on UStVAn_KuNr = temp.kdnr and UStVAn_ReDatVon <= temp.Rechnungsdatum and UStVAn_ReDatBis >= temp.Rechnungsdatum and [Länderverzeichnis für die Außenhandelsstatistik].LandNr = UStVAn_LandNr and isnull(UStVAn_AntragArt,'MWST') = 'MWST' left JOIN tblSteuernummern On temp.Einreichland = tblSteuernummern.LandKz and KdNr = tblSteuernummern.AdressenNr where 1 = 1 and isnull(kde_keineMWSt,0) = 0 " & sqlwhereLand & sqlwhereSteuerNr & sqlwhereLieferant & - " group by isnull(UStVAn_ID,0) , Lieferant, KdNr, Kundenname,Kundenland, Einreichland, isnull(tblSteuernummern.UStV,0), case WHEN UStVAn_AntragEingereichtAm IS NULL THEN 0 else 1 end " + " group by isnull(UStVAn_ID,0) , Lieferant, KdNr, Kundenname,Kundenland, Einreichland, isnull(tblSteuernummern.UStV,0), case WHEN UStVAn_AntragEingereichtAm IS NULL THEN 0 else 1 end order by Kundenname " Dim SQLWhere = "" @@ -1074,6 +1129,7 @@ Public Class frmUSTVoffeneAntraege R("MitgliedslandEU") = False dTLANDEU.Rows.Add(R) + frmMain.EnableDoubleBuffered(MyDatagridview1) End Sub @@ -1088,7 +1144,7 @@ Public Class frmUSTVoffeneAntraege WHERE t1.KdNr = t2.KdNr FOR XML PATH ('')) , 1, 1, ';') from tblKundenMWST t2 - group by KdNr;", "FMZOLL") + group by KdNr order by kdNr;", "FMZOLL") End If @@ -1097,4 +1153,14 @@ Public Class frmUSTVoffeneAntraege Private Sub cbxEigeneMWST_CheckedChanged(sender As Object, e As EventArgs) Handles cbxKundenMWST.CheckedChanged init() End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnPLOSE_DK.Click + + Dim SQL As New SQL + + If SQL.doSQL("update [VERAG].[dbo].[tblPLOSE_Inv_Data] set plInv_SupplierCountry = 'SE' where plInv_SupplierRechnungsNr like 'SE%' and plInv_SupplierCountry = 'DK'", "FMZOLL", False) Then + MsgBox("Wurden erfolgreich gesetzt!") + End If + + End Sub End Class \ No newline at end of file diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 1694ef9e..0a729456 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -336,6 +336,8 @@ Public Class usrCntlUSTV btnNeuerUSTVA.Enabled = True End If End If + + frmMain.EnableDoubleBuffered(dgvUSTV) ' Panel3.Height = Me.Height / 2 + 300 End Sub diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 88308a30..e9c25687 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -570,14 +570,27 @@ Public Class frmBU_Mahnlauf rpt.txtLeistung.Text = cFakturierung.checkNull(rpt.Fields.Item("OP_Typ").Value) rpt.Label15.Text = cFakturierung.checkNull(rpt.Fields.Item("Rechnungsdatum").Value) - If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then - rpt.Label16.Text = "" - rpt.Label15.ForeColor = Color.Black + If Not Firma_ID = 19 Then + If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then + rpt.Label16.Text = "" + rpt.Label15.ForeColor = Color.Black + Else + rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value) + rpt.Label15.ForeColor = Color.DarkRed + End If Else rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value) - rpt.Label15.ForeColor = Color.DarkRed + If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then + rpt.Label15.ForeColor = Color.Black + rpt.Label16.ForeColor = Color.Black + Else + rpt.Label15.ForeColor = Color.DarkRed + rpt.Label16.ForeColor = Color.DarkRed + End If End If + + rpt.Label17.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Rechnungsbetrag").Value)), CDbl(rpt.Fields.Item("Rechnungsbetrag").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") rpt.TextBox1.Text = cFakturierung.checkNull(rpt.Fields.Item("Bemerkung").Value) rpt.Label19.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Zahlung").Value)), CDbl(rpt.Fields.Item("Zahlung").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") diff --git a/SDL/buchhaltung/usrCntlBH.Designer.vb b/SDL/buchhaltung/usrCntlBH.Designer.vb index e27205c3..abb31705 100644 --- a/SDL/buchhaltung/usrCntlBH.Designer.vb +++ b/SDL/buchhaltung/usrCntlBH.Designer.vb @@ -25,20 +25,29 @@ Partial Class usrCntlBH Me.Label6 = New System.Windows.Forms.Label() Me.pnl = New System.Windows.Forms.Panel() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.GroupBox11 = New System.Windows.Forms.GroupBox() + Me.Label51 = New System.Windows.Forms.Label() + Me.Label49 = New System.Windows.Forms.Label() + Me.btnZinsbelastung = New System.Windows.Forms.Button() + Me.txtZinssatz = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label45 = New System.Windows.Forms.Label() + Me.Label48 = New System.Windows.Forms.Label() + Me.txtKdNrvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label46 = New System.Windows.Forms.Label() + Me.txtKdNrbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtTolInTagen = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label47 = New System.Windows.Forms.Label() + Me.Label44 = New System.Windows.Forms.Label() + Me.txtZRvon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtZRbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label42 = New System.Windows.Forms.Label() Me.GroupBox10 = New System.Windows.Forms.GroupBox() + Me.btnZNBverrechnen = New System.Windows.Forms.Button() + Me.txtnichtabrechneteKunden = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label43 = New System.Windows.Forms.Label() + Me.Button13 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() - Me.Label37 = New System.Windows.Forms.Label() - Me.GroupBox9 = New System.Windows.Forms.GroupBox() - Me.Label41 = New System.Windows.Forms.Label() - Me.Button11 = New System.Windows.Forms.Button() - Me.Label40 = New System.Windows.Forms.Label() - Me.Button10 = New System.Windows.Forms.Button() - Me.txtStichtag = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label39 = New System.Windows.Forms.Label() - Me.Label38 = New System.Windows.Forms.Label() - Me.Button9 = New System.Windows.Forms.Button() + Me.lblnichtabgerechneteZNB = New System.Windows.Forms.Label() Me.Label34 = New System.Windows.Forms.Label() Me.GroupBox8 = New System.Windows.Forms.GroupBox() Me.Label36 = New System.Windows.Forms.Label() @@ -56,13 +65,13 @@ Partial Class usrCntlBH Me.Label26 = New System.Windows.Forms.Label() Me.Button5 = New System.Windows.Forms.Button() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Label50 = New System.Windows.Forms.Label() Me.cbxMdmSollHabenOhneKdNr = New System.Windows.Forms.CheckBox() Me.cbxMdmHabenHaben = New System.Windows.Forms.CheckBox() Me.cbxMdmSollSoll = New System.Windows.Forms.CheckBox() Me.cbxMdmSollHaben = New System.Windows.Forms.CheckBox() Me.Label1 = New System.Windows.Forms.Label() Me.btnWord = New System.Windows.Forms.Button() - Me.Label24 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label2 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() @@ -70,6 +79,7 @@ Partial Class usrCntlBH Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Label25 = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() + Me.Label24 = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.cbxBankgarantieInfo = New System.Windows.Forms.CheckBox() @@ -120,16 +130,27 @@ Partial Class usrCntlBH Me.Button2 = New System.Windows.Forms.Button() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.Label37 = New System.Windows.Forms.Label() + Me.GroupBox9 = New System.Windows.Forms.GroupBox() + Me.Label41 = New System.Windows.Forms.Label() + Me.Button11 = New System.Windows.Forms.Button() + Me.Label40 = New System.Windows.Forms.Label() + Me.Button10 = New System.Windows.Forms.Button() + Me.txtStichtag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label39 = New System.Windows.Forms.Label() + Me.Label38 = New System.Windows.Forms.Label() + Me.Button9 = New System.Windows.Forms.Button() Me.Label28 = New System.Windows.Forms.Label() Me.GroupBox6 = New System.Windows.Forms.GroupBox() Me.Label31 = New System.Windows.Forms.Label() Me.Label30 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() + Me.Label52 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.GroupBox11.SuspendLayout() Me.GroupBox10.SuspendLayout() - Me.GroupBox9.SuspendLayout() Me.GroupBox8.SuspendLayout() Me.GroupBox7.SuspendLayout() Me.GroupBox5.SuspendLayout() @@ -142,6 +163,7 @@ Partial Class usrCntlBH Me.Panel2.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage5.SuspendLayout() + Me.GroupBox9.SuspendLayout() Me.GroupBox6.SuspendLayout() Me.SuspendLayout() ' @@ -168,10 +190,9 @@ Partial Class usrCntlBH 'TabPage1 ' Me.TabPage1.AutoScroll = True + Me.TabPage1.Controls.Add(Me.GroupBox11) Me.TabPage1.Controls.Add(Me.Label42) Me.TabPage1.Controls.Add(Me.GroupBox10) - Me.TabPage1.Controls.Add(Me.Label37) - Me.TabPage1.Controls.Add(Me.GroupBox9) Me.TabPage1.Controls.Add(Me.Label34) Me.TabPage1.Controls.Add(Me.GroupBox8) Me.TabPage1.Controls.Add(Me.Label32) @@ -193,6 +214,253 @@ Partial Class usrCntlBH Me.TabPage1.Text = "Allgemein" Me.TabPage1.UseVisualStyleBackColor = True ' + 'GroupBox11 + ' + Me.GroupBox11.Controls.Add(Me.Label52) + Me.GroupBox11.Controls.Add(Me.btnZNBverrechnen) + Me.GroupBox11.Controls.Add(Me.Label51) + Me.GroupBox11.Controls.Add(Me.txtnichtabrechneteKunden) + Me.GroupBox11.Controls.Add(Me.Label49) + Me.GroupBox11.Controls.Add(Me.btnZinsbelastung) + Me.GroupBox11.Controls.Add(Me.Button13) + Me.GroupBox11.Controls.Add(Me.txtZinssatz) + Me.GroupBox11.Controls.Add(Me.lblnichtabgerechneteZNB) + Me.GroupBox11.Controls.Add(Me.Label45) + Me.GroupBox11.Controls.Add(Me.Label48) + Me.GroupBox11.Controls.Add(Me.txtKdNrvon) + Me.GroupBox11.Controls.Add(Me.Label46) + Me.GroupBox11.Controls.Add(Me.txtKdNrbis) + Me.GroupBox11.Controls.Add(Me.txtTolInTagen) + Me.GroupBox11.Controls.Add(Me.Label47) + Me.GroupBox11.Controls.Add(Me.Label44) + Me.GroupBox11.Controls.Add(Me.txtZRvon) + Me.GroupBox11.Controls.Add(Me.txtZRbis) + Me.GroupBox11.Location = New System.Drawing.Point(5, 874) + Me.GroupBox11.Name = "GroupBox11" + Me.GroupBox11.Size = New System.Drawing.Size(847, 69) + Me.GroupBox11.TabIndex = 35 + Me.GroupBox11.TabStop = False + ' + 'Label51 + ' + Me.Label51.AutoSize = True + Me.Label51.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label51.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label51.Location = New System.Drawing.Point(2, -4) + Me.Label51.Name = "Label51" + Me.Label51.Size = New System.Drawing.Size(160, 17) + Me.Label51.TabIndex = 36 + Me.Label51.Text = "Zinsnachberechnung" + ' + 'Label49 + ' + Me.Label49.AutoSize = True + Me.Label49.Location = New System.Drawing.Point(123, 45) + Me.Label49.Name = "Label49" + Me.Label49.Size = New System.Drawing.Size(53, 13) + Me.Label49.TabIndex = 33 + Me.Label49.Text = "Zinssatz*:" + ' + 'btnZinsbelastung + ' + Me.btnZinsbelastung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnZinsbelastung.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZinsbelastung.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnZinsbelastung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnZinsbelastung.Location = New System.Drawing.Point(5, 19) + Me.btnZinsbelastung.Name = "btnZinsbelastung" + Me.btnZinsbelastung.Size = New System.Drawing.Size(98, 44) + Me.btnZinsbelastung.TabIndex = 8 + Me.btnZinsbelastung.Text = "Zinsbelastung erstellen" + Me.btnZinsbelastung.UseVisualStyleBackColor = True + ' + 'txtZinssatz + ' + Me.txtZinssatz._DateTimeOnly = False + Me.txtZinssatz._numbersOnly = False + Me.txtZinssatz._numbersOnlyKommastellen = "" + Me.txtZinssatz._numbersOnlyTrennzeichen = True + Me.txtZinssatz._Prozent = False + Me.txtZinssatz._ShortDateNew = False + Me.txtZinssatz._ShortDateOnly = False + Me.txtZinssatz._TimeOnly = False + Me.txtZinssatz._TimeOnly_Seconds = False + Me.txtZinssatz._value = "9.5" + Me.txtZinssatz._Waehrung = False + Me.txtZinssatz._WaehrungZeichen = True + Me.txtZinssatz.ForeColor = System.Drawing.Color.Black + Me.txtZinssatz.Location = New System.Drawing.Point(194, 40) + Me.txtZinssatz.MaxLineLength = -1 + Me.txtZinssatz.MaxLines_Warning = "" + Me.txtZinssatz.MaxLines_Warning_Label = Nothing + Me.txtZinssatz.Name = "txtZinssatz" + Me.txtZinssatz.Size = New System.Drawing.Size(34, 20) + Me.txtZinssatz.TabIndex = 31 + Me.txtZinssatz.Text = "9.5" + ' + 'Label45 + ' + Me.Label45.AutoSize = True + Me.Label45.Location = New System.Drawing.Point(252, 19) + Me.Label45.Name = "Label45" + Me.Label45.Size = New System.Drawing.Size(82, 13) + Me.Label45.TabIndex = 29 + Me.Label45.Text = "Kunden-Nr von:" + ' + 'Label48 + ' + Me.Label48.AutoSize = True + Me.Label48.Location = New System.Drawing.Point(123, 21) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(67, 13) + Me.Label48.TabIndex = 29 + Me.Label48.Text = "Tol inTagen:" + ' + 'txtKdNrvon + ' + Me.txtKdNrvon._DateTimeOnly = False + Me.txtKdNrvon._numbersOnly = False + Me.txtKdNrvon._numbersOnlyKommastellen = "" + Me.txtKdNrvon._numbersOnlyTrennzeichen = True + Me.txtKdNrvon._Prozent = False + Me.txtKdNrvon._ShortDateNew = False + Me.txtKdNrvon._ShortDateOnly = False + Me.txtKdNrvon._TimeOnly = False + Me.txtKdNrvon._TimeOnly_Seconds = False + Me.txtKdNrvon._value = Nothing + Me.txtKdNrvon._Waehrung = False + Me.txtKdNrvon._WaehrungZeichen = True + Me.txtKdNrvon.ForeColor = System.Drawing.Color.Black + Me.txtKdNrvon.Location = New System.Drawing.Point(337, 16) + Me.txtKdNrvon.MaxLineLength = -1 + Me.txtKdNrvon.MaxLines_Warning = "" + Me.txtKdNrvon.MaxLines_Warning_Label = Nothing + Me.txtKdNrvon.Name = "txtKdNrvon" + Me.txtKdNrvon.Size = New System.Drawing.Size(70, 20) + Me.txtKdNrvon.TabIndex = 32 + ' + 'Label46 + ' + Me.Label46.AutoSize = True + Me.Label46.Location = New System.Drawing.Point(418, 43) + Me.Label46.Name = "Label46" + Me.Label46.Size = New System.Drawing.Size(23, 13) + Me.Label46.TabIndex = 22 + Me.Label46.Text = "bis:" + ' + 'txtKdNrbis + ' + Me.txtKdNrbis._DateTimeOnly = False + Me.txtKdNrbis._numbersOnly = False + Me.txtKdNrbis._numbersOnlyKommastellen = "" + Me.txtKdNrbis._numbersOnlyTrennzeichen = True + Me.txtKdNrbis._Prozent = False + Me.txtKdNrbis._ShortDateNew = False + Me.txtKdNrbis._ShortDateOnly = False + Me.txtKdNrbis._TimeOnly = False + Me.txtKdNrbis._TimeOnly_Seconds = False + Me.txtKdNrbis._value = Nothing + Me.txtKdNrbis._Waehrung = False + Me.txtKdNrbis._WaehrungZeichen = True + Me.txtKdNrbis.ForeColor = System.Drawing.Color.Black + Me.txtKdNrbis.Location = New System.Drawing.Point(445, 16) + Me.txtKdNrbis.MaxLineLength = -1 + Me.txtKdNrbis.MaxLines_Warning = "" + Me.txtKdNrbis.MaxLines_Warning_Label = Nothing + Me.txtKdNrbis.Name = "txtKdNrbis" + Me.txtKdNrbis.Size = New System.Drawing.Size(70, 20) + Me.txtKdNrbis.TabIndex = 33 + ' + 'txtTolInTagen + ' + Me.txtTolInTagen._DateTimeOnly = False + Me.txtTolInTagen._numbersOnly = False + Me.txtTolInTagen._numbersOnlyKommastellen = "" + Me.txtTolInTagen._numbersOnlyTrennzeichen = True + Me.txtTolInTagen._Prozent = False + Me.txtTolInTagen._ShortDateNew = False + Me.txtTolInTagen._ShortDateOnly = False + Me.txtTolInTagen._TimeOnly = False + Me.txtTolInTagen._TimeOnly_Seconds = False + Me.txtTolInTagen._value = "0" + Me.txtTolInTagen._Waehrung = False + Me.txtTolInTagen._WaehrungZeichen = True + Me.txtTolInTagen.ForeColor = System.Drawing.Color.Black + Me.txtTolInTagen.Location = New System.Drawing.Point(194, 16) + Me.txtTolInTagen.MaxLineLength = -1 + Me.txtTolInTagen.MaxLines_Warning = "" + Me.txtTolInTagen.MaxLines_Warning_Label = Nothing + Me.txtTolInTagen.Name = "txtTolInTagen" + Me.txtTolInTagen.Size = New System.Drawing.Size(34, 20) + Me.txtTolInTagen.TabIndex = 30 + Me.txtTolInTagen.Text = "0" + ' + 'Label47 + ' + Me.Label47.AutoSize = True + Me.Label47.Location = New System.Drawing.Point(252, 43) + Me.Label47.Name = "Label47" + Me.Label47.Size = New System.Drawing.Size(82, 13) + Me.Label47.TabIndex = 23 + Me.Label47.Text = "Zahlungen von:" + ' + 'Label44 + ' + Me.Label44.AutoSize = True + Me.Label44.Location = New System.Drawing.Point(416, 19) + Me.Label44.Name = "Label44" + Me.Label44.Size = New System.Drawing.Size(23, 13) + Me.Label44.TabIndex = 31 + Me.Label44.Text = "bis:" + ' + 'txtZRvon + ' + Me.txtZRvon._DateTimeOnly = False + Me.txtZRvon._numbersOnly = False + Me.txtZRvon._numbersOnlyKommastellen = "" + Me.txtZRvon._numbersOnlyTrennzeichen = True + Me.txtZRvon._Prozent = False + Me.txtZRvon._ShortDateNew = True + Me.txtZRvon._ShortDateOnly = False + Me.txtZRvon._TimeOnly = False + Me.txtZRvon._TimeOnly_Seconds = False + Me.txtZRvon._value = "" + Me.txtZRvon._Waehrung = False + Me.txtZRvon._WaehrungZeichen = True + Me.txtZRvon.ForeColor = System.Drawing.Color.Black + Me.txtZRvon.Location = New System.Drawing.Point(337, 40) + Me.txtZRvon.MaxLength = 10 + Me.txtZRvon.MaxLineLength = -1 + Me.txtZRvon.MaxLines_Warning = "" + Me.txtZRvon.MaxLines_Warning_Label = Nothing + Me.txtZRvon.Name = "txtZRvon" + Me.txtZRvon.Size = New System.Drawing.Size(70, 20) + Me.txtZRvon.TabIndex = 34 + ' + 'txtZRbis + ' + Me.txtZRbis._DateTimeOnly = False + Me.txtZRbis._numbersOnly = False + Me.txtZRbis._numbersOnlyKommastellen = "" + Me.txtZRbis._numbersOnlyTrennzeichen = True + Me.txtZRbis._Prozent = False + Me.txtZRbis._ShortDateNew = True + Me.txtZRbis._ShortDateOnly = False + Me.txtZRbis._TimeOnly = False + Me.txtZRbis._TimeOnly_Seconds = False + Me.txtZRbis._value = "" + Me.txtZRbis._Waehrung = False + Me.txtZRbis._WaehrungZeichen = True + Me.txtZRbis.ForeColor = System.Drawing.Color.Black + Me.txtZRbis.Location = New System.Drawing.Point(445, 40) + Me.txtZRbis.MaxLength = 10 + Me.txtZRbis.MaxLineLength = -1 + Me.txtZRbis.MaxLines_Warning = "" + Me.txtZRbis.MaxLines_Warning_Label = Nothing + Me.txtZRbis.Name = "txtZRbis" + Me.txtZRbis.Size = New System.Drawing.Size(70, 20) + Me.txtZRbis.TabIndex = 35 + ' 'Label42 ' Me.Label42.AutoSize = True @@ -214,6 +482,46 @@ Partial Class usrCntlBH Me.GroupBox10.TabIndex = 18 Me.GroupBox10.TabStop = False ' + 'btnZNBverrechnen + ' + Me.btnZNBverrechnen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnZNBverrechnen.Enabled = False + Me.btnZNBverrechnen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZNBverrechnen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnZNBverrechnen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnZNBverrechnen.Location = New System.Drawing.Point(743, 39) + Me.btnZNBverrechnen.Name = "btnZNBverrechnen" + Me.btnZNBverrechnen.Size = New System.Drawing.Size(98, 26) + Me.btnZNBverrechnen.TabIndex = 40 + Me.btnZNBverrechnen.Text = "verrechnen" + Me.btnZNBverrechnen.UseVisualStyleBackColor = True + ' + 'txtnichtabrechneteKunden + ' + Me.txtnichtabrechneteKunden._DateTimeOnly = False + Me.txtnichtabrechneteKunden._numbersOnly = False + Me.txtnichtabrechneteKunden._numbersOnlyKommastellen = "" + Me.txtnichtabrechneteKunden._numbersOnlyTrennzeichen = True + Me.txtnichtabrechneteKunden._Prozent = False + Me.txtnichtabrechneteKunden._ShortDateNew = False + Me.txtnichtabrechneteKunden._ShortDateOnly = False + Me.txtnichtabrechneteKunden._TimeOnly = False + Me.txtnichtabrechneteKunden._TimeOnly_Seconds = False + Me.txtnichtabrechneteKunden._value = "0" + Me.txtnichtabrechneteKunden._Waehrung = False + Me.txtnichtabrechneteKunden._WaehrungZeichen = True + Me.txtnichtabrechneteKunden.ForeColor = System.Drawing.Color.Black + Me.txtnichtabrechneteKunden.Location = New System.Drawing.Point(698, 16) + Me.txtnichtabrechneteKunden.MaxLineLength = -1 + Me.txtnichtabrechneteKunden.MaxLines_Warning = "" + Me.txtnichtabrechneteKunden.MaxLines_Warning_Label = Nothing + Me.txtnichtabrechneteKunden.Name = "txtnichtabrechneteKunden" + Me.txtnichtabrechneteKunden.ReadOnly = True + Me.txtnichtabrechneteKunden.Size = New System.Drawing.Size(34, 20) + Me.txtnichtabrechneteKunden.TabIndex = 39 + Me.txtnichtabrechneteKunden.Text = "0" + Me.txtnichtabrechneteKunden.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label43 ' Me.Label43.AutoSize = True @@ -223,6 +531,19 @@ Partial Class usrCntlBH Me.Label43.TabIndex = 2 Me.Label43.Text = "Sachkontenzuweisung für Syska." ' + 'Button13 + ' + Me.Button13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button13.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button13.Location = New System.Drawing.Point(743, 10) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(98, 26) + Me.Button13.TabIndex = 38 + Me.Button13.Text = "Übersicht" + Me.Button13.UseVisualStyleBackColor = True + ' 'Button12 ' Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center @@ -236,142 +557,14 @@ Partial Class usrCntlBH Me.Button12.Text = "Sachkonten" Me.Button12.UseVisualStyleBackColor = True ' - 'Label37 + 'lblnichtabgerechneteZNB ' - Me.Label37.AutoSize = True - Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label37.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label37.Location = New System.Drawing.Point(3, 871) - Me.Label37.Name = "Label37" - Me.Label37.Size = New System.Drawing.Size(136, 17) - Me.Label37.TabIndex = 16 - Me.Label37.Text = "Kontoabstimmung" - Me.Label37.Visible = False - ' - 'GroupBox9 - ' - Me.GroupBox9.Controls.Add(Me.Label41) - Me.GroupBox9.Controls.Add(Me.Button11) - Me.GroupBox9.Controls.Add(Me.Label40) - Me.GroupBox9.Controls.Add(Me.Button10) - Me.GroupBox9.Controls.Add(Me.txtStichtag) - Me.GroupBox9.Controls.Add(Me.Label39) - Me.GroupBox9.Controls.Add(Me.Label38) - Me.GroupBox9.Controls.Add(Me.Button9) - Me.GroupBox9.Location = New System.Drawing.Point(4, 891) - Me.GroupBox9.Name = "GroupBox9" - Me.GroupBox9.Size = New System.Drawing.Size(847, 67) - Me.GroupBox9.TabIndex = 17 - Me.GroupBox9.TabStop = False - Me.GroupBox9.Visible = False - ' - 'Label41 - ' - Me.Label41.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label41.AutoSize = True - Me.Label41.Location = New System.Drawing.Point(720, 39) - Me.Label41.Name = "Label41" - Me.Label41.Size = New System.Drawing.Size(81, 13) - Me.Label41.TabIndex = 25 - Me.Label41.Text = "VZ RMC (2865)" - ' - 'Button11 - ' - Me.Button11.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button11.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button11.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.Location = New System.Drawing.Point(583, 30) - Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(121, 31) - Me.Button11.TabIndex = 26 - Me.Button11.Text = " Excel" - Me.Button11.UseVisualStyleBackColor = True - ' - 'Label40 - ' - Me.Label40.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label40.AutoSize = True - Me.Label40.Location = New System.Drawing.Point(424, 39) - Me.Label40.Name = "Label40" - Me.Label40.Size = New System.Drawing.Size(100, 13) - Me.Label40.TabIndex = 23 - Me.Label40.Text = "VZ Verag (2866-68)" - ' - 'Button10 - ' - Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button10.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button10.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(287, 30) - Me.Button10.Name = "Button10" - Me.Button10.Size = New System.Drawing.Size(121, 31) - Me.Button10.TabIndex = 24 - Me.Button10.Text = " Excel" - Me.Button10.UseVisualStyleBackColor = True - ' - 'txtStichtag - ' - Me.txtStichtag._DateTimeOnly = False - Me.txtStichtag._numbersOnly = False - Me.txtStichtag._numbersOnlyKommastellen = "" - Me.txtStichtag._numbersOnlyTrennzeichen = True - Me.txtStichtag._Prozent = False - Me.txtStichtag._ShortDateNew = True - Me.txtStichtag._ShortDateOnly = False - Me.txtStichtag._TimeOnly = False - Me.txtStichtag._TimeOnly_Seconds = False - Me.txtStichtag._value = "" - Me.txtStichtag._Waehrung = False - Me.txtStichtag._WaehrungZeichen = True - Me.txtStichtag.ForeColor = System.Drawing.Color.Black - Me.txtStichtag.Location = New System.Drawing.Point(67, 10) - Me.txtStichtag.MaxLength = 10 - Me.txtStichtag.MaxLineLength = -1 - Me.txtStichtag.MaxLines_Warning = "" - Me.txtStichtag.MaxLines_Warning_Label = Nothing - Me.txtStichtag.Name = "txtStichtag" - Me.txtStichtag.Size = New System.Drawing.Size(60, 20) - Me.txtStichtag.TabIndex = 21 - ' - 'Label39 - ' - Me.Label39.AutoSize = True - Me.Label39.Location = New System.Drawing.Point(4, 13) - Me.Label39.Name = "Label39" - Me.Label39.Size = New System.Drawing.Size(49, 13) - Me.Label39.TabIndex = 22 - Me.Label39.Text = "Stichtag:" - ' - 'Label38 - ' - Me.Label38.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label38.AutoSize = True - Me.Label38.Location = New System.Drawing.Point(143, 39) - Me.Label38.Name = "Label38" - Me.Label38.Size = New System.Drawing.Size(81, 13) - Me.Label38.TabIndex = 2 - Me.Label38.Text = "Sicherheit 3470" - ' - 'Button9 - ' - Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button9.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(6, 30) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(121, 31) - Me.Button9.TabIndex = 7 - Me.Button9.Text = " Excel" - Me.Button9.UseVisualStyleBackColor = True + Me.lblnichtabgerechneteZNB.AutoSize = True + Me.lblnichtabgerechneteZNB.Location = New System.Drawing.Point(554, 19) + Me.lblnichtabgerechneteZNB.Name = "lblnichtabgerechneteZNB" + Me.lblnichtabgerechneteZNB.Size = New System.Drawing.Size(144, 13) + Me.lblnichtabgerechneteZNB.TabIndex = 37 + Me.lblnichtabgerechneteZNB.Text = "Nicht abgerechnete Kunden:" ' 'Label34 ' @@ -546,6 +739,7 @@ Partial Class usrCntlBH ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.Label50) Me.GroupBox1.Controls.Add(Me.cbxMdmSollHabenOhneKdNr) Me.GroupBox1.Controls.Add(Me.cbxMdmHabenHaben) Me.GroupBox1.Controls.Add(Me.cbxMdmSollSoll) @@ -559,6 +753,17 @@ Partial Class usrCntlBH Me.GroupBox1.TabStop = False Me.GroupBox1.Visible = False ' + 'Label50 + ' + Me.Label50.AutoSize = True + Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label50.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label50.Location = New System.Drawing.Point(5, 83) + Me.Label50.Name = "Label50" + Me.Label50.Size = New System.Drawing.Size(168, 17) + Me.Label50.TabIndex = 36 + Me.Label50.Text = "Sachkontenzuweisung" + ' 'cbxMdmSollHabenOhneKdNr ' Me.cbxMdmSollHabenOhneKdNr.AutoSize = True @@ -628,17 +833,6 @@ Partial Class usrCntlBH Me.btnWord.Text = "Abgleich starten" Me.btnWord.UseVisualStyleBackColor = True ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label24.Location = New System.Drawing.Point(2, -3) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(150, 17) - Me.Label24.TabIndex = 8 - Me.Label24.Text = "OeKB Versicherung" - ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.Label2) @@ -715,6 +909,17 @@ Partial Class usrCntlBH Me.Button4.Text = " Excel" Me.Button4.UseVisualStyleBackColor = True ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label24.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label24.Location = New System.Drawing.Point(2, -3) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(150, 17) + Me.Label24.TabIndex = 8 + Me.Label24.Text = "OeKB Versicherung" + ' 'Label7 ' Me.Label7.AutoSize = True @@ -1404,15 +1609,154 @@ Partial Class usrCntlBH ' 'TabPage5 ' + Me.TabPage5.Controls.Add(Me.Label37) + Me.TabPage5.Controls.Add(Me.GroupBox9) Me.TabPage5.Controls.Add(Me.Label28) Me.TabPage5.Controls.Add(Me.GroupBox6) Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" - Me.TabPage5.Size = New System.Drawing.Size(956, 1062) + Me.TabPage5.Size = New System.Drawing.Size(956, 968) Me.TabPage5.TabIndex = 1 Me.TabPage5.Text = "IMEX" Me.TabPage5.UseVisualStyleBackColor = True ' + 'Label37 + ' + Me.Label37.AutoSize = True + Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label37.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label37.Location = New System.Drawing.Point(54, 441) + Me.Label37.Name = "Label37" + Me.Label37.Size = New System.Drawing.Size(136, 17) + Me.Label37.TabIndex = 18 + Me.Label37.Text = "Kontoabstimmung" + Me.Label37.Visible = False + ' + 'GroupBox9 + ' + Me.GroupBox9.Controls.Add(Me.Label41) + Me.GroupBox9.Controls.Add(Me.Button11) + Me.GroupBox9.Controls.Add(Me.Label40) + Me.GroupBox9.Controls.Add(Me.Button10) + Me.GroupBox9.Controls.Add(Me.txtStichtag) + Me.GroupBox9.Controls.Add(Me.Label39) + Me.GroupBox9.Controls.Add(Me.Label38) + Me.GroupBox9.Controls.Add(Me.Button9) + Me.GroupBox9.Location = New System.Drawing.Point(55, 461) + Me.GroupBox9.Name = "GroupBox9" + Me.GroupBox9.Size = New System.Drawing.Size(847, 67) + Me.GroupBox9.TabIndex = 19 + Me.GroupBox9.TabStop = False + Me.GroupBox9.Visible = False + ' + 'Label41 + ' + Me.Label41.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label41.AutoSize = True + Me.Label41.Location = New System.Drawing.Point(720, 39) + Me.Label41.Name = "Label41" + Me.Label41.Size = New System.Drawing.Size(81, 13) + Me.Label41.TabIndex = 25 + Me.Label41.Text = "VZ RMC (2865)" + ' + 'Button11 + ' + Me.Button11.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button11.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.Location = New System.Drawing.Point(583, 30) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(121, 31) + Me.Button11.TabIndex = 26 + Me.Button11.Text = " Excel" + Me.Button11.UseVisualStyleBackColor = True + ' + 'Label40 + ' + Me.Label40.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label40.AutoSize = True + Me.Label40.Location = New System.Drawing.Point(424, 39) + Me.Label40.Name = "Label40" + Me.Label40.Size = New System.Drawing.Size(100, 13) + Me.Label40.TabIndex = 23 + Me.Label40.Text = "VZ Verag (2866-68)" + ' + 'Button10 + ' + Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button10.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button10.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button10.Location = New System.Drawing.Point(287, 30) + Me.Button10.Name = "Button10" + Me.Button10.Size = New System.Drawing.Size(121, 31) + Me.Button10.TabIndex = 24 + Me.Button10.Text = " Excel" + Me.Button10.UseVisualStyleBackColor = True + ' + 'txtStichtag + ' + Me.txtStichtag._DateTimeOnly = False + Me.txtStichtag._numbersOnly = False + Me.txtStichtag._numbersOnlyKommastellen = "" + Me.txtStichtag._numbersOnlyTrennzeichen = True + Me.txtStichtag._Prozent = False + Me.txtStichtag._ShortDateNew = True + Me.txtStichtag._ShortDateOnly = False + Me.txtStichtag._TimeOnly = False + Me.txtStichtag._TimeOnly_Seconds = False + Me.txtStichtag._value = "" + Me.txtStichtag._Waehrung = False + Me.txtStichtag._WaehrungZeichen = True + Me.txtStichtag.ForeColor = System.Drawing.Color.Black + Me.txtStichtag.Location = New System.Drawing.Point(67, 10) + Me.txtStichtag.MaxLength = 10 + Me.txtStichtag.MaxLineLength = -1 + Me.txtStichtag.MaxLines_Warning = "" + Me.txtStichtag.MaxLines_Warning_Label = Nothing + Me.txtStichtag.Name = "txtStichtag" + Me.txtStichtag.Size = New System.Drawing.Size(60, 20) + Me.txtStichtag.TabIndex = 21 + ' + 'Label39 + ' + Me.Label39.AutoSize = True + Me.Label39.Location = New System.Drawing.Point(4, 13) + Me.Label39.Name = "Label39" + Me.Label39.Size = New System.Drawing.Size(49, 13) + Me.Label39.TabIndex = 22 + Me.Label39.Text = "Stichtag:" + ' + 'Label38 + ' + Me.Label38.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label38.AutoSize = True + Me.Label38.Location = New System.Drawing.Point(143, 39) + Me.Label38.Name = "Label38" + Me.Label38.Size = New System.Drawing.Size(81, 13) + Me.Label38.TabIndex = 2 + Me.Label38.Text = "Sicherheit 3470" + ' + 'Button9 + ' + Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button9.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button9.Location = New System.Drawing.Point(6, 30) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(121, 31) + Me.Button9.TabIndex = 7 + Me.Button9.Text = " Excel" + Me.Button9.UseVisualStyleBackColor = True + ' 'Label28 ' Me.Label28.AutoSize = True @@ -1477,6 +1821,15 @@ Partial Class usrCntlBH Me.Button7.Text = "Importieren" Me.Button7.UseVisualStyleBackColor = True ' + 'Label52 + ' + Me.Label52.AutoSize = True + Me.Label52.Location = New System.Drawing.Point(554, 46) + Me.Label52.Name = "Label52" + Me.Label52.Size = New System.Drawing.Size(138, 13) + Me.Label52.TabIndex = 41 + Me.Label52.Text = "*wenn nicht im Kd hinterlegt" + ' 'usrCntlBH ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1490,10 +1843,10 @@ Partial Class usrCntlBH Me.pnl.PerformLayout() Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + Me.GroupBox11.ResumeLayout(False) + Me.GroupBox11.PerformLayout() Me.GroupBox10.ResumeLayout(False) Me.GroupBox10.PerformLayout() - Me.GroupBox9.ResumeLayout(False) - Me.GroupBox9.PerformLayout() Me.GroupBox8.ResumeLayout(False) Me.GroupBox8.PerformLayout() Me.GroupBox7.ResumeLayout(False) @@ -1516,6 +1869,8 @@ Partial Class usrCntlBH Me.tbcntr.ResumeLayout(False) Me.TabPage5.ResumeLayout(False) Me.TabPage5.PerformLayout() + Me.GroupBox9.ResumeLayout(False) + Me.GroupBox9.PerformLayout() Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() Me.ResumeLayout(False) @@ -1610,19 +1965,40 @@ Partial Class usrCntlBH Friend WithEvents Label35 As Label Friend WithEvents Label36 As Label Friend WithEvents cboAbfVerbFirma As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxBankgarantieInfo As CheckBox + Friend WithEvents Label42 As Label + Friend WithEvents GroupBox10 As GroupBox + Friend WithEvents Label43 As Label + Friend WithEvents Button12 As Button + Friend WithEvents btnZinsbelastung As Button + Friend WithEvents Label46 As Label + Friend WithEvents Label44 As Label + Friend WithEvents txtZRbis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtZRvon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label47 As Label + Friend WithEvents txtKdNrbis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtKdNrvon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label45 As Label + Friend WithEvents Label49 As Label + Friend WithEvents txtZinssatz As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label48 As Label + Friend WithEvents txtTolInTagen As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents GroupBox11 As GroupBox Friend WithEvents Label37 As Label Friend WithEvents GroupBox9 As GroupBox - Friend WithEvents Label38 As Label - Friend WithEvents Button9 As Button Friend WithEvents Label41 As Label Friend WithEvents Button11 As Button Friend WithEvents Label40 As Label Friend WithEvents Button10 As Button Friend WithEvents txtStichtag As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label39 As Label - Friend WithEvents cbxBankgarantieInfo As CheckBox - Friend WithEvents Label42 As Label - Friend WithEvents GroupBox10 As GroupBox - Friend WithEvents Label43 As Label - Friend WithEvents Button12 As Button + Friend WithEvents Label38 As Label + Friend WithEvents Button9 As Button + Friend WithEvents Button13 As Button + Friend WithEvents lblnichtabgerechneteZNB As Label + Friend WithEvents Label51 As Label + Friend WithEvents Label50 As Label + Friend WithEvents txtnichtabrechneteKunden As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents btnZNBverrechnen As Button + Friend WithEvents Label52 As Label End Class diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index 01e86f51..171e1c9d 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -1,5 +1,8 @@ Imports System.Globalization Imports System.Text +Imports com.sun.xml.internal.rngom +Imports GrapeCity.ActiveReports.ReportsCore.Tools +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlBH Dim GrenzeVersicherung = 50000 @@ -43,10 +46,15 @@ Public Class usrCntlBH Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" : MyListBox1.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [VERAG].[dbo].[tblFirma] where Firma_ID IN (20) order by [Firma_ID] ", False, "FMZOLL") Case Else + + Dim isMDM As Boolean = False + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "MDM" OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_nname = "Breimaier" Then isMDM = True + If isMDM Then txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0") + MyListBox1.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [VERAG].[dbo].[tblFirma] where Firma_ID NOT IN (20) order by [Firma_ID] ", False, "FMZOLL") For i = 0 To MyListBox1.Items.Count - 1 - If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "MDM" Then + If isMDM Then If DirectCast(MyListBox1.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value = 1 Or DirectCast(MyListBox1.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value = 15 Then MyListBox1.SetSelected(i, True) Else If DirectCast(MyListBox1.Items(i), VERAG_PROG_ALLGEMEIN.MyListItem).Value <> 7 Then MyListBox1.SetSelected(i, True) @@ -71,27 +79,27 @@ Public Class usrCntlBH Me.Cursor = Cursors.WaitCursor If Not checkOPValid() Then Me.Cursor = Cursors.Default : Exit Sub - Dim dt = SQL.loadDgvBySql(getOPSql(), "FMZOLL") - dt.Columns.Add("VersicherungsBetrag", Type.GetType("System.Double")) - For Each r In dt.Rows + Dim dt = SQL.loadDgvBySql(getOPSql(), "FMZOLL") + dt.Columns.Add("VersicherungsBetrag", Type.GetType("System.Double")) + For Each r In dt.Rows r("VersicherungsBetrag") = getVersBetrag(r("Risiko"), r("Versicherungssumme"), r("GemeldeterBetrag"), r("nichtVersicherbar")) Next - dt.Columns("VersicherungsBetrag").ColumnName = "V-Betrag" - dt.Columns("Versicherungssumme").ColumnName = "V-Summe" - dt.Columns("Vorauszahlung").ColumnName = "VZ" - 'dt.Columns("GemeldeterBetrag") - dt.Columns.Remove("GemeldeterBetrag") + dt.Columns("VersicherungsBetrag").ColumnName = "V-Betrag" + dt.Columns("Versicherungssumme").ColumnName = "V-Summe" + dt.Columns("Vorauszahlung").ColumnName = "VZ" + 'dt.Columns("GemeldeterBetrag") + dt.Columns.Remove("GemeldeterBetrag") - If cbxFormatNumbers.Checked Then - cProgramFunctions.genExcelFromDT_NEW(dt, {"E1:E" & (dt.Rows.Count + 1), "H1:M" & (dt.Rows.Count + 1), "O1:P" & (dt.Rows.Count + 1)}) - Else - cProgramFunctions.genExcelCSVFromDT(dt) - End If + If cbxFormatNumbers.Checked Then + cProgramFunctions.genExcelFromDT_NEW(dt, {"E1:E" & (dt.Rows.Count + 1), "H1:M" & (dt.Rows.Count + 1), "O1:P" & (dt.Rows.Count + 1)}) + Else + cProgramFunctions.genExcelCSVFromDT(dt) + End If - 'cProgramFunctions.genExcelFromDT_NEW(dt) - 'cProgramFunctions.genExcelFromDT_NEW(dt, , False) - Me.Cursor = Cursors.Default + 'cProgramFunctions.genExcelFromDT_NEW(dt) + 'cProgramFunctions.genExcelFromDT_NEW(dt, , False) + Me.Cursor = Cursors.Default Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -569,7 +577,7 @@ Public Class usrCntlBH Try Dim fd As New OpenFileDialog - fd.Filter ="CSV Files (*.csv)|*.csv" + fd.Filter = "CSV Files (*.csv)|*.csv" If fd.ShowDialog = DialogResult.OK Then If fd.FileName.ToUpper.EndsWith(".CSV") Then @@ -698,7 +706,7 @@ Public Class usrCntlBH Me.Cursor = Cursors.Default End Sub - Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click + Private Sub Button9_Click(sender As Object, e As EventArgs) If txtStichtag.Text <> "" AndAlso Not IsNumeric(txtStichtag.Text) Then MsgBox("Stichtag nicht korrekt!") : Exit Sub @@ -723,7 +731,7 @@ Public Class usrCntlBH Me.Cursor = Cursors.Default End Sub - Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click, Button11.Click + Private Sub Button10_Click(sender As Object, e As EventArgs) If txtStichtag.Text <> "" AndAlso Not IsNumeric(txtStichtag.Text) Then MsgBox("Stichtag nicht korrekt!") : Exit Sub @@ -766,4 +774,470 @@ Public Class usrCntlBH Dim f As New SDL.frmLeistundenFIBUKonten(VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Leistungen_FIBU", "SDL")) f.ShowDialog(Me) End Sub + + Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnZinsbelastung.Click + + If txtKdNrvon.Text = "" OrElse Not IsNumeric(txtKdNrvon.Text) Then + txtKdNrvon.Focus() + Exit Sub + End If + + If txtKdNrbis.Text = "" OrElse Not IsNumeric(txtKdNrbis.Text) Then + txtKdNrbis.Focus() + Exit Sub + End If + + If txtZRvon.Text = "" OrElse Not IsDate(txtZRvon.Text) Then + txtZRvon.Focus() + Exit Sub + End If + + If txtZRbis.Text = "" OrElse Not IsDate(txtZRbis.Text) Then + txtZRbis.Focus() + Exit Sub + End If + + + If txtTolInTagen.Text = "" OrElse Not IsNumeric(txtTolInTagen.Text) Then + txtTolInTagen.Focus() + Exit Sub + End If + + If txtZinssatz.Text = "" OrElse Not IsNumeric(txtZinssatz.Text) Then + txtZinssatz.Focus() + Exit Sub + End If + + If vbYes = MsgBox("Möchten Sie die Zinsbelastung starten?", vbYesNoCancel) Then + + 'Defaultwerte + Dim zinssatz As Double = CDbl(txtZinssatz.Text.Replace(".", ",")) + Dim toleranztage As Integer = CInt(txtTolInTagen.Text) + + + Dim sqlStr_FIBU = "declare @KundeVon as Integer = " & txtKdNrvon.Text & " + declare @KundeBis as Integer = " & txtKdNrbis.Text & " + declare @ZahlungVon as Date = '" & CDate(txtZRvon.Text).ToShortDateString & "' + declare @ZahlungBis as Date = '" & CDate(txtZRbis.Text).ToShortDateString & "' + declare @MandantNr as Integer = 19 + + + SELECT + op_debitor.c_urbelegid AS BelegNr, + op_debitor.i_personenkonto AS KundenNr, + op_debitor.d_rechnung AS Belegdatum, + ISNULL(op_debitor.OWNFIELD_Belegdatum, '01.01.2000') AS origbelegdatum, + op_debitor.eur_bruttobetrag AS Bruttobetrag, + op_debitor.eur_zahlung AS Zahlungsbetrag, + op_debitor.d_netto AS Nettodatum, + op_debitor.c_bemerkung AS buchungstext, + op_debitor.d_zahlung AS Zahlungsdatum, + ISNULL(op_debitor.c_zahlziel, '0/0/20') AS ZZ_in_OP, + isnull(kde_zinssatz," & zinssatz.ToString.Replace(",", ".") & ") AS Zinssatz_Kunde, + ISNULL(fibu_konto.c_zahlziel, '0/0/20') AS ZZ_in_Debitor, + isnull(dbo.fibu_zahlziel.si_ntage,0) as ZZinTage , + DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung) as ReZielZahlungsdatum, + DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & " ), op_debitor.d_rechnung), op_debitor.d_zahlung) as ÜberschreitungInTagen, + + case when DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 then + + op_debitor.eur_bruttobetrag * isnull(kde_zinssatz," & zinssatz.ToString.Replace(",", ".") & ") / 100 * DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & " ), op_debitor.d_rechnung), op_debitor.d_zahlung) / 360 + + else 0 end as Zinsbetrag, + cast(0 as bit) as abgerechnet + + FROM op_debitor INNER JOIN fibu_konto ON (op_debitor.i_personenkonto = fibu_konto.i_konto) + inner join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenErweitert] on kde_KundenNr = op_debitor.i_personenkonto + left join fibu_zahlziel on dbo.fibu_zahlziel.i_firm_refid = dbo.op_debitor.i_firm_refid and dbo.fibu_zahlziel.c_zahlziel = ISNULL(fibu_konto.c_zahlziel, '0/0/20') + + WHERE op_debitor.i_firm_refid = @MandantNr and fibu_konto.i_firm_refid = @MandantNr + + AND (op_debitor.eur_bruttobetrag + op_debitor.eur_zahlung <= 1) + AND (op_debitor.eur_bruttobetrag + op_debitor.eur_zahlung >= (-1)) + AND op_debitor.i_personenkonto >= @KundeVon AND op_debitor.i_personenkonto <= @KundeBis + AND op_debitor.d_zahlung >= @ZahlungVon AND op_debitor.d_zahlung <= @ZahlungBis + AND DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 + + ORDER BY op_debitor.i_personenkonto, op_debitor.d_rechnung, ISNULL(op_debitor.OWNFIELD_Belegdatum, '01.01.2000'), op_debitor.c_urbelegid" + + + Dim dt = SQL.loadDgvBySql(sqlStr_FIBU, "FIBU") + + If dt.Rows.Count = 0 Then + MsgBox("keine Daten") + Else + + Dim counter As Integer = 0 + + For Each r As DataRow In dt.Rows + + If r.Item("Zinsbetrag") > 0 Then + + Dim zins As New cMDMZinsberechnung(r.Item("KundenNr"), r.Item("BelegNr")) + + If zins.hasEntry AndAlso zins.verrechnet IsNot Nothing Then + counter += 1 + + dt.Columns("abgerechnet").ReadOnly = False + r.Item("abgerechnet") = True + dt.Columns("abgerechnet").ReadOnly = True + + Else + + zins.buchungstext = r.Item("buchungstext") + zins.kundeZahlungsziel = r.Item("ZZ_in_Debitor") + zins.zinssatz = r.Item("Zinssatz_Kunde") + zins.belegZahlungsziel = r.Item("ZZinTage") + zins.ueberschreitungInTagen = r.Item("ÜberschreitungInTagen") + zins.zinsbetrag = CDbl(r.Item("Zinsbetrag")) + zins.timestamp = Now() + zins.belegDatum = r.Item("Belegdatum") + zins.zahlungsBetrag = r.Item("Zahlungsbetrag") + zins.zahlungDatum = r.Item("Zahlungsdatum") + zins.zahlungsperiode_start = CDate(txtZRvon.Text).ToShortDateString + zins.zahlungsperiode_ende = CDate(txtZRbis.Text).ToShortDateString + zins.SAVE() + + End If + End If + + + Next + + If counter > 0 Then + MsgBox("In der Zinsberechnung befinden sich " & counter & " Positionen, die bereits abgerechnet wurden!" & vbNewLine & "Diese wurden ") + End If + + Dim dtTemp As New DataTable + + dtTemp = dt.Select("Zinsbetrag > 0").CopyToDataTable + If dtTemp.Rows.Count > 0 Then + cProgramFunctions.genExcelFromDT_NEW(dtTemp, {"E1:E" & (dt.Rows.Count + 1), "F1:F" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)}) + txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0") + End If + + End If + + + + + End If + End Sub + + Function gen_SPEDBUCH_ByKdNr(KdNr As String, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, Optional abrechnugsdatum As Date = Nothing, Optional Vermerk As String = "") + Try + If KdNr = "" Then Return False + + Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr) + SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch + + Dim OffertenNr As Integer + Dim Abfertigungsart As Integer + + 'todo setzen!! + OffertenNr = 95 : Abfertigungsart = 10 : SPEDBUCH.FilialenNr = 8001 + + + Dim GJ = Now.Year + If IsDate(abrechnugsdatum) AndAlso abrechnugsdatum > Now.AddYears(-5) Then GJ = cRKSV.getGJ(abrechnugsdatum, 19) + + SPEDBUCH.AbfertigungsNr = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(SPEDBUCH.FilialenNr, GJ) + SPEDBUCH.NewUNTER_NR() + + SPEDBUCH.Vermittler = AD.Ordnungsbegriff + SPEDBUCH.VermittlerKundenNr = KdNr + SPEDBUCH.VermittlerOffertenNr = OffertenNr + SPEDBUCH.Abfertigungsdatum = abrechnugsdatum.ToShortDateString + + SPEDBUCH.Abfertigungsart = Abfertigungsart + SPEDBUCH.Bar = 0 + SPEDBUCH.Fakturiert = 1 + SPEDBUCH.AnzahlSonstiges = 1 + SPEDBUCH.Abfertigungsanzahl = 1 + + SPEDBUCH.AvisUhrzeit = Nothing + SPEDBUCH.Umrechnungskurs = Nothing + SPEDBUCH.veoerz_basbtg = Nothing + SPEDBUCH.Sicherheitsbetrag = Nothing + + SPEDBUCH.Vermerk = Vermerk + + SPEDBUCH.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + + + Return SPEDBUCH.SAVE + + Catch ex As System.Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return False + + End Function + + Function gen_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, ByRef RK_ID As Integer) + Try + + If KdNr = "" Then Return False + + Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SPEDBUCH.VermittlerKundenNr) + Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(SPEDBUCH.VermittlerKundenNr) + Dim RG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang + + Dim OffertenNr As Integer + Dim Abfertigungsart As Integer + + 'TODO. Setzen! + OffertenNr = 95 : Abfertigungsart = 10 : RG.Anlage_1 = "" + + RG.Firma_ID = 19 + + RG.FilialenNr = SPEDBUCH.FilialenNr + RG.AbfertigungsNr = SPEDBUCH.AbfertigungsNr + RG.SpeditionsbuchUnterNr = SPEDBUCH.UnterNr + RG.UnterNr = RG.getMaxRGUnterNr() + + RG.Buchungsjahr = cRKSV.getGJ(SPEDBUCH.Abfertigungsdatum, RG.Firma_ID) 'If(Now.Month = 1, Now.Year - 1, Now.Year) + RG.FilialenNr = SPEDBUCH.FilialenNr + RG.Abfertigungsdatum = SPEDBUCH.Abfertigungsdatum + RG.Sammelrechnung = 0 + RG.BelegartenKz = "AR" + RG.BelegartenNr = 70 + RG.BelegartenBez = "Rechnung" + RG.Vorzeichen = "+" + + RG.VermittlerKundenNr = AD.AdressenNr + RG.VermittlerLandKz = AD.LandKz + RG.VermittlerName_1 = AD.Name_1 + RG.VermittlerName_2 = AD.Name_2 + RG.VermittlerOffertenNr = OffertenNr + RG.VermittlerOrt = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "")) + RG.VermittlerStraße = AD.Straße + RG.Rechnung_an = 3 + RG.OffertenNr = OffertenNr + + RG.KundenNrZentrale = KD.KundenNrZentrale + RG.RechnungsKundenNr = AD.AdressenNr + RG.RechnungsLandKz = AD.LandKz + RG.RechnungsName_1 = AD.Name_1 + RG.RechnungsName_2 = AD.Name_2 + RG.RechnungsOrt = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, "")) + RG.RechnungsStraße = AD.Straße + + RG.RechnungsUstIdKz = AD.UstIdKz + RG.RechnungsUstIdNr = AD.UstIdNr + RG.RechnungsUstIdGeprüft = AD.UstIdGeprüft + + RG.Lastschrift = KD.Lastschrift + RG.Kunden_SVS = KD.SVS + RG.Steuerschlüssel = KD.Steuerschlüssel + RG.Vorkasse = KD.Vorkasse + RG.Vorlageprovision_Proz = KD.Vorlageprovision + RG.Kreditaufwendungen_Proz = KD.Kreditaufwendungen + RG.RechnungSprache = "DE" + RG.Packstücke_und_Warenbezeichnung = "" + + RG.Anlage_2 = "" + RG.Anlage_3 = "" + RG.Anlage_4 = "" + RG.Anlage_5 = "" + RG.Anlage_6 = "" + + RG.Text = "" + RG.EMailRechnungstext = Nothing ' "" + + + RG.Nettozahlungsziel = KD.Zahlungsziel + + RG.SteuerpflichtigerGesamtbetrag = 0 + RG.SteuerfreierGesamtbetrag = 0 + RG.Status = 0 '<= Status während der Erfassung über die Maut/Diesel-Schnittstelle - Nach Abschluss der Datenübernahme Änderung auf 0 20231220 -> gleich auf 0 setzen! + + RG.[Vorkosten] = 0 + RG.[Erlös] = 0 + 'RG.[Buchungsjahr] = 0 + RG.[Währungscode] = "EUR" + RG.ReErfZeitstempel = Now + + + RG.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + + Dim sqlstr As String = "" + Dim useNettogesamtbetrag As Boolean = False + + Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True) + RG.LOAD_OFFERT_POSITIONEN() ' --> OFFERTE MIT ANZAHL >0 und Preis >0 + + Dim dt As New DataTable + cMDMZinsberechnung.GET_NICHTABGERECHNETE_ZB(dt, KdNr) + + + For Each r In dt.Rows + + Dim NettoBetrag As Double = r("zinsbetrag") + Dim BruttoBetrag As Double = r("zinsbetrag") + Dim UstBetrag As Double = BruttoBetrag = NettoBetrag + Dim LeistungsNr As Integer = 950 + Dim LeistungsBezAdd As String = "" + If r("buchungstext") <> "" Then + LeistungsBezAdd &= r("buchungstext") + If LeistungsBezAdd.Length > 30 Then + LeistungsBezAdd = LeistungsBezAdd.ToString.Substring(0, 30) + End If + End If + + + allPos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag, UstBetrag, LeistungsBezAdd) + + Next + + Dim dtSt As DataTable = SQL.loadDgvBySql("SELECT TOP 1 isnull([Steuersatz %],0),isnull([Steuerbezeichnung],'') FROM [Steuertabelle] WHERE [Steuerschlüssel]='" & RG.Steuerschlüssel & "'", "FMZOLL") + If dtSt IsNot Nothing AndAlso dtSt.Rows.Count > 0 Then + RG.Steuersatz_Proz = dtSt.Rows(0)(0) + End If + + cFakturierung.setGesamtBetraege(RG,, useNettogesamtbetrag) + + RG.Text = (cFakturierung.przRechnungstextTXT(RG, SPEDBUCH) & vbNewLine & cFakturierung.przRechnungstextZZ(RG)).Trim + + If RG.SAVE Then + RK_ID = RG.RK_ID + Return True + Else + Return False + End If + + Catch ex As System.Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + + End Function + + + + Function allPos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double, Optional UstBetrag As Double = 0, Optional leistungsBez As String = "") + Try + + For Each o In OFFERTE.POSITIONEN + If o.LeistungsNr = LeistungsNr Then + + Dim POS As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen() + Dim LEISTUNG As New VERAG_PROG_ALLGEMEIN.cLeistungen(o.LeistungsNr) + POS.LeistungsNr = o.LeistungsNr + POS.LeistungsBez = IIf(leistungsBez <> "", leistungsBez, o.LeistungsBez) + + POS.BerechnungsartNr = o.BerechnungsartNr + 'POS.Preis = BruttoBetrag + POS.Anzahl = 1 + POS.Steuerpflichtig = LEISTUNG.Steuerpflichtig + 'Berrechnunggebühr wird immer vom übergebenen Betrag abzüglich UST berechnet (Nettobetrag), außer bei UTA! + POS.BGebBgl = NettoBetrag - UstBetrag + + + If POS.Steuerpflichtig Then + POS.SteuerpflichtigerBetrag = NettoBetrag + POS.Preis = NettoBetrag + Else + POS.SteuerfreierBetrag = BruttoBetrag + POS.Preis = BruttoBetrag + End If + + POS.BGebLeistungsNr = o.BGebLeistungsNr + POS.BGebProzent = o.BGebProzent + POS.BGebMinBetrag = o.BGebMinBetrag + + RG.POSITIONEN.Add(POS) + + Return True + End If + Next + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return False + End Function + + Private Sub Button13_Click_1(sender As Object, e As EventArgs) Handles Button13.Click + Dim frm As New frmZinsnachberechnung("tblMDM_Zinsberechnung", "FMZOLL") + frm.ShowDialog(Me) + End Sub + + Private Sub txtnichtabrechneteKunden_TextChanged(sender As Object, e As EventArgs) Handles txtnichtabrechneteKunden.TextChanged + If txtnichtabrechneteKunden.Text <> "" AndAlso IsNumeric(txtnichtabrechneteKunden.Text) AndAlso txtnichtabrechneteKunden.Text > 0 Then + btnZNBverrechnen.Enabled = True + Else + btnZNBverrechnen.Enabled = False + End If + + + End Sub + + Private Sub btnZNBverrechnen_Click(sender As Object, e As EventArgs) Handles btnZNBverrechnen.Click + + Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("Select [kundenNr], zahlungsperiode_start,zahlungsperiode_ende FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where [verrechnet] Is null group by [kundenNr], zahlungsperiode_start, zahlungsperiode_ende ", "FMZOLL") + + If dt_Main.Rows.Count > 0 Then + Dim kundenNr As String = "" + If dt_Main.Columns.Contains("kundenNr") Then + Dim dtNew As DataTable = dt_Main.Rows.Cast(Of DataRow)().Where(Function(row) Not row.ItemArray.All(Function(field) field Is DBNull.Value Or field.Equals(""))).CopyToDataTable() + If dtNew.Rows.Count > 0 Then + Dim counter = 0 + For Each r As DataRow In dtNew.Rows + kundenNr &= r.Item(0) + counter = counter + 1 + If (dtNew.Rows.Count <> 0 And counter <> dtNew.Rows.Count) Then + kundenNr &= "," + End If + Next + End If + End If + + + Dim sqlStringFehlendeOffertenNr = "select KundenNr from Offertenpositionen where KundenNr in (" & kundenNr & ") + GROUP by KundenNr + EXCEPT + select KundenNr from Offertenpositionen where LeistungsNr = 950 and OffertenNr = 95 and KundenNr in (" & kundenNr & ") + GROUP by KundenNr" + + Dim dtfehlendeOfferten As DataTable = SQL.loadDgvBySql(sqlStringFehlendeOffertenNr, "FMZOLL") + If dtfehlendeOfferten.Rows.Count > 0 Then + MsgBox("Es fehlen bei " & dtfehlendeOfferten.Rows.Count & " Kunden das Offert 95, bitte hinterlegen ansonsten wird die Position nicht verrechnet!" & "Vorgang wird abgebrochen!") + cProgramFunctions.genExcelCSVFromDT(dtfehlendeOfferten, True) + Exit Sub + End If + + + If vbYes = MsgBox("Möchten Sie für " & dt_Main.Rows.Count & " Kunden die Zinsbelastung verrechnen?", vbYesNoCancel) Then + + + For Each R In dt_Main.Rows + + Dim startDate As String = CDate(R("zahlungsperiode_start")).ToShortDateString + Dim EndDate As String = CDate(R("zahlungsperiode_ende")).ToShortDateString + + Dim vermerk As String = "Abrechnungsperiode von " & startDate & " bis " & EndDate + + Dim verarbOK As Boolean = True + Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing + Dim RK_ID As Integer = -1 + If Not gen_SPEDBUCH_ByKdNr(R("kundenNr"), SPEDBUCH, Now(), vermerk) Then verarbOK = False + If Not gen_RECHNUNG_BySPEDBUCH(R("kundenNr"), SPEDBUCH, RK_ID) Then verarbOK = False + + If verarbOK Then + SQL.doSQL("UPDATE [tblMDM_Zinsberechnung] SET [verrechnet]=GETDATE(), RK_ID = " & RK_ID & " WHERE [verrechnet] Is null And kundenNr='" & R("kundenNr") & "' ", "FMZOLL") + End If + + Next + + txtnichtabrechneteKunden.Text = SQL.getValueTxtBySql("SELECT count(distinct(kundenNr)) FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where verrechnet is null", "FMZOLL",,, "0") + + End If + + End If + + + + End Sub + + End Class diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index 351cdea4..e1d29c79 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -2,6 +2,7 @@ Imports Microsoft.Office.Interop Imports System.Drawing.Drawing2D Imports VERAG_PROG_ALLGEMEIN +Imports System.Reflection Public Class frmMain @@ -51,6 +52,12 @@ Public Class frmMain Label9.Visible = True End If End Sub + Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView) + Dim dgvType As Type = dgv.[GetType]() + Dim pi As PropertyInfo = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance Or BindingFlags.NonPublic) + pi.SetValue(dgv, True, Nothing) + End Sub + Private Sub frmMain_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb index 5410325a..76c6b1e5 100644 --- a/SDL/frmdynMailvorlage.vb +++ b/SDL/frmdynMailvorlage.vb @@ -449,6 +449,7 @@ Public Class frmdynMailvorlagen cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM-SR", "4")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Erstattungsschreiben", "5")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Zu Wenig", "6")) + cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM-VZ", "7")) cbxTyp.changeItem("") Case Else diff --git a/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb b/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb index 1c78b677..ffd77e05 100644 --- a/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb +++ b/SDL/kunden/frmGoMautBoxen_Bestellung.Designer.vb @@ -24,12 +24,17 @@ Partial Class frmGoMautBoxen_Bestellung Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGoMautBoxen_Bestellung)) Me.pnl = New System.Windows.Forms.Panel() + Me.lblPLZRegel = New System.Windows.Forms.Label() + Me.Label25 = New System.Windows.Forms.Label() + Me.cbxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label24 = New System.Windows.Forms.Label() + Me.txtAnsprechpartner_NN = New System.Windows.Forms.TextBox() Me.txtAxles = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label23 = New System.Windows.Forms.Label() Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label22 = New System.Windows.Forms.Label() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtFahrzeugtyp = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtLicensePlate = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label20 = New System.Windows.Forms.Label() Me.Label21 = New System.Windows.Forms.Label() Me.txtJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -39,7 +44,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.cbxKK = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label19 = New System.Windows.Forms.Label() Me.Label16 = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.txtTitle = New System.Windows.Forms.TextBox() Me.Label15 = New System.Windows.Forms.Label() Me.txtTel = New System.Windows.Forms.TextBox() Me.Label14 = New System.Windows.Forms.Label() @@ -60,7 +65,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.lblAenderung = New System.Windows.Forms.Label() Me.txtAnsprechpartnerAnrede = New System.Windows.Forms.TextBox() Me.Label13 = New System.Windows.Forms.Label() - Me.txtAnsprechpartner = New System.Windows.Forms.TextBox() + Me.txtAnsprechpartner_VN = New System.Windows.Forms.TextBox() Me.cbxLandKz = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtOrt = New System.Windows.Forms.TextBox() Me.Label12 = New System.Windows.Forms.Label() @@ -74,9 +79,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.Label5 = New System.Windows.Forms.Label() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.btnAbbrechen = New System.Windows.Forms.Button() - Me.btnOK = New System.Windows.Forms.Button() - Me.TextBox2 = New System.Windows.Forms.TextBox() - Me.Label24 = New System.Windows.Forms.Label() + Me.btnNew = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.SuspendLayout() ' @@ -84,14 +87,17 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.lblPLZRegel) + Me.pnl.Controls.Add(Me.Label25) + Me.pnl.Controls.Add(Me.cbxSprache) Me.pnl.Controls.Add(Me.Label24) - Me.pnl.Controls.Add(Me.TextBox2) + Me.pnl.Controls.Add(Me.txtAnsprechpartner_NN) Me.pnl.Controls.Add(Me.txtAxles) Me.pnl.Controls.Add(Me.Label23) Me.pnl.Controls.Add(Me.MyComboBox3) Me.pnl.Controls.Add(Me.Label22) - Me.pnl.Controls.Add(Me.MyTextBox1) - Me.pnl.Controls.Add(Me.MyTextBox2) + Me.pnl.Controls.Add(Me.txtFahrzeugtyp) + Me.pnl.Controls.Add(Me.txtLicensePlate) Me.pnl.Controls.Add(Me.Label20) Me.pnl.Controls.Add(Me.Label21) Me.pnl.Controls.Add(Me.txtJahr) @@ -101,7 +107,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.pnl.Controls.Add(Me.cbxKK) Me.pnl.Controls.Add(Me.Label19) Me.pnl.Controls.Add(Me.Label16) - Me.pnl.Controls.Add(Me.TextBox1) + Me.pnl.Controls.Add(Me.txtTitle) Me.pnl.Controls.Add(Me.Label15) Me.pnl.Controls.Add(Me.txtTel) Me.pnl.Controls.Add(Me.Label14) @@ -122,7 +128,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.pnl.Controls.Add(Me.lblAenderung) Me.pnl.Controls.Add(Me.txtAnsprechpartnerAnrede) Me.pnl.Controls.Add(Me.Label13) - Me.pnl.Controls.Add(Me.txtAnsprechpartner) + Me.pnl.Controls.Add(Me.txtAnsprechpartner_VN) Me.pnl.Controls.Add(Me.cbxLandKz) Me.pnl.Controls.Add(Me.txtOrt) Me.pnl.Controls.Add(Me.Label12) @@ -136,13 +142,68 @@ Partial Class frmGoMautBoxen_Bestellung Me.pnl.Controls.Add(Me.Label5) Me.pnl.Controls.Add(Me.KdSearchBox1) Me.pnl.Controls.Add(Me.btnAbbrechen) - Me.pnl.Controls.Add(Me.btnOK) + Me.pnl.Controls.Add(Me.btnNew) Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" Me.pnl.Size = New System.Drawing.Size(827, 448) Me.pnl.TabIndex = 1 ' + 'lblPLZRegel + ' + Me.lblPLZRegel.AutoSize = True + Me.lblPLZRegel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblPLZRegel.ForeColor = System.Drawing.Color.Red + Me.lblPLZRegel.Location = New System.Drawing.Point(248, 161) + Me.lblPLZRegel.Name = "lblPLZRegel" + Me.lblPLZRegel.Size = New System.Drawing.Size(0, 13) + Me.lblPLZRegel.TabIndex = 83 + ' + 'Label25 + ' + Me.Label25.AutoSize = True + Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label25.Location = New System.Drawing.Point(515, 135) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(50, 13) + Me.Label25.TabIndex = 82 + Me.Label25.Text = "Sprache:" + ' + 'cbxSprache + ' + Me.cbxSprache._allowedValuesFreiText = Nothing + Me.cbxSprache._allowFreiText = True + Me.cbxSprache._value = "" + Me.cbxSprache.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cbxSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxSprache.DropDownWidth = 200 + Me.cbxSprache.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cbxSprache.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxSprache.FormattingEnabled = True + Me.cbxSprache.Location = New System.Drawing.Point(621, 129) + Me.cbxSprache.Name = "cbxSprache" + Me.cbxSprache.Size = New System.Drawing.Size(152, 21) + Me.cbxSprache.TabIndex = 81 + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label24.Location = New System.Drawing.Point(515, 83) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(56, 13) + Me.Label24.TabIndex = 80 + Me.Label24.Text = "Lastname:" + ' + 'txtAnsprechpartner_NN + ' + Me.txtAnsprechpartner_NN.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAnsprechpartner_NN.Location = New System.Drawing.Point(621, 80) + Me.txtAnsprechpartner_NN.MaxLength = 40 + Me.txtAnsprechpartner_NN.Name = "txtAnsprechpartner_NN" + Me.txtAnsprechpartner_NN.Size = New System.Drawing.Size(194, 20) + Me.txtAnsprechpartner_NN.TabIndex = 79 + ' 'txtAxles ' Me.txtAxles._DateTimeOnly = False @@ -201,51 +262,51 @@ Partial Class frmGoMautBoxen_Bestellung Me.Label22.TabIndex = 75 Me.Label22.Text = "License Plate Nat.:" ' - 'MyTextBox1 + 'txtFahrzeugtyp ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = False - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = False - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = "" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = False - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(621, 316) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox1.TabIndex = 74 + Me.txtFahrzeugtyp._DateTimeOnly = False + Me.txtFahrzeugtyp._numbersOnly = False + Me.txtFahrzeugtyp._numbersOnlyKommastellen = "" + Me.txtFahrzeugtyp._numbersOnlyTrennzeichen = False + Me.txtFahrzeugtyp._Prozent = False + Me.txtFahrzeugtyp._ShortDateNew = False + Me.txtFahrzeugtyp._ShortDateOnly = False + Me.txtFahrzeugtyp._TimeOnly = False + Me.txtFahrzeugtyp._TimeOnly_Seconds = False + Me.txtFahrzeugtyp._value = "" + Me.txtFahrzeugtyp._Waehrung = False + Me.txtFahrzeugtyp._WaehrungZeichen = False + Me.txtFahrzeugtyp.ForeColor = System.Drawing.Color.Black + Me.txtFahrzeugtyp.Location = New System.Drawing.Point(621, 316) + Me.txtFahrzeugtyp.MaxLineLength = -1 + Me.txtFahrzeugtyp.MaxLines_Warning = "" + Me.txtFahrzeugtyp.MaxLines_Warning_Label = Nothing + Me.txtFahrzeugtyp.Name = "txtFahrzeugtyp" + Me.txtFahrzeugtyp.Size = New System.Drawing.Size(53, 20) + Me.txtFahrzeugtyp.TabIndex = 74 ' - 'MyTextBox2 + 'txtLicensePlate ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = False - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = False - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = False - Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(621, 261) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(67, 20) - Me.MyTextBox2.TabIndex = 73 + Me.txtLicensePlate._DateTimeOnly = False + Me.txtLicensePlate._numbersOnly = False + Me.txtLicensePlate._numbersOnlyKommastellen = "" + Me.txtLicensePlate._numbersOnlyTrennzeichen = False + Me.txtLicensePlate._Prozent = False + Me.txtLicensePlate._ShortDateNew = False + Me.txtLicensePlate._ShortDateOnly = False + Me.txtLicensePlate._TimeOnly = False + Me.txtLicensePlate._TimeOnly_Seconds = False + Me.txtLicensePlate._value = "" + Me.txtLicensePlate._Waehrung = False + Me.txtLicensePlate._WaehrungZeichen = False + Me.txtLicensePlate.ForeColor = System.Drawing.Color.Black + Me.txtLicensePlate.Location = New System.Drawing.Point(621, 261) + Me.txtLicensePlate.MaxLineLength = -1 + Me.txtLicensePlate.MaxLines_Warning = "" + Me.txtLicensePlate.MaxLines_Warning_Label = Nothing + Me.txtLicensePlate.Name = "txtLicensePlate" + Me.txtLicensePlate.Size = New System.Drawing.Size(67, 20) + Me.txtLicensePlate.TabIndex = 73 ' 'Label20 ' @@ -332,7 +393,7 @@ Partial Class frmGoMautBoxen_Bestellung 'cbxKK ' Me.cbxKK._allowedValuesFreiText = Nothing - Me.cbxKK._allowFreiText = False + Me.cbxKK._allowFreiText = True Me.cbxKK._value = "" Me.cbxKK.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.cbxKK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -364,20 +425,20 @@ Partial Class frmGoMautBoxen_Bestellung Me.Label16.TabIndex = 62 Me.Label16.Text = "Title:" ' - 'TextBox1 + 'txtTitle ' - Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox1.Location = New System.Drawing.Point(621, 30) - Me.TextBox1.MaxLength = 4 - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(96, 20) - Me.TextBox1.TabIndex = 61 + Me.txtTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTitle.Location = New System.Drawing.Point(621, 30) + Me.txtTitle.MaxLength = 4 + Me.txtTitle.Name = "txtTitle" + Me.txtTitle.Size = New System.Drawing.Size(96, 20) + Me.txtTitle.TabIndex = 61 ' 'Label15 ' Me.Label15.AutoSize = True Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label15.Location = New System.Drawing.Point(509, 60) + Me.Label15.Location = New System.Drawing.Point(516, 61) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(55, 13) Me.Label15.TabIndex = 60 @@ -517,7 +578,7 @@ Partial Class frmGoMautBoxen_Bestellung Me.lblWarning.AutoSize = True Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(3, 8) + Me.lblWarning.Location = New System.Drawing.Point(6, 33) Me.lblWarning.Name = "lblWarning" Me.lblWarning.Size = New System.Drawing.Size(0, 13) Me.lblWarning.TabIndex = 47 @@ -570,20 +631,20 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.Label13.AutoSize = True Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label13.Location = New System.Drawing.Point(516, 11) + Me.Label13.Location = New System.Drawing.Point(513, 11) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(57, 13) Me.Label13.TabIndex = 31 Me.Label13.Text = "Salutation:" ' - 'txtAnsprechpartner + 'txtAnsprechpartner_VN ' - Me.txtAnsprechpartner.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtAnsprechpartner.Location = New System.Drawing.Point(621, 53) - Me.txtAnsprechpartner.MaxLength = 40 - Me.txtAnsprechpartner.Name = "txtAnsprechpartner" - Me.txtAnsprechpartner.Size = New System.Drawing.Size(194, 20) - Me.txtAnsprechpartner.TabIndex = 33 + Me.txtAnsprechpartner_VN.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAnsprechpartner_VN.Location = New System.Drawing.Point(621, 53) + Me.txtAnsprechpartner_VN.MaxLength = 40 + Me.txtAnsprechpartner_VN.Name = "txtAnsprechpartner_VN" + Me.txtAnsprechpartner_VN.Size = New System.Drawing.Size(194, 20) + Me.txtAnsprechpartner_VN.TabIndex = 33 ' 'cbxLandKz ' @@ -670,7 +731,7 @@ Partial Class frmGoMautBoxen_Bestellung 'txtEmail ' Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEmail.Location = New System.Drawing.Point(620, 125) + Me.txtEmail.Location = New System.Drawing.Point(620, 106) Me.txtEmail.MaxLength = 40 Me.txtEmail.Name = "txtEmail" Me.txtEmail.Size = New System.Drawing.Size(194, 20) @@ -680,7 +741,7 @@ Partial Class frmGoMautBoxen_Bestellung ' Me.Label11.AutoSize = True Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(515, 128) + Me.Label11.Location = New System.Drawing.Point(515, 106) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(39, 13) Me.Label11.TabIndex = 29 @@ -737,34 +798,15 @@ Partial Class frmGoMautBoxen_Bestellung Me.btnAbbrechen.Text = "Abbrechen" Me.btnAbbrechen.UseVisualStyleBackColor = True ' - 'btnOK + 'btnNew ' - Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOK.Location = New System.Drawing.Point(654, 401) - Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(160, 34) - Me.btnOK.TabIndex = 6 - Me.btnOK.Text = "OK" - Me.btnOK.UseVisualStyleBackColor = True - ' - 'TextBox2 - ' - Me.TextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextBox2.Location = New System.Drawing.Point(621, 80) - Me.TextBox2.MaxLength = 40 - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(194, 20) - Me.TextBox2.TabIndex = 79 - ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.Location = New System.Drawing.Point(509, 83) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(56, 13) - Me.Label24.TabIndex = 80 - Me.Label24.Text = "Lastname:" + Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNew.Location = New System.Drawing.Point(654, 401) + Me.btnNew.Name = "btnNew" + Me.btnNew.Size = New System.Drawing.Size(160, 34) + Me.btnNew.TabIndex = 6 + Me.btnNew.Text = "Neu" + Me.btnNew.UseVisualStyleBackColor = True ' 'frmGoMautBoxen_Bestellung ' @@ -784,7 +826,7 @@ Partial Class frmGoMautBoxen_Bestellung End Sub Friend WithEvents pnl As System.Windows.Forms.Panel Friend WithEvents btnAbbrechen As System.Windows.Forms.Button - Friend WithEvents btnOK As System.Windows.Forms.Button + Friend WithEvents btnNew As System.Windows.Forms.Button Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents KdSearchBox1 As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents cbxLandKz As VERAG_PROG_ALLGEMEIN.MyComboBox @@ -799,7 +841,7 @@ Partial Class frmGoMautBoxen_Bestellung Friend WithEvents Label11 As Label Friend WithEvents txtAnsprechpartnerAnrede As TextBox Friend WithEvents Label13 As Label - Friend WithEvents txtAnsprechpartner As TextBox + Friend WithEvents txtAnsprechpartner_VN As TextBox Friend WithEvents lblSachbearb As Label Friend WithEvents lblAenderung As Label Friend WithEvents Label1 As Label @@ -818,12 +860,12 @@ Partial Class frmGoMautBoxen_Bestellung Friend WithEvents Label7 As Label Friend WithEvents Label6 As Label Friend WithEvents Label16 As Label - Friend WithEvents TextBox1 As TextBox + Friend WithEvents txtTitle As TextBox Friend WithEvents Label15 As Label Friend WithEvents MyComboBox3 As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label22 As Label - Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents MyTextBox2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtFahrzeugtyp As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtLicensePlate As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label20 As Label Friend WithEvents Label21 As Label Friend WithEvents txtJahr As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -835,5 +877,8 @@ Partial Class frmGoMautBoxen_Bestellung Friend WithEvents txtAxles As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label23 As Label Friend WithEvents Label24 As Label - Friend WithEvents TextBox2 As TextBox + Friend WithEvents txtAnsprechpartner_NN As TextBox + Friend WithEvents Label25 As Label + Friend WithEvents cbxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents lblPLZRegel As Label End Class diff --git a/SDL/kunden/frmGoMautBoxen_Bestellung.vb b/SDL/kunden/frmGoMautBoxen_Bestellung.vb index 5ff0d6b4..f19a9445 100644 --- a/SDL/kunden/frmGoMautBoxen_Bestellung.vb +++ b/SDL/kunden/frmGoMautBoxen_Bestellung.vb @@ -1,5 +1,5 @@ -Imports System.DirectoryServices.ActiveDirectory -Imports com.sun.tools.corba.se.idl.constExpr + +Imports javax.xml.bind.annotation Imports VERAG_PROG_ALLGEMEIN Public Class frmGoMautBoxen_Bestellung @@ -9,13 +9,12 @@ Public Class frmGoMautBoxen_Bestellung Dim adresse As cAdressen Dim kundeErw As cKundenErweitert Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim dt As New DataTable Public addnew = False - Public WithEvents s As New cBinding("SDL") 'fürs Binding Dim changed As Boolean = False Dim ready As Boolean = False + Dim Land2ISOcode As String = "" Sub New(kundenNr) @@ -42,40 +41,53 @@ Public Class frmGoMautBoxen_Bestellung End Sub - Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click + Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnNew.Click lblWarning.Text = "" - If kunde Is Nothing And kundenNr < 0 Then - lblWarning.Text = "Bitte Kunden-Nr eingeben." + If Not checkValues() Then + btnNew.DialogResult = DialogResult.None Exit Sub + Else + btnNew.DialogResult = DialogResult.OK End If + Dim cardNum As String = cbxKK.SelectedValue - If cbxKK.SelectedValue = "" Then - lblWarning.Text = "Bitte Kreditkarten-Nr eingeben." - Exit Sub - End If + txtLicensePlate.Text = txtLicensePlate.Text.ToUpper.Trim + Dim LicenseNat As String = getLand(MyComboBox3._value) - - btnOK.DialogResult = DialogResult.OK - - 'txtKennzeichen.Text = txtKennzeichen.Text.ToUpper.Trim - 'txtNationalitaet.Text = txtNationalitaet.Text.ToUpper 'Label5.ForeColor = Color.Black 'lblErfassung.ForeColor = Color.Black 'If KdSearchBox1.KdNr < 0 Then Label5.ForeColor = Color.Red : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub 'If txtKennzeichen.Text = "" Then lblErfassung.ForeColor = Color.Red : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub + Dim LandBez As String = cbxLandKz.SelectedItem.ToString + + If LandBez <> "" Then + LandBez = LandBez.Replace(cbxLandKz._value, "") + LandBez = LandBez.Replace("-", "") + LandBez = LandBez.Trim() + End If + + If Not SQL.doSQL("INSERT INTO VERAG.dbo.tblGOBOXBestellungen (gb_adressNr,gb_transactionTyp,gb_company1,gb_company2,gb_companyStreet,gb_companyStreetNr,gb_companyPostalcode,gb_companyCity,gb_companyCountryISO,gb_companyCountry,gb_companyTel,gb_companyFax,gb_salutation,gb_title,gb_firstname,gb_lastname,gb_email,gb_personLanguage,gb_licensePlate,gb_licensePlateNat,gb_vehicleTyp,gb_Axles,gb_CardNum,gb_CardValidMonth,gb_CardValidYear) + VALUES (" & kunde.KundenNr & ",'" & MyComboBox1._value & "','" & txtName.Text & "','" & txtName2.Text & "','" & txtStrasse.Text & "','" & txtStasseNr.Text & "','" & txtPlz.Text & "','" & txtOrt.Text & "','" & getLand(cbxLandKz._value) & "','" & LandBez & "','" & txtTel.Text & "','" & txtFax.Text & "','" & txtAnsprechpartnerAnrede.Text & "','" & txtTitle.Text & "','" & txtAnsprechpartner_VN.Text & "','" & txtAnsprechpartner_NN.Text & "','" & txtEmail.Text & "','','" & txtLicensePlate.Text & "','" & LicenseNat & "','" & txtFahrzeugtyp.Text & "','" & txtAxles.Text & "','" & cardNum & "','" & txtMonat.Text & "','" & txtJahr.Text & "')", "FMZOLL") Then + MsgBox("Fehler beim Anlegen!") + Else + MsgBox("Bestellung wurde angelegt!") + Me.Close() + End If + + 'If s.updateBinding Then ' Dim SQL As New SQL - ' If oldkfz <> txtKennzeichen.Text Then - ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.REMANE_FOLDER_KDNR(New VERAG_PROG_ALLGEMEIN.cDatenserver_Change_Value("DOKUMENTE", "MDM", kundenNr, oldkfz, Nothing, Nothing), - ' New VERAG_PROG_ALLGEMEIN.cDatenserver_Change_Value("DOKUMENTE", "MDM", kundenNr, txtKennzeichen.Text, Nothing, Nothing)) - ' SQL.doSQL("UPDATE SDL SET KfzKennzeichen= '" & txtKennzeichen.Text & "' WHERE KundenNr='" & kundenNr & "' AND KfzKennzeichen='" & oldkfz & "'", "SDL", True) - ' SQL.doSQL("UPDATE [Kartenpool] SET KfzKennzeichen= '" & txtKennzeichen.Text & "' WHERE KundenNr='" & kundenNr & "' AND KfzKennzeichen='" & oldkfz & "'", "SDL", True) - ' End If - ' Me.Close() + 'If oldkfz <> txtLicensePlate.Text Then + ' ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.REMANE_FOLDER_KDNR(New VERAG_PROG_ALLGEMEIN.cDatenserver_Change_Value("DOKUMENTE", "MDM", kundenNr, oldkfz, Nothing, Nothing), + ' ' New VERAG_PROG_ALLGEMEIN.cDatenserver_Change_Value("DOKUMENTE", "MDM", kundenNr, txtKennzeichen.Text, Nothing, Nothing)) + ' SQL.doSQL("UPDATE SDL SET KfzKennzeichen= '" & txtLicensePlate.Text & "' WHERE KundenNr='" & kundenNr & "' AND KfzKennzeichen='" & oldkfz & "'", "SDL", True) + ' SQL.doSQL("UPDATE [Kartenpool] SET KfzKennzeichen= '" & txtLicensePlate.Text & "' WHERE KundenNr='" & kundenNr & "' AND KfzKennzeichen='" & oldkfz & "'", "SDL", True) + 'End If + Me.Close() 'End If End Sub @@ -102,6 +114,10 @@ Public Class frmGoMautBoxen_Bestellung cbxKK.DisplayMember = "KartenNr" cbxKK.ValueMember = "KartenNr" cbxKK.changeItem(dv.Item(0).Row.Item(0)) + + txtMonat.Text = dt.Rows(0).Item("Kartenablaufmonat").ToString + txtJahr.Text = dt.Rows(0).Item("Kartenablaufjahr").ToString + End If @@ -109,38 +125,34 @@ Public Class frmGoMautBoxen_Bestellung VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - - If addnew Then newEntry() 'NEUER EINTRAG! - ready = True End Sub - Public Sub newEntry() - ' s.updateBinding() - Dim row = s.bindingdataTable.NewRow() - row.Item("KundenNr") = kundenNr - row.Item("KfzKennzeichen") = "" - s.bindingdataTable.Rows.Add(row) + Private Function fktMod10(ByVal number As String) As Char + Dim sum As Integer = 0 + Dim doubleDigit As Boolean = True - s.bindingSource.MoveLast() - 'If save Then updateBinding() - lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") - lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - If kundenNr < 0 Then KdSearchBox1.Enabled = True - End Sub + ' Durchlaufen von rechts nach links + For i As Integer = number.Length - 1 To 0 Step -1 + Dim digit As Integer = CInt(number(i).ToString()) - Sub BindingTableColumnChanged(sender As Object, e As System.Data.DataColumnChangeEventArgs) - If ready Then - lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") - changed = True - End If - End Sub + If doubleDigit Then + digit *= 2 + If digit > 9 Then digit -= 9 + End If + + sum += digit + doubleDigit = Not doubleDigit + Next + + Dim check As Integer = (10 - (sum Mod 10)) Mod 10 + Return check.ToString()(0) + End Function Private Sub btnAbbrechen_Click(sender As Object, e As EventArgs) Handles btnAbbrechen.Click ', Me.FormClosing If changed Then Select Case MsgBox("Änderungen speichern", vbYesNoCancel) - Case vbYes : Me.DialogResult = Windows.Forms.DialogResult.None : btnOK.PerformClick() + Case vbYes : Me.DialogResult = Windows.Forms.DialogResult.None : btnNew.PerformClick() Case vbNo : Me.Close() Case vbCancel : Me.DialogResult = Windows.Forms.DialogResult.None End Select @@ -151,26 +163,43 @@ Public Class frmGoMautBoxen_Bestellung Private Sub frmLKWDetails_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown If e.KeyCode = Keys.Return Then - btnOK.PerformClick() + btnNew.PerformClick() End If End Sub Private Sub frmLKWDetails_Load(sender As Object, e As EventArgs) Handles Me.Load - 'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MAUTBOXEN_bearbeiten", Me) Then - ' MsgBox("Keine Berechtigung!") - ' Me.Close() - 'End If + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_MAUTBOXEN_bearbeiten", Me) Then + MsgBox("Keine Berechtigung!") + Me.Close() + End If KdSearchBox1.initKdBox(Me) + MyComboBox1.Items.Add(New MyListItem("N", "N")) '"N" -> Neue Bestellung + MyComboBox1.changeItem("N") + + cbxSprache.Items.Add(New MyListItem("", "")) + cbxSprache.Items.Add(New MyListItem("deutsch", "DE")) + cbxSprache.Items.Add(New MyListItem("englisch", "EN")) + cbxSprache.Items.Add(New MyListItem("italienisch", "IT")) + cbxSprache.Items.Add(New MyListItem("kroatisch", "HR")) + cbxSprache.Items.Add(New MyListItem("tschechisch", "CZ")) + cbxSprache.Items.Add(New MyListItem("ungarisch", "HU")) + MyComboBox1.changeItem("") If kundenNr > 0 Then Me.KdSearchBox1.KdNr = kundenNr KdSearchBox1.Enabled = False End If - cbxLandKz.fillWithSQL(" select distinct landkz, Währungstabelle.Land from Währungstabelle where landkz is not null order by LandKz", , "FMZOLL", True) + cbxLandKz.fillWithSQL(" select distinct landkz, Währungstabelle.Land from Währungstabelle where landkz is not null order by LandKz", , "FMZOLL", True) + + If cbxLandKz.Items.Count > 0 Then + MyComboBox2.Items.AddRange(cbxLandKz.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) + MyComboBox3.Items.AddRange(cbxLandKz.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) + End If + initKunde() @@ -180,6 +209,132 @@ Public Class frmGoMautBoxen_Bestellung initKunde() End Sub + Private Sub setDefaultValues() + + 'Anzahl der Achsen des Zugfahrzeuges. Fahrzeuge mit mehr als 4 Achsen sind mit 4 zu deklarieren. + If txtAxles.Text = "" Then + txtAxles.Text = "2" + End If + + 'Fahrzeugtyp (Busse und Wohnmobile sind als "Bus", alle anderen mautpflichtigen Fahrzeuge als "LKW" zu deklarieren). + If txtFahrzeugtyp.Text = "" Then + txtFahrzeugtyp.Text = "LKW" + End If + + 'Firmenadresse: Strasse; Sollte es keine Strasseninformation geben, so ist dieses Feld mit einem "-" zu füllen. + If txtStrasse.Text = "" Then + txtStrasse.Text = "-" + End If + + 'Firmenadresse: Hausnummer; Sollte es keine Hausnummer geben, so ist dieses Feld mit einem "-" zu füllen. + If txtStasseNr.Text = "" Then + txtStasseNr.Text = "-" + End If + + + End Sub + + Private Function checkValues() As Boolean + + If kunde Is Nothing And kundenNr < 0 Then + lblWarning.Text = "Bitte Kunden-Nr eingeben." + Return False + End If + + + If cbxKK.SelectedValue = "" Then + lblWarning.Text = "Bitte Kreditkarten-Nr eingeben." + Return False + End If + + + Dim PLZRegel As Integer = 0 + Select Case Land2ISOcode + Case "BE" : PLZRegel = 2 + Case "DZ", "DK", "DE", "FI", "FR", "GR", "IR", "IS", "IT", "HR", "KW", "LI", "LU", "MC", "NO", "AT", "RU", "CH", "RS", "SI", "ES", "TN", "TR", "UA", "HU", "CY" : PLZRegel = 4 + Case "GB" : PLZRegel = 5 + Case "NL", "PL", "PT", "SE", "SK", "CZ" : PLZRegel = 9 + + End Select + + 'PLZ-Regel PLZ-RegelBeschreibung + '1 Maximale Länge; keine Leerzeichen + '2 Numerisch; Maximale Länge; keine Leerzeichen + '3 Exakte Länge; keine Leerzeichen + '4 Numerisch; exakte Länge; keine Leerzeichen + '5 Maximale Länge + '6 Numerisch; maximale Länge + '7 Exakte Länge + '8 Numerisch; exakte Länge + '9 Länder-spezifisch (siehe PostleitzahlFormat) + + Dim laengePLZ As Integer = 0 + + Select Case Land2ISOcode + + Case "IS" : laengePLZ = 3 + Case "BE", "DK", "LI", "LU", "NO", "AT", "CH", "SI", "TN", "HU", "CY" : laengePLZ = 4 + Case "DZ", "DE", "FI", "FR", "GR", "IR", "IL", "IT", "HR", "KW", "MC", "RS", "ES", "TR", "UA" : laengePLZ = 5 + Case "NL", "PL", "RU", "SE", "SK", "CZ" : laengePLZ = 6 + Case "PT" : laengePLZ = 8 + Case "GB" : laengePLZ = 9 + End Select + + + Dim PLZFormat As String = "" + If PLZRegel = 9 Then + Select Case Land2ISOcode + Case "NL" : PLZFormat = "NNNN AA" + Case "PL" : PLZFormat = "NN-NNN" + Case "PT" : PLZFormat = "NNNN NNN oder NNNN" + Case "SE", "SK", "CZ" : PLZFormat = "NNN NN" + End Select + ElseIf PLZRegel = 2 Then + lblPLZRegel.Text = "Numerisch; keine LZ Max. Länge: " & laengePLZ + ElseIf PLZRegel = 4 Then + lblPLZRegel.Text = " Numerisch; keine LZ, genaue Länge: " & laengePLZ + ElseIf PLZRegel = 5 Then + lblPLZRegel.Text = "Max. Länge: " & laengePLZ + End If + + If PLZFormat <> "" Then lblPLZRegel.Text &= PLZFormat + + If txtPlz.Text <> "" AndAlso txtPlz.Text <> "-" Then + If laengePLZ > 0 AndAlso (txtPlz.Text.Length <> laengePLZ AndAlso PLZRegel = 4) OrElse (txtPlz.Text.Length > laengePLZ AndAlso (PLZRegel = 2 OrElse PLZRegel = 5)) Then + lblWarning.Text = "Die PLZ für " & Land2ISOcode & IIf(PLZRegel = 2 Or PLZRegel = 5, " darf max. ", " muss genau ") & laengePLZ & " Stellen besitzen!" + Return False + End If + End If + + Dim licensePlate As String = txtLicensePlate.Text + + If Not String.IsNullOrEmpty(licensePlate) Then + For i As Integer = 0 To licensePlate.Length - 1 + Dim ch As Char = licensePlate(i) + If Not (Char.IsDigit(ch) OrElse (ch >= "A"c AndAlso ch <= "Z"c) OrElse ch = " "c OrElse ch = "-"c) Then + MessageBox.Show("Ungültiges Zeichen: " & ch, "Eingabeprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information) + Return False + Exit For + + End If + Next + End If + + Dim cardNum As String = cbxKK.SelectedValue + + If Not String.IsNullOrEmpty(cardNum) Then + Dim mainPart As String = cardNum.Substring(0, cardNum.Length - 1) + Dim checkDigit As Char = cardNum(cardNum.Length - 1) + + If checkDigit <> fktMod10(mainPart) Then + MessageBox.Show("CardNum ungültig. Prüfziffernfehler!", "Eingabeprüfung", MessageBoxButtons.OK, MessageBoxIcon.Error) + Return False + End If + End If + + Return True + End Function + Private Sub initKunde() @@ -188,13 +343,16 @@ Public Class frmGoMautBoxen_Bestellung If adresse IsNot Nothing Then - txtName.Text = If(adresse.Name_1, "") & If(adresse.Name_2, "") - txtStrasse.Text = If(adresse.Straße, "") + txtName.Text = If(adresse.Name_1, "") + txtName2.Text = If(adresse.Name_2, "") + + StrasseNrAufteilen(adresse.Straße, txtStrasse.Text, txtStasseNr.Text) + txtOrt.Text = If(adresse.Ort, "") txtPlz.Text = If(adresse.PLZ, "") cbxLandKz.changeItem(If(adresse.LandKz, "")) txtAnsprechpartnerAnrede.Text = adresse.Anrede - txtAnsprechpartner.Text = adresse.Ansprechpartner + txtAnsprechpartner_VN.Text = adresse.Ansprechpartner txtFax.Text = adresse.Telefax txtEmail.Text = adresse.E_Mail @@ -211,19 +369,65 @@ Public Class frmGoMautBoxen_Bestellung Dim KD = KdSearchBox1.KdData_KUNDE Dim KDERW = KdSearchBox1.KdData_KUNDE_ERW - txtName.Text = If(AD.Name_1, "") & If(AD.Name_2, "") - txtStrasse.Text = If(AD.Straße, "") + txtName.Text = If(AD.Name_1, "") + txtName2.Text = If(AD.Name_2, "") + + StrasseNrAufteilen(AD.Straße, txtStrasse.Text, txtStasseNr.Text) + txtOrt.Text = If(AD.Ort, "") txtPlz.Text = If(AD.PLZ, "") cbxLandKz.changeItem(If(AD.LandKz, "")) txtAnsprechpartnerAnrede.Text = AD.Anrede - txtAnsprechpartner.Text = AD.Ansprechpartner + txtAnsprechpartner_VN.Text = AD.Ansprechpartner initdgv() End If End If + If cbxLandKz._value <> "" Then getLand(cbxLandKz._value, True) + + setDefaultValues() + + + End Sub + + Private Function getLand(landkz As String, Optional setISO2Global As Boolean = False) As String + + Dim LandISO2 As String = "" + If landkz.Length = 2 Then + LandISO2 = landkz + ElseIf landkz.Length = 3 Then + LandISO2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO3Land(landkz) + ElseIf landkz.Length = 1 Then + LandISO2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO1Land(landkz) + End If + + If setISO2Global Then + Land2ISOcode = LandISO2 + + End If + + Return LandISO2 + + 'MyComboBox3.changeItem(LandISO2) 'License plate Nationality + 'MyComboBox2.changeItem(LandISO2) 'CompanyCountryAbbr + + End Function + + Private Sub checkAndSetKKNr(adressenNr As String) + + + Dim strCardNum As String + + '' Take the last 6 digits of AdressenNr, padded with leading zeros + 'strCardNum = "990001" & Right(adressenNr.PadLeft(6, "0"c), 6) & "0001" + + '' Append the Mod10 check digit + 'strCardNum &= fktMod10(strCardNum) + + '' Assign to CardNum TextBox + 'txtCardNum.Text = strCardNum End Sub @@ -242,15 +446,42 @@ Public Class frmGoMautBoxen_Bestellung End Sub + Private Sub StrasseNrAufteilen(Strasse_input As String, ByRef companyStreet_output As String, ByRef companyNumber_output As String) + + Dim companyStreet As String = "-" + Dim companyNumber As String = "" + + For i As Integer = 0 To Strasse_input.Length - 1 + If Char.IsDigit(Strasse_input(i)) Then + companyStreet = Strasse_input.Substring(0, i).Trim() + companyNumber = Strasse_input.Substring(i).Trim() + Exit For + End If + Next + + If String.IsNullOrWhiteSpace(companyStreet) Then companyStreet = "-" + + companyStreet_output = companyStreet + companyNumber_output = companyNumber + + End Sub + + Private Sub cbxLandKz_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxLandKz.SelectedValueChanged + If cbxLandKz._value <> "" Then getLand(cbxLandKz._value, True) + lblPLZRegel.Text = "" + End Sub + + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + ' frm_GOX_BOX_Bestellung (FMZOLL) + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- - - ' Select Case tbl_GO_BOX_Bestellung.* - 'From tbl_GO_BOX_Bestellung - 'Where (((tbl_GO_BOX_Bestellung.Bestelldatum) Is Null) And ((tbl_GO_BOX_Bestellung.Bestellnummer) Is Null)) - 'Order By tbl_GO_BOX_Bestellung.ID; - - + 'Option Compare Database + 'Option Explicit On ' Private Sub AdressenNr_AfterUpdate() @@ -350,9 +581,13 @@ Public Class frmGoMautBoxen_Bestellung ' End Sub - - - '-------------------------------------------------------BESTELLVORGANG + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + ' frm_GO_BOX_Bestellvorgang (FMZOLL) + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- + '------------------------------------------------------------------------------------------------------------------------------------------------------------- ' Option Compare Database 'Option Explicit On @@ -642,4 +877,8 @@ Public Class frmGoMautBoxen_Bestellung '2000 Cancel = BerechtigungsprüfungForm(Me) '2010 If Cancel Then Exit Sub ' End Sub + + + + End Class \ No newline at end of file diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 33849ca1..3e12c219 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -119,6 +119,7 @@ Partial Class frmKundenblatt Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.Button5 = New System.Windows.Forms.Button() Me.Panel5 = New System.Windows.Forms.Panel() + Me.btnBestelldateiErzeugen = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() Me.Label35 = New System.Windows.Forms.Label() Me.flpSDLDok = New System.Windows.Forms.FlowLayoutPanel() @@ -197,9 +198,17 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() + Me.btn_FIBU_speichern = New System.Windows.Forms.Button() + Me.lblZNB_verrechnet = New System.Windows.Forms.Label() + Me.lblZNB_offen = New System.Windows.Forms.Label() + Me.Label18 = New System.Windows.Forms.Label() + Me.Label16 = New System.Windows.Forms.Label() + Me.dgvZinsnachberechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Label15 = New System.Windows.Forms.Label() + Me.Label14 = New System.Windows.Forms.Label() + Me.txtZinsbelastung = New System.Windows.Forms.TextBox() Me.Label12 = New System.Windows.Forms.Label() Me.rtbGespreachsbericht = New System.Windows.Forms.RichTextBox() - Me.btnFirmendatenFormularSpeichern = New System.Windows.Forms.Button() Me.Label9 = New System.Windows.Forms.Label() Me.txtFIBUKuerzel = New System.Windows.Forms.TextBox() Me.tbRechnungen = New System.Windows.Forms.TabPage() @@ -286,6 +295,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.SuspendLayout() Me.tbUSTVAntrage.SuspendLayout() Me.tbFIBU.SuspendLayout() + CType(Me.dgvZinsnachberechnung, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbRechnungen.SuspendLayout() CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() @@ -324,7 +334,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1441) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1509) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -334,7 +344,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 1435) + Me.Panel4.Size = New System.Drawing.Size(1638, 1503) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -344,7 +354,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1435) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1503) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -364,7 +374,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1470) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1538) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -405,7 +415,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1441) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1509) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -486,7 +496,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 853) + Me.TabControl1.Size = New System.Drawing.Size(718, 921) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -498,7 +508,7 @@ Partial Class frmKundenblatt 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(710, 827) + Me.TabPage1.Size = New System.Drawing.Size(710, 895) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -557,7 +567,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 792) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 860) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -590,7 +600,7 @@ Partial Class frmKundenblatt 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(710, 827) + Me.TabPage2.Size = New System.Drawing.Size(710, 895) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -635,7 +645,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 799) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 901) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -683,7 +693,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 827) + Me.TabPage3.Size = New System.Drawing.Size(710, 895) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -739,7 +749,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 838) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 940) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -1100,7 +1110,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1397) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1465) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1154,7 +1164,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 1441) + Me.tbZoll.Size = New System.Drawing.Size(1644, 1509) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1166,7 +1176,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1435) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1503) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1174,7 +1184,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1409) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1477) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1185,7 +1195,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 1441) + Me.tbMdm.Size = New System.Drawing.Size(1644, 1509) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1204,7 +1214,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1435) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1503) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1216,7 +1226,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 1409) + Me.tbSDL.Size = New System.Drawing.Size(1630, 1477) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1258,7 +1268,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1213) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1281) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1347,6 +1357,7 @@ Partial Class frmKundenblatt ' 'Panel5 ' + Me.Panel5.Controls.Add(Me.btnBestelldateiErzeugen) Me.Panel5.Controls.Add(Me.Button7) Me.Panel5.Controls.Add(Me.Label35) Me.Panel5.Controls.Add(Me.flpSDLDok) @@ -1363,11 +1374,21 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 1263) + Me.Panel5.Location = New System.Drawing.Point(3, 1331) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 ' + 'btnBestelldateiErzeugen + ' + Me.btnBestelldateiErzeugen.Location = New System.Drawing.Point(1169, 46) + Me.btnBestelldateiErzeugen.Name = "btnBestelldateiErzeugen" + Me.btnBestelldateiErzeugen.Size = New System.Drawing.Size(155, 32) + Me.btnBestelldateiErzeugen.TabIndex = 179 + Me.btnBestelldateiErzeugen.Text = "Bestelldaten erzeugen" + Me.btnBestelldateiErzeugen.UseVisualStyleBackColor = True + Me.btnBestelldateiErzeugen.Visible = False + ' 'Button7 ' Me.Button7.Location = New System.Drawing.Point(1169, 20) @@ -2249,7 +2270,7 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 1441) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 1509) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -2261,7 +2282,7 @@ Partial Class frmKundenblatt Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1441) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1509) Me.UsrCntlOfferte1.TabIndex = 0 ' 'tbUSTV @@ -2269,7 +2290,7 @@ Partial Class frmKundenblatt Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 1441) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 1509) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2283,7 +2304,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1441) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1509) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2296,7 +2317,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1415) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1483) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2412,23 +2433,127 @@ Partial Class frmKundenblatt ' 'tbFIBU ' + Me.tbFIBU.Controls.Add(Me.btn_FIBU_speichern) + Me.tbFIBU.Controls.Add(Me.lblZNB_verrechnet) + Me.tbFIBU.Controls.Add(Me.lblZNB_offen) + Me.tbFIBU.Controls.Add(Me.Label18) + Me.tbFIBU.Controls.Add(Me.Label16) + Me.tbFIBU.Controls.Add(Me.dgvZinsnachberechnung) + Me.tbFIBU.Controls.Add(Me.Label15) + Me.tbFIBU.Controls.Add(Me.Label14) + Me.tbFIBU.Controls.Add(Me.txtZinsbelastung) Me.tbFIBU.Controls.Add(Me.Label12) Me.tbFIBU.Controls.Add(Me.rtbGespreachsbericht) - Me.tbFIBU.Controls.Add(Me.btnFirmendatenFormularSpeichern) Me.tbFIBU.Controls.Add(Me.Label9) Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 1441) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 1509) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True ' + 'btn_FIBU_speichern + ' + Me.btn_FIBU_speichern.Location = New System.Drawing.Point(1468, 9) + Me.btn_FIBU_speichern.Name = "btn_FIBU_speichern" + Me.btn_FIBU_speichern.Size = New System.Drawing.Size(79, 30) + Me.btn_FIBU_speichern.TabIndex = 29 + Me.btn_FIBU_speichern.Text = "speichern" + Me.btn_FIBU_speichern.UseVisualStyleBackColor = True + ' + 'lblZNB_verrechnet + ' + Me.lblZNB_verrechnet.AutoSize = True + Me.lblZNB_verrechnet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblZNB_verrechnet.Location = New System.Drawing.Point(1534, 84) + Me.lblZNB_verrechnet.Name = "lblZNB_verrechnet" + Me.lblZNB_verrechnet.Size = New System.Drawing.Size(13, 13) + Me.lblZNB_verrechnet.TabIndex = 28 + Me.lblZNB_verrechnet.Text = "0" + Me.lblZNB_verrechnet.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'lblZNB_offen + ' + Me.lblZNB_offen.AutoSize = True + Me.lblZNB_offen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblZNB_offen.Location = New System.Drawing.Point(1534, 61) + Me.lblZNB_offen.Name = "lblZNB_offen" + Me.lblZNB_offen.Size = New System.Drawing.Size(13, 13) + Me.lblZNB_offen.TabIndex = 27 + Me.lblZNB_offen.Text = "0" + Me.lblZNB_offen.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label18.Location = New System.Drawing.Point(1259, 84) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(58, 13) + Me.Label18.TabIndex = 26 + Me.Label18.Text = "verrechnet" + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label16.Location = New System.Drawing.Point(1259, 61) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(84, 13) + Me.Label16.TabIndex = 25 + Me.Label16.Text = "nicht verrechnet" + ' + 'dgvZinsnachberechnung + ' + Me.dgvZinsnachberechnung.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvZinsnachberechnung.AllowUserToAddRows = False + Me.dgvZinsnachberechnung.AllowUserToDeleteRows = False + Me.dgvZinsnachberechnung.AllowUserToResizeColumns = False + Me.dgvZinsnachberechnung.AllowUserToResizeRows = False + Me.dgvZinsnachberechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvZinsnachberechnung.Location = New System.Drawing.Point(688, 104) + Me.dgvZinsnachberechnung.Name = "dgvZinsnachberechnung" + Me.dgvZinsnachberechnung.ReadOnly = True + Me.dgvZinsnachberechnung.RowHeadersVisible = False + Me.dgvZinsnachberechnung.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvZinsnachberechnung.Size = New System.Drawing.Size(865, 492) + Me.dgvZinsnachberechnung.TabIndex = 23 + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.Location = New System.Drawing.Point(685, 83) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(111, 13) + Me.Label15.TabIndex = 22 + Me.Label15.Text = "Zinsnachberechnung:" + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label14.Location = New System.Drawing.Point(685, 18) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(124, 13) + Me.Label14.TabIndex = 21 + Me.Label14.Text = "Zinssatz (Zinsbelastung):" + ' + 'txtZinsbelastung + ' + Me.txtZinsbelastung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtZinsbelastung.Location = New System.Drawing.Point(959, 11) + Me.txtZinsbelastung.MaxLength = 50 + Me.txtZinsbelastung.Name = "txtZinsbelastung" + Me.txtZinsbelastung.Size = New System.Drawing.Size(53, 20) + Me.txtZinsbelastung.TabIndex = 20 + ' 'Label12 ' Me.Label12.AutoSize = True Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label12.Location = New System.Drawing.Point(8, 57) + Me.Label12.Location = New System.Drawing.Point(8, 83) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(93, 13) Me.Label12.TabIndex = 19 @@ -2436,23 +2561,12 @@ Partial Class frmKundenblatt ' 'rtbGespreachsbericht ' - Me.rtbGespreachsbericht.Location = New System.Drawing.Point(11, 78) + Me.rtbGespreachsbericht.Location = New System.Drawing.Point(11, 104) Me.rtbGespreachsbericht.Name = "rtbGespreachsbericht" - Me.rtbGespreachsbericht.Size = New System.Drawing.Size(628, 324) + Me.rtbGespreachsbericht.Size = New System.Drawing.Size(628, 492) Me.rtbGespreachsbericht.TabIndex = 18 Me.rtbGespreachsbericht.Text = "" ' - 'btnFirmendatenFormularSpeichern - ' - Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(568, 3) - Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" - Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) - Me.btnFirmendatenFormularSpeichern.TabIndex = 17 - Me.btnFirmendatenFormularSpeichern.Text = "Speichern" - Me.btnFirmendatenFormularSpeichern.UseVisualStyleBackColor = True - ' 'Label9 ' Me.Label9.AutoSize = True @@ -2469,7 +2583,7 @@ Partial Class frmKundenblatt Me.txtFIBUKuerzel.Location = New System.Drawing.Point(112, 18) Me.txtFIBUKuerzel.MaxLength = 50 Me.txtFIBUKuerzel.Name = "txtFIBUKuerzel" - Me.txtFIBUKuerzel.Size = New System.Drawing.Size(289, 20) + Me.txtFIBUKuerzel.Size = New System.Drawing.Size(223, 20) Me.txtFIBUKuerzel.TabIndex = 3 ' 'tbRechnungen @@ -2478,7 +2592,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1441) + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1509) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2497,7 +2611,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 1381) + Me.dgvRg.Size = New System.Drawing.Size(1644, 1449) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2892,7 +3006,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1595, 1599) + Me.ClientSize = New System.Drawing.Size(1651, 1667) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) @@ -2969,6 +3083,7 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.ResumeLayout(False) Me.tbFIBU.ResumeLayout(False) Me.tbFIBU.PerformLayout() + CType(Me.dgvZinsnachberechnung, System.ComponentModel.ISupportInitialize).EndInit() Me.tbRechnungen.ResumeLayout(False) CType(Me.dgvRg, System.ComponentModel.ISupportInitialize).EndInit() Me.MyPanel1.ResumeLayout(False) @@ -3160,7 +3275,6 @@ Partial Class frmKundenblatt Friend WithEvents ToolStripMenuItem9 As ToolStripMenuItem Friend WithEvents Label9 As Label Friend WithEvents txtFIBUKuerzel As TextBox - Friend WithEvents btnFirmendatenFormularSpeichern As Button Friend WithEvents tbRechnungen As TabPage Friend WithEvents dgvRg As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel @@ -3172,4 +3286,14 @@ Partial Class frmKundenblatt Friend WithEvents ToolStripMenuItem10 As ToolStripMenuItem Friend WithEvents Label12 As Label Friend WithEvents rtbGespreachsbericht As RichTextBox + Friend WithEvents Label14 As Label + Friend WithEvents txtZinsbelastung As TextBox + Friend WithEvents Label15 As Label + Friend WithEvents lblZNB_verrechnet As Label + Friend WithEvents lblZNB_offen As Label + Friend WithEvents Label18 As Label + Friend WithEvents Label16 As Label + Friend WithEvents dgvZinsnachberechnung As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents btnBestelldateiErzeugen As Button + Friend WithEvents btn_FIBU_speichern As Button End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 519218c4..8f953c4c 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -4,6 +4,11 @@ Imports System.Reflection Imports javax.xml.bind.annotation Imports VERAG_PROG_ALLGEMEIN Imports System.Globalization +Imports System.Data.OleDb +Imports System.IO +Imports System.Web.UI.WebControls.Expressions +Imports System.DirectoryServices.ActiveDirectory +Imports Microsoft.Office.Interop Public Class frmKundenblatt @@ -466,6 +471,10 @@ Public Class frmKundenblatt If kdNr > 0 Then rtbGespreachsbericht.Text = checkNullStr(KUNDE.Gesprächsbericht) txtFIBUKuerzel.Text = checkNullStr(KUNDE_ERW.kde_BezFIBU) + txtZinsbelastung.Text = checkNullStr(KUNDE_ERW.kde_zinssatz) + + initZNB() + End If Else @@ -1318,6 +1327,7 @@ Public Class frmKundenblatt scanErstbestellung.Visible = False scanMWSTAgreement.Visible = False Button7.Visible = False + btnBestelldateiErzeugen.Visible = False If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then Panel2.Visible = True @@ -1331,7 +1341,7 @@ Public Class frmKundenblatt Select Case tmpSDLNr Case 100 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.IDSKundenNr 'IDS - Case 200 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.ATKundenNr : Button7.Visible = True 'AT + Case 200 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.ATKundenNr : Button7.Visible = True : btnBestelldateiErzeugen.Visible = True Case 212 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.UTAKundenNr 'UTA Case 101 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.WölflKundenNr 'WÖLFL Case 202 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.TELEPASS_Kd_Nr 'TELEPASS @@ -2215,17 +2225,6 @@ Public Class frmKundenblatt changeTab(4, sender) End Sub - Private Sub btnFirmendatenFormularSpeichern_Click(sender As Object, e As EventArgs) Handles btnFirmendatenFormularSpeichern.Click - KUNDE_ERW.kde_BezFIBU = checkNullStr(txtFIBUKuerzel.Text) - KUNDE_ERW.SAVE() - - If KUNDE.Gesprächsbericht <> "" AndAlso checkNullStr(rtbGespreachsbericht.Text) = "" OrElse KUNDE.Gesprächsbericht = "" AndAlso checkNullStr(rtbGespreachsbericht.Text) <> "" Then - KUNDE.Gesprächsbericht = checkNullStr(rtbGespreachsbericht.Text) - KUNDE.SAVE() - End If - - End Sub - Private Sub ToolStripMenuItem10_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem10.Click changeTab(7, sender) End Sub @@ -2380,5 +2379,248 @@ Public Class frmKundenblatt End Sub + Sub initZNB() + + With dgvZinsnachberechnung + Dim sqlStr = "" + sqlStr &= " SELECT TOP 1000 [belegNr] ,[belegDatum],[buchungstext],[zinsbetrag],[zinssatz],[ueberschreitungInTagen],[belegZahlungsziel],[timestamp], cast(case when [verrechnet] is null then 0 else 1 end as bit) as verrechnet" + sqlStr &= " FROM [tblMDM_Zinsberechnung] WHERE kundenNr=" & kdNr + + .SET_SQL(sqlStr & " ORDER BY belegdatum desc", "FMZOLL") + .LOAD() + + '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + + + .Columns("belegNr").Width = 70 + .Columns("belegNr").HeaderText = "Beleg-Nr" + .Columns("belegNr").HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("belegNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + .Columns("belegDatum").Width = 100 + .Columns("belegDatum").HeaderText = "Beleg-Dat." + .Columns("belegDatum").HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("belegDatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + '.Columns("Rechnungsbetrag").Width = 100 + '.Columns("Rechnungsbetrag").HeaderText = "Belegbetrag" + '.Columns("Rechnungsbetrag").DefaultCellStyle.Format = "C" + '.Columns("Rechnungsbetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + .Columns("buchungstext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("buchungstext").HeaderText = "Text" + .Columns("buchungstext").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + + .Columns("zinsbetrag").Width = 100 + .Columns("zinsbetrag").HeaderText = "Zinsbetrag" + .Columns("zinsbetrag").DefaultCellStyle.Format = "C" + .Columns("zinsbetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + .Columns("zinssatz").Width = 100 + .Columns("zinssatz").HeaderText = "Zinssatz" + .Columns("zinssatz").DefaultCellStyle.Format = "C" + .Columns("zinssatz").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + + + .Columns("ueberschreitungInTagen").Width = 45 + .Columns("ueberschreitungInTagen").HeaderText = "Tage" + .Columns("ueberschreitungInTagen").HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("ueberschreitungInTagen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + + .Columns("belegZahlungsziel").Width = 45 + .Columns("belegZahlungsziel").HeaderText = "ZZ" + .Columns("belegZahlungsziel").HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("belegZahlungsziel").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + .Columns("verrechnet").Width = 50 + .Columns("verrechnet").HeaderText = "Fakt." + .Columns("verrechnet").HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("verrechnet").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + .Columns("timestamp").Width = 100 + .Columns("timestamp").HeaderText = "Erstellt am" + .Columns("timestamp").HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("timestamp").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + + + Dim sumOffeneZB As Double = 0 + Dim sumVerrZB As Double = 0 + + + For Each r As DataGridViewRow In .Rows + If (IsNumeric(r.Cells("zinsbetrag").Value)) Then + If Not IsDBNull(r.Cells("verrechnet").Value) AndAlso r.Cells("verrechnet").Value > 0 Then + sumVerrZB += If(IsNumeric(r.Cells("zinsbetrag").Value), CDbl(r.Cells("zinsbetrag").Value), 0) + Else + sumOffeneZB += If(IsNumeric(r.Cells("zinsbetrag").Value), CDbl(r.Cells("zinsbetrag").Value), 0) + End If + End If + + + + + Next + + lblZNB_offen.Text = sumOffeneZB + lblZNB_verrechnet.Text = sumVerrZB + + + End With + + + + + + End Sub + + + Private Sub btnBestelldateiErzeugen_Click(sender As Object, e As EventArgs) Handles btnBestelldateiErzeugen.Click + Dim dateBestelldatum As Date = Date.Now + Dim intBestellnummer As Integer + Dim lngBestellanzahl As Long + Dim strDateiname As String + + Try + ' Kreditkarten prüfen/eintragen + + Dim dt_offeneBestellungen As New DataTable + dt_offeneBestellungen = SQL.loadDgvBySql("SELECT gb_bestelldatum, gb_bestellNr, gb_adressNr, gb_CardNum, gb_CardValidMonth, gb_CardValidYear, gb_licensePlate, gb_licensePlateNat, gb_Axles FROM [tblGOBOXBestellungen] WHERE gb_bestelldatum Is Null AND gb_bestellNr Is Null", "FMZOLL") + + If dt_offeneBestellungen IsNot Nothing Then + + lngBestellanzahl = dt_offeneBestellungen.Rows.Count + + For Each r As DataRow In dt_offeneBestellungen.Rows + + If Not IsDBNull(r.Item("gb_adressNr")) AndAlso Not IsDBNull(r.Item("gb_CardNum")) AndAlso Not IsDBNull(r.Item("gb_CardValidMonth")) AndAlso Not IsDBNull(r.Item("gb_CardValidYear")) Then + + Dim countKK = SQL.getValueTxtBySql("SELECT COUNT(*) FROM Kreditkarten WHERE AdressenNr = " & r.Item("gb_adressNr") & " AND KartenNr =" & r.Item("gb_CardNum"), "FMZOLL") + + If countKK = "0" Then + + If SQL.doSQL("INSERT INTO Kreditkarten (AdressenNr, KartenNr, Kartenfreischaltungsdatum, Kartenablaufmonat, Kartenablaufjahr, Kartensperre, Zeitstempel, Sachbearbeiter) + VALUES ('" & r.Item("gb_adressNr") & "','" & r.Item("gb_CardNum") & "','" & Date.Now & "','" & r.Item("gb_CardValidMonth") & "','" & r.Item("gb_CardValidYear") & "','0','" & Now() & "','" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "')", "FMZOLL") Then + + + End If + + + End If + + + End If + + Next + + + + End If + + ' 4️ Bestelldaten lesen + Dim dtBestellungen As DataTable = SQL.loadDgvBySql("SELECT gb_ID,gb_bestelldatum, gb_bestellNr, gb_adressNr, gb_CardNum, gb_CardValidMonth, gb_CardValidYear, gb_licensePlate, gb_licensePlateNat, gb_Axles FROM [tblGOBOXBestellungen] WHERE gb_bestelldatum Is Null AND gb_bestellNr Is Null", "FMZOLL") + If dtBestellungen.Rows.Count = 0 Then + MessageBox.Show("Keine Bestelldaten vorhanden.", "Bestelldatei erzeugen", MessageBoxButtons.OK, MessageBoxIcon.Information) + Exit Sub + End If + + '5 Neue Bestellnummer bestimmen + Dim bestellNr As String = SQL.getValueTxtBySql("SELECT Top(1) gb_bestellNr FROM [tblGOBOXBestellnummern] ORDER BY gb_bestelldatum DESC", "FMZOLL") + If bestellNr <> "" AndAlso IsNumeric(bestellNr) Then + intBestellnummer = CInt(bestellNr) + End If + + + ' 6️ Datensätze aktualisieren + Dim ID_bestellungen As String = "" + If dtBestellungen.Columns.Contains("gb_ID") Then + Dim dtNew As DataTable = dtBestellungen.Rows.Cast(Of DataRow)().Where(Function(row) Not row.ItemArray.All(Function(field) field Is DBNull.Value Or field.Equals(""))).CopyToDataTable() + If dtNew.Rows.Count > 0 Then + Dim counter = 0 + For Each r As DataRow In dtNew.Rows + ID_bestellungen &= r.Item(0) + counter = counter + 1 + If (dtNew.Rows.Count <> 0 And counter <> dtNew.Rows.Count) Then + ID_bestellungen &= "," + End If + Next + End If + End If + If ID_bestellungen <> "" Then + SQL.doSQL("UPDATE tblGOBOXBestellungen SET gb_bestelldatum = '" & dateBestelldatum.ToShortDateString & "', gb_bestellNr = " & intBestellnummer & " WHERE gb_ID in (" & ID_bestellungen & ")", "FMZOLL") + End If + + ' 7 Bestellnummer speichern + If IsDate(dateBestelldatum) AndAlso IsNumeric(intBestellnummer) AndAlso IsNumeric(lngBestellanzahl) Then + + SQL.doSQL("INSERT INTO tblGOBOXBestellnummern (gb_bestelldatum, gb_bestellNr, gb_bestellAnzahl) VALUES ('" & dateBestelldatum.ToShortDateString & "', " & intBestellnummer & ", " & lngBestellanzahl & ")", "FMZOLL") + + End If + + 'CSV erzeugen: + Dim SQL_String As String = "Select Top(1) 'S' As [Transaction Type], ''As Company1, ' ' As Company2, ' ' As CompanyStreet, ' ' As CompanyNumber, ' ' As CompanyCode, ' ' As CompanyCity, ' ' As CompanyCountry, ' ' As CompanyCountryAbbr, ' ' As CompanyTelephone, ' ' As CompanyTelefax, ' ' As Salutation, ' ' As Title, ' ' As FirstName, ' ' As LastName, ' ' As Email, ' ' As PersonLanguage, ' ' As [License plate], ' ' As [License plate Nationality], ' ' As VehicleType, ' ' As Axles, ' ' As [Stammnummer For Tripon Orders only], ' ' As CardNum, ' ' As CardValidMonth, ' ' As CardValidYear FROM [tblGOBOXBestellungen] + UNION ALL + Select gb_transactionTyp, gb_company1, gb_company2, gb_companyStreet, gb_companyStreetNr, gb_companyPostalcode, gb_companyCity, gb_companyCountry, gb_companyCountryISO, gb_companyTel, gb_companyFax, gb_salutation, gb_title, gb_firstname, gb_lastname, gb_email, gb_personLanguage, gb_licensePlate, gb_licensePlateNat, gb_vehicleTyp, gb_Axles, '', gb_CardNum,RIGHT('00' + CAST(gb_CardValidMonth AS VARCHAR(2)), 2) , RIGHT('00' + CAST(gb_CardValidYear AS VARCHAR(2)), 2) + From [tblGOBOXBestellungen] where gb_bestellNr = " & intBestellnummer & " and gb_transactionTyp = 'N' + UNION SELECT TOP (1) 'E', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' FROM [tblGOBOXBestellungen]" + + Dim dt_export As DataTable = SQL.loadDgvBySql(SQL_String, "FMZOLL") + + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + + Mail.Subject = "GO-BOX Bestellung Nr. " & intBestellnummer & " vom " & dateBestelldatum.ToShortDateString + + strDateiname = "PO_VG_" & Format(intBestellnummer, "0000") & "_" & Format(dateBestelldatum, "ddmmyy") & ".csv" + + Dim Path As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dt_export,,, strDateiname) + + 'muss genauer Bezeichnung haben!! + '"PO_VG_" & Format(Forms!frm_GO_BOX_Bestellvorgang!Bestellnummer, "0000") & "_" & Format(Forms!frm_GO_BOX_Bestellvorgang!Bestelldatum, "ddmmyy") & ".csv" + + + Mail.Body = "Als Anhang senden wir Ihnen die Datei """ & strDateiname & """ mit den GO-BOX-Bestellungen." & + vbCrLf & vbCrLf & "Mit freundlichen Grüssen" & + vbCrLf & "VERAG Spedition AG" & + vbCrLf & "ASFINAG-Mautabteilung" & + vbCrLf & "______________________" & + vbCrLf & "Tel. +43 7711 2777 - 14 o. 17 o. 47" & + vbCrLf & "Fax +43 7711 3386" & + vbCrLf & "email: maut.asfinag@verag.ag" & + vbCrLf & "www.verag.ag" + + + Mail.Attachments.Add(Path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, strDateiname) + + Mail.Display() + Me.Cursor = Cursors.Default + + + + + Catch ex As Exception + MessageBox.Show("Fehler beim Erzeugen der Bestelldatei: " & ex.Message, "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error) + End Try + End Sub + + Private Sub btn_FIBU_speichern_Click(sender As Object, e As EventArgs) Handles btn_FIBU_speichern.Click + KUNDE_ERW.kde_BezFIBU = checkNullStr(txtFIBUKuerzel.Text) + + If txtZinsbelastung.Text <> "" AndAlso txtZinsbelastung.Text.Contains(",") Then + txtZinsbelastung.Text = txtZinsbelastung.ToString.Replace(",", ".") + End If + + KUNDE_ERW.kde_zinssatz = checkNullStr(txtZinsbelastung.Text) + + + KUNDE_ERW.SAVE() + + If KUNDE.Gesprächsbericht <> "" AndAlso checkNullStr(rtbGespreachsbericht.Text) = "" OrElse KUNDE.Gesprächsbericht = "" AndAlso checkNullStr(rtbGespreachsbericht.Text) <> "" Then + KUNDE.Gesprächsbericht = checkNullStr(rtbGespreachsbericht.Text) + KUNDE.SAVE() + End If + End Sub End Class diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index cce98771..1087b1b3 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -175,14 +175,14 @@ Public Class usrCntlIDSPreise ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "LK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN tbl_IDS_Rechenwerte ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" Case "LSK" - SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID c,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & " ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" diff --git a/SDL/kunden/usrCntlOfferte.Designer.vb b/SDL/kunden/usrCntlOfferte.Designer.vb index f6d44139..af950f35 100644 --- a/SDL/kunden/usrCntlOfferte.Designer.vb +++ b/SDL/kunden/usrCntlOfferte.Designer.vb @@ -22,8 +22,9 @@ Partial Class usrCntlOfferte 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.lblBesonderheiten = New System.Windows.Forms.Label() Me.rtbBesonderheiten = New System.Windows.Forms.RichTextBox() Me.lblOffert = New System.Windows.Forms.TextBox() @@ -36,7 +37,7 @@ Partial Class usrCntlOfferte Me.Label67 = New System.Windows.Forms.Label() Me.btnDeleteLeistung = New System.Windows.Forms.Button() Me.btnAddLeistung = New System.Windows.Forms.Button() - Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip() + Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnOfferteSpeichern = New System.Windows.Forms.Button() Me.btnHinzufuegen = New System.Windows.Forms.Button() @@ -62,9 +63,10 @@ Partial Class usrCntlOfferte Me.lblArchivierteOfferten = New System.Windows.Forms.Label() Me.lblEditMode = New System.Windows.Forms.Label() Me.btnOffertbearbeiten = New System.Windows.Forms.Button() - Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Button2 = New System.Windows.Forms.Button() Me.Panel1 = New System.Windows.Forms.Panel() + Me.btnSaveBes = New System.Windows.Forms.Button() CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() @@ -123,8 +125,8 @@ Partial Class usrCntlOfferte Me.dgvOfferteDetails.AllowUserToDeleteRows = False Me.dgvOfferteDetails.AllowUserToOrderColumns = True Me.dgvOfferteDetails.AllowUserToResizeRows = False - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -143,8 +145,8 @@ Partial Class usrCntlOfferte Me.dgvOfferte.AllowUserToAddRows = False Me.dgvOfferte.AllowUserToDeleteRows = False Me.dgvOfferte.AllowUserToResizeRows = False - DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvOfferte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.dgvOfferte.BackgroundColor = System.Drawing.Color.White @@ -646,11 +648,25 @@ Partial Class usrCntlOfferte Me.Panel1.Size = New System.Drawing.Size(139, 51) Me.Panel1.TabIndex = 34 ' + 'btnSaveBes + ' + Me.btnSaveBes.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnSaveBes.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSaveBes.ForeColor = System.Drawing.Color.Black + Me.btnSaveBes.Image = Global.SDL.My.Resources.Resources.save + Me.btnSaveBes.Location = New System.Drawing.Point(1000, 545) + Me.btnSaveBes.Name = "btnSaveBes" + Me.btnSaveBes.Size = New System.Drawing.Size(30, 27) + Me.btnSaveBes.TabIndex = 34 + Me.btnSaveBes.Tag = "" + Me.btnSaveBes.UseVisualStyleBackColor = True + ' 'usrCntlOfferte ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.btnSaveBes) Me.Controls.Add(Me.dgvOfferteNew) Me.Controls.Add(Me.btnOffertbearbeiten) Me.Controls.Add(Me.lblEditMode) @@ -731,4 +747,5 @@ Partial Class usrCntlOfferte Friend WithEvents Button1 As Button Friend WithEvents Button2 As Button Friend WithEvents Panel1 As Panel + Friend WithEvents btnSaveBes As Button End Class diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 8382af61..3feb0dfc 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -198,6 +198,7 @@ Public Class usrCntlOfferte rtbBesonderheiten.Text = "" End If + btnSaveBes.Visible = False If dgvOfferteNew.SelectedRows.Count > 0 Then initDGVOfferteDetails(dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value) @@ -1012,4 +1013,31 @@ Public Class usrCntlOfferte End Function + Private Sub rtbBesonderheiten_TextChanged(sender As Object, e As EventArgs) Handles rtbBesonderheiten.TextChanged + btnSaveBes.Visible = true + End Sub + + Private Sub btnSaveBes_Click(sender As Object, e As EventArgs) Handles btnSaveBes.Click + + Dim OfferenNr = -1 + If dgvOfferteNew.RowCount > 0 Then + If dgvOfferteNew.SelectedRows.Count > 0 Then + + OfferenNr = cSqlDb.checkNullStr(dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value) + + Else + OfferenNr = cSqlDb.checkNullStr(dgvOfferteNew.Rows(0).Cells("OffertenNr").Value) + End If + + If OfferenNr > 0 AndAlso kdNr > 0 Then + If SQL.doSQL("update [Offerten] set [Besonderheiten] = '" & rtbBesonderheiten.Text & "' where KundenNr = " & kdNr & " and OffertenNr = " & OfferenNr, "FMZOLL") Then + initDGVOfferte() + End If + End If + + End If + + + + End Sub End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 1a69fd31..cc5e8c4a 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -243,6 +243,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbBank = New System.Windows.Forms.TabPage() Me.Label21 = New System.Windows.Forms.Label() Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.btnKKSave = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.bntGOBOXUmstellung = New System.Windows.Forms.Button() @@ -271,7 +272,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() - Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox() Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.Label113 = New System.Windows.Forms.Label() @@ -320,6 +320,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label102 = New System.Windows.Forms.Label() Me.rtb_Zahlungsinfo = New System.Windows.Forms.RichTextBox() Me.tbBankverbindungen = New System.Windows.Forms.TabPage() + Me.btnBnkExcel = New System.Windows.Forms.Button() Me.dgvBankverbindungen = New System.Windows.Forms.DataGridView() Me.cbxAlleBVanzeigen = New System.Windows.Forms.CheckBox() Me.Label108 = New System.Windows.Forms.Label() @@ -414,7 +415,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.btnBnkExcel = New System.Windows.Forms.Button() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -1278,7 +1278,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.kdProvDLProzentGSAn._UseFIRMA = "" Me.kdProvDLProzentGSAn._ValueKdAndName = True Me.kdProvDLProzentGSAn.dgvpos = "LEFT" - Me.kdProvDLProzentGSAn.KdName = Nothing + Me.kdProvDLProzentGSAn.KdName = "" Me.kdProvDLProzentGSAn.KdNr = "-1" Me.kdProvDLProzentGSAn.kdNrField = Nothing Me.kdProvDLProzentGSAn.KdNrNullInt = Nothing @@ -3407,6 +3407,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'GroupBox4 ' + Me.GroupBox4.Controls.Add(Me.btnKKSave) Me.GroupBox4.Controls.Add(Me.Button10) Me.GroupBox4.Controls.Add(Me.Button9) Me.GroupBox4.Controls.Add(Me.bntGOBOXUmstellung) @@ -3415,18 +3416,31 @@ Partial Class usrcntlKundeBearbeitenFull Me.GroupBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox4.Location = New System.Drawing.Point(9, 69) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(657, 383) + Me.GroupBox4.Size = New System.Drawing.Size(657, 404) Me.GroupBox4.TabIndex = 4 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Kreditkarten" ' + 'btnKKSave + ' + Me.btnKKSave.Enabled = False + Me.btnKKSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKKSave.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnKKSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnKKSave.Location = New System.Drawing.Point(488, 334) + Me.btnKKSave.Name = "btnKKSave" + Me.btnKKSave.Size = New System.Drawing.Size(163, 22) + Me.btnKKSave.TabIndex = 5 + Me.btnKKSave.Text = "speichern" + Me.btnKKSave.UseVisualStyleBackColor = True + ' 'Button10 ' Me.Button10.Enabled = False Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(488, 338) + Me.Button10.Location = New System.Drawing.Point(488, 360) Me.Button10.Name = "Button10" Me.Button10.Size = New System.Drawing.Size(163, 38) Me.Button10.TabIndex = 4 @@ -3439,7 +3453,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(351, 338) + Me.Button9.Location = New System.Drawing.Point(351, 360) Me.Button9.Name = "Button9" Me.Button9.Size = New System.Drawing.Size(131, 38) Me.Button9.TabIndex = 3 @@ -3452,7 +3466,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.bntGOBOXUmstellung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.bntGOBOXUmstellung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.bntGOBOXUmstellung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.bntGOBOXUmstellung.Location = New System.Drawing.Point(193, 338) + Me.bntGOBOXUmstellung.Location = New System.Drawing.Point(193, 360) Me.bntGOBOXUmstellung.Name = "bntGOBOXUmstellung" Me.bntGOBOXUmstellung.Size = New System.Drawing.Size(152, 38) Me.bntGOBOXUmstellung.TabIndex = 2 @@ -3467,7 +3481,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.btnKKhinzufuegen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnKKhinzufuegen.Image = Global.SDL.My.Resources.Resources.plus Me.btnKKhinzufuegen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKKhinzufuegen.Location = New System.Drawing.Point(9, 338) + Me.btnKKhinzufuegen.Location = New System.Drawing.Point(9, 360) Me.btnKKhinzufuegen.Name = "btnKKhinzufuegen" Me.btnKKhinzufuegen.Size = New System.Drawing.Size(178, 38) Me.btnKKhinzufuegen.TabIndex = 1 @@ -3504,7 +3518,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" - Me.dgvKreditkarten.ReadOnly = True DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -4507,6 +4520,18 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbBankverbindungen.Text = "Bankverbindung" Me.tbBankverbindungen.UseVisualStyleBackColor = True ' + 'btnBnkExcel + ' + Me.btnBnkExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo + Me.btnBnkExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnBnkExcel.FlatAppearance.BorderSize = 0 + Me.btnBnkExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBnkExcel.Location = New System.Drawing.Point(15, 290) + Me.btnBnkExcel.Name = "btnBnkExcel" + Me.btnBnkExcel.Size = New System.Drawing.Size(25, 20) + Me.btnBnkExcel.TabIndex = 137 + Me.btnBnkExcel.UseVisualStyleBackColor = True + ' 'dgvBankverbindungen ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False @@ -5659,18 +5684,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'btnBnkExcel - ' - Me.btnBnkExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo - Me.btnBnkExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnBnkExcel.FlatAppearance.BorderSize = 0 - Me.btnBnkExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnBnkExcel.Location = New System.Drawing.Point(15, 290) - Me.btnBnkExcel.Name = "btnBnkExcel" - Me.btnBnkExcel.Size = New System.Drawing.Size(25, 20) - Me.btnBnkExcel.TabIndex = 137 - Me.btnBnkExcel.UseVisualStyleBackColor = True - ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -6140,4 +6153,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents kdProvDLProzentGSAn As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents cbxProvDL As CheckBox Friend WithEvents Label115 As Label + Friend WithEvents btnKKSave As Button End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index fd08be14..9934253a 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -12,6 +12,7 @@ Public Class usrcntlKundeBearbeitenFull Dim sql As New SQL Dim WunschKdNr As Integer = -1 Public Filiale As Integer = -1 + Dim dgvKKLoaded As Boolean = False ' Dim kdnr = -1 Public Event KD_SAVED(kdnr) @@ -1018,6 +1019,7 @@ Public Class usrcntlKundeBearbeitenFull Dim cBinding_dgvSonst_IDSKunden As New cBinding("FMZOLL") Dim cBinding_dgvBankverbindungen As New cBinding("FMZOLL") Dim cBinding_dgvMWST As New cBinding("FMZOLL") + Dim cBinding_dgvKreditkaten As New cBinding("FMZOLL") @@ -1787,10 +1789,16 @@ Public Class usrcntlKundeBearbeitenFull Sub initdgvKreditkarten() + dgvKKLoaded = False + With dgvKreditkarten - .DataSource = sql.loadDgvBySql("SELECT [AdressenNr],KartenNr,Kartenfreischaltungsdatum as [Freisch.Dat.],CAST(Kartenablaufmonat AS varchar(2)) + '/' + CAST(Kartenablaufjahr AS varchar(2))as [Ablauf-Dat.],Kartensperre as Sperre,Kartensperrdatum as [Sperrdat.],NeueKartenNr,NeueKartenNrGemeldet as Gemeldet" & + + cBinding_dgvKreditkaten.initBinding("SELECT [AdressenNr],KartenNr,Kartenfreischaltungsdatum as [Freisch.Dat.],CAST(Kartenablaufmonat AS varchar(2)) + '/' + CAST(Kartenablaufjahr AS varchar(2))as [Ablauf-Dat.],Kartensperre as Sperre,Kartensperrdatum as [Sperrdat.],NeueKartenNr,NeueKartenNrGemeldet as Gemeldet" & " FROM [Kreditkarten] " & " WHERE [AdressenNr]='" & KUNDE.KundenNr & "' ORDER BY Kartensperre, Kartenablaufjahr DESC,Kartenablaufmonat DESC", "FMZOLL") + + .DataSource = cBinding_dgvKreditkaten.bindingdataTable + '.DataSource = sql.loadDgvBySql() .Columns(0).Visible = False .Columns(1).MinimumWidth = 120 @@ -1807,6 +1815,32 @@ Public Class usrcntlKundeBearbeitenFull .Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter .Columns(6).Width = 160 .Columns(7).Width = 70 + + .Columns(1).ReadOnly = True + .Columns(2).ReadOnly = True + .Columns(3).ReadOnly = True + .Columns(5).ReadOnly = True + .Columns(6).ReadOnly = True + .Columns(7).ReadOnly = True + + FUNC.dgvCellToCbo(dgvKreditkarten, 4, "Kartensperre", "Sperre", "select distinct(Kartensperre) as Kartensperre, case when Kartensperre = 0 then 'ensperren' else 'Stopped for Post-Pay' end as Grund from Kreditkarten ", "FMZOLL", 150) + + + + AddHandler btnKKSave.Click, + Sub(send As Object, evnt As EventArgs) + If cBinding_dgvKreditkaten.updateBinding() Then + send.Enabled = False + initdgvKreditkarten() + End If + End Sub + + AddHandler cBinding_dgvKreditkaten.bindingdataTable.ColumnChanged, + Sub(send As Object, evnt As EventArgs) + btnKKSave.Enabled = True + End Sub + + End With End Sub @@ -2390,4 +2424,5 @@ Public Class usrcntlKundeBearbeitenFull VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Bank,,,,,,,, True) End Sub + End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 5e90d8b9..060e327a 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -30,7 +30,7 @@ Public Class frmMDMDatenverarbetiung Case "PLOSE" : genSummenbericht_PLOSE() Case "ASFINAG" : genSummenbericht_ASFINAG() Case "UTA" : genSummenbericht_UTA() - Case "IDS" : genSummenbericht_IDS(17) : genSummenbericht_IDS(21) + Case "IDS" : genSummenbericht_IDS(17, cbxIDSmitVerag.Checked) : genSummenbericht_IDS(21, cbxIDSmitVerag.Checked) Case "MSE" : genSummenbericht_MSE() Case Else : MsgBox("Nicht verfügbar!") End Select @@ -551,15 +551,17 @@ Public Class frmMDMDatenverarbetiung End Sub - Sub genSummenbericht_IDS(typ As Integer) + Sub genSummenbericht_IDS(typ As Integer, mitVerag360_VeragAG As Boolean) Dim displayFilter = False Dim sqlstr As String = "" Dim sqlwhere = "" + + Select Case typ - Case 17 : sqlwhere = "<>740543" - Case 21 : sqlwhere = " =740543" + Case 17 : sqlwhere = "<>740543" & IIf(mitVerag360_VeragAG, "", " and tblIDSTransactionsNew.KdNrVERAG not in (756150, 711104)") + Case 21 : sqlwhere = " =740543" & IIf(mitVerag360_VeragAG, "", " and tblIDSTransactionsNew.KdNrVERAG not in (756150, 711104)") End Select sqlstr &= "SELECT Adressen.AdressenNr, Adressen.[Name 1] as Name, tblIDSTransactionsNew.[CustomerCode], Sum(tblIDSTransactionsNew.[TransactionVolume]) AS Liter, Sum(tblIDSTransactionsNew.AmminclVAT) AS Brutto, Sum(tblIDSTransactionsNew.[TotalNetAmount]) AS Netto, Sum(tblIDSTransactionsNew.Rabattbetrag) AS Rabatt @@ -1070,7 +1072,7 @@ Public Class frmMDMDatenverarbetiung Function genRGAtt_PLOSE(ploseParam As cPLOSE) As Boolean - Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where plose_Fakturiert = 0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ", "FMZOLL") + Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where plose_Fakturiert = 0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' AND AdressenNr = 401280 group by [AdressenNr],PLOSEKundenNr ", "FMZOLL") 'MsgBox("Keine Daten!""SELECT [AdressenNr],PLOSEKundenNr FROM tblPLOSE_Details INNER JOIN Adressen ON plose_POLSEKundennummer=PLOSEKundenNr where AND plose_Fakturiert = 0 AND plose_DatumTransaktion between '" & dat_Sum_Von.Value.ToShortDateString & "' and '" & dat_Sum_Bis.Value.ToShortDateString & "' group by [AdressenNr],PLOSEKundenNr ") If dt_Main Is Nothing OrElse dt_Main.Rows.Count = 0 Then MsgBox("Keine Daten!") @@ -1147,7 +1149,7 @@ Public Class frmMDMDatenverarbetiung INNER JOIN (((Adressen INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer) INNER JOIN Offertenpositionen ON Adressen.AdressenNr = Offertenpositionen.KundenNr) INNER JOIN tblUTALeistungen ON (tblUTALeistungen.VERAG_LeistungsNr = Offertenpositionen.LeistungsNr) AND (tblUTALeistungen.VERAG_OffertenNr = Offertenpositionen.OffertenNr) AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart - where isnull(charged,0) = 0 and cast([Rechnungsdatum] as date) = '" & DateTimePicker2.Text & "' and Adressen.AdressenNr not in(756150, 711104) " & IIf(test, " and KundenNr = 402352 or KundenNr = 402421 ", "") & + where isnull(charged,0) = 0 and cast([Rechnungsdatum] as date) = '" & DateTimePicker2.Text & "' and Adressen.AdressenNr not in(756150, 711104) and KundenNr = 401280 " & IIf(test, " and KundenNr = 402352 or KundenNr = 402421 ", "") & " group by Kundennummer, KundenNr, UTAExportCSV,Rechnungsdruck" Dim dt_Main As DataTable = SQL.loadDgvBySql_Param(SQLStr, "FMZOLL", 1200) diff --git a/SDL/packages.config b/SDL/packages.config index 624ab8ac..4d5c8907 100644 --- a/SDL/packages.config +++ b/SDL/packages.config @@ -1,7 +1,8 @@  - + + @@ -50,9 +51,9 @@ - - + + - + \ No newline at end of file diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 328f761f..2d5f8d0b 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -250,7 +250,7 @@ Public Class usrcntlFakturierung Dim BelegartenNr As Integer Dim BelegartenKz As String Dim BelegartenBez As String - Dim Vorzeichen As String + Dim Vorzeichen As String = "+" If r("Sammelrechnungsbetrag") >= 0 Then @@ -269,6 +269,22 @@ Public Class usrcntlFakturierung Dim steuersatz As Single = r("Steuersatz %") 'Single same as real-datatype in SQL (wichtig, sonst findet er den wert nicht!!!) + 'Dim dtRE_set As DataTable = (New SQL).loadDgvBySql("SELECT RK_ID FROM [Rechnungsausgang] WHERE [Firma_ID] = 19 AND [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter])= '" & Sachbearbeiter & "' AND [RechnungsKundenNr] = " & r("RechnungsKundenNr") & " AND [Währungscode] = '" & r("Währungscode") & "' AND [Steuersatz %] = " & steuersatz.ToString.Replace(",", ".") & " AND [Lastschrift] = " & IIf(r("Lastschrift"), 1, 0) & "AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'", "FMZOLL") + + 'For Each RE As DataRow In dtRE_set.Rows + + ' Dim RECHNUNG As New cRechnungsausgang(RE("RK_ID")) + ' RECHNUNG.BelegartenBez = BelegartenBez + ' RECHNUNG.BelegartenKz = BelegartenKz + ' RECHNUNG.BelegartenNr = BelegartenNr + ' RECHNUNG.Vorzeichen = Vorzeichen + ' ok = RECHNUNG.SAVE() + ' If Not ok Then Exit For + + 'Next + + + ok = SQL.doSQL("UPDATE [Rechnungsausgang] SET [BelegartenNr] = " & BelegartenNr & ", [BelegartenKz] = '" & BelegartenKz & "' , [BelegartenBez] = '" & BelegartenBez & "' , [Vorzeichen] = '" & Vorzeichen & "' WHERE [Firma_ID] = 19 AND [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter])= '" & Sachbearbeiter & "' AND [RechnungsKundenNr] = " & r("RechnungsKundenNr") & " AND [Währungscode] = '" & r("Währungscode") & "' AND [Steuersatz %] = " & steuersatz.ToString.Replace(",", ".") & " AND [Lastschrift] = " & IIf(r("Lastschrift"), 1, 0) & "AND cast(Abfertigungsdatum as Date) = '" & rechnungsdatum & "'", "FMZOLL") @@ -447,8 +463,8 @@ Public Class usrcntlFakturierung If Not IsDBNull(row("SteuerfreierBetrag")) AndAlso IsNumeric(row("SteuerfreierBetrag")) Then stfregesBetr = stfregesBetr - CDbl(row("SteuerfreierBetrag")) If RECHNUNG.DELETE_POSITIONEN(RECHNUNG.RK_ID, row("LeistungsNr"), row("Steuerpflichtig"), row("LeistungsBez"), row("IndexZkteing")) Then - RECHNUNG.SteuerfreierGesamtbetrag = stfregesBetr - RECHNUNG.SteuerpflichtigerGesamtbetrag = stgesBetr + RECHNUNG.SteuerfreierGesamtbetrag = stfregesBetr * If(RECHNUNG.Vorzeichen = "-", -1, 1) + RECHNUNG.SteuerpflichtigerGesamtbetrag = stgesBetr * If(RECHNUNG.Vorzeichen = "-", -1, 1) isSet = RECHNUNG.SAVE(False) End If @@ -631,8 +647,8 @@ Public Class usrcntlFakturierung If Not IsDBNull(row("SteuerfreierBetrag")) AndAlso IsNumeric(row("SteuerfreierBetrag")) Then stfregesBetr = stfregesBetr - CDbl(row("SteuerfreierBetrag")) If RECHNUNG.DELETE_POSITIONEN(RECHNUNG.RK_ID, row("LeistungsNr"), row("Steuerpflichtig"), row("LeistungsBez"), row("IndexZkteing")) Then - RECHNUNG.SteuerfreierGesamtbetrag = stfregesBetr - RECHNUNG.SteuerpflichtigerGesamtbetrag = stgesBetr + RECHNUNG.SteuerfreierGesamtbetrag = stfregesBetr * If(RECHNUNG.Vorzeichen = "-", -1, 1) 'Beim Speichern wird das Vorzeichen nochmals ermittelt + RECHNUNG.SteuerpflichtigerGesamtbetrag = stgesBetr * If(RECHNUNG.Vorzeichen = "-", -1, 1) isSet = RECHNUNG.SAVE(False) End If @@ -871,8 +887,8 @@ Public Class usrcntlFakturierung Dim RECHNUNG As New cRechnungsausgang(re("RK_ID")) If RECHNUNG.DELETE_POSITIONEN(RECHNUNG.RK_ID, r415("LeistungsNr"), r415("Steuerpflichtig"), r415("LeistungsBez"), r415("IndexZkteing")) Then - RECHNUNG.SteuerfreierGesamtbetrag = steuerfreiegerGesamtbetrag - RECHNUNG.SteuerpflichtigerGesamtbetrag = steuerpflichtigerGesamtbetrag + RECHNUNG.SteuerfreierGesamtbetrag = steuerfreiegerGesamtbetrag * If(RECHNUNG.Vorzeichen = "-", -1, 1) + RECHNUNG.SteuerpflichtigerGesamtbetrag = steuerpflichtigerGesamtbetrag * If(RECHNUNG.Vorzeichen = "-", -1, 1) isSet = RECHNUNG.SAVE(False) End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 3aade916..40815b9d 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -96,11 +96,10 @@ Public Class cKundenErweitert Property kde_Kopfsammelrechnung As Boolean = False Property kde_CSPortfolioAdded As Boolean = False Property kde_CSinsolventAm As Object = Nothing - - Property kde_Provisionsverguetung As Boolean = False Property kde_Provisionsverguetung_ProzentDL As Object = Nothing Property kde_Provisionsverguetung_GSAnKdNr As Object = Nothing + Property kde_zinssatz As Object = Nothing @@ -207,6 +206,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_ProzentDL", kde_Provisionsverguetung_ProzentDL)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_GSAnKdNr", kde_Provisionsverguetung_GSAnKdNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_zinssatz", kde_zinssatz)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb index 3210a3af..fe60ea6e 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMEInarbeitung.vb @@ -33,7 +33,7 @@ Public Class cMDMEinarbeitung Sub New(supplier, invoicedate, importdate) Me.supplier = supplier Me.invoicedate = invoicedate - Me.import_date = import_date + Me.import_date = importdate LOAD(supplier, invoicedate, import_date) End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index eec3cf7e..4cf96a87 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -1117,21 +1117,21 @@ Public Class cMDMFunctionsAllgemein AND leist.[UStV_Leistender]= [tblUStVPositionen].[UStVPo_Leistender]) where UStVAn_ID=" & USTV_ANTRAG.UStVAn_ID & sqlWHere & " ORDER BY UStVPo_ID" - Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, " FMZOLL") + Dim dtNew As DataTable = sql.loadDgvBySql(StringSQL, "FMZOLL") If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then - If type = " excel" Then + If type = "excel" Then Dim sumVAT As Double = 0 For Each row In dtNew.Rows - If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then sumVAT += CDbl(row(" Amount of tax refund")) - If Not IsDBNull(row(" Amount of tax refund")) AndAlso IsNumeric(row(" Amount of tax refund")) Then row(" Amount of tax refund") = CDbl(row(" Amount of tax refund")) - If Not IsDBNull(row(" Name of supplier")) AndAlso row(" Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then + If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then sumVAT += CDbl(row("Amount of tax refund")) + If Not IsDBNull(row("Amount of tax refund")) AndAlso IsNumeric(row("Amount of tax refund")) Then row("Amount of tax refund") = CDbl(row("Amount of tax refund")) + If Not IsDBNull(row("Name of supplier")) AndAlso row("Name of supplier") <> "" AndAlso Not IsDBNull(row("VAT")) AndAlso row("VAT") <> "" Then row("Name of supplier") = row("Name of supplier").ToString.Replace(" " & row("VAT").ToString.Substring(0, 2), "") End If Next diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb new file mode 100644 index 00000000..3569b0f0 --- /dev/null +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb @@ -0,0 +1,211 @@ + +Imports System.Data.SqlClient +Imports System.Reflection + +Public Class cMDMZinsberechnung + Property id As Integer + Property kundenNr As Object = Nothing + Property belegNr As Object = Nothing + Property buchungstext As Object = Nothing + Property kundeZahlungsziel As Object = Nothing + Property zinssatz As Object = Nothing + Property belegZahlungsziel As Object = Nothing + Property ueberschreitungInTagen As Object = Nothing + Property zinsbetrag As Object = Nothing + Property timestamp As Object = Nothing + Property verrechnet As Object = Nothing + Property belegDatum As Object = Nothing + Property zahlungDatum As Object = Nothing + Property zahlungsBetrag As Object = Nothing + Property zahlungsperiode_start As Object = Nothing + Property zahlungsperiode_ende As Object = Nothing + + Public hasEntry = False + + Dim SQL As New SQL + + Sub New(id) + Me.id = id + LOAD() + End Sub + + Sub New(kundennr, BelegNr) + Me.kundenNr = kundennr + Me.belegNr = BelegNr + LOAD(kundennr, BelegNr) + + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("id", id,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kundenNr", kundenNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("belegNr", belegNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("buchungstext", buchungstext)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kundeZahlungsziel", kundeZahlungsziel)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zinssatz", zinssatz)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("belegZahlungsziel", belegZahlungsziel)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ueberschreitungInTagen", ueberschreitungInTagen)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zinsbetrag", zinsbetrag)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("timestamp", timestamp)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("verrechnet", verrechnet)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("belegDatum", belegDatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungDatum", zahlungDatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungsBetrag", zahlungsBetrag)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungsperiode_start", zahlungsperiode_start)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("zahlungsperiode_ende", zahlungsperiode_ende)) + + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMDM_Zinsberechnung WHERE id=@id) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblMDM_Zinsberechnung WHERE id=@id ", conn) + cmd.Parameters.AddWithValue("@id", id) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + + Public Sub LOAD(kundennr, BelegNr) + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblMDM_Zinsberechnung WHERE kundennr=@kundennr and BelegNr=@BelegNr ", conn) + cmd.Parameters.AddWithValue("@kundennr", kundennr) + cmd.Parameters.AddWithValue("@BelegNr", BelegNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [tblMDM_Zinsberechnung] SET " & str & " WHERE id=@id ") + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblMDM_Zinsberechnung (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + + + Public Shared Function GET_NICHTABGERECHNETE_ZB(ByRef dt As DataTable, KundenNr As Integer) As Boolean + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + + Using cmd As New SqlCommand("SELECT belegNr,belegDatum,buchungstext,zahlungsBetrag,zahlungDatum, ueberschreitungInTagen, zinssatz,zinsbetrag + + FROM + tblMDM_Zinsberechnung + WHERE + kundenNr = @KundenNr + AND zinsbetrag <> 0 + AND verrechnet is null + ORDER BY + belegDatum", conn) + + cmd.Parameters.AddWithValue("@KundenNr", KundenNr) + + Dim dr = cmd.ExecuteReader() + dt.Load(dr) + 'While dr.Read + ' dt.Load(dr) + 'End While + dr.Close() + + End Using + End Using + Return True + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return False + + End Function + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index 8235e688..b9384a3b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -1338,6 +1338,7 @@ Public Class cUTA MDMEinarb.ds_count += savedTrans MDMEinarb.import_date = Now() + MDMEinarb.importfilename = fi.Name If MDMEinarb.ds_count = MDMEinarb.ds_total - 2 Then 'header and trailer wegzählen! MDMEinarb.completed = True MDMEinarb.completed_date = Now() diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 5c2345d4..6381a086 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -5,7 +5,6 @@ Imports System.Net Imports System.Reflection Imports System.Text.RegularExpressions Imports System.Threading -Imports com.sun.source.tree Public Class cCreditSafeAPI @@ -137,7 +136,7 @@ Public Class cCreditSafeAPI If type = "addCompanyToPortfolio_CSV" Then rest.PartSelector = "0" - rest.AddHeader("Content-Type", "multipart/form-data") + rest.AddHeader("Content-Type", "multipart/form-data") 'nicht notwendig!!! - wird automatisch gesetzt rest.AddHeader("Expect", "100-continue") Else rest.AddHeader("Content-Type", "application/json") @@ -166,9 +165,9 @@ Public Class cCreditSafeAPI rest.AddHeader("Content-Disposition", "form-data; name=""email""") rest.SetMultipartBodyString("d.breimaier@verag.ag;as@verag.ag;Viktoria.Leirich@imex-group.at") - rest.PartSelector = "0" + Dim strResponseBody As String = rest.FullRequestMultipart(method, url.Replace(API_STRING, "")) If (rest.LastMethodSuccess <> True) Then Debug.WriteLine(rest.LastErrorText) diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 5a9485b9..a9f327d8 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -393,6 +393,7 @@ + frmTimasabfrage.vb