Update 20260130

Client/Diverses/SplashScreen.Designer.cs

@@ -65,7 +65,7 @@
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(472, 26);
             this.label2.TabIndex = 2;
-            this.label2.Text = "9. Januar 2026";
+            this.label2.Text = "3. Febraur 2026";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.label2.Click += new System.EventHandler(this.label2_Click);
             // 

Client/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.11.05")]
-[assembly: AssemblyFileVersion("1.7.11.05")]
+[assembly: AssemblyVersion("1.8.0.01")]
+[assembly: AssemblyFileVersion("1.8.0.01")]

Client/UIControls/Approval.cs

@@ -201,7 +201,7 @@ namespace OnDoc.UIControls
             }
             try
             {
-                db.Get_Tabledata("Select * from ondoc_view_prov_pakete where (aktiv=1 and (signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "'))", false, true);
+                db.Get_Tabledata("Select * from ondoc_view_prov_pakete where (aktiv=1 and signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (aktiv= 1 and signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "')", false, true);
                 foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
                 {
                     if (tmppartner != Convert.ToInt32(dr["partnernr"]))
@@ -235,13 +235,36 @@ namespace OnDoc.UIControls
             pnlsignerror.Visible = false;
             frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(), "Ablehnen");
             DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
-
+            clsMailer mailer = new clsMailer();
             if (note.ShowDialog() == DialogResult.OK)
             {
                 DB db = new DB(AppParams.connectionstring);
+                if (treeViewAdv1.SelectedNode.Tag.ToString().Contains("(Paket)"))
+                {
+                    string pid = treeViewAdv1.SelectedNode.Tag.ToString();
+                    pid = pid.Substring(0, pid.Length - 7);
+                    DB db1 = new DB(AppParams.connectionstring);
+                    db1.clear_parameter();
+                    db1.add_parameter("@paketid", pid);
+                    db1.add_parameter("@unterzeichner", AppParams.currenttgnummer.ToString());
+                    db1.add_parameter("@genehmigt", "0");
+
+                    db1.Get_Tabledata("sp_ondoc_prov_versandpaket_genehmigt", true, false);
+                    if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) > 0)
+                    {
+                        clsMailer mailer1 = new clsMailer();
+                        mailer1.sendmail(10, db1.dsdaten.Tables[0].Rows[0][0].ToString(), "", "", pid.ToString(), "", AppParams.CurrentMitarbeiter.ToString(), "");
+                        mailer1 = null;
+                    }
+
+                    remove_node();
+                    db1 = null;
+                    return;
+                }
+               
                 string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "', betreff='" + note.betreff + "', notizgrund='" + note.notiz + "' where id=" + dr["id"].ToString();
                 db.Exec_SQL(sql);
-                clsMailer mailer = new clsMailer();
+
                 string empfaengerid = "";
                 db.Get_Tabledata("Select mutierer from dokument_Bewilligung where id=" + dr["id"].ToString(), false, true);
                 empfaengerid = db.dsdaten.Tables[0].Rows[0][0].ToString();
@@ -434,6 +457,13 @@ namespace OnDoc.UIControls
                 db1.add_parameter("@genehmigt", "1");
 
                 db1.Get_Tabledata("sp_ondoc_prov_versandpaket_genehmigt", true, false);
+                if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) > 0)
+                {
+                    clsMailer mailer1 = new clsMailer();
+                    mailer1.sendmail(11, db1.dsdaten.Tables[0].Rows[0][0].ToString(), "", "", pid.ToString(), "", AppParams.CurrentMitarbeiter.ToString(),"");
+                    mailer1 = null;
+                }
+
                 remove_node();
                 db1 = null;
                 return;
@@ -450,10 +480,10 @@ namespace OnDoc.UIControls
                 treeViewAdv1.SelectedNode.Height = 0;
                 signthread.Start();
                
-               
+
                 //remove_node();
-                
-                
+
+
                 return;
             }
 

Client/UIControls/DokList.cs

@@ -2134,7 +2134,7 @@ namespace OnDoc.UICintrols
                 approval = approval + Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]);
                 try
                 {
-                    db1.Get_Tabledata("Select count(*) from ondoc_view_prov_pakete where (aktiv=1 and (signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "'))", false, true);
+                    db1.Get_Tabledata("Select count(*) from ondoc_view_prov_pakete where (aktiv=1  and signedleft=0 and signleft='" + AppParams.currenttgnummer.ToString() + "') or (aktiv=1 and signedright=0 and signright='" + AppParams.currenttgnummer.ToString() + "')", false, true);
                     approval = approval + Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]);
                 }
                 catch { }

Client/Versandstrasse/Versandstrasse.cs

@@ -1437,8 +1437,14 @@ namespace OnDoc.Versandstrasse
             DB db = new DB(AppParams.connectionstring);
             DB db2 = new DB(AppParams.connectionstring);
             //STH
-            //db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where isnull(signed,1)=1 and  aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
-            db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
+            try
+            {
+                db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where isnull(signed,1)=1 and  aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
+            }
+            catch
+            {
+                db.Get_Tabledata("Select * from ondoc_versandstrasse_paket where aktiv=1 and ersteller=" + AppParams.CurrentMitarbeiter + " and versendet=0", false, true);
+            }
             treeViewAdvCouverts.Nodes.Clear();
             foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
             {