diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 261aadd8..1d61eac1 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -636,7 +636,8 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME USTV_POS.UStVPo_Zeitstempel = Now() - USTV_POS.UStVPo_daId = ANTRAG.plose_daId + If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False + ' USTV_POS.UStVPo_daId = ANTRAG.plose_daId ' Berechnungen If Not MWSTSummenAusBeleg Then @@ -745,6 +746,8 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_Zeitstempel = Now() USTV_POS.UStVPo_daId = sql.getValueTxtBySql("SELECT TOP(1) RK_ID FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = 4814 AND RK_ID is not null", "FMZOLL") + If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False + Dim dt_Prod As New DataTable Dim GET_Positionen = cTrdProduct.GET_PRODUCTS(dt_Prod, USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr) @@ -834,6 +837,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr USTV_POS.UStVPo_daId = r.Item("rmc_daId") + If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then @@ -900,6 +904,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_ReNr = r.Item("invoice_number") & " - " & kdNr & IIf(Antrag_LandKz = "BE", "/Belgium", "") USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr USTV_POS.UStVPo_daId = r.Item("daId") + If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False If Not alreadyExistsMitLeistungsBez(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then @@ -967,6 +972,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_ReNr = r.Item("Rechnungsnummer").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr USTV_POS.UStVPo_daId = r.Item("daId") + If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then @@ -1036,7 +1042,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr USTV_POS.UStVPo_daId = sql.getValueTxtBySql("SELECT TOP(1) tblIDSInvoicesNew.daId FROM [tblIDSTransactionsNew] INNER JOIN tbl_IDS_Länder ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode LEFT JOIN tblIDSInvoicesNew on tblIDSInvoicesNew.CustomerCode = tblIDSTransactionsNew.CustomerCode and tblIDSInvoicesNew.Invoicenumber = Paymentsummarynumber where tblIDSTransactionsNew.[YearMonthDay] ='" & USTV_POS.UStVPo_ReDat & "' AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) ='" & USTV_POS.UStVPo_ReNr & "' and tbl_IDS_Länder.Lieferland_ISO2='" & Antrag_LandKz & "' AND tblIDSInvoicesNew.daId is not null", "FMZOLL") - + If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then USTV_POS.UStVPo_Schnittstelle = True diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index dc9f6a84..875cf11d 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -86,7 +86,7 @@ Public Class ustCntlUSTV_AntragPosition If da_id > -1 Then scanSonstiges.INIT_daId(da_id) - scanSonstiges.Enabled = Not UStV_POS.UStVPo_SchnittstellenNr > 0 + scanSonstiges.Enabled = UStV_POS.UStVPo_daId_loeschbar 'Not UStV_POS.UStVPo_SchnittstellenNr > 0 Else scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_ID) 'scanSonstiges.INIT_daId(da_id) diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb index 2efe8331..e711bebf 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -22,6 +22,7 @@ Partial Class ustCntlUSTV_ErstattungPosition 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.Label8 = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() @@ -59,9 +60,30 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel3 = New System.Windows.Forms.Panel() + Me.tbcntr = New System.Windows.Forms.TabControl() + Me.tabDok = New System.Windows.Forms.TabPage() + Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.tabVollmachten = New System.Windows.Forms.TabPage() + Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.tabFABest = New System.Windows.Forms.TabPage() + Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.Panel4 = New System.Windows.Forms.Panel() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.Panel2.SuspendLayout() Me.pnl.SuspendLayout() Me.Panel1.SuspendLayout() + Me.Panel3.SuspendLayout() + Me.tbcntr.SuspendLayout() + Me.tabDok.SuspendLayout() + Me.tabVollmachten.SuspendLayout() + Me.tabFABest.SuspendLayout() + Me.Panel4.SuspendLayout() + Me.TabControl1.SuspendLayout() + Me.TabPage1.SuspendLayout() Me.SuspendLayout() ' 'Label8 @@ -92,7 +114,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1300, 30) + Me.Panel2.Size = New System.Drawing.Size(1307, 30) Me.Panel2.TabIndex = 0 ' 'Label9 @@ -109,7 +131,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(504, 14) + Me.Label1.Location = New System.Drawing.Point(465, 14) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(62, 13) Me.Label1.TabIndex = 1 @@ -145,7 +167,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label2.Location = New System.Drawing.Point(504, 31) + Me.Label2.Location = New System.Drawing.Point(465, 31) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(108, 15) Me.Label2.TabIndex = 4 @@ -155,7 +177,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label3.Location = New System.Drawing.Point(692, 31) + Me.Label3.Location = New System.Drawing.Point(640, 31) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(87, 15) Me.Label3.TabIndex = 5 @@ -288,14 +310,14 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 30) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1300, 235) + Me.pnl.Size = New System.Drawing.Size(1307, 235) Me.pnl.TabIndex = 1 ' 'Label19 ' Me.Label19.AutoSize = True Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label19.Location = New System.Drawing.Point(504, 112) + Me.Label19.Location = New System.Drawing.Point(465, 112) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(107, 15) Me.Label19.TabIndex = 34 @@ -305,7 +327,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label18.AutoSize = True Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(504, 92) + Me.Label18.Location = New System.Drawing.Point(465, 92) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(58, 13) Me.Label18.TabIndex = 33 @@ -325,7 +347,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtGuNr._value = Nothing Me.txtGuNr._Waehrung = False Me.txtGuNr._WaehrungZeichen = False - Me.txtGuNr.Location = New System.Drawing.Point(695, 49) + Me.txtGuNr.Location = New System.Drawing.Point(643, 49) Me.txtGuNr.MaxLength = 22 Me.txtGuNr.MaxLineLength = -1 Me.txtGuNr.MaxLines_Warning = "" @@ -349,7 +371,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerufungsdatum._Waehrung = False Me.txtBerufungsdatum._WaehrungZeichen = True Me.txtBerufungsdatum.ForeColor = System.Drawing.Color.Red - Me.txtBerufungsdatum.Location = New System.Drawing.Point(507, 130) + Me.txtBerufungsdatum.Location = New System.Drawing.Point(468, 130) Me.txtBerufungsdatum.MaxLength = 50 Me.txtBerufungsdatum.MaxLineLength = -1 Me.txtBerufungsdatum.MaxLines_Warning = "" @@ -383,20 +405,20 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBemerkung._Waehrung = False Me.txtBemerkung._WaehrungZeichen = True Me.txtBemerkung.ForeColor = System.Drawing.Color.Red - Me.txtBemerkung.Location = New System.Drawing.Point(507, 179) + Me.txtBemerkung.Location = New System.Drawing.Point(468, 179) Me.txtBemerkung.MaxLength = 50 Me.txtBemerkung.MaxLineLength = -1 Me.txtBemerkung.MaxLines_Warning = "" Me.txtBemerkung.MaxLines_Warning_Label = Nothing Me.txtBemerkung.Name = "txtBemerkung" - Me.txtBemerkung.Size = New System.Drawing.Size(458, 20) + Me.txtBemerkung.Size = New System.Drawing.Size(418, 20) Me.txtBemerkung.TabIndex = 11 ' 'Label14 ' Me.Label14.AutoSize = True Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label14.Location = New System.Drawing.Point(692, 112) + Me.Label14.Location = New System.Drawing.Point(645, 112) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(95, 15) Me.Label14.TabIndex = 23 @@ -406,7 +428,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label15.AutoSize = True Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label15.Location = New System.Drawing.Point(863, 112) + Me.Label15.Location = New System.Drawing.Point(784, 112) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(91, 15) Me.Label15.TabIndex = 25 @@ -427,7 +449,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerufungshoehe._Waehrung = False Me.txtBerufungshoehe._WaehrungZeichen = True Me.txtBerufungshoehe.ForeColor = System.Drawing.Color.Red - Me.txtBerufungshoehe.Location = New System.Drawing.Point(866, 130) + Me.txtBerufungshoehe.Location = New System.Drawing.Point(787, 130) Me.txtBerufungshoehe.MaxLength = 10 Me.txtBerufungshoehe.MaxLineLength = -1 Me.txtBerufungshoehe.MaxLines_Warning = "" @@ -463,7 +485,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label16.Location = New System.Drawing.Point(504, 161) + Me.Label16.Location = New System.Drawing.Point(465, 161) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(71, 15) Me.Label16.TabIndex = 27 @@ -484,13 +506,13 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerurunfgrund._Waehrung = False Me.txtBerurunfgrund._WaehrungZeichen = True Me.txtBerurunfgrund.ForeColor = System.Drawing.Color.Red - Me.txtBerurunfgrund.Location = New System.Drawing.Point(695, 130) + Me.txtBerurunfgrund.Location = New System.Drawing.Point(643, 130) Me.txtBerurunfgrund.MaxLength = 50 Me.txtBerurunfgrund.MaxLineLength = -1 Me.txtBerurunfgrund.MaxLines_Warning = "" Me.txtBerurunfgrund.MaxLines_Warning_Label = Nothing Me.txtBerurunfgrund.Name = "txtBerurunfgrund" - Me.txtBerurunfgrund.Size = New System.Drawing.Size(154, 20) + Me.txtBerurunfgrund.Size = New System.Drawing.Size(136, 20) Me.txtBerurunfgrund.TabIndex = 9 ' 'txtBelegDatum @@ -531,13 +553,13 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtGuDatum._value = Nothing Me.txtGuDatum._Waehrung = False Me.txtGuDatum._WaehrungZeichen = False - Me.txtGuDatum.Location = New System.Drawing.Point(507, 49) + Me.txtGuDatum.Location = New System.Drawing.Point(468, 49) Me.txtGuDatum.MaxLength = 22 Me.txtGuDatum.MaxLineLength = -1 Me.txtGuDatum.MaxLines_Warning = "" Me.txtGuDatum.MaxLines_Warning_Label = Nothing Me.txtGuDatum.Name = "txtGuDatum" - Me.txtGuDatum.Size = New System.Drawing.Size(182, 20) + Me.txtGuDatum.Size = New System.Drawing.Size(169, 20) Me.txtGuDatum.TabIndex = 3 ' 'txtUSTBetragEUR @@ -614,14 +636,204 @@ Partial Class ustCntlUSTV_ErstattungPosition ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.Panel3) Me.Panel1.Controls.Add(Me.btnBildAuf) Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel1.Location = New System.Drawing.Point(1201, 30) + Me.Panel1.Location = New System.Drawing.Point(945, 30) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(99, 235) + Me.Panel1.Size = New System.Drawing.Size(362, 235) Me.Panel1.TabIndex = 2 ' + 'Panel3 + ' + Me.Panel3.Controls.Add(Me.tbcntr) + Me.Panel3.Controls.Add(Me.Panel4) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Right + Me.Panel3.Location = New System.Drawing.Point(98, 0) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(264, 235) + Me.Panel3.TabIndex = 26 + Me.Panel3.Visible = False + ' + 'tbcntr + ' + Me.tbcntr.Controls.Add(Me.tabDok) + Me.tbcntr.Controls.Add(Me.tabVollmachten) + Me.tbcntr.Controls.Add(Me.tabFABest) + Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Fill + Me.tbcntr.Location = New System.Drawing.Point(0, 16) + Me.tbcntr.Name = "tbcntr" + Me.tbcntr.SelectedIndex = 0 + Me.tbcntr.Size = New System.Drawing.Size(264, 219) + Me.tbcntr.TabIndex = 3 + ' + 'tabDok + ' + Me.tabDok.Controls.Add(Me.scanSonstiges) + Me.tabDok.Location = New System.Drawing.Point(4, 22) + Me.tabDok.Name = "tabDok" + Me.tabDok.Padding = New System.Windows.Forms.Padding(3) + Me.tabDok.Size = New System.Drawing.Size(256, 193) + Me.tabDok.TabIndex = 1 + Me.tabDok.Text = "Bescheide" + Me.tabDok.UseVisualStyleBackColor = True + ' + 'scanSonstiges + ' + Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanSonstiges._DATENSERVER_ORDNER = "MDM" + Me.scanSonstiges._DATENSERVER_UOrdner1 = "" + Me.scanSonstiges._DATENSERVER_UOrdner2 = "" + Me.scanSonstiges._DATENSERVER_UOrdner3 = "" + Me.scanSonstiges._OPEN_ORIGINAL = False + Me.scanSonstiges._TYPE = "PDF" + Me.scanSonstiges.AllowDrop = True + Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanSonstiges.BackColor = System.Drawing.Color.White + Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanSonstiges.Dock = System.Windows.Forms.DockStyle.Fill + Me.scanSonstiges.Location = New System.Drawing.Point(3, 3) + Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) + Me.scanSonstiges.Name = "scanSonstiges" + Me.scanSonstiges.Size = New System.Drawing.Size(250, 187) + Me.scanSonstiges.TabIndex = 0 + ' + 'tabVollmachten + ' + Me.tabVollmachten.Controls.Add(Me.scanUSTVVollmachten) + Me.tabVollmachten.Location = New System.Drawing.Point(4, 22) + Me.tabVollmachten.Name = "tabVollmachten" + Me.tabVollmachten.Padding = New System.Windows.Forms.Padding(3) + Me.tabVollmachten.Size = New System.Drawing.Size(256, 193) + Me.tabVollmachten.TabIndex = 2 + Me.tabVollmachten.Text = "Vollmachten" + Me.tabVollmachten.UseVisualStyleBackColor = True + ' + 'scanUSTVVollmachten + ' + Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM" + Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = "" + Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = "" + Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = "" + Me.scanUSTVVollmachten._OPEN_ORIGINAL = False + Me.scanUSTVVollmachten._TYPE = "PDF" + Me.scanUSTVVollmachten.AllowDrop = True + Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White + Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill + Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3) + Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0) + Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten" + Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 187) + Me.scanUSTVVollmachten.TabIndex = 1 + ' + 'tabFABest + ' + Me.tabFABest.Controls.Add(Me.scanUSTVFABest) + Me.tabFABest.Location = New System.Drawing.Point(4, 22) + Me.tabFABest.Name = "tabFABest" + Me.tabFABest.Size = New System.Drawing.Size(256, 193) + Me.tabFABest.TabIndex = 3 + Me.tabFABest.Text = "FA_Bestätigung" + Me.tabFABest.UseVisualStyleBackColor = True + ' + 'scanUSTVFABest + ' + Me.scanUSTVFABest._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanUSTVFABest._DATENSERVER_ORDNER = "MDM" + Me.scanUSTVFABest._DATENSERVER_UOrdner1 = "" + Me.scanUSTVFABest._DATENSERVER_UOrdner2 = "" + Me.scanUSTVFABest._DATENSERVER_UOrdner3 = "" + Me.scanUSTVFABest._OPEN_ORIGINAL = False + Me.scanUSTVFABest._TYPE = "PDF" + Me.scanUSTVFABest.AllowDrop = True + Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanUSTVFABest.BackColor = System.Drawing.Color.White + Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanUSTVFABest.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanUSTVFABest.Dock = System.Windows.Forms.DockStyle.Fill + Me.scanUSTVFABest.Location = New System.Drawing.Point(0, 0) + Me.scanUSTVFABest.Margin = New System.Windows.Forms.Padding(0) + Me.scanUSTVFABest.Name = "scanUSTVFABest" + Me.scanUSTVFABest.Size = New System.Drawing.Size(256, 193) + Me.scanUSTVFABest.TabIndex = 1 + ' + 'Panel4 + ' + Me.Panel4.Controls.Add(Me.TabControl1) + Me.Panel4.Controls.Add(Me.scanLieferschein) + Me.Panel4.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel4.Location = New System.Drawing.Point(0, 0) + Me.Panel4.Name = "Panel4" + Me.Panel4.Size = New System.Drawing.Size(264, 16) + Me.Panel4.TabIndex = 26 + ' + 'TabControl1 + ' + Me.TabControl1.Controls.Add(Me.TabPage1) + Me.TabControl1.Location = New System.Drawing.Point(39, 49) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(278, 239) + Me.TabControl1.TabIndex = 3 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.UsrcntlPDFScanList1) + 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(270, 213) + Me.TabPage1.TabIndex = 1 + Me.TabPage1.Text = "Dokumente" + Me.TabPage1.UseVisualStyleBackColor = True + ' + 'UsrcntlPDFScanList1 + ' + Me.UsrcntlPDFScanList1._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.UsrcntlPDFScanList1._DATENSERVER_ORDNER = "MDM" + Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner1 = "" + Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner2 = "" + Me.UsrcntlPDFScanList1._DATENSERVER_UOrdner3 = "" + Me.UsrcntlPDFScanList1._OPEN_ORIGINAL = False + Me.UsrcntlPDFScanList1._TYPE = "PDF" + Me.UsrcntlPDFScanList1.AllowDrop = True + Me.UsrcntlPDFScanList1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White + Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Hand + Me.UsrcntlPDFScanList1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(3, 3) + Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0) + Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1" + Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207) + Me.UsrcntlPDFScanList1.TabIndex = 0 + ' + 'scanLieferschein + ' + Me.scanLieferschein._ARCHIV = True + Me.scanLieferschein._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanLieferschein._DATENSERVER_ORDNER = "MDM" + Me.scanLieferschein._DATENSERVER_UOrdner1 = Nothing + Me.scanLieferschein._DATENSERVER_UOrdner2 = Nothing + Me.scanLieferschein._DATENSERVER_UOrdner3 = Nothing + Me.scanLieferschein._MULTI_FILES = True + Me.scanLieferschein._TEXT_PDF = "XX Vollmacht" + Me.scanLieferschein.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanLieferschein.BackColor = System.Drawing.Color.White + Me.scanLieferschein.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanLieferschein.Cursor = System.Windows.Forms.Cursors.Default + Me.scanLieferschein.Location = New System.Drawing.Point(146, 3) + Me.scanLieferschein.Name = "scanLieferschein" + Me.scanLieferschein.Size = New System.Drawing.Size(111, 34) + Me.scanLieferschein.TabIndex = 2 + Me.scanLieferschein.Visible = False + ' 'ustCntlUSTV_ErstattungPosition ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -630,12 +842,20 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Controls.Add(Me.pnl) Me.Controls.Add(Me.Panel2) Me.Name = "ustCntlUSTV_ErstattungPosition" - Me.Size = New System.Drawing.Size(1300, 265) + Me.Size = New System.Drawing.Size(1307, 265) Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.Panel1.ResumeLayout(False) + Me.Panel3.ResumeLayout(False) + Me.tbcntr.ResumeLayout(False) + Me.tabDok.ResumeLayout(False) + Me.tabVollmachten.ResumeLayout(False) + Me.tabFABest.ResumeLayout(False) + Me.Panel4.ResumeLayout(False) + Me.TabControl1.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -676,4 +896,17 @@ Partial Class ustCntlUSTV_ErstattungPosition Friend WithEvents Label18 As Label Friend WithEvents txtGuNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label19 As Label + Friend WithEvents Panel3 As Panel + Friend WithEvents tbcntr As TabControl + Friend WithEvents tabDok As TabPage + Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents tabVollmachten As TabPage + Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents tabFABest As TabPage + Friend WithEvents scanUSTVFABest As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents Panel4 As Panel + Friend WithEvents TabControl1 As TabControl + Friend WithEvents TabPage1 As TabPage + Friend WithEvents UsrcntlPDFScanList1 As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan End Class diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index 44df7114..14de90e6 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -269,5 +269,7 @@ Public Class ustCntlUSTV_ErstattungPosition End Sub + Private Sub Panel1_Paint(sender As Object, e As PaintEventArgs) Handles Panel1.Paint + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 7b7edd9c..3a90e738 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -301,6 +301,7 @@ Public Class cUStVPositionen Property UStVPo_Sachbearbeiter As Object = Nothing ' NVARCHAR(15) NULL, Property UStVPo_Zeitstempel As Object = Nothing ' DATETIME Default (getdate()) NULL, Property UStVPo_daId As Object = Nothing + Property UStVPo_daId_loeschbar As Object = Nothing Dim SQL As New SQL @@ -399,6 +400,7 @@ Public Class cUStVPositionen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_Sachbearbeiter", UStVPo_Sachbearbeiter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_Zeitstempel", UStVPo_Zeitstempel)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_daId", UStVPo_daId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_daId_loeschbar", UStVPo_daId_loeschbar)) Return list End Function @@ -455,6 +457,7 @@ Public Class cUStVErstattungPositionen Property UStVEr_USteuerbetragEUR As Object = Nothing Property UStVEr_Sachbearbeiter As Object = Nothing Property UStVEr_Zeitstempel As Object = Nothing + Property UStVEr_daId As Object = Nothing Dim SQL As New SQL @@ -477,6 +480,7 @@ Public Class cUStVErstattungPositionen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_USteuerbetragEUR", UStVEr_USteuerbetragEUR)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Sachbearbeiter", UStVEr_Sachbearbeiter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Zeitstempel", UStVEr_Zeitstempel)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_daId", UStVEr_daId)) Return list End Function