From 41cb0583e3d786783f4bf8c0308dba0c0d06204a Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Tue, 23 Jun 2026 14:38:35 +0200 Subject: [PATCH] =?UTF-8?q?FormFehlmengeCount=20kann=20nicht=20geschlossen?= =?UTF-8?q?=20werden=20wenn=20nicht=20KundeFertig.=20Button=20Zur=C3=BCck(?= =?UTF-8?q?Abbrechen)=20damit=20wenn=20falsch=20gew=C3=A4hlt=20der=20Abtei?= =?UTF-8?q?lungStatus=20zur=C3=BCckgesetzt=20werden=20kann.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AA-Forms/FormFehlmengeCount.Designer.cs | 118 ++++-- AA-Forms/FormFehlmengeCount.cs | 73 ++-- App.config | 2 +- Properties/AssemblyInfo.cs | 4 +- SetupVerwaltung/SetupVerwaltung.vdproj | 542 ++++++++++++------------ Verwaltung_ReadMe.txt | 4 +- 6 files changed, 406 insertions(+), 337 deletions(-) diff --git a/AA-Forms/FormFehlmengeCount.Designer.cs b/AA-Forms/FormFehlmengeCount.Designer.cs index c11db5a..357e643 100644 --- a/AA-Forms/FormFehlmengeCount.Designer.cs +++ b/AA-Forms/FormFehlmengeCount.Designer.cs @@ -45,6 +45,7 @@ this.tableLayoutPanelArtikel = new System.Windows.Forms.TableLayoutPanel(); this.labelAnmerkung = new System.Windows.Forms.Label(); this.labelAnmerkungText = new System.Windows.Forms.Label(); + this.buttonAbbrechen = new System.Windows.Forms.Button(); this.groupBoxArtikel.SuspendLayout(); this.tableLayoutPanelArtikel.SuspendLayout(); this.SuspendLayout(); @@ -52,9 +53,10 @@ // textBoxScann // this.textBoxScann.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxScann.Location = new System.Drawing.Point(12, 12); + this.textBoxScann.Location = new System.Drawing.Point(161, 15); + this.textBoxScann.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBoxScann.Name = "textBoxScann"; - this.textBoxScann.Size = new System.Drawing.Size(130, 31); + this.textBoxScann.Size = new System.Drawing.Size(172, 37); this.textBoxScann.TabIndex = 1; this.textBoxScann.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxScann_KeyDown); this.textBoxScann.Leave += new System.EventHandler(this.TextBoxScann_Leave); @@ -64,20 +66,24 @@ this.labelSuchtext.AutoSize = true; this.labelSuchtext.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelSuchtext.ForeColor = System.Drawing.Color.White; - this.labelSuchtext.Location = new System.Drawing.Point(148, 9); + this.labelSuchtext.Location = new System.Drawing.Point(341, 9); + this.labelSuchtext.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelSuchtext.Name = "labelSuchtext"; - this.labelSuchtext.Size = new System.Drawing.Size(195, 37); + this.labelSuchtext.Size = new System.Drawing.Size(240, 46); this.labelSuchtext.TabIndex = 2; this.labelSuchtext.Text = "KundeName"; // // buttonFertig // this.buttonFertig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.buttonFertig.BackColor = System.Drawing.Color.Lime; + this.buttonFertig.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonFertig.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonFertig.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFertig.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonFertig.Location = new System.Drawing.Point(1098, 12); + this.buttonFertig.Location = new System.Drawing.Point(1464, 15); + this.buttonFertig.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonFertig.Name = "buttonFertig"; - this.buttonFertig.Size = new System.Drawing.Size(156, 142); + this.buttonFertig.Size = new System.Drawing.Size(208, 175); this.buttonFertig.TabIndex = 3; this.buttonFertig.Text = "Kunde Fertig"; this.buttonFertig.UseVisualStyleBackColor = false; @@ -88,9 +94,10 @@ this.labelName.AutoSize = true; this.labelName.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelName.ForeColor = System.Drawing.Color.White; - this.labelName.Location = new System.Drawing.Point(7, 46); + this.labelName.Location = new System.Drawing.Point(155, 65); + this.labelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(148, 29); + this.labelName.Size = new System.Drawing.Size(179, 36); this.labelName.TabIndex = 4; this.labelName.Text = "KundeName"; // @@ -99,9 +106,10 @@ this.buttonArt1.BackColor = System.Drawing.Color.Turquoise; this.buttonArt1.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt1.ForeColor = System.Drawing.Color.Black; - this.buttonArt1.Location = new System.Drawing.Point(3, 3); + this.buttonArt1.Location = new System.Drawing.Point(4, 4); + this.buttonArt1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt1.Name = "buttonArt1"; - this.buttonArt1.Size = new System.Drawing.Size(303, 243); + this.buttonArt1.Size = new System.Drawing.Size(404, 299); this.buttonArt1.TabIndex = 0; this.buttonArt1.Text = "Artikel1"; this.buttonArt1.UseVisualStyleBackColor = false; @@ -114,9 +122,10 @@ this.buttonArt2.BackColor = System.Drawing.Color.Turquoise; this.buttonArt2.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt2.ForeColor = System.Drawing.Color.Black; - this.buttonArt2.Location = new System.Drawing.Point(312, 3); + this.buttonArt2.Location = new System.Drawing.Point(416, 4); + this.buttonArt2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt2.Name = "buttonArt2"; - this.buttonArt2.Size = new System.Drawing.Size(303, 243); + this.buttonArt2.Size = new System.Drawing.Size(404, 299); this.buttonArt2.TabIndex = 1; this.buttonArt2.Text = "Artikel2"; this.buttonArt2.UseVisualStyleBackColor = false; @@ -129,9 +138,10 @@ this.buttonArt4.BackColor = System.Drawing.Color.Turquoise; this.buttonArt4.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt4.ForeColor = System.Drawing.Color.Black; - this.buttonArt4.Location = new System.Drawing.Point(930, 3); + this.buttonArt4.Location = new System.Drawing.Point(1240, 4); + this.buttonArt4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt4.Name = "buttonArt4"; - this.buttonArt4.Size = new System.Drawing.Size(303, 243); + this.buttonArt4.Size = new System.Drawing.Size(404, 299); this.buttonArt4.TabIndex = 2; this.buttonArt4.Text = "Artikel4"; this.buttonArt4.UseVisualStyleBackColor = false; @@ -144,9 +154,10 @@ this.buttonArt3.BackColor = System.Drawing.Color.Turquoise; this.buttonArt3.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt3.ForeColor = System.Drawing.Color.Black; - this.buttonArt3.Location = new System.Drawing.Point(621, 3); + this.buttonArt3.Location = new System.Drawing.Point(828, 4); + this.buttonArt3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt3.Name = "buttonArt3"; - this.buttonArt3.Size = new System.Drawing.Size(303, 243); + this.buttonArt3.Size = new System.Drawing.Size(404, 299); this.buttonArt3.TabIndex = 3; this.buttonArt3.Text = "Artikel3"; this.buttonArt3.UseVisualStyleBackColor = false; @@ -159,9 +170,10 @@ this.buttonArt7.BackColor = System.Drawing.Color.Turquoise; this.buttonArt7.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt7.ForeColor = System.Drawing.Color.Black; - this.buttonArt7.Location = new System.Drawing.Point(621, 252); + this.buttonArt7.Location = new System.Drawing.Point(828, 311); + this.buttonArt7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt7.Name = "buttonArt7"; - this.buttonArt7.Size = new System.Drawing.Size(303, 244); + this.buttonArt7.Size = new System.Drawing.Size(404, 300); this.buttonArt7.TabIndex = 4; this.buttonArt7.Text = "Artikel7"; this.buttonArt7.UseVisualStyleBackColor = false; @@ -174,9 +186,10 @@ this.buttonArt8.BackColor = System.Drawing.Color.Turquoise; this.buttonArt8.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt8.ForeColor = System.Drawing.Color.Black; - this.buttonArt8.Location = new System.Drawing.Point(930, 252); + this.buttonArt8.Location = new System.Drawing.Point(1240, 311); + this.buttonArt8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt8.Name = "buttonArt8"; - this.buttonArt8.Size = new System.Drawing.Size(303, 244); + this.buttonArt8.Size = new System.Drawing.Size(404, 300); this.buttonArt8.TabIndex = 5; this.buttonArt8.Text = "Artikel8"; this.buttonArt8.UseVisualStyleBackColor = false; @@ -189,9 +202,10 @@ this.buttonArt6.BackColor = System.Drawing.Color.Turquoise; this.buttonArt6.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt6.ForeColor = System.Drawing.Color.Black; - this.buttonArt6.Location = new System.Drawing.Point(312, 252); + this.buttonArt6.Location = new System.Drawing.Point(416, 311); + this.buttonArt6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt6.Name = "buttonArt6"; - this.buttonArt6.Size = new System.Drawing.Size(303, 244); + this.buttonArt6.Size = new System.Drawing.Size(404, 300); this.buttonArt6.TabIndex = 6; this.buttonArt6.Text = "Artikel6"; this.buttonArt6.UseVisualStyleBackColor = false; @@ -204,9 +218,10 @@ this.buttonArt5.BackColor = System.Drawing.Color.Turquoise; this.buttonArt5.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonArt5.ForeColor = System.Drawing.Color.Black; - this.buttonArt5.Location = new System.Drawing.Point(3, 252); + this.buttonArt5.Location = new System.Drawing.Point(4, 311); + this.buttonArt5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonArt5.Name = "buttonArt5"; - this.buttonArt5.Size = new System.Drawing.Size(303, 244); + this.buttonArt5.Size = new System.Drawing.Size(404, 300); this.buttonArt5.TabIndex = 7; this.buttonArt5.Text = "Artikel5"; this.buttonArt5.UseVisualStyleBackColor = false; @@ -221,9 +236,11 @@ | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxArtikel.Controls.Add(this.tableLayoutPanelArtikel); this.groupBoxArtikel.ForeColor = System.Drawing.Color.White; - this.groupBoxArtikel.Location = new System.Drawing.Point(12, 160); + this.groupBoxArtikel.Location = new System.Drawing.Point(16, 197); + this.groupBoxArtikel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBoxArtikel.Name = "groupBoxArtikel"; - this.groupBoxArtikel.Size = new System.Drawing.Size(1242, 518); + this.groupBoxArtikel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxArtikel.Size = new System.Drawing.Size(1656, 638); this.groupBoxArtikel.TabIndex = 0; this.groupBoxArtikel.TabStop = false; this.groupBoxArtikel.Text = "Kundenartikel"; @@ -245,12 +262,13 @@ this.tableLayoutPanelArtikel.Controls.Add(this.buttonArt3, 2, 0); this.tableLayoutPanelArtikel.Controls.Add(this.buttonArt4, 3, 0); this.tableLayoutPanelArtikel.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanelArtikel.Location = new System.Drawing.Point(3, 16); + this.tableLayoutPanelArtikel.Location = new System.Drawing.Point(4, 19); + this.tableLayoutPanelArtikel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanelArtikel.Name = "tableLayoutPanelArtikel"; this.tableLayoutPanelArtikel.RowCount = 2; this.tableLayoutPanelArtikel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanelArtikel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanelArtikel.Size = new System.Drawing.Size(1236, 499); + this.tableLayoutPanelArtikel.Size = new System.Drawing.Size(1648, 615); this.tableLayoutPanelArtikel.TabIndex = 8; // // labelAnmerkung @@ -258,9 +276,10 @@ this.labelAnmerkung.AutoSize = true; this.labelAnmerkung.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelAnmerkung.ForeColor = System.Drawing.Color.White; - this.labelAnmerkung.Location = new System.Drawing.Point(7, 75); + this.labelAnmerkung.Location = new System.Drawing.Point(155, 101); + this.labelAnmerkung.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelAnmerkung.Name = "labelAnmerkung"; - this.labelAnmerkung.Size = new System.Drawing.Size(141, 29); + this.labelAnmerkung.Size = new System.Drawing.Size(176, 36); this.labelAnmerkung.TabIndex = 5; this.labelAnmerkung.Text = "Anmerkung:"; this.labelAnmerkung.Visible = false; @@ -270,19 +289,44 @@ this.labelAnmerkungText.AutoSize = true; this.labelAnmerkungText.BackColor = System.Drawing.Color.White; this.labelAnmerkungText.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelAnmerkungText.Location = new System.Drawing.Point(154, 82); + this.labelAnmerkungText.Location = new System.Drawing.Point(339, 110); + this.labelAnmerkungText.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelAnmerkungText.Name = "labelAnmerkungText"; - this.labelAnmerkungText.Size = new System.Drawing.Size(39, 20); + this.labelAnmerkungText.Size = new System.Drawing.Size(51, 25); this.labelAnmerkungText.TabIndex = 6; this.labelAnmerkungText.Text = "Text"; this.labelAnmerkungText.Visible = false; // + // buttonAbbrechen + // + this.buttonAbbrechen.AutoSize = true; + this.buttonAbbrechen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; + this.buttonAbbrechen.CausesValidation = false; + this.buttonAbbrechen.FlatAppearance.BorderColor = System.Drawing.Color.Red; + this.buttonAbbrechen.FlatAppearance.BorderSize = 0; + this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAbbrechen.ForeColor = System.Drawing.Color.White; + this.buttonAbbrechen.Location = new System.Drawing.Point(12, 15); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonAbbrechen.Name = "buttonAbbrechen"; + this.buttonAbbrechen.Size = new System.Drawing.Size(103, 30); + this.buttonAbbrechen.TabIndex = 7; + this.buttonAbbrechen.Text = "<< Zurück"; + this.buttonAbbrechen.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.buttonAbbrechen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonAbbrechen.UseVisualStyleBackColor = false; + this.buttonAbbrechen.Click += new System.EventHandler(this.ButtonAbbrechen_Click); + // // FormFehlmengeCount // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.ClientSize = new System.Drawing.Size(1266, 690); + this.ClientSize = new System.Drawing.Size(1688, 849); + this.Controls.Add(this.buttonAbbrechen); this.Controls.Add(this.labelAnmerkungText); this.Controls.Add(this.labelAnmerkung); this.Controls.Add(this.labelName); @@ -290,10 +334,13 @@ this.Controls.Add(this.labelSuchtext); this.Controls.Add(this.textBoxScann); this.Controls.Add(this.groupBoxArtikel); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FormFehlmengeCount"; this.Text = "FEHLMENGEN-ERFASSUNG"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormFehlmengeCount_FormClosing); this.Load += new System.EventHandler(this.FormFehlmengeCount_Load); this.groupBoxArtikel.ResumeLayout(false); this.tableLayoutPanelArtikel.ResumeLayout(false); @@ -319,5 +366,6 @@ private System.Windows.Forms.TableLayoutPanel tableLayoutPanelArtikel; private System.Windows.Forms.Label labelAnmerkung; private System.Windows.Forms.Label labelAnmerkungText; + private System.Windows.Forms.Button buttonAbbrechen; } } \ No newline at end of file diff --git a/AA-Forms/FormFehlmengeCount.cs b/AA-Forms/FormFehlmengeCount.cs index f6e63b1..f89ae9a 100644 --- a/AA-Forms/FormFehlmengeCount.cs +++ b/AA-Forms/FormFehlmengeCount.cs @@ -59,6 +59,8 @@ namespace Deckungsbeitrag private async void FormFehlmengeCount_Load(object sender, EventArgs e) { + this.buttonAbbrechen.Location = new Point(buttonAbbrechen.Left, buttonFertig.Top); + videoDevices = new FilterInfoCollection(FilterCategory.VideoInputDevice); this.Text = " Version: " + Assembly.GetExecutingAssembly().GetName().Version.ToString(); if (userid != null) @@ -69,8 +71,17 @@ namespace Deckungsbeitrag if (userid.Contains("spannleintuch")) { kategorie = ArtikelKategorie.Spannleintuch; } } - //Kunde wird durch Scan oder Handeingabe Ausgewählt. - //this.kunde = Funktionen.KundenAuswahl(); + GetAuswahl(); + + ControlLaden(); + CloseKeyboard(); + } + + /// + /// Auftrag mit Kunde wird durch FormAuftragAuswahl ausgewählt. Wenn Dialogresult nicht OK werden Kunde und Auftrag auf null gesetzt und das Program geschlossen. + /// + private async void GetAuswahl() + { if ((userid != null && userid.Contains("reklamation")) || (this.benutzer != null && this.benutzer.Rolle == BenutzerRolle.Expedit) || (this.benutzer != null && this.benutzer.Rolle == BenutzerRolle.Frottee)) await Open_Liste(); else { @@ -86,11 +97,9 @@ namespace Deckungsbeitrag this.auftrag = null; this.Close(); } - + } - ControlLaden(); - CloseKeyboard(); } private void CloseKeyboard() { @@ -111,6 +120,8 @@ namespace Deckungsbeitrag } private void ControlLaden() { + buttonAbbrechen.Visible = buttonAbbrechen.Enabled = true; + // Nachdem die textboxScann verlassen wird und ein Kunde gefunden wurde wird Form_Load ausgelöst. if (kunde != null) { @@ -189,8 +200,8 @@ namespace Deckungsbeitrag foreach (Button btn in this.tableLayoutPanelArtikel.Controls) { btn.Tag = null; - if (int.TryParse(btn.Name.Substring(9, 1), out int x)) artZahl[x - 1]++; - btn.Text = AktualisiereButtonText(btn.Text, artZahl[x - 1]); + //if (int.TryParse(btn.Name.Substring(9, 1), out int x)) artZahl[x - 1]++; + //btn.Text = AktualisiereButtonText(btn.Text, artZahl[x - 1]); } this.groupBoxArtikel.Visible = true; this.tableLayoutPanelArtikel.Visible = true; @@ -507,25 +518,7 @@ namespace Deckungsbeitrag } - //Kunde wird durch Scan oder Handeingabe Ausgewählt. - if ((userid != null && userid.Contains("reklamation")) || (this.benutzer != null && this.benutzer.Rolle == BenutzerRolle.Expedit) || (this.benutzer != null && this.benutzer.Rolle == BenutzerRolle.Frottee)) await Open_Liste(); - else - { - FormAuftragAuswahl auswahl = new FormAuftragAuswahl(); - if (auswahl.ShowDialog() == DialogResult.OK) - { - this.kunde = auswahl.kunde; - this.auftrag = auswahl.auftrag; - } - else - { - this.kunde = null; - this.auftrag = null; - this.Close(); - } - - } - + GetAuswahl(); ControlLaden(); } private void EtikettDrucken() @@ -623,6 +616,8 @@ namespace Deckungsbeitrag } private void Button_Click(object sender, EventArgs e) { + buttonAbbrechen.Visible = buttonAbbrechen.Enabled = false; + // Beim geklickten Artikel wird Fehlmenge erhöht Button btn = (Button)sender; KundeArtikel kndart = (KundeArtikel)btn.Tag; @@ -674,6 +669,32 @@ namespace Deckungsbeitrag return button; } + + private void FormFehlmengeCount_FormClosing(object sender, FormClosingEventArgs e) + { + + } + + private void ButtonAbbrechen_Click(object sender, EventArgs e) + { + if (auftrag != null) + { + if (this.benutzer == null | (userid != null && !userid.Contains("reklamation"))) + { + // AbteilungsStatus Begonnen wird hier gesetzt. + if (userid.Contains("kleinteile")) { auftrag.Abteilungen &= ~AbteilungsStatus.KleinteileBegonnen; } + if (userid.Contains("grossteile")) { auftrag.Abteilungen &= ~AbteilungsStatus.GrossteileBegonnen; } + if (userid.Contains("frottee")) { auftrag.Abteilungen &= ~AbteilungsStatus.FrotteeBegonnen; } + if (userid.Contains("spannleintuch")) { auftrag.Abteilungen &= ~AbteilungsStatus.SpannleintuchBegonnen; } + + auftrag.MaschineID = null; + auftrag.Save(); + } + } + this.auftrag = null; + this.kunde = null; + GetAuswahl(); + } } } //DONE: Wenn Frottee-Expedit auch Reklamation bearbeitet, muss BenutzerRolle abgefragt werden. siehe CHANGES. \ No newline at end of file diff --git a/App.config b/App.config index 6484ec4..3a65338 100644 --- a/App.config +++ b/App.config @@ -6,7 +6,7 @@ - + diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index bff338b..ff4be67 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,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.1.7.0")] -[assembly: AssemblyFileVersion("1.1.7.0")] +[assembly: AssemblyVersion("1.1.7.1")] +[assembly: AssemblyFileVersion("1.1.7.1")] diff --git a/SetupVerwaltung/SetupVerwaltung.vdproj b/SetupVerwaltung/SetupVerwaltung.vdproj index 5be9831..d999a25 100644 --- a/SetupVerwaltung/SetupVerwaltung.vdproj +++ b/SetupVerwaltung/SetupVerwaltung.vdproj @@ -34,37 +34,7 @@ "Entry" { "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -76,7 +46,37 @@ "Entry" { "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -124,31 +124,7 @@ "Entry" { "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -160,7 +136,31 @@ "Entry" { "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -214,13 +214,13 @@ "Entry" { "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -268,19 +268,7 @@ "Entry" { "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -292,7 +280,19 @@ "Entry" { "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -352,37 +352,7 @@ "Entry" { "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -394,7 +364,37 @@ "Entry" { "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -406,7 +406,7 @@ "Entry" { "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -418,7 +418,7 @@ "Entry" { "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" - "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -442,13 +442,13 @@ "Entry" { "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -478,163 +478,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EEA0FC277F3C1BC119E28ABD40FA3C76" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -646,7 +490,163 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_EEA0FC277F3C1BC119E28ABD40FA3C76" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" "MsmSig" = "8:_UNDEFINED" } } @@ -1594,15 +1594,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:SetupVerwaltung" - "ProductCode" = "8:{3ED6B287-1043-4189-AF73-35192034AB95}" - "PackageCode" = "8:{76C9A4E3-4912-4F55-96A5-79CD92D6BE3E}" + "ProductCode" = "8:{E3EF167A-1E05-470F-8EC5-E326A0A58AD7}" + "PackageCode" = "8:{1E2A146E-6F16-40D5-946F-B25A73376AC3}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.70" + "ProductVersion" = "8:1.1.71" "Manufacturer" = "8:Kilian Wirl GmbH" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt index f7fff0e..085104e 100644 --- a/Verwaltung_ReadMe.txt +++ b/Verwaltung_ReadMe.txt @@ -1,5 +1,5 @@ ===================================== -NEUIGKEITEN - Version 1.1.7.0 +NEUIGKEITEN - Version 1.1.7.1 ===================================== Build-Info: @@ -73,5 +73,5 @@ Build-Info: Keine Install-Reminder vorhanden ✅ -Installation: 23.06.2026 11:26 +Installation: 23.06.2026 14:01 =====================================