Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2023-03-07 08:12:53 +01:00
parent c705ed1032 5dbd3931da
commit 49fec67faf
48 changed files with 357 additions and 170 deletions
--- a/SDL/kassenbuch/frmBelegNeu.Designer.vb
+++ b/SDL/kassenbuch/frmBelegNeu.Designer.vb
@@ -98,15 +98,13 @@ Partial Class frmBelegNeu
        Me.Label1 = New System.Windows.Forms.Label()
        Me.kdkunde = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.pnlOPt = New System.Windows.Forms.Panel()
-        Me.btnPOS = New System.Windows.Forms.Button()
+        Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbxBelegOffnen = New System.Windows.Forms.CheckBox()
        Me.lblStorno = New System.Windows.Forms.Label()
        Me.Label17 = New System.Windows.Forms.Label()
        Me.Label18 = New System.Windows.Forms.Label()
        Me.cboKassen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Button3 = New System.Windows.Forms.Button()
        Me.Label3 = New System.Windows.Forms.Label()
-        Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.pnlBetrag = New System.Windows.Forms.Panel()
        Me.Label23 = New System.Windows.Forms.Label()
        Me.lblBetrag_Netto = New System.Windows.Forms.Label()
@@ -114,6 +112,11 @@ Partial Class frmBelegNeu
        Me.lblBetrag_Steuern = New System.Windows.Forms.Label()
        Me.Label25 = New System.Windows.Forms.Label()
        Me.lblBetrag_Brutto = New System.Windows.Forms.Label()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label27 = New System.Windows.Forms.Label()
+        Me.Label26 = New System.Windows.Forms.Label()
+        Me.btnPOS = New System.Windows.Forms.Button()
+        Me.Button3 = New System.Windows.Forms.Button()
        Me.pnlOptionen = New System.Windows.Forms.Panel()
        Me.txtEinzelpreis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -143,6 +146,7 @@ Partial Class frmBelegNeu
        Me.pnlData.SuspendLayout()
        Me.pnlOPt.SuspendLayout()
        Me.pnlBetrag.SuspendLayout()
+        Me.Panel1.SuspendLayout()
        Me.pnlOptionen.SuspendLayout()
        Me.SuspendLayout()
        '
@@ -424,17 +428,18 @@ Partial Class frmBelegNeu
        '
        'btnPrint
        '
+        Me.btnPrint.BackgroundImage = Global.SDL.My.Resources.Resources.pay_cash_s
+        Me.btnPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnPrint.ForeColor = System.Drawing.Color.Black
-        Me.btnPrint.Image = Global.SDL.My.Resources.Resources.printer2
        Me.btnPrint.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnPrint.Location = New System.Drawing.Point(556, 33)
+        Me.btnPrint.Location = New System.Drawing.Point(71, 29)
        Me.btnPrint.Name = "btnPrint"
        Me.btnPrint.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
-        Me.btnPrint.Size = New System.Drawing.Size(64, 59)
+        Me.btnPrint.Size = New System.Drawing.Size(73, 59)
        Me.btnPrint.TabIndex = 13
-        Me.btnPrint.Text = "Beleg drucken" & Global.Microsoft.VisualBasic.ChrW(10) & "und buchen"
-        Me.btnPrint.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnPrint.Text = "BAR"
+        Me.btnPrint.TextAlign = System.Drawing.ContentAlignment.BottomCenter
        Me.btnPrint.UseVisualStyleBackColor = True
        '
        'FlowLayoutPanel
@@ -1154,6 +1159,7 @@ Partial Class frmBelegNeu
        Me.kdkunde._displayWoelflKd = False
        Me.kdkunde._hideIfListEmpty = True
        Me.kdkunde._loadKdData = True
+        Me.kdkunde._searchName1 = True
        Me.kdkunde._UseFIRMA = ""
        Me.kdkunde._ValueKdAndName = False
        Me.kdkunde.dgvpos = "LEFT"
@@ -1173,42 +1179,37 @@ Partial Class frmBelegNeu
        '
        'pnlOPt
        '
-        Me.pnlOPt.Controls.Add(Me.btnPOS)
+        Me.pnlOPt.Controls.Add(Me.cboPrinter)
        Me.pnlOPt.Controls.Add(Me.cbxBelegOffnen)
        Me.pnlOPt.Controls.Add(Me.lblStorno)
        Me.pnlOPt.Controls.Add(Me.Label17)
        Me.pnlOPt.Controls.Add(Me.Label18)
        Me.pnlOPt.Controls.Add(Me.cboKassen)
        Me.pnlOPt.Controls.Add(Me.lblMandant)
-        Me.pnlOPt.Controls.Add(Me.Button3)
        Me.pnlOPt.Controls.Add(Me.lblKassenbuchNr)
        Me.pnlOPt.Controls.Add(Me.Label3)
        Me.pnlOPt.Controls.Add(Me.Label14)
        Me.pnlOPt.Controls.Add(Me.lblSachbearbeiter)
        Me.pnlOPt.Controls.Add(Me.lblMandant_niederlassung)
        Me.pnlOPt.Controls.Add(Me.Label15)
-        Me.pnlOPt.Controls.Add(Me.btnPrint)
-        Me.pnlOPt.Controls.Add(Me.cboPrinter)
        Me.pnlOPt.Controls.Add(Me.pnlBetrag)
+        Me.pnlOPt.Controls.Add(Me.Panel1)
        Me.pnlOPt.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.pnlOPt.Location = New System.Drawing.Point(498, 212)
        Me.pnlOPt.Name = "pnlOPt"
        Me.pnlOPt.Size = New System.Drawing.Size(624, 92)
        Me.pnlOPt.TabIndex = 6
        '
-        'btnPOS
+        'cboPrinter
        '
-        Me.btnPOS.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnPOS.ForeColor = System.Drawing.Color.Black
-        Me.btnPOS.Image = Global.SDL.My.Resources.Resources.verag_Card1
-        Me.btnPOS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnPOS.Location = New System.Drawing.Point(486, 33)
-        Me.btnPOS.Name = "btnPOS"
-        Me.btnPOS.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
-        Me.btnPOS.Size = New System.Drawing.Size(64, 59)
-        Me.btnPOS.TabIndex = 16
-        Me.btnPOS.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnPOS.UseVisualStyleBackColor = True
+        Me.cboPrinter._allowedValuesFreiText = Nothing
+        Me.cboPrinter._allowFreiText = False
+        Me.cboPrinter._value = ""
+        Me.cboPrinter.FormattingEnabled = True
+        Me.cboPrinter.Location = New System.Drawing.Point(331, 6)
+        Me.cboPrinter.Name = "cboPrinter"
+        Me.cboPrinter.Size = New System.Drawing.Size(141, 21)
+        Me.cboPrinter.TabIndex = 3
        '
        'cbxBelegOffnen
        '
@@ -1269,42 +1270,16 @@ Partial Class frmBelegNeu
        Me.cboKassen.Size = New System.Drawing.Size(226, 21)
        Me.cboKassen.TabIndex = 1
        '
-        'Button3
-        '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.ForeColor = System.Drawing.Color.Black
-        Me.Button3.Image = Global.SDL.My.Resources.Resources.save
-        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button3.Location = New System.Drawing.Point(590, 67)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(31, 25)
-        Me.Button3.TabIndex = 14
-        Me.Button3.Text = "Beleg speichern" & Global.Microsoft.VisualBasic.ChrW(10) & "(wird nicht boniert)"
-        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button3.UseVisualStyleBackColor = True
-        Me.Button3.Visible = False
-        '
        'Label3
        '
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(301, 9)
+        Me.Label3.Location = New System.Drawing.Point(284, 9)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(48, 13)
        Me.Label3.TabIndex = 2
        Me.Label3.Text = "Drucker:"
        '
-        'cboPrinter
-        '
-        Me.cboPrinter._allowedValuesFreiText = Nothing
-        Me.cboPrinter._allowFreiText = False
-        Me.cboPrinter._value = ""
-        Me.cboPrinter.FormattingEnabled = True
-        Me.cboPrinter.Location = New System.Drawing.Point(355, 6)
-        Me.cboPrinter.Name = "cboPrinter"
-        Me.cboPrinter.Size = New System.Drawing.Size(265, 21)
-        Me.cboPrinter.TabIndex = 3
-        '
        'pnlBetrag
        '
        Me.pnlBetrag.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
@@ -1317,7 +1292,7 @@ Partial Class frmBelegNeu
        Me.pnlBetrag.Controls.Add(Me.lblBetrag_Brutto)
        Me.pnlBetrag.Location = New System.Drawing.Point(280, 33)
        Me.pnlBetrag.Name = "pnlBetrag"
-        Me.pnlBetrag.Size = New System.Drawing.Size(206, 59)
+        Me.pnlBetrag.Size = New System.Drawing.Size(196, 59)
        Me.pnlBetrag.TabIndex = 12
        '
        'Label23
@@ -1329,7 +1304,6 @@ Partial Class frmBelegNeu
        Me.Label23.Size = New System.Drawing.Size(85, 13)
        Me.Label23.TabIndex = 4
        Me.Label23.Text = "Bruttobetrag:"
-        Me.Label23.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
        'lblBetrag_Netto
        '
@@ -1351,7 +1325,6 @@ Partial Class frmBelegNeu
        Me.Label24.Size = New System.Drawing.Size(85, 13)
        Me.Label24.TabIndex = 2
        Me.Label24.Text = "Steuern:"
-        Me.Label24.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
        'lblBetrag_Steuern
        '
@@ -1373,7 +1346,6 @@ Partial Class frmBelegNeu
        Me.Label25.Size = New System.Drawing.Size(85, 13)
        Me.Label25.TabIndex = 0
        Me.Label25.Text = "Nettobetrag:"
-        Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
        'lblBetrag_Brutto
        '
@@ -1386,6 +1358,73 @@ Partial Class frmBelegNeu
        Me.lblBetrag_Brutto.Text = "0,00 €"
        Me.lblBetrag_Brutto.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.Cornsilk
+        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.Label27)
+        Me.Panel1.Controls.Add(Me.Label26)
+        Me.Panel1.Controls.Add(Me.btnPOS)
+        Me.Panel1.Controls.Add(Me.btnPrint)
+        Me.Panel1.Controls.Add(Me.Button3)
+        Me.Panel1.Location = New System.Drawing.Point(475, 3)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(145, 89)
+        Me.Panel1.TabIndex = 13
+        '
+        'Label27
+        '
+        Me.Label27.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label27.Location = New System.Drawing.Point(3, 14)
+        Me.Label27.Name = "Label27"
+        Me.Label27.Size = New System.Drawing.Size(135, 13)
+        Me.Label27.TabIndex = 6
+        Me.Label27.Text = "Beleg drucken"
+        Me.Label27.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'Label26
+        '
+        Me.Label26.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle))
+        Me.Label26.Location = New System.Drawing.Point(3, 1)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(137, 20)
+        Me.Label26.TabIndex = 17
+        Me.Label26.Text = "Zahlung"
+        Me.Label26.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'btnPOS
+        '
+        Me.btnPOS.BackgroundImage = Global.SDL.My.Resources.Resources.pay_card_s1
+        Me.btnPOS.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnPOS.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnPOS.ForeColor = System.Drawing.Color.Black
+        Me.btnPOS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnPOS.Location = New System.Drawing.Point(-1, 29)
+        Me.btnPOS.Name = "btnPOS"
+        Me.btnPOS.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
+        Me.btnPOS.Size = New System.Drawing.Size(73, 59)
+        Me.btnPOS.TabIndex = 16
+        Me.btnPOS.Text = "mit Karte"
+        Me.btnPOS.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.btnPOS.UseVisualStyleBackColor = True
+        '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.ForeColor = System.Drawing.Color.Black
+        Me.Button3.Image = Global.SDL.My.Resources.Resources.save
+        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button3.Location = New System.Drawing.Point(96, 59)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(31, 25)
+        Me.Button3.TabIndex = 14
+        Me.Button3.Text = "Beleg speichern" & Global.Microsoft.VisualBasic.ChrW(10) & "(wird nicht boniert)"
+        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button3.UseVisualStyleBackColor = True
+        Me.Button3.Visible = False
+        '
        'pnlOptionen
        '
        Me.pnlOptionen.BackColor = System.Drawing.Color.White
@@ -1561,6 +1600,7 @@ Partial Class frmBelegNeu
        Me.kdFrachtf._displayWoelflKd = False
        Me.kdFrachtf._hideIfListEmpty = True
        Me.kdFrachtf._loadKdData = True
+        Me.kdFrachtf._searchName1 = True
        Me.kdFrachtf._UseFIRMA = ""
        Me.kdFrachtf._ValueKdAndName = False
        Me.kdFrachtf.dgvpos = "LEFT"
@@ -1690,6 +1730,7 @@ Partial Class frmBelegNeu
        Me.pnlOPt.ResumeLayout(False)
        Me.pnlOPt.PerformLayout()
        Me.pnlBetrag.ResumeLayout(False)
+        Me.Panel1.ResumeLayout(False)
        Me.pnlOptionen.ResumeLayout(False)
        Me.pnlOptionen.PerformLayout()
        Me.ResumeLayout(False)
@@ -1809,4 +1850,7 @@ Partial Class frmBelegNeu
    Friend WithEvents Label22 As System.Windows.Forms.Label
    Friend WithEvents btnPOS As Button
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents Label27 As Label
+    Friend WithEvents Label26 As Label
 End Class