From 7eb653c0fdb323cf9c306ae4f3893ff105e5b62c Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 1 Oct 2024 08:24:38 +0200 Subject: [PATCH 01/21] Version --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a962301..0747092 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 14dd9d5504fc0cf1e6f9d63262050847bfd81d2c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 1 Oct 2024 09:44:22 +0200 Subject: [PATCH 02/21] Updater, Login (Standort.txt) --- AVISOUPDATER/UPDATERfrm.vb | 4 ++++ Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmLogin.vb | 2 ++ Aviso/usrcntlAktDetails.vb | 8 ++++++-- Gemeinsames/Gemeinsames.vbproj | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/AVISOUPDATER/UPDATERfrm.vb b/AVISOUPDATER/UPDATERfrm.vb index e9cf396..276081f 100644 --- a/AVISOUPDATER/UPDATERfrm.vb +++ b/AVISOUPDATER/UPDATERfrm.vb @@ -35,6 +35,10 @@ Public Class UPDATERfrm CopyIncremental = False End If + If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" Then + MsgBox("Programm kann nicht im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " geupdated werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical) + Exit Sub + End If Dim FIRMA = "VERAG" Dim pfadDatei As String = System.AppDomain.CurrentDomain.BaseDirectory & "\Standort.txt" diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a962301..0747092 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index d7d5f64..3eae677 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -87,6 +87,8 @@ Public Class frmLogin If firma = "NKD" Then firma = "VERAG" If firma = "NEU" Then firma = "VERAG" If firma = "SUB" Then firma = "VERAG" + strmReader.Close() + Else ' FIRMA VON AD HOLEN, wenn keine StandortTxt diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index dd6bb1a..fc38aa8 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -839,9 +839,13 @@ Public Class usrcntlAktDetails .RowTemplate.MinimumHeight = 20 .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells + .Columns("anh_id").Visible = False 'VermerkID nicht anzeigen - .Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen - .Columns("anh_markiert").Visible = False 'AvisoID nicht anzeigen + .Columns("anh_docId").Visible = False + .Columns("anh_markiert").Visible = False + .Columns("anh_LaufzettelDruck").Visible = False + .Columns("anh_GestellungslisteAnfuegen").Visible = False + .Columns("anh_cmrId").Visible = False .Columns("anh_Name").MinimumWidth = 150 .Columns("anh_Name").HeaderText = "Name" diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index beb46fd..a26772e 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -35,7 +35,7 @@ true - x64 + AnyCPU true full true From c671b05b923bd9bd4add99e84dc07b1fe1f0f866 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 1 Oct 2024 10:12:13 +0200 Subject: [PATCH 03/21] ambar_boarder --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/My Project/Resources.Designer.vb | 4 ++-- Aviso/My Project/Resources.resx | 3 +-- Aviso/frmGesamtsicherheitenNEU.vb | 11 ++++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 0747092..d6b263e 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 4ee09de..10ca82e 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -182,9 +182,9 @@ Namespace My.Resources ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' - Public ReadOnly Property ambar_boarder() As System.Drawing.Bitmap + Public ReadOnly Property ambar_boarder_() As System.Drawing.Bitmap Get - Dim obj As Object = ResourceManager.GetObject("ambar_boarder", resourceCulture) + Dim obj As Object = ResourceManager.GetObject("ambar_boarder_", resourceCulture) Return CType(obj,System.Drawing.Bitmap) End Get End Property diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index e10981e..c8e2d23 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -493,7 +493,7 @@ ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\bin\Debug\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -691,5 +691,4 @@ ..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index c97f0e7..ef80ab7 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -83,8 +83,17 @@ Public Class frmGesamtsicherheitenNEU txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200) + If Standort = "AMBAR GmbH" Then + If cboFiliale.Items.Count > 0 Then + cboFiliale.SelectedIndex = 0 + End If + If cboWarenort.Items.Count > 0 Then + cboWarenort.changeItem("5701") + End If + End If + Else - LoadDGVSicherheiten(True) + LoadDGVSicherheiten(True) End If LoadStandort() cboSicherheitATR.Enabled = currentGesSichRef.brgakto_gs_ATR From 0adcd38837347ce420cab432feff819dd9023554 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 1 Oct 2024 15:47:08 +0200 Subject: [PATCH 04/21] ambar_boarder --- Aviso/Aviso.vbproj | 2 ++ Aviso/My Project/Resources.Designer.vb | 4 ++-- Aviso/My Project/Resources.resx | 6 +++--- Aviso/Resources/ambar_boarder1.png | Bin 0 -> 23129 bytes 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 Aviso/Resources/ambar_boarder1.png diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 8e825da..891b570 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1610,6 +1610,7 @@ + @@ -1663,6 +1664,7 @@ + Always diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 10ca82e..1a17060 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -182,9 +182,9 @@ Namespace My.Resources ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' - Public ReadOnly Property ambar_boarder_() As System.Drawing.Bitmap + Public ReadOnly Property ambar_boarder_1() As System.Drawing.Bitmap Get - Dim obj As Object = ResourceManager.GetObject("ambar_boarder_", resourceCulture) + Dim obj As Object = ResourceManager.GetObject("ambar_boarder_1", resourceCulture) Return CType(obj,System.Drawing.Bitmap) End Get End Property diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index c8e2d23..b5fb6af 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -493,9 +493,6 @@ ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -691,4 +688,7 @@ ..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\bin\Debug\Resources\ambar_boarder1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Aviso/Resources/ambar_boarder1.png b/Aviso/Resources/ambar_boarder1.png new file mode 100644 index 0000000000000000000000000000000000000000..bc0c10130a2833f84f81c8447fa0a8181ce1eef0 GIT binary patch literal 23129 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 Ef)~5i_y7O^ literal 0 HcmV?d00001 From 857057747e59de05436e5ea9baf897a5e6555fc3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 1 Oct 2024 16:14:57 +0200 Subject: [PATCH 05/21] ambar_boarder --- Aviso/My Project/Resources.Designer.vb | 4 ++-- Aviso/My Project/Resources.resx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 1a17060..4ee09de 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -182,9 +182,9 @@ Namespace My.Resources ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' - Public ReadOnly Property ambar_boarder_1() As System.Drawing.Bitmap + Public ReadOnly Property ambar_boarder() As System.Drawing.Bitmap Get - Dim obj As Object = ResourceManager.GetObject("ambar_boarder_1", resourceCulture) + Dim obj As Object = ResourceManager.GetObject("ambar_boarder", resourceCulture) Return CType(obj,System.Drawing.Bitmap) End Get End Property diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index b5fb6af..859e08c 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -688,7 +688,7 @@ ..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\bin\Debug\Resources\ambar_boarder1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file From 2ce5fae1113cc9393abc80b87cffbaf6495be5ef Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 1 Oct 2024 16:27:14 +0200 Subject: [PATCH 06/21] ambar_png --- Aviso/bin/Debug/Resources/ambar_boarder.png | Bin 0 -> 23129 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Aviso/bin/Debug/Resources/ambar_boarder.png diff --git a/Aviso/bin/Debug/Resources/ambar_boarder.png b/Aviso/bin/Debug/Resources/ambar_boarder.png new file mode 100644 index 0000000000000000000000000000000000000000..bc0c10130a2833f84f81c8447fa0a8181ce1eef0 GIT binary patch literal 23129 zcmV)&K#aeMP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXfS?)7e@Xx5}D2KVk|`Biod=-bco4KO}l z8EJumhHdrNf>s7sLv;M1zsWWy z?whT?>o;JkSPh<@o;Y#h1j56^Vd^(fZC5wola!u&vDVWT=ezKCCnD9S!P#|5>h<*l;xY{28ar-Vd}z$?E&hkcoJSr zzu?N1E7j+eDO0d)*)sLLG_dXiwvewA8k_>uO{B#b!RK!COKa^9g2co`%Qqk(AOI$l zNqx`B$w5?fl=_~Xovr>xq^GB=PwN}Fdh<3$Pv3^n2(x8Nfg2zUZjo{m-SM8M(X!>< zpx;3A?u%h)zZqj!AHr>KKiQIlxcH>PH*mkf8^}mqf)DC-MMh=@GPAOV8fhi&o6$ZKEmbVXP%yU$KBOdr0=+e2f{VJk=9VXP zih_1Q?ca_aJHqsM0YOCGXWO~MO?|pJIjhe$tu#51V>x*8O|ueGgeGot@K=k7t{|WL zA`|3WRz68cq+Gg)oa`L<`}@P)-5thyUs(QPxdAsvs70 z1z1F}hC(-R-;tyBoqyEpfyb*gKvq^Z`VU!vJARhV%zvDnopJowF)UfU7~P};Mn**D zj%viJm8;OCabxw}&(}|h?L`Y0soy&G@7s^XvMn?$Ogi-rIBnmqwv#YyhR&N27951o z@G!ja{z&yVLfrr_e6JWeGVi2>&PlnDKJrzIIkPQk zSeFL*HNG6gRCyM$6Q)>x=OOLpb;Q(qxzJtbzJRM&u4uwo9=d(ocIx}5OLwWi_3hOg z?OL~0+bE{&I&?%AyF8JUAHwl2VVXL-RpX=iJ~8rJ+g8^j1kF!H%6CoeeRE%^8qU=I zl)XDbu`Prnirm~*i)yS!AJHLl#2Dal7UiF?egP?)x5D`1Yv|vfBGw1Sqm5-0BbuESqeAvcRF;hfWf#bUT0?(91!4UHNL|wlFKa(+ zz$`t$S`i`gvB2wIW~^JgF84*$+8u&6XCm<8n&WuHH5h+(4Z_3H)XnG=lh1;qrD3b= zvt1}-*QoV$Z?c2+5p~zOb89o@B z+=zCwfrVZ`yLMVHId$R`7A;<+w05tfUW&z%k~J;;(xpoX4GxiWcTjffhV|>=>*K2= z`J6d(Fm38o?Dg2I_9a%WSgA(+l#~?Am^R(ARfDY;a5u2|0(6icJ@)L$?GbE5|Bh{h zA`$BQZw*^7AT%rp-*#MrI-gI()OkBmr`{OY4P1f4N6(1q&bZEU?4I@{jT3&0KWKUkkS*|cASiMU8d&hj5)X7sYbnuXT6DtGz4^XD& zq6G`pZ#OZ%h)WkQs!w9v*s*Zmy<2@ZMn~i9nX~91GKj-&^Pie3lO-@vn}*V%_W-_t z%&e=(%)E|i%iK|=!8|0@|L=Riz2Xo30{#adUXui-cixBb z@uy&X>9r!o_FX-EWMm|IcJF~s9XnXI+%FV$dv^zpPR4faHRY%GK%~c*5kGSdVrtfb zu~yz{fDW4vf9~vA%$_+*9?}l2Tm2#r+#L?{W~0wsvE-L}Va)BM`*gbm?S;ZxU0IMB zAEzF?po&YxRI7nRQSq&j@8Ky`soc=`p{{?}eYa?O0SHT`j&JLfwoy<&DC$LN``zus z7ya5z6{{jWGF*M3JSLf^J>9s@^bR!UXmAf_T_P)MAT0a5XMPZR0A5X6eyllZSQUZ`uvoL+9EMY}*3W zOIhU?t8JH7$KA3LLxV{6iO;ZYCeyIttI@4J>&8hj_6lpLhfhvQQV+$4zIyel`s9qP z_pRIN!TFnwW+We6|6LG^eB)5TQKzCjq^QgW=K!2CYq~z?q4+S-7HjclLNY4I3(+T4 zi3vB2sJffR4lO)w-ij}8z~yK>W)k zot2&c=N-}=b$-olyh(O84O4EIg*RnCD_h?h1?_c>>cS%O(%97>a@N#XQ(C5GQY$-O z>m9x&JiLyW$17{Y-BZu1VJ@ahb(`Ya>fwnTteHJsb$z}7f>TuI5`?0NA;W?{X z7R;P6!}9IFhXM~z9SsCV}MU)7f zy?gg!*^;Gd8+8a8LB4l<)bCE6Iw3kzTRomTdk$8wUah{{+uN&8u0SoEw*WhL>{P$+ z7i>H{Aw$ia>AAz+yt&#SJTIv1HPEJbd&Yw3QJ|d;pJLESFoBs3@&Y#mfbTTZ? zO;)Cbk0+6qKh4>P|2#SFBKa7qXV(Sbq9hi`>tQ7 zU3cU94eC=zmi(tnAwzw8ROq`C=CB}y$#FMsMPvCI7rgw*Soj5L7N3q>%7+ALmJ=@= z6c~iV2M-}!3y{e-IjPBEhptA87inwTzCJz(mg91=HC-w+Bouqx_vG3D z02@lJbN2NWCeV!k}+xrGu_gIAX{j?WrjogRV-)>PT%@}KqyWL+0P340J z4_bZ|24{M$oehe@ywwNr&X*I=eds#Nmcsa-;Q6xR5B>1J2k3JRrA1LXR$2J$ffE1Z z$&*S|XY=*-#f=*`)C5a8@=)Rew1uh(V%HfTeG=vu>cCt}EcF^M!u)Ja#5`A9&EUmK zGghpISc}7UX%z8$B7RzGsv4C!TSm|H=~Jf4Ks7?Vu??m^kZJf6k!MS>#xi_dV2CRC@@eFxu4v;>xT81ICB=UUd=fkqmOkPgr`?9zSsc^XJdU<}F)r`}S?MUVkr$PEE(; zTV`}UZ^m*zEf~UDv}xaSu+TRKJuaFs^R^jr7Mnvyc6KHv-ZU#`sos~O5uK+0T_b)4 zA^w=_Mog3IuuZuYgN=bSpsepb@0!Pr$(V6FMlH4^TCSCMPul05gj5WjS>5)yOgH`#ji>5aAsLn+RmJy+;&Y}=hQ-`?Vp zlQ)0r7$^jdg;QueUiP35BxlKk5tEUQ?ICgUTbn)q+%p{O0u#~yvPphxPGyg{X`kG` zhHFZgZG3eoJijn z87IH;I8FyUgnGfU&tHW=w$S2~QSI~Qf&6Pn8nRJmuf@TZ%~_9%D-5;FV%e{PilQql z$!2)RsC&_yd${I&TO5iaKF@Bd^fb)RJTHcOyi$~h3>kt+lP2N&@4v^yi4zsaGxlYZ zbQDJEwQ17^pMF|T9dCN93SvZ0NI7>w{kDYyoS%a~FFA%I`#fORUR%x78|Sr&{&KTA z0ogi9Czw8YqMF>d-k;5S!Ot4h6*x2$2NJvK$w(ExxGOBa2;%1vL=R~x2u2(7?|P_9 zL8vH1o`c-%8i+$ti8ij4EgUSIO`>w&B8b1ivdXHRujBcoA`H zH`ushVWdY#!BqJf#r5>tEe?gmezyGA??wVT4IPOsn>QEYc&_laZ}l^tb2y8BCj;@* zsVKBOa2q{4X^S4cI@zJOT}Rcrw#oC;TjCRon(o0W(5d3)>sWm!8h>)8sN~BEvH1Ju zf9WJby~EnyDYC1(hv3~qq0++e{-JPf&EN8}YwgKDZ>OWQ#9!hUCz8fOI1%yHWf*vM zpM2kDkuICLu$qM^v2YBI>?k5JMDp+$-p_l|Uh?2}%Q@}?@d>^W^XK0v^Uh2quJY4} zo4*k0aj~EVk&%*$L^n5>>bwe5jh7HBntqfJzcd}iroyM=F%Kga{5l3JmMza+)McZ_ zPyEGMUW`0s;}a3s?H`H$hpyyt$6Yns#3$&Sosq67O4&J?$Yc}6O>YE0GqP=mX{BXl zAel>wnYRCK6s0dLB@+pvJ6Ln`wYU_Vj!8y(R(_??8X0n3A0aS_T(EJay)%&cw6!GY z*iQ4-Gi+mAMJT>M7A`L_6IX zV+~DF4lUcZZBxS$$Gxtdx~LU|v!_ohkK!(Nnr%$a-a!KfDrJb443DD)!U^;vhYl-` zWJfuVDcY#UQ1{*L=+Z@7^5nG!4IG3$?(P_1Wl|BG$SOF5>1)u`&P$rXD=qOK1WG}C z9nuM$0^qPC>mH7u>RW3+&sw50@@nLi480)V8ZvuBsJ}rj38X@#Du4 z;OCF=W5=lpk|`4>BRE)71VckZF=58_U=E0 zbsP6!?Bvy$WxvsKRt@(=d>xfMA~9y*0GvK@2!ETgNyhLfOulLD+Eg0d^N)$*h~Iy# z1G-Idg`xRM7`kkSVW0;LqmQ8D=JR-O;b{!md!6Ngoxk9|5Z@YiBf`s3nE2UQQDV_VA~m6&5H3t*w|TVcw|Mit4rtV3v>FD8 z$Er0z=k7BwZ;=zO-SksB&chYI!RT?C$42|EQ&Hj3|ETYTe?S=0a;LL3+;`%a4Ja$t0&(6&<@`;8l<-Q z1%%*>?*`(0q2{3}Smw6pwGe`9^8eOO`BA zzd4uBMF$TL5B0mW@bmSBUB`~f1fz*%4K6bAoE=56yj#~GE`p?qX;)hCIgG~plN_tG z(21Xsz8k5rm2xE~IXo*f4HX+NfWdAP9vbKl!$dD^JL8R8qWEc!sCn&{G`Ia{;p-oQ z=l<3c&%NCbzw|0T-AO*;JFIg+3o)mNPIh*PjEF#^h7A!K5~9);(Uzu`&4nL2tkHp- z9)5IMYtgK^GIux`M6eS@M@6Z*Xhz>2IB-Diqk}$U*7h+i10Ek76pTp|C#vh6JaIx1 zooM|_YwUD$!{I}RR3~UArXEc*t|?5NGDRhXNzX`Ej_%#Mc2&pF(%^N*iRnk*1I`(w zrlcs7k%*6rSJ%@!75xu%{P4pMYJ40ua+I?B4;?&&K9)I$-qNXd@7k?aD;cSLLQG8i zxpUS1^Ec6=X>&F2PESalgQg|T(}J)T`1AxtA5iwYu2)pHx5s~H3I(9xdVa%VZYoRpEa3=170`OzNLZfG5_wQ z>mLGlJLFj7UXCpt%69&8h3^lHa^nAiQBM5d5LBM^70c3qdVnnfU)DjTocO;XVnmsy zwNVoEiJc7DKc>AMqMoaTs3)qZ#44sLHDLZv1EgNo7Lx7;4~+QKo|#~cVY$?JuV1^C z8>CeZ4T|`dRmY-0!qeo7{>Mi!J)>pOi=ksj^;$4LTMIGI*HOPsHEY9IwFWZfoLW~Y zSspwv;>X9wtK8YlitGZ#5cbGq2hSs<5euvJ;j5a!1&7Flmsw6T1nej z42mT_XURCtO2R6~O%dVr+&yvZIHpgXhE5&quw>yvY+O1Yt)?!)LrYI6M~`|ZW3ei)J>P#7|92h5OFkYU)vU*P^oq-M5%6lRo(*h} ztZ8_B{y{vk&!loFYr^NhL1bGGRB&7V-^CqqFT}TX-omiGS8>FTvFollIO?^$m^%`i z4Ef=QAFAJ+;wG5rM@LppHeyGPQ{KMOHEI`oe}#z8#gfe%Hz@+^9yzSQaq8r$To2xb z3l^f~kTLk^1PNZ)LzNi^wr}6AZtC!n!|EaL4cTxHk4N82M)bL8L|{_>1mD^N=HNeu5B49Nh;XGDCS^sC`5dgNw6k7ee}3sp%b2xVBZcWtO(5; zzd0;$(Srp_cq}7+xJu{m>!-fcua9Z!xp+el+THG24&BmV!VMEtesB8j>)yUXsK0qw zzqA}YtlY@Ck2K{zE}vV2aN3lNxQtB8Idl(V?kC^31md!Em_X4*l#{7`tlre`U{u;c ziJ(0zKdZXQb~>l(ZtA@5)&O`K6D{-jIT&))2*WmgpAgj8!_aj792$xxe#I&({5nOr zo%xIV^y!l?d7^a+ed{)N?p$>hW}P&%yiGCd3i*hC`QjzDM5+^>gu8g*qH>kix3LpA zIXPL5;4)+;I#_iUy)j8L*T$J(x!~XQFs_oYz$aFFv7$$O<{1H((0GixX4VKPT>AQ6 zOI)0zzea@ZL6~&Ygq6aPHQgD_6DCBGeN}KsFrE-1uJ(_GgZ%xkdZv8GU=>VB;y=AR z6z(E17^k;e+KB5yKox@*iYjtFLUU8+Jq2Q}cMP0@6Y%05*@ySJJs76+3>74*I+xt{ zr=DS0>=y?I85S7|ZjIuIZ>so|B7TNw?fb<%=4zv@*t~*m`0(M{@lR;P&nzwRX^&e6 zX_C;fV$P9ct%=8VZI1s0*Riet#-73?US;}lZR6NOdhw7-3E zG(u(ce9T4T&b&v>!GF9MhZlwlJA(1r-aPKr_R0~0G8!iYe-Xm+v!;i(bebRfwZhQw z1oJ?K;?F8AA_=KqEgK`QX*nWa+ZV1PdHCHejQ3r%o?a~HSFfdseaCI;H{%2JQg3uo zXNO>|AucyF#~pLZlG&7>UV0kL)oO^?&x`Q2g?z-{w{KrQe|$EIbOtTxVqb65rc70- z*eT}O8R!$gZ0S<$+POn3R;wfHwB0i@X`z9>|8Wa!~O6yefNm^dF`<63$| zF`Gz%l29z?|I$_wKly!4VNSl&S9Pt@&$r(M<)6XM4zVrbZyf0RfW5+hb`jIoH?^p#HYAa(L6Hd+Co9%CuQ0; zF-uSU5L9roR_yZdu?iODbwo-?Cpa8kI3WdLP5ejhk@y5NawzVvR7DLkC4qNj{N!I^ zM>bCXQ#jWKU@g)*DWVgcBpcc%_`f5K9HbvzQCyXD`P zttjH#&zOe(efr`~at6LV9;FJoet*n%ahk_PL8EAIeWtKe*U zJv_Tt#|{Ydy`#=(77h4YuLwNu7KBG!0#SF>5qLxi@hqaWf>PEBBRNAve{O~gfBgMG zxC)16dqo9)TE=V9)D!Q8_;L+K0IPj@J{hn7evlbGZ1ROM-y>whnVy`XAtaiB{J3`R`P-iW4lFP+5r zbPdF%(SJ% zp}Yj5%g9M$a>+}vCU7ZRam3F{wVADA@U3I>vt%3Rt}{eyFX$x6-)spYJ>sR&v$!yF z5R#mNP#J=Q$E(MG~Lb8JUa^N6f}au`8{kaVZTv4b-YI1{IP_Wq`y55Q-J|~@u0`1##mU`R-=e>!oTeqsuvcSvB>#hPl?ge*4{0D(z ziBD_}OTiaIrsCA`6Zs?nmvm2@JdRo3vC;vAh$1eNgk!E1NX)>tCn8Y@T$t#3D~kB^ z;ioCNcJ&$+&BF|yw{P86)&lj5{d@PR`E2_3Gnj)z67AvkmdqiXOJG?yg43h)n`fLp zI~32$h#s1+?92pLEeG_~k}vRBnx*U3ti_=I1CX4OqV}_nW@0Cy6=V%YJrRuMCyGnX z@Vh5Iu{Iihe41lm@DWX&qyGAO_w{hMzeWp|`H#RE#KB zoTH~Lzom#-JWCxC7GY#MH>NpZIMlW+TUDnc(fI;tQZlzMql`GtGv=;O?>>s_C_P9x zZl5ll=V$2z{7z3KJ^YGOr8>tCA2Liis4!nTkNtJrc*VtRk>L?4@gc#E!fVp6fdwX6 zONFJtmo8qSwlR`NPZ(bm%0m3m2oq*4*@G6{m*V?2^U!znCLB6mdL_>qr6xYHHaH2N zj+mvCK)yJ=1JI`LEF$r==mt6{^uk3;VXn-?7&CTkT(5{jY0+8Q{%!fQ<=cW@cZD&1 z)&Z3C9O7~&|IXmh+uq)4JExU74AAq4&}+Jo&=)UVQr`*Y|6>QxMKg&^CsS^t?;*i` zc$`@X#5r`Hlf#ZRcs!5OI~YU9=(tMoH(PNiJ@K;<6dDCbH!pcsf4uU^NL4H5kk>`L z^YyRzzV&?6m2CqjXu3{G_Pvg~B0k|DL%>I(1Rg)?rEGq^1L%!&{S2yXE3HYRMru`0 zHy3-z*xb8Qd%Qi@SuBHSEb=ku)3Qs0p+kqlb%(3v*Z*&nmiT**T!gP*Aa09<>pGN$ zf<~*fEH&O8h8I87zW?ou@%VR>X?Xb~rd!P;K09DUlqlb?u zf4+hpfQ{<`0saBlylFFf+O>mS@BVmf?FBr$--O$78fTWahyJgkG{kq)QNp?Bwwcw@m%5$z@{_0?Ut$miumw?;|CA3k9t9{=YUOx|z=hPLZqu-gJdcPBj2 z*A<kLRJA6|T5?>%1^7Vu?G1o#c;4&49a#EKTMG-$c z%Z!xNqssb7&&=5(YePgJXY;Hp?S7S)kb{t<6u1b zv{plsc;cBK(0hR9&p&=@;evWZIq`o(SQ9@h{ge>Cy82E~9Gzh(zd*w?6EI*WPJ|^bD;7j2gQFFTUOyZ~fB_qsMAFglEhtdNQq?_`f0Y zh%ZX9aC&xj-V$;`N+K%#FkiI%4KVa`hhgez7?#{Xu&+OE-|@>;?ATZ|b;sfJ2nq_s zm8-YK-nYlE(>LOWU-UZU`Nh4Ce8e9zc(BcMVYa}uZCq<-%oxEbP@-Nvt<1;WphNri zDt#KKe+%NPFTYe=P~6h4EpXgp6wBR!)71Y>SaW`Aj6ufx{A(O*oV{RZyaa}x&Uk3l z0X#JA6hZ?uQ!c-0=ZAp60N5|viy>pzqsBYk(V_nuT=%ve)vF_y_{UEihx2wV7=v@# zo=1*g(L$|AEWwJnoKGj#JFHi3*d&VEjvXppS@&+;k)D=@y_N)w8`iJKv16KVzKgR9 zHf`Lb^4=ANRV!BFsHdm;zG&gX+>8~RDZFy|iaIaz-p#edr7=g})-Bpx_JREeuw~1Z z+;#j78#bu*fIHrr8`Bp+ISt+ zQpL05GtmT#;&bJW>i`=!Xi1G(JeLv8O#QAe|8jwe@ACRJZLL9vHRp4@&rEYbc20`? z)TX@ozSp~-fuZFJW#1bH?1F>mHAII7!QU?c-af+h-a)wI7lsR$uVa?|dep5q26aCf zi@G0=Q0FKPxx^>I$@Nas0k~koHS_J;9C1bn+w7;NNR*erROh2cj6_6ugvxD4u%6ou zd8n=O@=4s8GiGA?v}tN;x4oq<4|Dk4x_L7&PO-=;YXyU zr(?mqd1|GMMEK!*O`G-g@l^>R84Ex#aU>UY7+I8-nuZAz#w%|le?LE!PcKTICp9G% zlO|3QA}&Ehm{yX7_n;T?XCQ>9r7#o=L^(J(sG?8=D;G0&&NO*0CVWhYkH-%Ueo)a& zef#uPQpV2CPE}oAw{D$!2ke}Ben3hzt^jiB*BaKGPoyO_5;_=>p3HgynrKEus$t%~c}p#Ave$Cy)I)kS@uNI6!L{wkh)AqkyH;^ESKau)te4FsiUdQ9=y5uG z)@-%*eeSH5{E(b+*=m)|dZ^*`iJ#Zw(nU`c$-3g~APik&sqFy&{A>FKiBD3I^V5?$ONY9M6te+Y zSr>q$SJ7%fCq#w6j1h}F;@b81@J-(#=s&(I?)V1d`t2w=S2Wu6UXH)K)LTvKmS$=# zm-rkXnXZ%~mJi#yb!+7?L5vSkF`Ey_a3YUA z9;(-~bjeZAqw1yo`s=SsdK3huNmm(b8REt0-Wk)UE2%>1!tdlNX7J?FEvsCRv$&MX zOq<=icUQx~<;$1VxtIoZ%H+xFdkf)sV)UrdXz=~_>N_Pwixyhy)q>#qe;Xm}h!G=H zv3TYJW<(6pxpQY#j)gVUnF5yA-nDyIZqav28`iV?)l&1E**S@U0|uy}k+F}dK^u6*vv*5V%8Xl=L2rqpy&XR$13|e+s2p?ZRL`6s7;ac7CeH(kr5!!q}Nhrkm z1i9}2Gx);q7dR}eSiW54ATA3SPR+EhZG@Q$g2NxBS7|_3RpR_rUvwO>8vpp_SG@l3 zu^2jO3#Kp9q_T$6Kf6uhmm@!P=a91EUXL#sW$Wza#Qy`MocMoWloP)k<@f`lobk)? zhXpNdCYK8-Mf&5r1vPNJak@4mHU=pdFCx*^6|t*UA#UMf#4lZjq)l6p;^~RBz#x^` ztaLW|y`!A*%khT=8K0RZZB4V?Ep-1>wls$LOrHhg+wZAz*XD}V5c5n;Ew;Mm%ZO#1 zwRNjmN5xv3t5k>Sv8P~s_Ia3pX@`{KCmxs}_ScL|!cH zz2Jc|KK(IbV`A0HEK~4ayK)uBy^dj*+fF#FU8h!S=_^5B2qykws6A^Ba@3})z_FuV zYH6I&&K%iYot$xC?_M~pT!y)mCt&%k=~z5<5|+-GjQMkCVa$xVXghro{yt*^9$M&$ zC*8s@;-;uwcTvCSkBb}xB&EUNq^DB|#AB}hh)OM-aO{5t_d4Pyxx1@ToFg-9VVGq! zXHKm6@e`F$xL2ggC~ti0UBpy=Hdg>Jy`o73LsoX4m@W(Mnej6-G7uITrqpRVK<#jG z#hTTtF>B^bj2b=yy?gXjnS3}x(-Uv@%vl&QY`BW-zj@=Pa+YF@FGumQqsCy?w8>b# zU>-IuS%i6WXJh!B`Di_74L+Rbgl87)fnn(hRkK4SXWJ2uKkbRea|g}%>XZp%Z^png zIvMHN<&1v!$Wck>A9G_WjSw)u7%LAL%Nai(nEH!M9Xr<^rbj9Y!!rk(Fl5E5h-uv} zml?COvy}fEwN|$c-(;pLgzVOV`dymllamE;90pDlTe0>)5dPQQYjgis|+Kr@N7{+Q_S~zN)Hfzw*i}%J-1&*ss6- zI##V(g^xe}ICtOaq5-#TsX3ckgMUqrj70QnZ^Oh|dSw2mo`L!MhR76?qbz;C)Qq1H zpP-nXZrrSq!{s>B>>Pm#FOabF|$1{5u(*pA-h%<|xPSbKHs^Lr0?OEEi$& zP<(Ja9xMD45SjY_cckXa*Ct(b@)uOZ_*)+@iYJw(#Odd;-dF$4mL(mg;59U8N9g+z z*556V&PF>mZ=$FG<2wi8X<>XOxzzujzga`S-_n4`>d$653tzWI;IrYc;- z`_WMr#?MGjQn`&)(JL|_NBS$XJY1Cr&Djf?nX`$BkF9Bh)IWEzldA>#t)*jaJ^%bcpRJ_eHO3&J!$N zxJbFwpE-R--BXe!!05q%_nwUlF)8SHHWE)WJutJ-(N4DHde&{`r`&=u;F1wBYR(~# z??c^-cFr1mf-pvokF}_vJeK7Sa~VH3RU(g-dnnW_=aut6>KcrnPle%j0>d5n zTv|3DD zV_LR``ANCHFutjhjQTBGmFe2WGJcFXM$M)(4<$!)eblyY9L>jwZ9ehWUzJcOYM-G) zhKT*|f@Mdwu!@32Vfw=s&6?-a4s10t|A7Aeb8RDrP*Bj=+Lw(&hv#G%2E#A(psag` z)(JbFkA`83bhzB4vSGrQWPV{V=Is_HRgKKF!?Mrz5InOp7+2#c{B(xT#?;#}(s|`L zCri;7>A+epaXG)vfXq4W9Eu7%STRVuPE`>$r%fsN_P89kS^h59c!<~HJ#CkBsN>`w zcn*HL$ToGa(zfwl{8iz&n2bz3YN;1ifyeXwOhnJhLIoS2jpxn17v5_yD#-R-;aY(? zjZt$j`Ib?hi|>HflykbseQuY=5>j1yLr(U+aMACn{?*_|Mgb>E$<&9-EDVv+UNI6A^IMp1z@=!>0MhV`sMRVr zEd_^sR@)T>*HFf^6`miCN=-w{Q^Ejb9AQo+0C-M*T9}m;AFjvQdQQMsjYWntl4zX?4ut0fQ8C72Hp6JP+pwbS;8ax)?G|hGwJ5z+Alg zDgXruopIW<`UO8XZ=wF4oSdSfbs5d8*X`k~DNO;I0ldET`6!&M@16TlJJBap?iM=Z zH#w2YdZrT)lMxIGOTMpLw#VUrUCZY)sGMjwzT*9O*FP9(#KylE| z#XJJs+NlSr|VvE(XST-h=tsni}&xQ3Wy5?{%tk#-62anQeW*fB`D#nVH`k zHEM+M(!^`A0jifE~tA4xh2t z1raz}l@)sV(e1Y^D3b9*QqnPL-8LNd*sW&gi(_d1jZ8`=Bh!-MxQ!Ej1@|Qra&+d} zJj2}Q&9zsd|ICfREat|jXvB(%5f>AS7?T-hqX`k=;Rq4pFsH*#x1GwK=Q#=%?4tTl z#~*4Su|iZvh%?jq2vB|mrB7%jLYwi_gVSFNS?OGTgv&`y~ z0Uxh|crgKpgv3N_5iNP!wrwgojGn-TRRmY8SfMf)aQ2?X=?)w?pfVA7dU~q#6Py5K zg#Z^ZiTV4c^!GJu)*xB5oh%vLO#k4d;`4Idx-eC(4%25}sX4fkdt6}@YvZ>(8Hz@u zX5iSKT`IW>N8y5utT)}3K6mDvBJZ0WNKXibd%2>T{@#*ht}w2*AcbsccShBSM=)A#bzzm zf~~BK->+|f#K!7rzl%cguTfJ+b1>J3Bdv6Ds-VI+ABt+4WtpVoK2&ClLP?BYR5?&v zxW9}af< zeR-4#k2IlH(o);+mGP|+ziKU_9(_{T`}Ew4sa_jV)v6hu2rBmBv{1DXI6DA`g z_bVOlE8`1|9RlMq{<>ur-onIuu6Ko2j=}Mw*@zGj0hgYY1s`F)$u~`Sf|G94e$;cw z{vr^!1XHuh(M$>56k&};#{hhMC={-t@rX&+&SmQzZ3^W4gB(}T1o@pXzRn(L@v$&{ z@r`n&Rc^a%46b>+GK^o2slK5u*ZNmZP85!o5P}E*_5IwqzKxxwo-8y$dpUxf8uK!^C zJa|mL)^gBjH0w7U9#`++c6_?DRBQ=~#f$D5^QsQRk%kjPTteC**V`!_kk^*$R^Azk zKUsGs)k0J`ze{m?hbsQ1YL!uQ5G@S;IVbD3_-i&lM@p_O^ZK0JqRq=$ZM|)mW?2H$ z1O~5dX|lc6o^Y{+3wM;FaK9Pf-dig$7L=5Vx9JN&KLRozC+v8?e4px>c<(y1OXIs1 zAz0rlOf(ivL(uz`b*6&BXBiSy0%UyA>Zoi`upI|p& zPe?Z#VQkq3roUE%SyXbR0f;RgQ}ZR5syqv$jM~QPwP1YreHj1qEliD?!rY({OrLy) z=$BuEu~IddD$2?D()W@4j^HU^Ja zeCKurcH?IVqe`bF!|o7!+D#axVB_)ZaB5cDsuPx}-5ulGf-x-vtNh~d%b5tgC!^YH z`@``%n~avW+8g`B@aDk?ym3I==e50Iq7FwO`7Uhy?J^42+!>^n-uT(?E^C{#JrjkB zE&*zpt)f!^mimzKb7Yhvy|v~Um5dH&qfk=>>qC6kvL6}q5fO54>o>?bHD6EC z(JGUqsA0e*cpy@N6p8wX_IjB_%SS9yi}>+9OVl#KeusdZr@%l1-D~J zA|B#W5}j2zLT(E{(+de$yJR6Q?RLW4@EjRIsBYdXLzlLdjqy2`!D7O6(bT}>bjIcP zqFZWmA|{L*i<2tUlG}87&hL59T{kyw+^Cj`bg2FE?<$b3rBng6z4Y#?F}ZeDeVYc( zIy1H+Grb_QaUa=Rsj{WJCXr_X>Cnzo`o@1t|C~kPelor_^4_G@vP1()zkVHwPR@v* zF%z*vMj*EDV8r(yg1E60khpR+QoOv75pB#pPW!yK=PM3(&G>oHZfZwFiW+hMHDoFr z?6tc3ix)1=UDhio09a(XUE4M|=A{)MUhGR-P8ggjAV+Oc%U|>eM_N`UX5BWU61Pzm zrTUkvIv3HnpRx(54HRVTl3Ljqf5Q0jDo{xWGkDVnyI^NZOh{A=L_y)_>!+BR!h%aS zdI!FE@uKqOW=VIhK1`cBRpl07B5Ou>-SPHTomB@zmYL9+%beEWQYDv*SXf$*3S+Fr z{(bwD4}@G$ZDXc$UWfICS%-kv(FGWtoVdKirBN=m>Y2z17L?|>&YwST*#hNE#cLX+ z^Xj-R?}BqYK0c+Jg#B;hK{0+w;M->_y~0s_HA2 zttiq2;L1S9_8p}oo>Iq8xMdQxU+iQTx_=5I3KKu;&UpY6W_!nB_MLdl@@7jYvf2B@ z;XAsm>JBXh7(2JoJW${B|NU+mpYFfy+qcI}VHjqmZ_%uoa!Mjo4;wlZ_V)HFzcO2T8By}O(56kB&{58nlcn81?}ZuW*REcpe$SmfN4YsOPeLc5&4B&`l;Gfb zm;s(1k-UD_E?rb6`HZx5wd{IHgp!{sZO{z6ckNas6L{{ECr+Ykr!GiJOj5b)es0+k z-Xfp|4jhP8D^{s%>KcnRSoxkA_gTNf(a}+bs}=>WZJ#`O(((&xEqtd46oL*fM-CrW z-|rT`732RNa32_7gEneqV@-$%08!z;7&Z+X7TPNfVBPAqY9^jSps)a7`GWTFI;vID z*&337+Pj5uIjNNE`BlmhTunk*n3|JBoT(RWqMCaI8eT}mbiX7qQIg;u8IKCo5OM{8 z)*f=cJI3b-*Ry9&?aunG`8zv!Su#y+r5TQ0SQt5>fo{|PcXEBJ7ZWuw@O9&*2t5!%`> zYoyTW%G!~MOvI8J40NIc3UNR*6w-+WX_z2o>5`>tyN=<*hvQc<16*BPaQ@tRIG<8#sDjq^Y^MR3xy@``8>^kAdbF?I43mGgnMS*T^O zGSQsbvsF!#Q6opGDo$m=gJpcahm!lyZ-x8D__@#pKyb2*+5!02@EN%#z?O}hl~a!` zKLBb4ZQ8WKJQ*271M`Z`9E(lI=$o-2#c z&{K=9og8Jk4@XG;z17b@tD-<$4yC}L89*HKI;NPJZk-I})RQ-G6r~_yof&EsH{=`y z-9qWdz&drTUqeAfW@59(m8(}&EgS2KPpqlKdm?BKP*_o5^y$+_nE_Pe`MjMvby6;- z^f+T39oCScu&3h}U8)O$p{HbcGB*n{QDfqJ;4@G#^4x1gaIshtYw^>ZVr`xf`MuIo zk&8k@FI83+JV?e*&&X zXgvM)U{v|r0KEU*ujtf&6{arOiEB5lORebE{{0gq_n+}~SOmbj5D@^*A^1oHz=|1D zal*?>l|Q2w9XozO0l>zN#Lm_Bm)0u2pA5EKMjB_wZ8)%Z54;W^!0{u}4)4Q3cQi9C2P5ZU$&_DlOr*EF*ostuPbWb2PWIq&Mthw#z|!|~Eb zqfz%07B$t{E7EEUgV*@`P`vT4v3T)=k$6@#ffwZStC^!P~37R%l@2lSU^1A^@O)s6<^WYiZ0*$qDusJkQ?CEg4 zJ9;7P$B)6$Lx+{U%2A!_E7ik-j9#b-bK7;W6VP*Q4^N?B_LkefV{pgHOo4Rl!_aizg3=yHBSmAU6^?R?y zL;s$Pir>var626^)DN>!rNLZ0{rxOF@$s)1JJ$`d=5Pds1gWC80fE6-yygIU3|WO$ z>knY}fzvp9=_Zbyx{4j{r*Px85B&TB)qIeSU3-q>?;m!=LyvuhN1pl~217k`={d7R z4femr_<7I-z&84;yM^N&5dbqr4#lCp`&6_ZBlV~O-+%3Nf<2PV@ z9U5~gKY*R#cx~KbOc~rC`@|+@Zog%Vmk5)0K;L%1pqtqF{~13IRhJ(Hv)fc~k4BR- z(byXyYK|p$r1=3{Pg) z7`(Vf<`0ix4hUP&?s1jFE)fu%$}WuGknuHWx0r(qv1zEXKL$0YY(>jyi}5$NTToto z?os&hvdH&__r|MOd&&=PmjmH?IRG;}eT8Ym5F8!}vnd)eMp5^} z!r&heEGW}#9+kxoPVWb zt1Wv$)cpXw`*BzNx#BnYOU3`-tM3P)WA|zJ=(Aq<(-Zaa=O@3yXJ7Y4NSJMP|KQ=X z*tm7C<(F;zju^ij<@oQSWX8`yM%pH%#5{uZq~1yZWMzlI;uNW{Y0G~6^{M)J;^_w1 zvGW-07dql`5dcq!0C3-T!m^i!&cf)ASNj3azuXel>ok+r6wkiY6c1Pa1`Zpv(K#hK z6>q<9hpIIj5D$uE@wZg3RnRWM&)_Gc#5GqR%I3m}9>chQEG^%GDd=^Kbg% zyT(J%;HRPZDKHyoFn^cKsf(c*xzNSjJ~?2>r$* zA|uuJ`{mt6H&41+@`dx9^v9;FrY$hYg%M?R;e3#wn=FfYuruh*Y&I)*)8d|+_0hI$ z-J&Af2$o8s55M(V>w^FjhU(XR5THLj{rL6hzW+toV*Kpv1X1hzBQ0f?sPxIgWcg{Y z|DLg8KVEA#7mu`D2}7IpFm!c9h5kG7(8&ETOgaX`tn>KG!b@ z?pjsbY1481*fGmr?+&(@X3nhH%KMI;i+J^g+zndlliqfw<}8i`%!gWjgOWWN_O{cDMK`LOmuf3I`9J$KO96imG)x zqt-tLqHaBU{f)(Q?+(TIna-B`C>v}tK4Z#TG;e`^z5A-53mqK&=n~tZZF_X@(oL1J zrcb=il$$ne#Lq2Ss%p3`TeQH^rCKDH_wCz?i5M|9pl^Q_Fv2od#Ju_QRRxl$h)5+6 z+Wyi;Me)&0xWbk0s8Jjd}oEspscI{ex{q@%>@{ZANUw`=(_PA>f z8jOr<{!>$x(3C+mCZh?LuUtlJx!1u12dQ&1;c0Rbv*eTvY7?YC>1hpWMGTPPd*(af zduF5{WBMt?8Ku`u?t^g{6o3pAVl`!YrFHGvMZE_e*Rfp(b&t1h+*0)sNaF_IeXoQ+ z!-Bu5UmxDLZmUpXzQa+YMyczs6oJa~>*r|HuwicCl8>*C%I8S>u#Yuq*a-8j@+8=T ztr1^GdipM;nhZ#bt%Hp07!e3$^}+~`2p5LEgR!d)plYk7Ff^9dVFL_Z#QyKT9fqFH z_)8yGbXa*3{Txo9<)S0_YN`k3x!%CJtAV(ECkjD<>k$<`24~N0gZ&~GjGMd)E^dc$ z?&2-{+-(VJ{$r$a^L_c_k*M@~Kdj#7Wx0CUQLL)(dBjsO8UtULqyCQ19W?#vCsmh@ zpsQ`eAAeLGk@3+K1ng+tI(Na(^8L`ELu$k%u{LegI+2%X4viZ%!uhl3R2(_a&!Pdu ziQ~udQ{yHoyp!p@roi08D*V)f{}9UoYqlh z92FS<%{X@6&(Wh=A`l&93f?PNepXCK*JLt2LuJWO6j;1|c2?f<<(Sc9l=k7}c@#g1 z5V&+nt3b4H!2-o}6pW5rw~63vf@{~WslO2v4h(SOImvu2<(Ziez}oy+xqO9sM|>BH z7A&-E)xh^nL1LZYgEj2vR?X-_YH7?Dz<#kzgge7)d-v|0D*#Q=qWOq$XKnz}jnB%+ zMaKIxUZ0Fi`t20@G!_Qc-z}eg$e_U(E<%xDz5xn9UAVJ!+OWYx)%Oe1=Nil3=l0^`tr>|2&AR~Dq(v!!_ z-=mR{nTF7y^)N-cLX*|_c=$wI_W3*JY-eZwXEvF1Q4usPohy$r^y95s$Kn5!Di2xgYOpZP zxwB_gC!|&p7!-t%kPtL$(iEFFX(5^nL#4n7DnU)xv2Wi#B@oCYn>K8KgP0pU2h9w2 ztcE}QsABC|JhZjkAFoYpmJyL!M`&0WA|oT!yIJqBUI`hVlY(ph+N)-UBoDSi@P~DTMc#UH)HZ4wcA`B|AP`$OZ&AlmgCc|Y$~FDP zrX(ZS&$Sm}?E}xFo~m#|X+Y*1Jz|tH#a77(OU-A?)~#xeg^WuEX4!KJsg})J;N*!D zit&5(?5P5!n1GcdKD7;I_#xe>$&41kOmm9NNWnxI zi&9XF;(KKOA}GjM50QUU8j8I8(IZEx90YdlJ1U`Jxdq z4qv)Hfy55PV@XIJOJ-uqC+q8w$(iPf$LgS}NzH=SCwL4i=;+rk4m>ya=Xp7Tv++B( zF;^PF`{G0zpPAnYo}161KMO}d7B*x@=ihjJK6Al20*;pYJK}wFUp@;n(C}~8;Pdc! z>xoU$gV*8p^ylMoJRj+zzXO5-llQ<(K?P}56nHM{cR~74+tb1KK=qdA?qP-q=6%YZJV8 z-#b1cbbe74XiCD}Fn;Nw-A`OX2G(vnj_+E}!}ISAkr8_Up84BgJpb-6yzu@=FbeOf zHwI$<3J+xp?Gbyv$FS9?{`MgJ*nR;V9FHSiOq~aXVpV->aD<{=T2MtUM>!}YM~nK- zf+<6X428RxFaJ%jb|VKRPDXQ{fkjwL18NJLv*2X*e+!wJ88FAiBPu!;QN}n#o8m-B zly2_jexlTjUygE=<9`R`j9-p&`~gwU_~j_a9}d9(0r2+UZ|o}wt^fc407*qoM6N<$ Ef)~5i_y7O^ literal 0 HcmV?d00001 From 3f40f213d15ca13bff188d04ba4b19cc6f1cabfb Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 1 Oct 2024 16:27:26 +0200 Subject: [PATCH 07/21] ambar_png --- Aviso/Aviso.vbproj | 7 ++++--- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/My Project/Resources.resx | 7 +++---- Diverses/ambar_boarder.png | Bin 0 -> 23129 bytes 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 Diverses/ambar_boarder.png diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 8e825da..07bd4c2 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1609,7 +1609,6 @@ - @@ -1661,8 +1660,8 @@ - + Always @@ -1867,7 +1866,9 @@ True - + + + diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 0747092..d6b263e 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index e10981e..2db26fa 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -493,9 +493,6 @@ ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -691,5 +688,7 @@ ..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + ..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Diverses/ambar_boarder.png b/Diverses/ambar_boarder.png new file mode 100644 index 0000000000000000000000000000000000000000..bc0c10130a2833f84f81c8447fa0a8181ce1eef0 GIT binary patch literal 23129 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 Ef)~5i_y7O^ literal 0 HcmV?d00001 From 83250af9615fcc9b05d9235bdfc0ba97af58445a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 2 Oct 2024 11:34:58 +0200 Subject: [PATCH 08/21] Updater, Login mit Standort.txt --- AVISOUPDATER/UPDATERfrm.vb | 4 ++++ Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmLogin.vb | 2 ++ Aviso/usrcntlAktDetails.vb | 8 ++++++-- Gemeinsames/Gemeinsames.vbproj | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/AVISOUPDATER/UPDATERfrm.vb b/AVISOUPDATER/UPDATERfrm.vb index e9cf396..276081f 100644 --- a/AVISOUPDATER/UPDATERfrm.vb +++ b/AVISOUPDATER/UPDATERfrm.vb @@ -35,6 +35,10 @@ Public Class UPDATERfrm CopyIncremental = False End If + If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" Then + MsgBox("Programm kann nicht im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " geupdated werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical) + Exit Sub + End If Dim FIRMA = "VERAG" Dim pfadDatei As String = System.AppDomain.CurrentDomain.BaseDirectory & "\Standort.txt" diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a962301..0747092 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index d7d5f64..3eae677 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -87,6 +87,8 @@ Public Class frmLogin If firma = "NKD" Then firma = "VERAG" If firma = "NEU" Then firma = "VERAG" If firma = "SUB" Then firma = "VERAG" + strmReader.Close() + Else ' FIRMA VON AD HOLEN, wenn keine StandortTxt diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index dd6bb1a..fc38aa8 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -839,9 +839,13 @@ Public Class usrcntlAktDetails .RowTemplate.MinimumHeight = 20 .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells + .Columns("anh_id").Visible = False 'VermerkID nicht anzeigen - .Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen - .Columns("anh_markiert").Visible = False 'AvisoID nicht anzeigen + .Columns("anh_docId").Visible = False + .Columns("anh_markiert").Visible = False + .Columns("anh_LaufzettelDruck").Visible = False + .Columns("anh_GestellungslisteAnfuegen").Visible = False + .Columns("anh_cmrId").Visible = False .Columns("anh_Name").MinimumWidth = 150 .Columns("anh_Name").HeaderText = "Name" diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index beb46fd..a26772e 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -35,7 +35,7 @@ true - x64 + AnyCPU true full true From 3b44f9345828c26abc73bd5bf324ead46340c2bd Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 2 Oct 2024 11:35:10 +0200 Subject: [PATCH 09/21] Therefore --- Aviso/frmHauptfenster.Designer.vb | 237 ++++++++++++++++-------------- Aviso/frmHauptfenster.resx | 3 - Aviso/frmHauptfenster.vb | 146 ++++++++++++++++++ 3 files changed, 271 insertions(+), 115 deletions(-) diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index bb7526a..3647d5e 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -291,7 +291,6 @@ Partial Class frmHauptfenster Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() - Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -399,6 +398,8 @@ Partial Class frmHauptfenster Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.Button1 = New System.Windows.Forms.Button() + Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -892,26 +893,26 @@ Partial Class frmHauptfenster 'GenerelleGestellungenDurchsuchenToolStripMenuItem ' Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem" - Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen" Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False ' 'KundenVonFremdenSpeditionenToolStripMenuItem ' Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem" - Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen" ' 'KundenverwaltungToolStripMenuItem ' Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem" - Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung" ' 'MDMParkplatzkartenToolStripMenuItem ' Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem" - Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten" ' 'SMSSendenToolStripMenuItem @@ -919,7 +920,7 @@ Partial Class frmHauptfenster Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem}) Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2 Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem" - Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.SMSSendenToolStripMenuItem.Text = "SMS" ' 'NeueSMSSendenToolStripMenuItem @@ -937,51 +938,51 @@ Partial Class frmHauptfenster 'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem ' Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem" - Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen" ' 'MRNBarcodedruckToolStripMenuItem ' Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem" - Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck" ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6) ' 'tool_BRGXLS ' Me.tool_BRGXLS.Name = "tool_BRGXLS" - Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30) + Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22) Me.tool_BRGXLS.Text = "Bürgschaften Excel" ' 'ToolStripMenuItem4 ' Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel" Me.ToolStripMenuItem4.Visible = False ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel" Me.ToolStripMenuItem5.Visible = False ' 'BürgschaftenExcelToolStripMenuItem ' Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem" - Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel" Me.BürgschaftenExcelToolStripMenuItem.Visible = False ' 'ToolStripMenuItem6 ' Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" - Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel" Me.ToolStripMenuItem6.Visible = False ' @@ -989,69 +990,69 @@ Partial Class frmHauptfenster ' Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem}) Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem" - Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten" Me.GesamtsicherheitenToolStripMenuItem.Visible = False ' 'ATVeragAGToolStripMenuItem ' Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem" - Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG" ' 'ATImexCSToolStripMenuItem ' Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem" - Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH" ' 'ATVeragCSToolStripMenuItem ' Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem" - Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS" ' 'DEVeragGmbHToolStripMenuItem ' Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem" - Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH" ' 'ATUnispedGmbHToolStripMenuItem ' Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem" - Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH" ' 'DEAmbarToolStripMenuItem ' Me.DEAmbarToolStripMenuItem.Name = "DEAmbarToolStripMenuItem" - Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(178, 22) Me.DEAmbarToolStripMenuItem.Text = "DE | Ambar GmbH" Me.DEAmbarToolStripMenuItem.Visible = False ' 'ToolStripMenuItem10 ' Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem10.Text = "TICKET Parkplatz" ' 'TICKETWaidhausToolStripMenuItem ' Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem" - Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz" ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6) ' 'DAKOSYToolStripMenuItem ' Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem}) Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem" - Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.DAKOSYToolStripMenuItem.Text = "DAKOSY" ' 'StammreferenzenVerwaltenToolStripMenuItem @@ -1063,69 +1064,69 @@ Partial Class frmHauptfenster 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6) ' 'toolOriginalATR ' Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr Me.toolOriginalATR.Name = "toolOriginalATR" - Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30) + Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22) Me.toolOriginalATR.Text = "Original-ATR" ' 'SDLAbholaufträgeToolStripMenuItem ' Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem" - Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge" ' 'ToolStripMenuItem13 ' Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13" - Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)" ' 'VorauskassenToolStripMenuItem ' Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem" - Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6) ' 'EssensbestellungenToolStripMenuItem ' Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem" - Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen" Me.EssensbestellungenToolStripMenuItem.Visible = False ' 'AdministrationEssensbestellungenToolStripMenuItem ' Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem" - Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen" Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6) ' 'WarenorteToolStripMenuItem ' Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem" - Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.WarenorteToolStripMenuItem.Text = "Warenorte" ' 'DatevBuchungsexportToolStripMenuItem ' Me.DatevBuchungsexportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EMAILToolStripMenuItem, Me.FTPToolStripMenuItem}) Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem" - Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport" Me.DatevBuchungsexportToolStripMenuItem.Visible = False ' @@ -1144,13 +1145,13 @@ Partial Class frmHauptfenster 'APIToolStripMenuItem ' Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem" - Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.APIToolStripMenuItem.Text = "API" ' 'FIBUSachkontenToolStripMenuItem ' Me.FIBUSachkontenToolStripMenuItem.Name = "FIBUSachkontenToolStripMenuItem" - Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.FIBUSachkontenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.FIBUSachkontenToolStripMenuItem.Text = "FIBU Sachkonten" ' 'StatistikToolStripMenuItem @@ -1774,6 +1775,7 @@ Partial Class frmHauptfenster 'Top ' Me.Top.BackColor = System.Drawing.Color.White + Me.Top.Controls.Add(Me.Button1) Me.Top.Controls.Add(Me.lblUsrname) Me.Top.Controls.Add(Me.lblFimaAviso) Me.Top.Controls.Add(Me.Button11) @@ -1825,7 +1827,7 @@ Partial Class frmHauptfenster ' 'Button11 ' - Me.Button11.Location = New System.Drawing.Point(687, 26) + Me.Button11.Location = New System.Drawing.Point(1081, 15) Me.Button11.Name = "Button11" Me.Button11.Size = New System.Drawing.Size(75, 23) Me.Button11.TabIndex = 14 @@ -2494,15 +2496,6 @@ Partial Class frmHauptfenster Me.SplitContainer3.SplitterDistance = 158 Me.SplitContainer3.TabIndex = 3 ' - 'UsrCntlBenachrichtigungen1 - ' - Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) - Me.UsrCntlBenachrichtigungen1.TabIndex = 0 - ' 'pnl ' Me.pnl.Controls.Add(Me.Button10) @@ -2535,38 +2528,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) @@ -2979,47 +2972,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 248) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3793,6 +3786,25 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(1028, 7) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 87 + Me.Button1.Text = "Button1" + Me.Button1.UseVisualStyleBackColor = True + Me.Button1.Visible = False + ' + 'UsrCntlBenachrichtigungen1 + ' + Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) + Me.UsrCntlBenachrichtigungen1.TabIndex = 0 + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4232,4 +4244,5 @@ Partial Class frmHauptfenster Friend WithEvents FTPToolStripMenuItem As ToolStripMenuItem Friend WithEvents SpireLizenzPrüfenToolStripMenuItem As ToolStripMenuItem Friend WithEvents DEAmbarToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Button1 As Button End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 9801068..b95b36c 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -243,9 +243,6 @@ pOTzPwAAAABJRU5ErkJggg== - - 560, 17 - 659, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 84c1b38..4abeb5d 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -368,6 +368,7 @@ Public Class frmHauptfenster AdministrationToolStripMenuItem.Visible = True lblMitarbeiter.Text += " (Admin)" Button3.Visible = True + Button1.Visible = True End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then @@ -4318,11 +4319,153 @@ Public Class frmHauptfenster Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click + Exit Sub + setProfileImage() cHMRC.VATTEST(InputBox("Token")) End Sub + Sub saveLukowaPDFsFromTherefore() + ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + ' Dim dt As DataTable = SQL.loadDgvBySql("", "EZOLL") + Dim slist As New List(Of String) + slist.Add("530324001596") + slist.Add("530324001604") + slist.Add("530324001658") + slist.Add("530324001685") + slist.Add("530324001707") + slist.Add("530324001721") + slist.Add("530324001756") + slist.Add("530324001720") + slist.Add("530324001755") + slist.Add("530324001863") + slist.Add("530324001853") + slist.Add("530324001941") + slist.Add("530324001695") + slist.Add("530324002015") + slist.Add("530324002021") + slist.Add("530324002034") + slist.Add("530324002042") + slist.Add("530324002083") + slist.Add("530324002089") + slist.Add("530324002090") + slist.Add("530324002094") + slist.Add("530324002097") + slist.Add("530324002107") + slist.Add("530324002108") + slist.Add("530324002117") + slist.Add("530324002115") + slist.Add("530324002114") + slist.Add("530324002116") + slist.Add("530324002189") + slist.Add("530324002217") + slist.Add("530324002230") + slist.Add("530324002274") + slist.Add("530324002276") + slist.Add("530324002288") + slist.Add("530324002290") + slist.Add("530324002291") + slist.Add("530324002349") + slist.Add("530324002386") + slist.Add("530324002387") + slist.Add("530324002390") + slist.Add("530324002380") + slist.Add("530324002383") + slist.Add("530324002412") + slist.Add("530324002451") + slist.Add("530324002450") + slist.Add("530324002453") + slist.Add("530324002459") + slist.Add("530324002460") + slist.Add("530324002474") + slist.Add("530324002498") + slist.Add("530324002499") + slist.Add("530324002487") + slist.Add("530324002507") + slist.Add("530324002554") + slist.Add("530324002560") + slist.Add("530324002544") + slist.Add("530324002548") + slist.Add("530324002551") + slist.Add("530324002581") + slist.Add("530324002616") + slist.Add("530324002619") + slist.Add("530324002610") + slist.Add("530324002634") + slist.Add("530324002636") + slist.Add("530324002675") + slist.Add("530324002681") + slist.Add("530324002682") + slist.Add("530324002688") + slist.Add("530324002689") + slist.Add("530324002665") + slist.Add("530324002659") + slist.Add("530324002723") + slist.Add("530324002796") + slist.Add("530324002798") + slist.Add("530324002783") + slist.Add("530324002890") + slist.Add("530324002905") + slist.Add("530324002913") + slist.Add("530324002918") + slist.Add("530324002926") + slist.Add("530324002956") + slist.Add("530324002959") + slist.Add("530324002961") + slist.Add("530324002962") + slist.Add("530324002972") + slist.Add("530324002963") + slist.Add("530324003079") + slist.Add("530324003111") + slist.Add("530324003140") + slist.Add("530324003142") + slist.Add("530324003161") + slist.Add("530324003164") + slist.Add("530324003230") + slist.Add("530324003294") + slist.Add("530324003295") + slist.Add("530324003312") + slist.Add("530324003380") + slist.Add("530324003430") + slist.Add("530324003395") + slist.Add("530324003514") + slist.Add("530324003454") + slist.Add("530324003499") + slist.Add("530324003501") + slist.Add("530324003504") + slist.Add("530324003500") + slist.Add("530324003606") + slist.Add("530324003616") + slist.Add("530324003674") + slist.Add("530324003682") + slist.Add("530324003780") + slist.Add("530324003653") + slist.Add("530324003985") + slist.Add("530324004016") + slist.Add("530324004157") + slist.Add("530324004254") + slist.Add("530324004367") + slist.Add("530324004386") + slist.Add("530324004387") + slist.Add("530324004747") + slist.Add("530324004756") + slist.Add("530324004757") + slist.Add("530324004836") + slist.Add("530324004918") + slist.Add("530324004916") + slist.Add("530324005000") + slist.Add("530324005049") + slist.Add("530324005132") + + + + For Each s In slist + VERAG_PROG_ALLGEMEIN.cTherefore.getFileFromFolderCat("C:\Users\DEVELOPER1\Desktop\LUKOWA\", s, "", "Import ab Jänner 2024", "Import ab Jänner 2024") + Next + + + End Sub Private Sub GVMSUKIMportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSUKIMportToolStripMenuItem.Click Process.Start("https://www.tax.service.gov.uk/goods-movement-system/dashboard") End Sub @@ -4739,7 +4882,10 @@ Public Class frmHauptfenster End Sub + Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + saveLukowaPDFsFromTherefore() + End Sub End Class Public Class AvisoStatusFunctions From 5dc935be432a98a2b71c56e58e674c5674dcb95e Mon Sep 17 00:00:00 2001 From: "m.ilhan" Date: Wed, 2 Oct 2024 11:38:42 +0200 Subject: [PATCH 10/21] =?UTF-8?q?route=20Meldung=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/frmRoutendauerBerechnen.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aviso/frmRoutendauerBerechnen.vb b/Aviso/frmRoutendauerBerechnen.vb index c410614..9b59c8a 100644 --- a/Aviso/frmRoutendauerBerechnen.vb +++ b/Aviso/frmRoutendauerBerechnen.vb @@ -54,7 +54,7 @@ Public Class frmRoutendauerBerechnen cbxVon.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cbxVon.changeItem("") If cbxVon._value = "" Then - MsgBox("Es wurde für die Bestimmungszollstelle " & txtNach.Text & " keine Route definiert." & vbCrLf & "Bitte voraus. Datum des Eintreffens manuell eingeben!") + MsgBox("Es wurde für die Bestimmungszollstelle " & txtNach.Text & " keine Route definiert." & vbCrLf & "Bitte voraus. Datum des Eintreffens manuell eingeben") End If From ebcdca584b2e321fd3803a4c1d3198c130f462f6 Mon Sep 17 00:00:00 2001 From: "m.ilhan" Date: Wed, 2 Oct 2024 14:18:36 +0200 Subject: [PATCH 11/21] Ambar GmbH autoselect --- Aviso/frmGesamtsicherheitenNEU.vb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index ef80ab7..0a4bbfb 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -84,12 +84,18 @@ Public Class frmGesamtsicherheitenNEU txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200) If Standort = "AMBAR GmbH" Then - If cboFiliale.Items.Count > 0 Then - cboFiliale.SelectedIndex = 0 - End If - If cboWarenort.Items.Count > 0 Then - cboWarenort.changeItem("5701") - End If + For i As Integer = 0 To cboFiliale.Items.Count - 1 + If cboFiliale.Items(i).ToString().Contains("5701") Then + cboFiliale.SelectedIndex = i + Exit For + End If + Next + For i As Integer = 0 To cboWarenort.Items.Count - 1 + If cboWarenort.Items(i).ToString().Contains("AMBAR") Then + cboWarenort.SelectedIndex = i + Exit For + End If + Next End If Else From f12c20c80042c818ca9ba75357b3f9c5d63b970e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 10 Oct 2024 11:31:28 +0200 Subject: [PATCH 12/21] Gesamtsicherheiten, Sendungsdetails (Ausdruck Anhang Rechnung) --- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 2 +- Aviso/frmGesamtsicherheitenMenuNEU.vb | 191 +++++++++++++----- Aviso/frmGesamtsicherheitenNEU.vb | 34 ++-- Aviso/frmSendungsdetailsNEU.vb | 7 +- 4 files changed, 172 insertions(+), 62 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 71a770f..25a7ad7 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -498,7 +498,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.btnResetFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnResetFilter.ForeColor = System.Drawing.Color.Black Me.btnResetFilter.Image = Global.AVISO.My.Resources.Resources.refresh - Me.btnResetFilter.Location = New System.Drawing.Point(249, 24) + Me.btnResetFilter.Location = New System.Drawing.Point(283, 21) Me.btnResetFilter.Name = "btnResetFilter" Me.btnResetFilter.Size = New System.Drawing.Size(62, 33) Me.btnResetFilter.TabIndex = 3 diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 74f5d10..4a90f66 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -54,7 +54,7 @@ Public Class frmGesamtsicherheitenMenuNEU btnMonat.Text = MONAT.ToString("MMMM") btnJahr.Text = JAHR.Year - If GesSichRef.brgakto_gs_ATR = True Then + If GesSichRef.brgakto_gs_ATR Then Dim anzahlOffenerGSUeber85Tage As Integer = checkOpenATBs() If anzahlOffenerGSUeber85Tage > 0 Then btnOpenOver85Days.Visible = True @@ -67,36 +67,95 @@ Public Class frmGesamtsicherheitenMenuNEU Public Function LoadDGV() Dim sqladdon As String = "" - If chkOffen.Checked Then sqladdon &= " AND gs_SicherheitsSaldo != '0,00 €'" - If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = '" & cbxStandort._value.ToString & "'" + Dim sqlSicherheitssaldo As String = "" + If chkOffen.Checked Then sqlSicherheitssaldo &= " HAVING + ( COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + + COALESCE(MAX(PositionenSaldo.gsp_SicherheitsSaldo), 0) + ) <> 0 " + If cbxStandort._value <> "" Then sqladdon &= " AND gs_filialenNr = " & cbxStandort._value.ToString If cbxWarenort._value <> "" Then sqladdon &= " AND gs_warenort = '" & cbxWarenort._value.ToString & "'" - Dim sqlstring As String = - " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId, - max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT( - (Select SUM( Case - when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) - when gs_art = 'Close' then gs_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr - ) - + - (Select SUM( Case - when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) - when gsp_art = 'Close' then gsp_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr - ) , 'C', 'de-DE') as gs_SicherheitsSaldo + 'Dim sqlstring As String = + ' " select * from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort, MIN(gs_warenort) as gs_warenort, MIN(gs_filialenNr) as gs_filialenNr, min(gs_abfertigungsNr) as gs_abfertigungsNr, MIN(gs_avisoId) as gs_avisoId, + ' max(gs_LKWKZ) as gs_LKWKZ, min (gs_datum) as gs_datum, FORMAT( + ' (Select SUM( Case + 'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + 'when gs_art = 'Close' then gs_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr + ' ) + ' + + ' (Select SUM( Case + 'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) + 'when gsp_art = 'Close' then gsp_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr + ' ) , 'C', 'de-DE') as gs_SicherheitsSaldo - From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where - gs_freitext like '%" & txtSuchbegriff.Text & "%' OR - gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR - gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR - gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR - gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR - gs_warenort like '%" & txtSuchbegriff.Text & "%' - ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2 - Where gs_standort = '" & Standort & "' " & sqladdon & " - AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "' - AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr" + ' From (select * from (select gs_gsnr as ding from [tblGesamtsicherheit] where + ' gs_freitext like '%" & txtSuchbegriff.Text & "%' OR + ' gs_abfertigungsNr like '%" & txtSuchbegriff.Text & "%' OR + ' gs_avisoId like '%" & txtSuchbegriff.Text & "%' OR + ' gs_ATBNr like '%" & txtSuchbegriff.Text & "%' OR + ' gs_LKWKZ like '%" & txtSuchbegriff.Text & "%' OR + ' gs_warenort like '%" & txtSuchbegriff.Text & "%' + ' ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2 + ' Where gs_standort = '" & Standort & "' " & sqladdon & " + ' AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "' + ' AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr" + + + + Dim sqlstring As String = "WITH SicherheitsSaldo AS ( + SELECT + gs_gsnr, + SUM(CASE + WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag + WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag + END) AS gs_SicherheitsSaldo + FROM tblGesamtsicherheit + GROUP BY gs_gsnr + ), + PositionenSaldo AS ( + SELECT + gsp_gsnr, + SUM(CASE + WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag + WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag + END) AS gsp_SicherheitsSaldo + FROM tblGesamtsicherheitsPositionen + GROUP BY gsp_gsnr + ) + SELECT + gs.gs_gsnr, + MIN(gs.gs_standort) AS gs_standort, + MIN(gs.gs_warenort) AS gs_warenort, + MIN(gs.gs_filialenNr) AS gs_filialenNr, + MIN(gs.gs_abfertigungsNr) AS gs_abfertigungsNr, + MIN(gs.gs_avisoId) AS gs_avisoId, + MAX(gs.gs_LKWKZ) AS gs_LKWKZ, + MIN(gs.gs_datum) AS gs_datum, + ( + COALESCE(MAX(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + + COALESCE(MAX(PositionenSaldo.gsp_SicherheitsSaldo), 0) + ) AS gs_SicherheitsSaldo + FROM + tblGesamtsicherheit gs + LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr + LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr + WHERE + gs.gs_standort = '" & Standort & "' " & sqladdon & " + AND gs.gs_datum BETWEEN '" & Date.Parse(txtDatVon.Text) & "' AND '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' + AND ( + gs.gs_freitext LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_abfertigungsNr LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_avisoId LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_ATBNr LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_LKWKZ LIKE '%" & txtSuchbegriff.Text & "%' OR + gs.gs_warenort LIKE '%" & txtSuchbegriff.Text & "%' + ) + GROUP BY + gs.gs_gsnr " & sqlSicherheitssaldo & + "ORDER BY + gs.gs_gsnr;" dgvListe.SET_SQL(sqlstring, "AVISO") dgvListe.LOAD() @@ -115,6 +174,7 @@ Public Class frmGesamtsicherheitenMenuNEU .Columns("gs_datum").HeaderText = "Datum" .Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("gs_SicherheitsSaldo").HeaderText = "offener S-Betrag" + .Columns("gs_SicherheitsSaldo").DefaultCellStyle.Format = "c2" .Columns("gs_Warenort").Width = 96 .Columns("gs_Warenort").HeaderText = "Warenort" .Columns("gs_avisoId").Width = 96 @@ -123,8 +183,6 @@ Public Class frmGesamtsicherheitenMenuNEU End With - - If dgvListe.Rows.Count = 0 Then Exit Function dataTable = New DataTable() @@ -361,21 +419,63 @@ Public Class frmGesamtsicherheitenMenuNEU Dim anzahlOffenerGSUeber85Tage As Integer - Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, - (Select SUM( Case - when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) - when gs_art = 'Close' then gs_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr - ) - + - (Select SUM( Case - when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) - when gsp_art = 'Close' then gsp_sicherheitsbetrag - End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr - ) as Sicherheitssaldo + ' Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, + ' (Select SUM( Case + 'when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + 'when gs_art = 'Close' then gs_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheit] where gs_gsnr = meh.gs_gsnr + ' ) + ' + + ' (Select SUM( Case + 'when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1) + 'when gsp_art = 'Close' then gsp_sicherheitsbetrag + ' End) As gs_SicherheitsSaldo FROM [tblGesamtsicherheitsPositionen] where gsp_gsnr = meh.gs_gsnr + ' ) as Sicherheitssaldo + + ' From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2 + ' Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0 AND gs_datum < '" & Date.Now().AddDays(-85) & "'" + + + + Dim sqlstring As String = "WITH SicherheitsSaldo AS ( + SELECT + gs_gsnr, + SUM(CASE + WHEN gs_art = 'Open' THEN -gs_sicherheitsbetrag + WHEN gs_art = 'Close' THEN gs_sicherheitsbetrag + END) AS gs_SicherheitsSaldo + FROM tblGesamtsicherheit + GROUP BY gs_gsnr + ), + PositionenSaldo AS ( + SELECT + gsp_gsnr, + SUM(CASE + WHEN gsp_art = 'Open' THEN -gsp_sicherheitsbetrag + WHEN gsp_art = 'Close' THEN gsp_sicherheitsbetrag + END) AS gsp_SicherheitsSaldo + FROM tblGesamtsicherheitsPositionen + GROUP BY gsp_gsnr + ) + SELECT + COUNT(*) AS anzahlOffeneATBs + FROM ( + SELECT + gs.gs_gsnr, + MIN(gs.gs_standort) AS gs_standort, + MIN(gs.gs_datum) AS gs_datum, + COALESCE(SUM(SicherheitsSaldo.gs_SicherheitsSaldo), 0) + + COALESCE(SUM(PositionenSaldo.gsp_SicherheitsSaldo), 0) AS Sicherheitssaldo + FROM tblGesamtsicherheit gs + LEFT JOIN SicherheitsSaldo ON gs.gs_gsnr = SicherheitsSaldo.gs_gsnr + LEFT JOIN PositionenSaldo ON gs.gs_gsnr = PositionenSaldo.gsp_gsnr + WHERE gs.gs_standort = '" & Standort & "' + AND gs.gs_datum < '" & Date.Now().AddDays(-85) & "' + GROUP BY gs.gs_gsnr + ) AS meh2 + WHERE meh2.Sicherheitssaldo <> 0;" + - From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2 - Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0 AND gs_datum < '" & Date.Now().AddDays(-85) & "'" Dim dtNew As DataTable = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True) @@ -412,13 +512,10 @@ Public Class frmGesamtsicherheitenMenuNEU Next Dim frm As New frmGesamtsicherheitenNEU - Dim datumVon As Date = CDate(txtDatVon.Text) - datumVon = datumVon.AddDays(-1) If sender.ToString = "Detailliste" Then - frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text) ElseIf sender.ToString = "Referenzliste-Zollamt" Then frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort) diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index ef80ab7..5dbc325 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -75,7 +75,7 @@ Public Class frmGesamtsicherheitenNEU panOverlay.Visible = True cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) - cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) + cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] = 1 AND [wo_firma] = " & firmaId & " AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) If datum = Nothing Then datum = Date.Now nextGessicherheitID = -1 @@ -114,15 +114,15 @@ Public Class frmGesamtsicherheitenNEU txtGestellInfo.Text = "" Dim sqladd1 As String = "" - If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust" + If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", (([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100) as gs_ust" If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]" Dim sqlSearchSting As String = "" If withFilterParam = True Then - If txtSuche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')" + If txtSuche.Text <> "" Then sqlSearchSting &= " AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')" If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0" End If - Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" + Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = " & gessicherheitID & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,) dgvGesamtsicherheit.LOAD() @@ -153,6 +153,7 @@ Public Class frmGesamtsicherheitenNEU .Columns("gs_atr").Width = 35 .Columns("gs_ust").Width = 70 .Columns("gs_ust").HeaderText = "Ust" + .Columns("gs_ust").DefaultCellStyle.Format = "c2" Case Else @@ -220,13 +221,6 @@ Public Class frmGesamtsicherheitenNEU Next - 'Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', - ' [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext - ' from [tblGesamtsicherheit] - ' inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId - ' where [gs_gsnr] IN (" & gsnr & ") - ' order by gs_gsId" - Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' From [tblGesamtsicherheit] @@ -725,6 +719,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ust = "" .gsp_avisoId = Me.avisoID .gsp_gsNr = OPEN.gs_gsNr + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With @@ -791,6 +786,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ust = currentSicherheit.gs_ust .gsp_ATCNr = txtPositionenCRN.Text .gsp_avisoId = Me.avisoID + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With SicherheitsPos.SAVE() @@ -990,6 +986,8 @@ Public Class frmGesamtsicherheitenNEU End With If checkSicherheitsbetrag() = False Then Exit Sub + currentSicherheit.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + currentSicherheit.gs_zuletztgeandert = Now() currentSicherheit.SAVE() txtAnzahlPos.Enabled = True btnUpdateSicherheit.Visible = False @@ -1002,7 +1000,10 @@ Public Class frmGesamtsicherheitenNEU Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click - If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then Exit Sub + If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then + + Exit Sub + End If With currentSPos @@ -1016,11 +1017,17 @@ Public Class frmGesamtsicherheitenNEU currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text) Else currentSPos.gsp_datum = Nothing + If .gsp_ATCNr <> "" AndAlso currentSPos.gsp_datum Is Nothing Then + MsgBox("Datum/Uhrzeit bei Position " & currentSPos.gsp_gspPosId & " muss eingetragen werden!") + Exit Sub + End If End If End With If checkSicherheitsbetrag() = False Then Exit Sub + currentSPos.gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + currentSPos.gsp_zuletztgeandert = Now() currentSPos.SAVE() btnAddPos.Visible = True btnUpdatePos.Visible = False @@ -1123,6 +1130,8 @@ Public Class frmGesamtsicherheitenNEU sicherheiten.gs_abfertigungsnr = gessich.Abfertigungsnummer sicherheiten.gs_LKWKZ = gessich.LKWKZ sicherheiten.gs_warenort = gessich.warenortID + sicherheiten.gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + End Sub @@ -1886,6 +1895,7 @@ Public Class frmGesamtsicherheitenNEU .gsp_ATCNr = "Korrekt. Rundungsdiff. " & gessicherheitID .gsp_isPosRundungsdiff = True .gsp_avisoId = Me.avisoID + .gsp_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME End With SicherheitsPos.SAVE() diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 20d1e8f..768cea8 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5399,13 +5399,15 @@ Public Class frmSendungsdetailsNEU VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, SENDUNG.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge Dim invoicePrinted As Boolean = False - If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.Contains("RECHNUNG")) Then invoicePrinted = True + If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.ToUpper.Contains("RECHNUNG")) Then invoicePrinted = True For Each l In ANH_LIST_SND Select Case l.anh_Art.ToString.ToUpper Case "RECHNUNG", "HANDELSRECHNUNG" VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) - Case "EFATURA", "EUR1" + Case "EFATURA" If Not invoicePrinted Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) + Case "EUR1" + VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) End Select Next @@ -7099,6 +7101,7 @@ Public Class frmSendungsdetailsNEU Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + isFailureShown = True End Try End Sub From 0074a9c7485b3cecec46eb20966b2c146e96bfd9 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 11 Oct 2024 12:11:40 +0200 Subject: [PATCH 13/21] =?UTF-8?q?Bugfix=20=C3=96ffnen=20von=20Msg=20in=20A?= =?UTF-8?q?nh=C3=A4nge=20(Sendungsdetails).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmSendungsdetailsNEU.vb | 13 +++++++++---- Aviso/usrcntlAktDetailsATILLANeu.vb | 10 +++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index d6b263e..6c780f7 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 768cea8..5ac3a16 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -4154,13 +4154,18 @@ Public Class frmSendungsdetailsNEU Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhang.SelectedRows(0).Cells("anh_docId").Value) - If Not IO.File.Exists(docPath) Then + If Not File.Exists(docPath) Then MsgBox("Die Datei existiert nicht!") Else If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet) - Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() - System.IO.File.Copy(docPath, docPathTMP) - Process.Start(docPathTMP) + Try + Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() + File.Copy(docPath, docPathTMP) + Process.Start(docPathTMP) + Catch ex As Exception + 'wenn fehler, soll versucht werden, das oríginal zu öffnen. + Process.Start(docPath) + End Try Else Process.Start(docPath) End If diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 3445685..972e0e2 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -606,9 +606,13 @@ Public Class usrcntlAktDetailsATILLANeu MsgBox("Die Datei existiert nicht!") Else If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet) - Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() - File.Copy(docPath, docPathTMP) - Process.Start(docPathTMP) + Try + Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() + File.Copy(docPath, docPathTMP) + Process.Start(docPathTMP) + Catch ex As Exception + Process.Start(docPath) + End Try Else Process.Start(docPath) End If From aea776a71f3d4e3f0ffd614bb7fe1221ff7daca2 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 11 Oct 2024 13:19:04 +0200 Subject: [PATCH 14/21] Anhangsimport - Bugfix --- Aviso/Anhänge/frmSendungAnhangImport.vb | 47 +++++++++++++------------ 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 3711af0..fac6788 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -1,16 +1,10 @@  -'Imports iTextSharp.text.pdf -'Imports iTextSharp.text +Imports itextsharp.text Imports System.IO Imports Spire.Pdf -Imports Spire.Pdf.Conversion Imports Spire.Pdf.Conversion.Compression Imports Spire.Pdf.Exporting Imports VERAG_PROG_ALLGEMEIN -'Imports GrapeCity.Documents.Pdf - -'Imports Spire.Pdf - Public Class frmSendungAnhangImport @@ -148,9 +142,16 @@ Public Class frmSendungAnhangImport WebBrowser.Visible = (loc <> "") WebBrowser.Navigate(loc) Else + WebBrowser.Visible = False PdfViewer.Visible = (loc <> "") - PdfViewer.LoadFromFile(loc) + + Dim data = File.ReadAllBytes(loc) + Dim pdfStream = New MemoryStream(data) + PdfViewer.LoadFromStream(pdfStream) + + 'NOT WORKING + 'PdfViewer.LoadFromFile(loc) NOT WORKING End If ElseIf typ = "BILD" Then PdfViewer.Visible = False @@ -494,7 +495,7 @@ Public Class frmSendungAnhangImport Try PagesLeft = 0 - Dim pdf As New PdfDocument() + Dim pdf As New Spire.Pdf.PdfDocument() pdf.LoadFromFile(sourceFile) ' Dim r As PdfReader = New PdfReader(sourceFile) Dim pagesToKeep As New List(Of Integer) @@ -511,7 +512,7 @@ Public Class frmSendungAnhangImport Next - Dim pdf1 As New PdfDocument() + Dim pdf1 As New Spire.Pdf.PdfDocument() Dim page As PdfPageBase For Each p In pagesToKeep @@ -580,10 +581,10 @@ Public Class frmSendungAnhangImport - Dim pdf As New PdfDocument() + Dim pdf As New Spire.Pdf.PdfDocument() pdf.LoadFromFile(sourceFile) - Dim pdf1 As New PdfDocument() + Dim pdf1 As New Spire.Pdf.PdfDocument() Dim page As PdfPageBase For Each p In pagesToExtract @@ -658,7 +659,7 @@ Public Class frmSendungAnhangImport Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile) If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf" Dim srcDoc As New iTextSharp.text.Document() 'Reader.GetPageSizeWithRotation(0)) - Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) + Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New FileStream(TargetFile, System.IO.FileMode.Create)) PdfCopyProvider.SetFullCompression() srcDoc.Open() For Each p In pagesToExtract @@ -1083,7 +1084,7 @@ Public Class frmSendungAnhangImport compressor.CompressToFile(DS.GET_TOP1_PATH) 'Load the pdf document - Dim doc As New PdfDocument() + Dim doc As New Spire.Pdf.PdfDocument() doc.LoadFromFile(DS.GET_TOP1_PATH) 'Compress the content in document @@ -1107,7 +1108,7 @@ Public Class frmSendungAnhangImport End If Return False End Function - Private Shared Sub CompressContent(ByVal doc As PdfDocument) + Private Shared Sub CompressContent(ByVal doc As Spire.Pdf.PdfDocument) 'Disable the incremental update doc.FileInfo.IncrementalUpdate = False @@ -1115,7 +1116,7 @@ Public Class frmSendungAnhangImport doc.CompressionLevel = PdfCompressionLevel.Best End Sub - Private Shared Sub CompressImage(ByVal doc As PdfDocument) + Private Shared Sub CompressImage(ByVal doc As Spire.Pdf.PdfDocument) Try 'Disable the incremental update doc.FileInfo.IncrementalUpdate = False @@ -1625,7 +1626,7 @@ Public Class frmSendungAnhangImport ' Dim F_listItem As String = Path.Combine("c:\mynewpath", Path.GetFileName(s)) ' File.Copy(s, newFile) ' MsgBox(s) - If IO.File.Exists(s) Then + If System.IO.File.Exists(s) Then Dim fi As New FileInfo(s) Dim filename = fi.Name @@ -1827,7 +1828,7 @@ Public Class frmSendungAnhangImport If u.FILE_TYPE <> "PDF" Then Exit Sub ' Dim fi As New FileInfo(u.FILE_PATH) - Dim pdf As New PdfDocument() + Dim pdf As New Spire.Pdf.PdfDocument() pdf.LoadFromFile(u.FILE_PATH) For Each p In pdf.Pages txtSeiten.Text = "1" @@ -2061,7 +2062,7 @@ Public Class frmSendungAnhangImport Try ' We have a embedded file. First lets try to get the file name out of memory - Dim theStream As IO.Stream = CType(e.Data.GetData("FileGroupDescriptor"), IO.Stream) + Dim theStream As System.IO.Stream = CType(e.Data.GetData("FileGroupDescriptor"), System.IO.Stream) Dim fileGroupDescriptor(512) As Byte theStream.Read(fileGroupDescriptor, 0, 512) Dim fileName As System.Text.StringBuilder = New System.Text.StringBuilder("") @@ -2074,7 +2075,7 @@ Public Class frmSendungAnhangImport theStream.Close() ' We should have the file name or if its an email, the subject line. Create our temp file based on the temp path and this info - Dim myTempFile As String = IO.Path.GetTempPath & VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName.ToString) + Dim myTempFile As String = System.IO.Path.GetTempPath & VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName.ToString) ' Look to see if this is a email message. If so save that temporarily and get the temp file. If InStr(myTempFile, ".msg") > 0 Then @@ -2091,19 +2092,19 @@ Public Class frmSendungAnhangImport objMI = Nothing Else ' If its a attachment we need to pull the file itself out of memory - Dim ms As IO.MemoryStream = CType(e.Data.GetData("FileContents", True), IO.MemoryStream) + Dim ms As System.IO.MemoryStream = CType(e.Data.GetData("FileContents", True), System.IO.MemoryStream) Dim FileBytes(CInt(ms.Length)) As Byte ' read the raw data into our variable ms.Position = 0 ms.Read(FileBytes, 0, CInt(ms.Length)) ms.Close() ' save the raw data into our temp file - Dim fs As IO.FileStream = New IO.FileStream(myTempFile, IO.FileMode.OpenOrCreate, IO.FileAccess.Write) + Dim fs As System.IO.FileStream = New System.IO.FileStream(myTempFile, System.IO.FileMode.OpenOrCreate, System.IO.FileAccess.Write) fs.Write(FileBytes, 0, FileBytes.Length) fs.Close() End If ' Make sure we have a actual file and also if we do make sure we erase it when done - If IO.File.Exists(myTempFile) Then + If System.IO.File.Exists(myTempFile) Then ' Assign the file name to the add dialog EmAilAttach = myTempFile Else From 8fb4d0fa0b7dda4270f7506e04e7140dc0050e27 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 14 Oct 2024 21:21:53 +0200 Subject: [PATCH 15/21] ImportZA to DAKOSY Fix --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmHauptfenster.vb | 176 +++++++++---------------------- 2 files changed, 50 insertions(+), 130 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index d6b263e..b5451f0 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 4abeb5d..db32eef 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4330,138 +4330,58 @@ Public Class frmHauptfenster ' Dim dt As DataTable = SQL.loadDgvBySql("", "EZOLL") Dim slist As New List(Of String) - slist.Add("530324001596") - slist.Add("530324001604") - slist.Add("530324001658") - slist.Add("530324001685") - slist.Add("530324001707") - slist.Add("530324001721") - slist.Add("530324001756") - slist.Add("530324001720") - slist.Add("530324001755") - slist.Add("530324001863") - slist.Add("530324001853") - slist.Add("530324001941") - slist.Add("530324001695") - slist.Add("530324002015") - slist.Add("530324002021") - slist.Add("530324002034") - slist.Add("530324002042") - slist.Add("530324002083") - slist.Add("530324002089") - slist.Add("530324002090") - slist.Add("530324002094") - slist.Add("530324002097") - slist.Add("530324002107") - slist.Add("530324002108") - slist.Add("530324002117") - slist.Add("530324002115") - slist.Add("530324002114") - slist.Add("530324002116") - slist.Add("530324002189") - slist.Add("530324002217") - slist.Add("530324002230") - slist.Add("530324002274") - slist.Add("530324002276") - slist.Add("530324002288") - slist.Add("530324002290") - slist.Add("530324002291") - slist.Add("530324002349") - slist.Add("530324002386") - slist.Add("530324002387") - slist.Add("530324002390") - slist.Add("530324002380") - slist.Add("530324002383") - slist.Add("530324002412") - slist.Add("530324002451") - slist.Add("530324002450") - slist.Add("530324002453") - slist.Add("530324002459") - slist.Add("530324002460") - slist.Add("530324002474") - slist.Add("530324002498") - slist.Add("530324002499") - slist.Add("530324002487") - slist.Add("530324002507") - slist.Add("530324002554") - slist.Add("530324002560") - slist.Add("530324002544") - slist.Add("530324002548") - slist.Add("530324002551") - slist.Add("530324002581") - slist.Add("530324002616") - slist.Add("530324002619") - slist.Add("530324002610") - slist.Add("530324002634") - slist.Add("530324002636") - slist.Add("530324002675") - slist.Add("530324002681") - slist.Add("530324002682") - slist.Add("530324002688") - slist.Add("530324002689") - slist.Add("530324002665") - slist.Add("530324002659") - slist.Add("530324002723") - slist.Add("530324002796") - slist.Add("530324002798") - slist.Add("530324002783") - slist.Add("530324002890") - slist.Add("530324002905") - slist.Add("530324002913") - slist.Add("530324002918") - slist.Add("530324002926") - slist.Add("530324002956") - slist.Add("530324002959") - slist.Add("530324002961") - slist.Add("530324002962") - slist.Add("530324002972") - slist.Add("530324002963") - slist.Add("530324003079") - slist.Add("530324003111") - slist.Add("530324003140") - slist.Add("530324003142") - slist.Add("530324003161") - slist.Add("530324003164") - slist.Add("530324003230") - slist.Add("530324003294") - slist.Add("530324003295") - slist.Add("530324003312") - slist.Add("530324003380") - slist.Add("530324003430") - slist.Add("530324003395") - slist.Add("530324003514") - slist.Add("530324003454") - slist.Add("530324003499") - slist.Add("530324003501") - slist.Add("530324003504") - slist.Add("530324003500") - slist.Add("530324003606") - slist.Add("530324003616") - slist.Add("530324003674") - slist.Add("530324003682") - slist.Add("530324003780") - slist.Add("530324003653") - slist.Add("530324003985") - slist.Add("530324004016") - slist.Add("530324004157") - slist.Add("530324004254") - slist.Add("530324004367") - slist.Add("530324004386") - slist.Add("530324004387") - slist.Add("530324004747") - slist.Add("530324004756") - slist.Add("530324004757") - slist.Add("530324004836") - slist.Add("530324004918") - slist.Add("530324004916") - slist.Add("530324005000") - slist.Add("530324005049") - slist.Add("530324005132") + slist.Add("510323010932") + slist.Add("510323011636") + slist.Add("510323011857") + slist.Add("510323011898") + slist.Add("510323011973") + slist.Add("510323012315") + slist.Add("510323012316") + slist.Add("510323012197") + slist.Add("510323012479") + slist.Add("510323012728") + slist.Add("510323012818") + slist.Add("510323012844") + slist.Add("510323012848") + slist.Add("510323012877") + slist.Add("510323012910") + slist.Add("510323012914") + slist.Add("510323012931") + slist.Add("510323012879") + slist.Add("510323012884") + slist.Add("510323013223") + slist.Add("510323013268") + slist.Add("510323013373") + slist.Add("510323013335") + slist.Add("510323013370") + slist.Add("510323013394") + slist.Add("510323013432") + slist.Add("510323013606") + slist.Add("510323013607") + slist.Add("510323013625") + slist.Add("510323013847") + slist.Add("510323013899") + slist.Add("510323013952") + slist.Add("510323013959") + slist.Add("510323013955") + slist.Add("510323013974") + slist.Add("510323014015") + slist.Add("510323014109") + slist.Add("510323014215") + slist.Add("510323014252") + slist.Add("510323014395") + slist.Add("510323014396") + slist.Add("510323014394") + slist.Add("510323014491") + slist.Add("510323014619") + slist.Add("510323014825") + slist.Add("510323015366") + slist.Add("510323015959") For Each s In slist - VERAG_PROG_ALLGEMEIN.cTherefore.getFileFromFolderCat("C:\Users\DEVELOPER1\Desktop\LUKOWA\", s, "", "Import ab Jänner 2024", "Import ab Jänner 2024") + VERAG_PROG_ALLGEMEIN.cTherefore.getFileFromFolderCat("C:\Users\DEVELOPER1\Desktop\LUKOWA\", s, "", "Import ab Jänner 2023", "Import ab Jänner 2023") Next From 66922965d3220d7cf3d71dbaaf093404c9bcbbc3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 17 Oct 2024 16:44:16 +0200 Subject: [PATCH 16/21] =?UTF-8?q?Gesamtsicherheiten,=20Streamreader=20in?= =?UTF-8?q?=20PDF=20schlie=C3=9Fen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/Anhänge/frmSendungAnhangImport.vb | 6 ++--- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 20 ++++++++--------- Aviso/frmGesamtsicherheitenNEU.vb | 26 +++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index fac6788..94024d4 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -6,7 +6,6 @@ Imports Spire.Pdf.Conversion.Compression Imports Spire.Pdf.Exporting Imports VERAG_PROG_ALLGEMEIN - Public Class frmSendungAnhangImport Public AvisoId As Integer @@ -128,7 +127,6 @@ Public Class frmSendungAnhangImport Try - 'If PdfViewer IsNot Nothing AndAlso PdfViewer.IsDocumentLoaded Then ' PdfViewer.CloseDocument() 'End If @@ -142,13 +140,15 @@ Public Class frmSendungAnhangImport WebBrowser.Visible = (loc <> "") WebBrowser.Navigate(loc) Else - + WebBrowser.Visible = False PdfViewer.Visible = (loc <> "") Dim data = File.ReadAllBytes(loc) Dim pdfStream = New MemoryStream(data) PdfViewer.LoadFromStream(pdfStream) + pdfStream.Close() + 'NOT WORKING 'PdfViewer.LoadFromFile(loc) NOT WORKING diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 6c780f7..243e579 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index 548360b..f4fc5b8 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -315,10 +315,10 @@ Partial Class frmGesamtsicherheitenNEU 'txtATCaendern ' Me.txtATCaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtATCaendern.Location = New System.Drawing.Point(95, 40) + Me.txtATCaendern.Location = New System.Drawing.Point(117, 40) Me.txtATCaendern.Margin = New System.Windows.Forms.Padding(0) Me.txtATCaendern.Name = "txtATCaendern" - Me.txtATCaendern.Size = New System.Drawing.Size(186, 24) + Me.txtATCaendern.Size = New System.Drawing.Size(164, 24) Me.txtATCaendern.TabIndex = 60 ' 'Label34 @@ -327,9 +327,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label34.Location = New System.Drawing.Point(10, 40) Me.Label34.Name = "Label34" - Me.Label34.Size = New System.Drawing.Size(80, 20) + Me.Label34.Size = New System.Drawing.Size(104, 20) Me.Label34.TabIndex = 5 - Me.Label34.Text = "ATC/MRN" + Me.Label34.Text = "Reg-Nr./MRN" ' 'FlatButton4 ' @@ -400,9 +400,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label32.Location = New System.Drawing.Point(10, 40) Me.Label32.Name = "Label32" - Me.Label32.Size = New System.Drawing.Size(61, 20) + Me.Label32.Size = New System.Drawing.Size(60, 20) Me.Label32.TabIndex = 5 - Me.Label32.Text = "ATB-Nr" + Me.Label32.Text = "Reg-Nr" ' 'FlatButton2 ' @@ -1524,9 +1524,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label12.ForeColor = System.Drawing.SystemColors.ButtonHighlight Me.Label12.Location = New System.Drawing.Point(819, 191) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(64, 13) + Me.Label12.Size = New System.Drawing.Size(77, 13) Me.Label12.TabIndex = 19 - Me.Label12.Text = "ATC / MRN" + Me.Label12.Text = "Reg-Nr / MRN" ' 'Label6 ' @@ -1584,9 +1584,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1.ForeColor = System.Drawing.SystemColors.ButtonHighlight Me.Label1.Location = New System.Drawing.Point(76, 191) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(70, 13) + Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 13 - Me.Label1.Text = "ATB Nummer" + Me.Label1.Text = "Reg. Nr." ' 'txtPosFreitext ' diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 43eff63..fb74bc3 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -148,7 +148,7 @@ Public Class frmGesamtsicherheitenNEU Case True If Standort = "Verag GmbH" Then - .Columns("gs_ATBNr").HeaderText = "ATB" + .Columns("gs_ATBNr").HeaderText = "Reg-Nr." Else .Columns("gs_ATBNr").HeaderText = "T1 MRN" End If @@ -164,7 +164,7 @@ Public Class frmGesamtsicherheitenNEU Case Else If Standort = "Verag GmbH" Then - .Columns("gs_ATBNr").HeaderText = "ATB" + .Columns("gs_ATBNr").HeaderText = "Reg-Nr." Else .Columns("gs_ATBNr").HeaderText = "T1 MRN" End If @@ -228,7 +228,7 @@ Public Class frmGesamtsicherheitenNEU Next - Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' + Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' From [tblGesamtsicherheit] Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 @@ -305,7 +305,7 @@ Public Class frmGesamtsicherheitenNEU Next - Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', + Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext from [tblGesamtsicherheit] inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId @@ -319,7 +319,7 @@ Public Class frmGesamtsicherheitenNEU dtSicherheiten.Columns.Add("SSaldo") Dim drFirst = dtSicherheiten.NewRow - drFirst.Item("ATB Verwahrlager") = "Uebertrag vom " & datumVon + drFirst.Item("Reg-Nr. Verwahrlager") = "Uebertrag vom " & datumVon drFirst.Item("SSaldo") = CDbl(dtSicherheiten.Rows(0).Item("Saldo")) dtSicherheiten.Rows.InsertAt(drFirst, 0) @@ -344,7 +344,7 @@ Public Class frmGesamtsicherheitenNEU Next Dim drLast = dtSicherheiten.NewRow - drLast.Item("ATB Verwahrlager") = "Saldo zum " & datumBis + drLast.Item("Reg-Nr. Verwahrlager") = "Saldo zum " & datumBis drLast.Item("SSaldo") = CDbl(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("SSaldo")) dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count) @@ -411,7 +411,7 @@ Public Class frmGesamtsicherheitenNEU Select Case currentGesSichRef.brgakto_gs_ATR Case True If Standort = "Verag GmbH" Then - .Columns("gsp_ATCNr").HeaderText = "ATC / MRN" + .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN" ElseIf Standort = "VERAG AG" Then .Columns("gsp_ATCNr").HeaderText = "T1 CRN" Else @@ -420,7 +420,7 @@ Public Class frmGesamtsicherheitenNEU Case Else If Standort = "Verag GmbH" Then - .Columns("gsp_ATCNr").HeaderText = "CRN / MRN" + .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN" ElseIf Standort = "VERAG AG" Then .Columns("gsp_ATCNr").HeaderText = "T1 CRN" Else @@ -1615,7 +1615,7 @@ Public Class frmGesamtsicherheitenNEU End If If mutlitpleATBNr Then - lblWarningATB.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. ATB-Nummern markiert!" + lblWarningATB.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. Reg-Nr. markiert!" Else lblWarningATB.Text = "" End If @@ -1648,7 +1648,7 @@ Public Class frmGesamtsicherheitenNEU End If If mutlitpleATCNr Then - lblATCwarning.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. ATC-Nummern markiert!" + lblATCwarning.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. Reg-Nr.Nummern markiert!" Else lblATCwarning.Text = "" End If @@ -1701,7 +1701,7 @@ Public Class frmGesamtsicherheitenNEU Private Sub FlatButton3_Click(sender As Object, e As EventArgs) Handles FlatButton3.Click If txtATCaendern.Text = "" Then - MsgBox("Bitte ATC/MRN-Nr angeben!") + MsgBox("Bitte Reg/MRN-Nr angeben!") Exit Sub End If @@ -1836,10 +1836,10 @@ Public Class frmGesamtsicherheitenNEU Private Sub changeLabel(Optional isATR As Boolean = True) If Standort = "Verag GmbH" Then - Label1.Text = "ATB Nummer" + Label1.Text = "Reg-Nr." If isATR Then - Label12.Text = "ATC / MRN" + Label12.Text = "Reg-Nr. / MRN" Else Label12.Text = "CRN / MRN" From 8d97c09f9919a0ff13b076acbfcc9307b34901bb Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 21 Oct 2024 07:56:38 +0200 Subject: [PATCH 17/21] vers --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index b5451f0..243e579 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From e35a81c271a045cabeb7deb70450e9e73467b288 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 21 Oct 2024 11:46:53 +0200 Subject: [PATCH 18/21] Anhangsimport --- Aviso/Anhänge/frmSendungAnhangImport.vb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 94024d4..b833911 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -143,11 +143,12 @@ Public Class frmSendungAnhangImport WebBrowser.Visible = False PdfViewer.Visible = (loc <> "") - - Dim data = File.ReadAllBytes(loc) - Dim pdfStream = New MemoryStream(data) - PdfViewer.LoadFromStream(pdfStream) - pdfStream.Close() + If doc <> "" Then + Dim data = File.ReadAllBytes(loc) + Dim pdfStream = New MemoryStream(data) + PdfViewer.LoadFromStream(pdfStream) + pdfStream.Close() + End If 'NOT WORKING From e1d61b834250dad379b7e9f1ae754222e76783ea Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 22 Oct 2024 15:32:53 +0200 Subject: [PATCH 19/21] Sendungsdetails --- Aviso/frmSendungsdetailsNEU.vb | 6 ------ Aviso/rCntrlVermerke.vb | 2 +- Aviso/usrcntlAktDetails.vb | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 5ac3a16..2b41b12 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -101,7 +101,6 @@ Public Class frmSendungsdetailsNEU cntlFrachtfuehrer_Sonst.special(False) Try - For Each c In Panel6.Controls If c.GetType.ToString = "AVISO.usrcntlCheckBox" Then Dim cntlCbx As usrcntlCheckBox = DirectCast(c, usrcntlCheckBox) @@ -5936,14 +5935,9 @@ Public Class frmSendungsdetailsNEU Sub calculateFreightCosts() Dim f = New frmFrachtkostenBerechnen() - f.UsrcntlFrachtkostenberechnung1.init(AvisoId, txtAbsenderKdNr._value, txtEmpfaengerKdNr._value, txtGewicht.Text, txtFrachtkostenGesamt.Text, rtbWarenbezeichnung.Text, txtWarenwert._value) - If f.ShowDialog = DialogResult.OK Then - 'txtFrachtkostenEU._value = frachkosten.usrcntlFrachtkostenberechnung.EUAnteil - 'txtFrachtkostenNichtEU._value = frachkosten.nichtEUAnteil - 'txtFrachtkostenGesamt._value = frachkosten.tbxGesamtfrachtkosten._value End If diff --git a/Aviso/rCntrlVermerke.vb b/Aviso/rCntrlVermerke.vb index a6c5c2f..b3e3d74 100644 --- a/Aviso/rCntrlVermerke.vb +++ b/Aviso/rCntrlVermerke.vb @@ -142,7 +142,7 @@ Public Class rCntrlVermerke ' End If ' Next ' Catch ex As Exception - ' MsgBox("ERR") + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) ' End Try ' End Select 'End Sub diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index fc38aa8..971e907 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -1527,7 +1527,7 @@ Public Class usrcntlAktDetails ' ArrowDown_ShowHide() 'Anzeigeproblem, wenn Aviso minimiert wird! --> Jetzt bei Timer! Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -1547,7 +1547,7 @@ Public Class usrcntlAktDetails End If Next Catch ex As Exception - MsgBox("ERR") + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Select End Sub From 6fb08b470e9c9a9ff4581be24fe4f2c874fa94d2 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 23 Oct 2024 14:42:40 +0200 Subject: [PATCH 20/21] Aviso-Treppe --- Aviso/usrcntlAktDetails.vb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 971e907..f61f5df 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -43,6 +43,7 @@ Public Class usrcntlAktDetails ' Dim WithEvents timerDetails As New Timer Dim AVISO As cAviso = Nothing Dim WithEvents timerSendRows As New Timer + Dim isFailureShown As Boolean = False Dim painted As Boolean = False ' Damit gridVermerke Formattierung nicht dauernd anspringt.. @@ -1532,6 +1533,7 @@ Public Class usrcntlAktDetails End Sub Sub ArrowDown_ShowHide() + If isFailureShown Then Exit Sub picArrowDown.Visible = False If dgvSendungen.RowCount = 0 Then Exit Sub Select Case tbcntlVermerke.SelectedIndex @@ -1548,6 +1550,7 @@ Public Class usrcntlAktDetails Next Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + isFailureShown = True End Try End Select End Sub From 580487ee75f47063a4c13edb3a0c4d9f291e8212 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 28 Oct 2024 08:23:54 +0100 Subject: [PATCH 21/21] PDF --- Aviso/Anhänge/frmSendungAnhangImport.vb | 2 +- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index b833911..61e6441 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -143,7 +143,7 @@ Public Class frmSendungAnhangImport WebBrowser.Visible = False PdfViewer.Visible = (loc <> "") - If doc <> "" Then + If loc <> "" Then Dim data = File.ReadAllBytes(loc) Dim pdfStream = New MemoryStream(data) PdfViewer.LoadFromStream(pdfStream) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 243e579..51f8164 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +